| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CALCETrV2+qkuj3WinOW-Ro_PjtZBhLaXwSHCeWpMpTJnog83EQ@mail.gmail.com>
Date: Thu, 18 Dec 2014 16:22:59 -0800
From: Andy Lutomirski <luto@...capital.net>
To: Shaohua Li <shli@...com>
Cc: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
X86 ML <x86@...nel.org>, Kernel-team@...com,
"H. Peter Anvin" <hpa@...or.com>, Ingo Molnar <mingo@...hat.com>,
Peter Zijlstra <peterz@...radead.org>,
John Stultz <john.stultz@...aro.org>
Subject: Re: [PATCH v2 3/3] X86: Add a thread cpu time implementation to vDSO
On Thu, Dec 18, 2014 at 3:30 PM, Andy Lutomirski <luto@...capital.net> wrote:
> On Wed, Dec 17, 2014 at 3:12 PM, Shaohua Li <shli@...com> wrote:
>> This primarily speeds up clock_gettime(CLOCK_THREAD_CPUTIME_ID, ..). We
>> use the following method to compute the thread cpu time:
>>
>> t0 = process start
>> t1 = most recent context switch time
>> t2 = time at which the vsyscall is invoked
>>
>> thread_cpu_time = sum(time slices between t0 to t1) + (t2 - t1)
>> = current->se.sum_exec_runtime + now - sched_clock()
>>
>> At context switch time We stash away
>>
>> adj_sched_time = sum_exec_runtime - sched_clock()
>>
>> in a per-cpu struct in the VVAR page and then compute
>>
>> thread_cpu_time = adj_sched_time + now
>>
>> All computations are done in nanosecs on systems where TSC is stable. If
>> TSC is unstable, we fallback to a regular syscall.
>> Benchmark data:
>>
>> for (i = 0; i < 100000000; i++) {
>> clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts);
>> sum += ts.tv_sec * NSECS_PER_SEC + ts.tv_nsec;
>> }
>
> A bunch of the time spent processing a CLOCK_THREAD_CPUTIME_ID syscall
> is spent taking various locks, and I think it could be worth adding a
> fast path for the read-my-own-clock case in which we just disable
> preemption and read the thing without any locks.
>
> If we're actually going to go the vdso route, I'd like to make the
> scheduler hooks clean. Peterz and/or John, what's the right way to
> get an arch-specific callback with sum_exec_runtime and an up to date
> sched_clock value during a context switch? I'd much rather not add
> yet another rdtsc instruction to the scheduler.
Bad news: this patch is incorrect, I think. Take a look at
update_rq_clock -- it does fancy things involving irq time and
paravirt steal time. So this patch could result in extremely
non-monotonic results.
There's CPUCLOCK_VIRT (which, oddly, I see no well-defined API for)
that *might* be a decent approximation.
Thoughts?
--Andy
>
> --Andy
>
>>
>> Baseline:
>> real 1m3.428s
>> user 0m5.190s
>> sys 0m58.220s
>>
>> patched:
>> real 0m4.912s
>> user 0m4.910s
>> sys 0m0.000s
>>
>> This should speed up profilers that need to query thread cpu time a lot
>> to do fine-grained timestamps.
>>
>> No statistically significant regression was detected on x86_64 context
>> switch code. Most archs that don't support vsyscalls will have this code
>> disabled via jump labels.
>>
>> Cc: Andy Lutomirski <luto@...capital.net>
>> Cc: H. Peter Anvin <hpa@...or.com>
>> Cc: Ingo Molnar <mingo@...hat.com>
>> Signed-off-by: Kumar Sundararajan <kumar@...com>
>> Signed-off-by: Arun Sharma <asharma@...com>
>> Signed-off-by: Chris Mason <clm@...com>
>> Signed-off-by: Shaohua Li <shli@...com>
>> ---
>> arch/x86/include/asm/vdso.h | 9 +++++-
>> arch/x86/kernel/tsc.c | 14 +++++++++
>> arch/x86/vdso/vclock_gettime.c | 69 ++++++++++++++++++++++++++++++++++++++++++
>> arch/x86/vdso/vma.c | 10 +++++-
>> kernel/sched/core.c | 3 ++
>> 5 files changed, 103 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
>> index d4556a3..fcdf611 100644
>> --- a/arch/x86/include/asm/vdso.h
>> +++ b/arch/x86/include/asm/vdso.h
>> @@ -52,14 +52,21 @@ extern void __init init_vdso_image(const struct vdso_image *image);
>> #ifdef CONFIG_VDSO_CS_DETECT
>> struct vdso_percpu_data {
>> u64 last_cs_timestamp;
>> +
>> + u64 adj_sched_time;
>> + u64 cyc2ns_offset;
>> + u32 cyc2ns_mul;
>> } ____cacheline_aligned;
>>
>> struct vdso_data {
>> - int dummy;
>> + unsigned int thread_cputime_disabled;
>> struct vdso_percpu_data vpercpu[0];
>> };
>> extern struct vdso_data vdso_data;
>>
>> +struct static_key;
>> +extern struct static_key vcpu_thread_cputime_enabled;
>> +
>> static inline void vdso_set_cpu_cs_timestamp(int cpu)
>> {
>> rdtscll(vdso_data.vpercpu[cpu].last_cs_timestamp);
>> diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
>> index b7e50bb..dd3b281 100644
>> --- a/arch/x86/kernel/tsc.c
>> +++ b/arch/x86/kernel/tsc.c
>> @@ -21,6 +21,7 @@
>> #include <asm/hypervisor.h>
>> #include <asm/nmi.h>
>> #include <asm/x86_init.h>
>> +#include <asm/vdso.h>
>>
>> unsigned int __read_mostly cpu_khz; /* TSC clocks / usec, not used here */
>> EXPORT_SYMBOL(cpu_khz);
>> @@ -263,6 +264,11 @@ static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu)
>> data->cyc2ns_offset = ns_now -
>> mul_u64_u32_shr(tsc_now, data->cyc2ns_mul, CYC2NS_SCALE_FACTOR);
>>
>> +#ifdef CONFIG_VDSO_CS_DETECT
>> + vdso_data.vpercpu[cpu].cyc2ns_mul = data->cyc2ns_mul;
>> + vdso_data.vpercpu[cpu].cyc2ns_offset = data->cyc2ns_offset;
>> +#endif
>> +
>> cyc2ns_write_end(cpu, data);
>>
>> done:
>> @@ -989,6 +995,10 @@ void mark_tsc_unstable(char *reason)
>> tsc_unstable = 1;
>> clear_sched_clock_stable();
>> disable_sched_clock_irqtime();
>> +#ifdef CONFIG_VDSO_CS_DETECT
>> + vdso_data.thread_cputime_disabled = 1;
>> + static_key_slow_dec(&vcpu_thread_cputime_enabled);
>> +#endif
>> pr_info("Marking TSC unstable due to %s\n", reason);
>> /* Change only the rating, when not registered */
>> if (clocksource_tsc.mult)
>> @@ -1202,6 +1212,10 @@ void __init tsc_init(void)
>>
>> tsc_disabled = 0;
>> static_key_slow_inc(&__use_tsc);
>> +#ifdef CONFIG_VDSO_CS_DETECT
>> + vdso_data.thread_cputime_disabled = !cpu_has(&boot_cpu_data,
>> + X86_FEATURE_RDTSCP);
>> +#endif
>>
>> if (!no_sched_irq_time)
>> enable_sched_clock_irqtime();
>> diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
>> index 9793322..0aa39b1 100644
>> --- a/arch/x86/vdso/vclock_gettime.c
>> +++ b/arch/x86/vdso/vclock_gettime.c
>> @@ -17,6 +17,7 @@
>> #include <asm/vvar.h>
>> #include <asm/unistd.h>
>> #include <asm/msr.h>
>> +#include <asm/vdso.h>
>> #include <linux/math64.h>
>> #include <linux/time.h>
>>
>> @@ -289,6 +290,62 @@ notrace static void do_monotonic_coarse(struct timespec *ts)
>> } while (unlikely(gtod_read_retry(gtod, seq)));
>> }
>>
>> +#if defined(CONFIG_VDSO_CS_DETECT) && defined(CONFIG_X86_64)
>> +#define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */
>> +notrace static inline u64 __cycles_2_ns(u64 cyc, u64 scale, u64 offset)
>> +{
>> + u64 ns = offset;
>> + ns += mul_u64_u32_shr(cyc, scale, CYC2NS_SCALE_FACTOR);
>> + return ns;
>> +}
>> +
>> +notrace static inline u64 vdso_get_cpu_cs_timestamp(int cpu)
>> +{
>> + return VVAR(vdso_data).vpercpu[cpu].last_cs_timestamp;
>> +}
>> +
>> +#define THREAD_CPU_TIME_MAX_LOOP 20
>> +notrace static u64 do_thread_cpu_time(void)
>> +{
>> + unsigned int p;
>> + u64 tscval;
>> + u64 adj_sched_time;
>> + u64 scale;
>> + u64 offset;
>> + const struct vdso_data *vp = &VVAR(vdso_data);
>> + int cpuo, cpun;
>> + int loop = 0;
>> +
>> + do {
>> + loop++;
>> + if (loop > THREAD_CPU_TIME_MAX_LOOP)
>> + return -1LL;
>> +
>> + rdtscpll(tscval, p);
>> + cpuo = p & VGETCPU_CPU_MASK;
>> + adj_sched_time = vp->vpercpu[cpuo].adj_sched_time;
>> + scale = vp->vpercpu[cpuo].cyc2ns_mul;
>> + offset = vp->vpercpu[cpuo].cyc2ns_offset;
>> +
>> + cpun = __getcpu() & VGETCPU_CPU_MASK;
>> + /*
>> + * The CPU check goarantees this runs in the same cpu, so no
>> + * barrier required
>> + */
>> + } while (unlikely(cpuo != cpun ||
>> + tscval <= vdso_get_cpu_cs_timestamp(cpun)));
>> +
>> + return __cycles_2_ns(tscval, scale, offset) + adj_sched_time;
>> +}
>> +
>> +notrace static inline void ns_to_ts(u64 ns, struct timespec *ts)
>> +{
>> + u32 rem;
>> + ts->tv_sec = div_u64_rem(ns, NSEC_PER_SEC, &rem);
>> + ts->tv_nsec = rem;
>> +}
>> +#endif
>> +
>> notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts)
>> {
>> switch (clock) {
>> @@ -306,6 +363,18 @@ notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts)
>> case CLOCK_MONOTONIC_COARSE:
>> do_monotonic_coarse(ts);
>> break;
>> +#if defined(CONFIG_VDSO_CS_DETECT) && defined(CONFIG_X86_64)
>> + case CLOCK_THREAD_CPUTIME_ID: {
>> + u64 time;
>> + if (VVAR(vdso_data).thread_cputime_disabled)
>> + goto fallback;
>> + time = do_thread_cpu_time();
>> + if (time == -1LL)
>> + goto fallback;
>> + ns_to_ts(time, ts);
>> + break;
>> + }
>> +#endif
>> default:
>> goto fallback;
>> }
>> diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
>> index 22b1a69..237b3af 100644
>> --- a/arch/x86/vdso/vma.c
>> +++ b/arch/x86/vdso/vma.c
>> @@ -12,6 +12,8 @@
>> #include <linux/random.h>
>> #include <linux/elf.h>
>> #include <linux/cpu.h>
>> +#include <linux/jump_label.h>
>> +#include <asm/vsyscall.h>
>> #include <asm/vgtod.h>
>> #include <asm/proto.h>
>> #include <asm/vdso.h>
>> @@ -23,7 +25,11 @@
>>
>> #if defined(CONFIG_X86_64)
>> unsigned int __read_mostly vdso64_enabled = 1;
>> -DEFINE_VVAR(struct vdso_data, vdso_data);
>> +
>> +DEFINE_VVAR(struct vdso_data, vdso_data) = {
>> + .thread_cputime_disabled = 1,
>> +};
>> +struct static_key vcpu_thread_cputime_enabled;
>> #endif
>>
>> void __init init_vdso_image(const struct vdso_image *image)
>> @@ -275,6 +281,8 @@ static int __init init_vdso(void)
>> init_vdso_image(&vdso_image_x32);
>> #endif
>>
>> + if (!vdso_data.thread_cputime_disabled)
>> + static_key_slow_inc(&vcpu_thread_cputime_enabled);
>> cpu_notifier_register_begin();
>>
>> on_each_cpu(vgetcpu_cpu_init, NULL, 1);
>> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
>> index d8e882d..03e6175 100644
>> --- a/kernel/sched/core.c
>> +++ b/kernel/sched/core.c
>> @@ -2236,6 +2236,9 @@ static struct rq *finish_task_switch(struct task_struct *prev)
>> int cpu = smp_processor_id();
>>
>> vdso_set_cpu_cs_timestamp(cpu);
>> + if (static_key_false(&vcpu_thread_cputime_enabled))
>> + vdso_data.vpercpu[cpu].adj_sched_time =
>> + current->se.sum_exec_runtime - sched_clock();
>> #endif
>>
>> rq->prev_mm = NULL;
>> --
>> 1.8.1
>>
>
>
>
> --
> Andy Lutomirski
> AMA Capital Management, LLC
--
Andy Lutomirski
AMA Capital Management, LLC
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists