lkml.org 
[lkml]   [2020]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: timers/core] hrtimers: Prepare hrtimer_nanosleep() for time namespaces
    The following commit has been merged into the timers/core branch of tip:

    Commit-ID: ea2d1f7fce0f18b67f915c00c6a7a6860116bc92
    Gitweb: https://git.kernel.org/tip/ea2d1f7fce0f18b67f915c00c6a7a6860116bc92
    Author: Andrei Vagin <avagin@gmail.com>
    AuthorDate: Tue, 12 Nov 2019 01:27:05
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitterDate: Tue, 14 Jan 2020 12:20:55 +01:00

    hrtimers: Prepare hrtimer_nanosleep() for time namespaces

    clock_nanosleep() accepts absolute values of expiration time when
    TIMER_ABSTIME flag is set. This absolute value is inside the task's
    time namespace, and has to be converted to the host's time.

    There is timens_ktime_to_host() helper for converting time, but
    it accepts ktime argument.

    As a preparation, make hrtimer_nanosleep() accept a clock value in ktime
    instead of timespec64.

    Co-developed-by: Dmitry Safonov <dima@arista.com>
    Signed-off-by: Andrei Vagin <avagin@openvz.org>
    Signed-off-by: Dmitry Safonov <dima@arista.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Link: https://lore.kernel.org/r/20191112012724.250792-17-dima@arista.com


    ---
    include/linux/hrtimer.h | 3 +--
    kernel/time/hrtimer.c | 12 +++++++-----
    kernel/time/posix-stubs.c | 4 ++--
    kernel/time/posix-timers.c | 4 +++-
    tools/perf/examples/bpf/5sec.c | 6 ++++--
    5 files changed, 17 insertions(+), 12 deletions(-)

    diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
    index 1f98b52..15c8ac3 100644
    --- a/include/linux/hrtimer.h
    +++ b/include/linux/hrtimer.h
    @@ -508,8 +508,7 @@ static inline u64 hrtimer_forward_now(struct hrtimer *timer,
    /* Precise sleep: */

    extern int nanosleep_copyout(struct restart_block *, struct timespec64 *);
    -extern long hrtimer_nanosleep(const struct timespec64 *rqtp,
    - const enum hrtimer_mode mode,
    +extern long hrtimer_nanosleep(ktime_t rqtp, const enum hrtimer_mode mode,
    const clockid_t clockid);

    extern int schedule_hrtimeout_range(ktime_t *expires, u64 delta,
    diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
    index 8de90ea..d8b62f9 100644
    --- a/kernel/time/hrtimer.c
    +++ b/kernel/time/hrtimer.c
    @@ -1910,8 +1910,8 @@ static long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
    return ret;
    }

    -long hrtimer_nanosleep(const struct timespec64 *rqtp,
    - const enum hrtimer_mode mode, const clockid_t clockid)
    +long hrtimer_nanosleep(ktime_t rqtp, const enum hrtimer_mode mode,
    + const clockid_t clockid)
    {
    struct restart_block *restart;
    struct hrtimer_sleeper t;
    @@ -1923,7 +1923,7 @@ long hrtimer_nanosleep(const struct timespec64 *rqtp,
    slack = 0;

    hrtimer_init_sleeper_on_stack(&t, clockid, mode);
    - hrtimer_set_expires_range_ns(&t.timer, timespec64_to_ktime(*rqtp), slack);
    + hrtimer_set_expires_range_ns(&t.timer, rqtp, slack);
    ret = do_nanosleep(&t, mode);
    if (ret != -ERESTART_RESTARTBLOCK)
    goto out;
    @@ -1958,7 +1958,8 @@ SYSCALL_DEFINE2(nanosleep, struct __kernel_timespec __user *, rqtp,

    current->restart_block.nanosleep.type = rmtp ? TT_NATIVE : TT_NONE;
    current->restart_block.nanosleep.rmtp = rmtp;
    - return hrtimer_nanosleep(&tu, HRTIMER_MODE_REL, CLOCK_MONOTONIC);
    + return hrtimer_nanosleep(timespec64_to_ktime(tu), HRTIMER_MODE_REL,
    + CLOCK_MONOTONIC);
    }

    #endif
    @@ -1978,7 +1979,8 @@ SYSCALL_DEFINE2(nanosleep_time32, struct old_timespec32 __user *, rqtp,

    current->restart_block.nanosleep.type = rmtp ? TT_COMPAT : TT_NONE;
    current->restart_block.nanosleep.compat_rmtp = rmtp;
    - return hrtimer_nanosleep(&tu, HRTIMER_MODE_REL, CLOCK_MONOTONIC);
    + return hrtimer_nanosleep(timespec64_to_ktime(tu), HRTIMER_MODE_REL,
    + CLOCK_MONOTONIC);
    }
    #endif

    diff --git a/kernel/time/posix-stubs.c b/kernel/time/posix-stubs.c
    index bcbaa20..5745a13 100644
    --- a/kernel/time/posix-stubs.c
    +++ b/kernel/time/posix-stubs.c
    @@ -147,7 +147,7 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
    rmtp = NULL;
    current->restart_block.nanosleep.type = rmtp ? TT_NATIVE : TT_NONE;
    current->restart_block.nanosleep.rmtp = rmtp;
    - return hrtimer_nanosleep(&t, flags & TIMER_ABSTIME ?
    + return hrtimer_nanosleep(timespec64_to_ktime(t), flags & TIMER_ABSTIME ?
    HRTIMER_MODE_ABS : HRTIMER_MODE_REL,
    which_clock);
    }
    @@ -236,7 +236,7 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags,
    rmtp = NULL;
    current->restart_block.nanosleep.type = rmtp ? TT_COMPAT : TT_NONE;
    current->restart_block.nanosleep.compat_rmtp = rmtp;
    - return hrtimer_nanosleep(&t, flags & TIMER_ABSTIME ?
    + return hrtimer_nanosleep(timespec64_to_ktime(t), flags & TIMER_ABSTIME ?
    HRTIMER_MODE_ABS : HRTIMER_MODE_REL,
    which_clock);
    }
    diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
    index 473082b..75fee6e 100644
    --- a/kernel/time/posix-timers.c
    +++ b/kernel/time/posix-timers.c
    @@ -1221,7 +1221,9 @@ SYSCALL_DEFINE2(clock_getres_time32, clockid_t, which_clock,
    static int common_nsleep(const clockid_t which_clock, int flags,
    const struct timespec64 *rqtp)
    {
    - return hrtimer_nanosleep(rqtp, flags & TIMER_ABSTIME ?
    + ktime_t texp = timespec64_to_ktime(*rqtp);
    +
    + return hrtimer_nanosleep(texp, flags & TIMER_ABSTIME ?
    HRTIMER_MODE_ABS : HRTIMER_MODE_REL,
    which_clock);
    }
    diff --git a/tools/perf/examples/bpf/5sec.c b/tools/perf/examples/bpf/5sec.c
    index b9c2032..e6b6181 100644
    --- a/tools/perf/examples/bpf/5sec.c
    +++ b/tools/perf/examples/bpf/5sec.c
    @@ -41,9 +41,11 @@

    #include <bpf.h>

    -int probe(hrtimer_nanosleep, rqtp->tv_sec)(void *ctx, int err, long sec)
    +#define NSEC_PER_SEC 1000000000L
    +
    +int probe(hrtimer_nanosleep, rqtp)(void *ctx, int err, long long sec)
    {
    - return sec == 5;
    + return sec / NSEC_PER_SEC == 5ULL;
    }

    license(GPL);
    \
     
     \ /
      Last update: 2020-01-14 14:03    [W:4.101 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site