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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0CB27C43334 for ; Sun, 5 Jun 2022 13:57:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350792AbiFEN5K (ORCPT ); Sun, 5 Jun 2022 09:57:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351096AbiFEN46 (ORCPT ); Sun, 5 Jun 2022 09:56:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EF121144E; Sun, 5 Jun 2022 06:55:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 56D1460F98; Sun, 5 Jun 2022 13:55:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EDF28C385A5; Sun, 5 Jun 2022 13:55:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654437339; bh=onJw5k+AKoF0e4naNu8gXb5kR7N1ZW6vobUu5CY79KM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q0u3wvAgyOXI8gw2GqV5GRc07hrFlCtbD4F0X+T5n9lcm4C4kat/FtafF79OkJqgx MXtBiMpVAzN7TOi4TFaG9rZqeJx15GLNwZM20Wei+ZSvZy620LvxZAQJrailoCVhTw IvSWR9gL9CVZyDm2w8xy24XyqaH3qFJz5eC7aCWqr8//vYzKGFIbfY5E4FMwIQq4Q2 CKYD8EOB/UlPJNEDYe//yVRf4h5e3q5zgL/tJq890JzDElmGbXmzwEltnxUpN3mK0I VKTSwfRxb10t6SeHburUuNLeiJLILS71rjVpckydcnH1dSOLviCibRM9/wcuneipqM fzduF3VZHLOlA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Maciej W. Rozycki" , Thomas Gleixner , John Stultz , Sasha Levin Subject: [PATCH MANUALSEL 4.14 2/4] time/sched_clock: Round the frequency reported to nearest rather than down Date: Sun, 5 Jun 2022 09:55:27 -0400 Message-Id: <20220605135533.61835-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220605135533.61835-1-sashal@kernel.org> References: <20220605135533.61835-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: "Maciej W. Rozycki" [ Upstream commit 92067440f1311dfa4d77b57a9da6b3706f5da32e ] The frequency reported for clock sources are rounded down, which gives misleading figures, e.g.: I/O ASIC clock frequency 24999480Hz sched_clock: 32 bits at 24MHz, resolution 40ns, wraps every 85901132779ns MIPS counter frequency 59998512Hz sched_clock: 32 bits at 59MHz, resolution 16ns, wraps every 35792281591ns Rounding to nearest is more adequate: I/O ASIC clock frequency 24999664Hz sched_clock: 32 bits at 25MHz, resolution 40ns, wraps every 85900499947ns MIPS counter frequency 59999728Hz sched_clock: 32 bits at 60MHz, resolution 16ns, wraps every 35791556599ns Signed-off-by: Maciej W. Rozycki Signed-off-by: Thomas Gleixner Acked-by: John Stultz Link: https://lore.kernel.org/r/alpine.DEB.2.21.2204240055590.9383@angie.orcam.me.uk Signed-off-by: Sasha Levin --- kernel/time/sched_clock.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c index 2d8f05aad442..207852fc7c42 100644 --- a/kernel/time/sched_clock.c +++ b/kernel/time/sched_clock.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -213,11 +214,11 @@ sched_clock_register(u64 (*read)(void), int bits, unsigned long rate) r = rate; if (r >= 4000000) { - r /= 1000000; + r = DIV_ROUND_CLOSEST(r, 1000000); r_unit = 'M'; } else { if (r >= 1000) { - r /= 1000; + r = DIV_ROUND_CLOSEST(r, 1000); r_unit = 'k'; } else { r_unit = ' '; -- 2.35.1