From patchwork Wed May 6 19:41: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: 48071 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D0A9120553 for ; Wed, 6 May 2015 19:42:09 +0000 (UTC) Received: by lbbqq2 with SMTP id qq2sf5877510lbb.0 for ; Wed, 06 May 2015 12:42:08 -0700 (PDT) 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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=1qABzkIinu5FMeiJId4WYQNWfDnQqp4wVq+26AiyqCU=; b=OPam1X54jELseT8Y6fv2aUg9xG2LssTLvk7DOiAFFl4zrY9RZQ1JDtdOpAuHnZgFmC o/V7fi3ypPwY00gpgQSsL2zR6jE0KW0dIzZSjRMwEVN6nhK0LFrzFJwRRim+jkCz43UC qX726vJIzGipZz6TQ6OUaXh5aE3RwLFwh13S1P8bS/EU/Y0BkVB/ubihxeEUZHoA29v6 2i2eWDur670H+Twr78CAGeB+mui61qhx+vpub6ZjqWw6U+sYbROnOTPBIk7NW4WM5Cgj aFtTtlAQtqWj1D93OiTTiXpjiJUBBQMyOHGe7qaQAzJsd5nIR3KIIE1O5Q8wuWciere+ iNRQ== X-Gm-Message-State: ALoCoQmwZDHuEI5yxzo+jYAmGga8CMnF+Avb3pEbkE/BTwIEjzWaEvFdcS28gA1Q265+NXxn+uTk X-Received: by 10.113.11.3 with SMTP id ee3mr169399lbd.9.1430941328775; Wed, 06 May 2015 12:42:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.227 with SMTP id kt3ls88182lac.18.gmail; Wed, 06 May 2015 12:42:08 -0700 (PDT) X-Received: by 10.112.173.167 with SMTP id bl7mr232251lbc.83.1430941328627; Wed, 06 May 2015 12:42:08 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id vt12si15314205lac.164.2015.05.06.12.42.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 May 2015 12:42:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by lbbqq2 with SMTP id qq2so15445006lbb.3 for ; Wed, 06 May 2015 12:42:08 -0700 (PDT) X-Received: by 10.153.8.167 with SMTP id dl7mr264959lad.86.1430941328484; Wed, 06 May 2015 12:42:08 -0700 (PDT) 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.67.65 with SMTP id l1csp3046869lbt; Wed, 6 May 2015 12:42:07 -0700 (PDT) X-Received: by 10.68.94.193 with SMTP id de1mr425148pbb.153.1430941326693; Wed, 06 May 2015 12:42:06 -0700 (PDT) Received: from mail-pd0-f178.google.com (mail-pd0-f178.google.com. [209.85.192.178]) by mx.google.com with ESMTPS id de9si30320505pdb.176.2015.05.06.12.42.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 May 2015 12:42:06 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.192.178 as permitted sender) client-ip=209.85.192.178; Received: by pdbnk13 with SMTP id nk13so18860276pdb.0 for ; Wed, 06 May 2015 12:42:05 -0700 (PDT) X-Received: by 10.66.216.136 with SMTP id oq8mr498870pac.97.1430941325699; Wed, 06 May 2015 12:42:05 -0700 (PDT) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id e6sm2669809pat.38.2015.05.06.12.42.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 May 2015 12:42:04 -0700 (PDT) From: John Stultz To: linux-kernel@vger.kernel.org Cc: John Stultz , Nicolas Pitre , Thomas Gleixner , Josh Boyer , One Thousand Gnomes , Trevor Cordes Subject: [RFC][PATCH v2] ktime: Fix ktime_divns to do signed division Date: Wed, 6 May 2015 12:41:55 -0700 Message-Id: <1430941315-18005-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 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.178 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: , It was noted that the 32bit implementation of ktime_divns() was doing unsigned division and didn't properly handle negative values. This patch fixes the problem by checking and preserving the sign bit, and then reapplying it if appropriate after the division, it also changes the return type to a s64 to make it more obvious this is expected. Nicolas also pointed out that negative dividers would cause infinite loops on 32bit systems, negative dividers is unlikely for users of this function, but out of caution this patch adds BUG_ON checks for negative dividers in both the 32 and 64bit versions to make sure no such use cases creep in. Cc: Nicolas Pitre Cc: Thomas Gleixner Cc: Josh Boyer Cc: One Thousand Gnomes Cc: Trevor Cordes Tested-by: Trevor Cordes Reported-by: Trevor Cordes Signed-off-by: John Stultz --- include/linux/ktime.h | 27 +++++++++++++++++++++++---- kernel/time/hrtimer.c | 11 ++++++++--- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/include/linux/ktime.h b/include/linux/ktime.h index 5fc3d10..ac9359e 100644 --- a/include/linux/ktime.h +++ b/include/linux/ktime.h @@ -166,19 +166,38 @@ static inline bool ktime_before(const ktime_t cmp1, const ktime_t cmp2) } #if BITS_PER_LONG < 64 -extern u64 __ktime_divns(const ktime_t kt, s64 div); -static inline u64 ktime_divns(const ktime_t kt, s64 div) +extern s64 __ktime_divns(const ktime_t kt, s64 div); +static inline s64 ktime_divns(const ktime_t kt, s64 div) { + /* + * Negative divisors could cause an inf loop, + * so bug out here. + */ + BUG_ON(div < 0); if (__builtin_constant_p(div) && !(div >> 32)) { - u64 ns = kt.tv64; + s64 ns = kt.tv64; + int neg = (ns < 0); + + if (neg) + ns = -ns; do_div(ns, div); + if (neg) + ns = -ns; return ns; } else { return __ktime_divns(kt, div); } } #else /* BITS_PER_LONG < 64 */ -# define ktime_divns(kt, div) (u64)((kt).tv64 / (div)) +static inline s64 ktime_divns(const ktime_t kt, s64 div) +{ + /* + * 32-bit implementation cannot handle negative divisors, + * so catch them on 64bit as well. + */ + BUG_ON(div < 0); + return (u64)((kt).tv64 / (div)) +} #endif static inline s64 ktime_to_us(const ktime_t kt) diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 76d4bd9..c98ce4d 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -266,12 +266,15 @@ lock_hrtimer_base(const struct hrtimer *timer, unsigned long *flags) /* * Divide a ktime value by a nanosecond value */ -u64 __ktime_divns(const ktime_t kt, s64 div) +s64 __ktime_divns(const ktime_t kt, s64 div) { - u64 dclc; - int sft = 0; + s64 dclc; + int neg, sft = 0; dclc = ktime_to_ns(kt); + neg = (dclc < 0); + if (neg) + dclc = -dclc; /* Make sure the divisor is less than 2^32: */ while (div >> 32) { sft++; @@ -279,6 +282,8 @@ u64 __ktime_divns(const ktime_t kt, s64 div) } dclc >>= sft; do_div(dclc, (unsigned long) div); + if (neg) + dclc = -dclc; return dclc; }