From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C1C1C43142 for ; Fri, 22 Jun 2018 12:49:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0EC6E2420E for ; Fri, 22 Jun 2018 12:49:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0EC6E2420E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754136AbeFVMtr (ORCPT ); Fri, 22 Jun 2018 08:49:47 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:41512 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751345AbeFVMtq (ORCPT ); Fri, 22 Jun 2018 08:49:46 -0400 Received: from hsi-kbw-5-158-153-52.hsi19.kabel-badenwuerttemberg.de ([5.158.153.52] helo=nanos.tec.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1fWLVX-0005GU-4A; Fri, 22 Jun 2018 14:49:43 +0200 Date: Fri, 22 Jun 2018 14:49:42 +0200 (CEST) From: Thomas Gleixner To: Geert Uytterhoeven cc: John Stultz , Stephen Boyd , Arnd Bergmann , linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] time: Make sure jiffies_to_msecs() preserves non-zero time periods In-Reply-To: <20180622075421.16001-1-geert@linux-m68k.org> Message-ID: References: <20180622075421.16001-1-geert@linux-m68k.org> User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 22 Jun 2018, Geert Uytterhoeven wrote: > For the common cases where 1000 is a multiple of HZ, or HZ is a multiple > of 1000, jiffies_to_msecs() never returns zero when passed a non-zero > time period. > > However, if HZ > 1000 and not an integer multiple of 1000 (e.g. 1024 or > 1200, as used on alpha and DECstation), jiffies_to_msecs() may return > zero for small non-zero time periods. This may break code that relies > on receiving back a non-zero value. > > jiffies_to_usecs() does not need such a fix, as does > not support values of HZ larger than 12287, thus rejecting any > problematic huge values of HZ. Sorry, I'm not understanding that sentence at all. > Signed-off-by: Geert Uytterhoeven This lacks a stable tag, right? > --- > v2: > - Add examples of affected systems, > - Use DIV_ROUND_UP(). > --- > kernel/time/time.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/kernel/time/time.c b/kernel/time/time.c > index 6fa99213fc720e4b..2b41e8e2d31db26f 100644 > --- a/kernel/time/time.c > +++ b/kernel/time/time.c > @@ -28,6 +28,7 @@ > */ > > #include > +#include > #include > #include > #include > @@ -314,9 +315,10 @@ unsigned int jiffies_to_msecs(const unsigned long j) > return (j + (HZ / MSEC_PER_SEC) - 1)/(HZ / MSEC_PER_SEC); > #else > # if BITS_PER_LONG == 32 > - return (HZ_TO_MSEC_MUL32 * j) >> HZ_TO_MSEC_SHR32; > + return (HZ_TO_MSEC_MUL32 * j + (1ULL << HZ_TO_MSEC_SHR32) - 1) >> > + HZ_TO_MSEC_SHR32; > # else > - return (j * HZ_TO_MSEC_NUM) / HZ_TO_MSEC_DEN; > + return DIV_ROUND_UP(j * HZ_TO_MSEC_NUM, HZ_TO_MSEC_DEN); > # endif > #endif > } > -- > 2.17.1 > >