From patchwork Sat Mar 7 02:49:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 45506 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D6107214A0 for ; Sat, 7 Mar 2015 02:50:26 +0000 (UTC) Received: by wghk14 with SMTP id k14sf14625118wgh.3 for ; Fri, 06 Mar 2015 18:50:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=p6HXNUdIS5JLPGjho4PYp7l3VJdDqFPfbyLtA1tPlDI=; b=PaSuN3IUhoBVcgzbKVlV5QXwulnCXnP7zTvk07te5QAlrBZIUs4XTKE+PWDeDSewQU 1OEETlzVVHoXvoXkIy81EGgrAOLyZePYK0urItRTgOGrRSe/u10euG7XkTrkRithmTjr cjt/Um5tzwj8tX6tbBJCiUO2LTb2f1iJA+P4d2TEDqzfslyjV+2j4op+ShH/CThJTtwy WZQVgS7Wn9r880BvLZu2JvW0zVQssrhz0Srg6pR0E9UzyMamNyMDcbtXDXR2pOgZM028 5gS5wup8HX5kTagPry2TLw7IELOkBVLdCqXMiwoDZ+gA5lmhHBxHPPimPctgEHOaeC/4 uPhQ== X-Gm-Message-State: ALoCoQl8dxEOXeJOKPJziAq48vd7N2SnBJjuj7+kB8BUKWVb2W/7H5YZ00KYiO560wSL3ieqB9WC X-Received: by 10.181.13.236 with SMTP id fb12mr3191962wid.1.1425696626207; Fri, 06 Mar 2015 18:50:26 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.234 with SMTP id i10ls129906lae.103.gmail; Fri, 06 Mar 2015 18:50:26 -0800 (PST) X-Received: by 10.112.140.74 with SMTP id re10mr15860984lbb.80.1425696625968; Fri, 06 Mar 2015 18:50:25 -0800 (PST) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id us19si8577362lbb.23.2015.03.06.18.50.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Mar 2015 18:50:25 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbiw7 with SMTP id w7so14442756lbi.6 for ; Fri, 06 Mar 2015 18:50:25 -0800 (PST) X-Received: by 10.112.188.165 with SMTP id gb5mr15883488lbc.35.1425696625868; Fri, 06 Mar 2015 18:50:25 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.35.133 with SMTP id h5csp256418lbj; Fri, 6 Mar 2015 18:50:25 -0800 (PST) X-Received: by 10.68.68.141 with SMTP id w13mr30685811pbt.97.1425696621673; Fri, 06 Mar 2015 18:50:21 -0800 (PST) Received: from mail-pd0-f169.google.com (mail-pd0-f169.google.com. [209.85.192.169]) by mx.google.com with ESMTPS id k12si3113309pdm.233.2015.03.06.18.50.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Mar 2015 18:50:21 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.192.169 as permitted sender) client-ip=209.85.192.169; Received: by pdev10 with SMTP id v10so33175626pde.0 for ; Fri, 06 Mar 2015 18:50:20 -0800 (PST) X-Received: by 10.67.10.47 with SMTP id dx15mr31063347pad.139.1425696620786; Fri, 06 Mar 2015 18:50:20 -0800 (PST) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id a2sm8381456pbu.27.2015.03.06.18.50.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Mar 2015 18:50:20 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Dave Jones , Linus Torvalds , Thomas Gleixner , Richard Cochran , Prarit Bhargava , Stephen Boyd , Ingo Molnar , Peter Zijlstra Subject: [PATCH 04/12] clocksource: Add max_cycles to clocksource structure Date: Fri, 6 Mar 2015 18:49:55 -0800 Message-Id: <1425696603-16878-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1425696603-16878-1-git-send-email-john.stultz@linaro.org> References: <1425696603-16878-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , In order to facilitate some clocksource validation, add a max_cycles entry to the structure which will hold the maximum cycle value that can safely be multiplied without potentially causing an overflow. Cc: Dave Jones Cc: Linus Torvalds Cc: Thomas Gleixner Cc: Richard Cochran Cc: Prarit Bhargava Cc: Stephen Boyd Cc: Ingo Molnar Cc: Peter Zijlstra Signed-off-by: John Stultz --- include/linux/clocksource.h | 6 ++++-- kernel/time/clocksource.c | 15 ++++++++++++--- kernel/time/sched_clock.c | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 9c78d15..63fe52f 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -56,6 +56,7 @@ struct module; * @shift: cycle to nanosecond divisor (power of two) * @max_idle_ns: max idle time permitted by the clocksource (nsecs) * @maxadj: maximum adjustment value to mult (~11%) + * @max_cycles: maximum safe cycle value which won't overflow on mult * @flags: flags describing special properties * @archdata: arch-specific data * @suspend: suspend function for the clocksource, if necessary @@ -76,7 +77,7 @@ struct clocksource { #ifdef CONFIG_ARCH_CLOCKSOURCE_DATA struct arch_clocksource_data archdata; #endif - + u64 max_cycles; const char *name; struct list_head list; int rating; @@ -189,7 +190,8 @@ extern struct clocksource * __init clocksource_default_clock(void); extern void clocksource_mark_unstable(struct clocksource *cs); extern u64 -clocks_calc_max_nsecs(u32 mult, u32 shift, u32 maxadj, u64 mask); +clocks_calc_max_nsecs(u32 mult, u32 shift, u32 maxadj, u64 mask, + u64 *max_cycles); extern void clocks_calc_mult_shift(u32 *mult, u32 *shift, u32 from, u32 to, u32 minsec); diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 4988411..e6c752b 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c @@ -469,11 +469,14 @@ static u32 clocksource_max_adjustment(struct clocksource *cs) * @shift: cycle to nanosecond divisor (power of two) * @maxadj: maximum adjustment value to mult (~11%) * @mask: bitmask for two's complement subtraction of non 64 bit counters + * @max_cyc: maximum cycle value before potential overflow (does not include + * any saftey margin) * * NOTE: This function includes a saftey margin of 50%, so that bad clock values * can be detected. */ -u64 clocks_calc_max_nsecs(u32 mult, u32 shift, u32 maxadj, u64 mask) +u64 clocks_calc_max_nsecs(u32 mult, u32 shift, u32 maxadj, u64 mask, + u64 *max_cyc) { u64 max_nsecs, max_cycles; @@ -493,6 +496,10 @@ u64 clocks_calc_max_nsecs(u32 mult, u32 shift, u32 maxadj, u64 mask) max_cycles = min(max_cycles, mask); max_nsecs = clocksource_cyc2ns(max_cycles, mult - maxadj, shift); + /* return the max_cycles value as well if requested */ + if (max_cyc) + *max_cyc = max_cycles; + /* Return 50% of the actual maximum, so we can detect bad values */ max_nsecs >>= 1; @@ -671,7 +678,8 @@ void __clocksource_updatefreq_scale(struct clocksource *cs, u32 scale, u32 freq) } cs->max_idle_ns = clocks_calc_max_nsecs(cs->mult, cs->shift, - cs->maxadj, cs->mask); + cs->maxadj, cs->mask, + &cs->max_cycles); } EXPORT_SYMBOL_GPL(__clocksource_updatefreq_scale); @@ -719,7 +727,8 @@ int clocksource_register(struct clocksource *cs) /* calculate max idle time permitted for this clocksource */ cs->max_idle_ns = clocks_calc_max_nsecs(cs->mult, cs->shift, - cs->maxadj, cs->mask); + cs->maxadj, cs->mask, + &cs->max_cycles); mutex_lock(&clocksource_mutex); clocksource_enqueue(cs); diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c index c794b84..d43855b 100644 --- a/kernel/time/sched_clock.c +++ b/kernel/time/sched_clock.c @@ -126,7 +126,7 @@ void __init sched_clock_register(u64 (*read)(void), int bits, new_mask = CLOCKSOURCE_MASK(bits); /* calculate how many ns until we risk wrapping */ - wrap = clocks_calc_max_nsecs(new_mult, new_shift, 0, new_mask); + wrap = clocks_calc_max_nsecs(new_mult, new_shift, 0, new_mask, NULL); new_wrap_kt = ns_to_ktime(wrap); /* update epoch for new counter and update epoch_ns from old counter*/