y2038: globally rename compat_time to old_time32

Christoph Hellwig suggested a slightly different path for handling
backwards compatibility with the 32-bit time_t based system calls:

Rather than simply reusing the compat_sys_* entry points on 32-bit
architectures unchanged, we get rid of those entry points and the
compat_time types by renaming them to something that makes more sense
on 32-bit architectures (which don't have a compat mode otherwise),
and then share the entry points under the new name with the 64-bit
architectures that use them for implementing the compatibility.

The following types and interfaces are renamed here, and moved
from linux/compat_time.h to linux/time32.h:

old				new
---				---
compat_time_t			old_time32_t
struct compat_timeval		struct old_timeval32
struct compat_timespec		struct old_timespec32
struct compat_itimerspec	struct old_itimerspec32
ns_to_compat_timeval()		ns_to_old_timeval32()
get_compat_itimerspec64()	get_old_itimerspec32()
put_compat_itimerspec64()	put_old_itimerspec32()
compat_get_timespec64()		get_old_timespec32()
compat_put_timespec64()		put_old_timespec32()

As we already have aliases in place, this patch addresses only the
instances that are relevant to the system call interface in particular,
not those that occur in device drivers and other modules. Those
will get handled separately, while providing the 64-bit version
of the respective interfaces.

I'm not renaming the timex, rusage and itimerval structures, as we are
still debating what the new interface will look like, and whether we
will need a replacement at all.

This also doesn't change the names of the syscall entry points, which can
be done more easily when we actually switch over the 32-bit architectures
to use them, at that point we need to change COMPAT_SYSCALL_DEFINEx to
SYSCALL_DEFINEx with a new name, e.g. with a _time32 suffix.

Suggested-by: Christoph Hellwig <hch@infradead.org>
Link: https://lore.kernel.org/lkml/20180705222110.GA5698@infradead.org/
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 15 insertions, 15 deletions

diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 4b9127e95430..3e71921668ba 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -755,13 +755,13 @@ SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
 #ifdef CONFIG_COMPAT_32BIT_TIME
 
 COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
-                       struct compat_itimerspec __user *, setting)
+                       struct old_itimerspec32 __user *, setting)
 {
         struct itimerspec64 cur_setting;
 
         int ret = do_timer_gettime(timer_id, &cur_setting);
         if (!ret) {
-                if (put_compat_itimerspec64(&cur_setting, setting))
+                if (put_old_itimerspec32(&cur_setting, setting))
                         ret = -EFAULT;
         }
         return ret;
@@ -928,8 +928,8 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
 COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
-                       struct compat_itimerspec __user *, new,
-                       struct compat_itimerspec __user *, old)
+                       struct old_itimerspec32 __user *, new,
+                       struct old_itimerspec32 __user *, old)
 {
         struct itimerspec64 new_spec, old_spec;
         struct itimerspec64 *rtn = old ? &old_spec : NULL;
@@ -937,12 +937,12 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
 
         if (!new)
                 return -EINVAL;
-        if (get_compat_itimerspec64(&new_spec, new))
+        if (get_old_itimerspec32(&new_spec, new))
                 return -EFAULT;
 
         error = do_timer_settime(timer_id, flags, &new_spec, rtn);
         if (!error && old) {
-                if (put_compat_itimerspec64(&old_spec, old))
+                if (put_old_itimerspec32(&old_spec, old))
                         error = -EFAULT;
         }
         return error;
@@ -1115,7 +1115,7 @@ SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock,
 #ifdef CONFIG_COMPAT_32BIT_TIME
 
 COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
-                       struct compat_timespec __user *, tp)
+                       struct old_timespec32 __user *, tp)
 {
         const struct k_clock *kc = clockid_to_kclock(which_clock);
         struct timespec64 ts;
@@ -1123,14 +1123,14 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
         if (!kc || !kc->clock_set)
                 return -EINVAL;
 
-        if (compat_get_timespec64(&ts, tp))
+        if (get_old_timespec32(&ts, tp))
                 return -EFAULT;
 
         return kc->clock_set(which_clock, &ts);
 }
 
 COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
-                       struct compat_timespec __user *, tp)
+                       struct old_timespec32 __user *, tp)
 {
         const struct k_clock *kc = clockid_to_kclock(which_clock);
         struct timespec64 ts;
@@ -1141,7 +1141,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
 
         err = kc->clock_get(which_clock, &ts);
 
-        if (!err && compat_put_timespec64(&ts, tp))
+        if (!err && put_old_timespec32(&ts, tp))
                 err = -EFAULT;
 
         return err;
@@ -1180,7 +1180,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
 #ifdef CONFIG_COMPAT_32BIT_TIME
 
 COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
-                       struct compat_timespec __user *, tp)
+                       struct old_timespec32 __user *, tp)
 {
         const struct k_clock *kc = clockid_to_kclock(which_clock);
         struct timespec64 ts;
@@ -1190,7 +1190,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
                 return -EINVAL;
 
         err = kc->clock_getres(which_clock, &ts);
-        if (!err && tp && compat_put_timespec64(&ts, tp))
+        if (!err && tp && put_old_timespec32(&ts, tp))
                 return -EFAULT;
 
         return err;
@@ -1237,8 +1237,8 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
 #ifdef CONFIG_COMPAT_32BIT_TIME
 
 COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
-                       struct compat_timespec __user *, rqtp,
-                       struct compat_timespec __user *, rmtp)
+                       struct old_timespec32 __user *, rqtp,
+                       struct old_timespec32 __user *, rmtp)
 {
         const struct k_clock *kc = clockid_to_kclock(which_clock);
         struct timespec64 t;
@@ -1248,7 +1248,7 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
         if (!kc->nsleep)
                 return -EOPNOTSUPP;
 
-        if (compat_get_timespec64(&t, rqtp))
+        if (get_old_timespec32(&t, rqtp))
                 return -EFAULT;
 
         if (!timespec64_valid(&t))