Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
From:   Peng Liu <pngliu@hotmail.com>
Cc:     frederic@kernel.org, tglx@linutronix.de, mingo@kernel.org,
        linux-kernel@vger.kernel.org, liupeng17@lenovo.com
Subject: [PATCH v2 2/2] tick/nohz: Remove duplicate between tick_nohz_lowres_handler() and tick_nohz_highres_handler()
Date:   Tue, 28 Nov 2023 17:24:13 +0800
Message-ID: <TYCP286MB2146FA111842EAD33796AF5EC6BCA@TYCP286MB2146.JPNP286.PROD.OUTLOOK.COM>
In-Reply-To: <20231127083118.145704-1-pngliu@hotmail.com>
References: <20231127083118.145704-1-pngliu@hotmail.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: TYCP286MB2146:EE_|TY1P286MB3405:EE_
X-MS-Office365-Filtering-Correlation-Id: 788d8520-7c0f-4b5d-6195-08dbeff3ca73
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: Hz23AqrVKKmuXSNVkSDPdHZmKpwfUxpgPZCf6O3PH2HuL3EuejFCq8h9Bj+1A9P7n3Jo/+9kI0kZ7MIfnq1sqggN4Fy7cVpyVDJPtf+QE8bMYLkVeF+qPZ5aGrCHGu0SZJf+Dt8Ks0DpiEBgeOsQjjFVfN25CnUhChqDroIJXsFKRdYNP4Z8yt/+DC2Do7WjF4ZUoMkoHEybVEwDyp8+xwLPmk5DhaCAAZuRIv5ZJULUGUXDaUM2yWL6U7W5Eck7wV1ROS5467gw5yDnvsG5dRh06v/9NJaRjU6z3dxfxyZ6E/QlGEX3qeGRnBrVi5AhCRxEJUZefHCSEWFZ2W2KDGrEA6yHDrM8xS5ZRF0L8sh4i6jKDSyS0hVD0jd08TX1tX+ZD9QuEECZk8qMr7KEczT8qtASGVq2J36bWm8gxsyt8IKHs8N4kL/c+5L6i3bhVDxTeujsi9xCXTtrbUKk98e0iq/f2jjEA6q/7eb1M2v84/BuV7jluYfcQ+DXZQtCGEXurMYEY7HEsYrQ7nyyCGyn0ySiHac4wdUYfywQK0L/rbPUB0Dy9S+3yfzqdmu+
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NmpkJxuMfuhgpcT6RfwcLNCwf7pPBmDtz9yuZnetP9MWbHtZGt8GsM3EIwvN?=
 =?us-ascii?Q?G/aSAxImmkH1HK8Oe1xihWagb8mkusvAMHDo7Q9JK/lVi8/lgx+pXwq7/sQw?=
 =?us-ascii?Q?Zap7CDVLPF+B0Dn6PSXVKUUWLI9W52DbC/PDGmSJXMG3Ab2oec78FptPulVo?=
 =?us-ascii?Q?SxWB8qah73uG4QOEmM7Rb7Mc9FB049nSFGGH06RNnJja1p6BLOdddwamfQXc?=
 =?us-ascii?Q?tDOqOYKEQxM7K3UkOUvL/F+Bf0Xl/XfIUSbwqF+s1ZadIJqwkiGB8Pzpj8kB?=
 =?us-ascii?Q?G6Hr6MYYLUXb4KC6u8lrdOXU2rqpzZSCjQG5+Y3rDQ7eyhZeBCehCS1DAKW0?=
 =?us-ascii?Q?paolWw3zty/OmxfgRfCNPj+Xk3JhCH671uKyLqQl4uDTOWatbr7dTqb6+pPp?=
 =?us-ascii?Q?oBWQtrbmDacqgaHV5866PbCje3lvJKVYF+oRspSz1Z4NrFSnWVrBGCZfV9sj?=
 =?us-ascii?Q?/f8lo4WVecEuzPcHKYszhkNhLTSqqABMVvvA4aLPV4iwCTx1wUnEEm/jjOGL?=
 =?us-ascii?Q?rrEv1sEMbRsIqVNuEuilbhOU7LkoPSn7pSdBwA5QoeXZqfxI8SrjFLqS6ZlE?=
 =?us-ascii?Q?MUZMQi3yqeCiY9tkJMdVHVZl187jft3aRlo/wEkJbNjlLDot6W35i10IYv9C?=
 =?us-ascii?Q?OTX+psArizsK3QBGRF8IWpMN7ycMH9mI6PRuW9iHoSNzRQacJkPS8KL0yQEA?=
 =?us-ascii?Q?1q6QOvT8PhKQTC3cJHZnUqHPHVxVDz6HmX58Bhg3LWz4BFv5ZCQDHJYzAwfF?=
 =?us-ascii?Q?3iMTecvQcND0PeIfqIgVZYpbCtIXYXnKjyxsZimaw6OQMqEnnUaP6lmDmybX?=
 =?us-ascii?Q?2usrGjgkVjrdTTq0gIzP27xW1sjm2xkJHw39sYKsaP2+fZd6BaPuItsZ6yOG?=
 =?us-ascii?Q?edr6/A4018Inu8WatrBsUSW7SOXa7NaKxbJNQeQQHK2nMAFD8RmbzN+E+H9e?=
 =?us-ascii?Q?e7EPlfUDBRQtdbzuNBfZl1+5h/yR12aMuB+7FB7Widmg2cnSM42UeYY9evwd?=
 =?us-ascii?Q?OuLU2Bse8K9+HWlG1nmP9Szg9dKyE5dZxnEo6sfs4TSq57stiekfKq1GXX5W?=
 =?us-ascii?Q?PRAUuwMwutjbqkpvL/+renfmmvToc1cK+aPFbHtSJyQ2MZpt9I41wZnM2hBK?=
 =?us-ascii?Q?D8VrxwwKc+QhuwERe8VY3qteKWefHDRiwibybK53pT/oo92bGCp34uB0oA75?=
 =?us-ascii?Q?7Yn8JcqERNvaPG/DGmbNOnIK5qftG8s7nDTxJQ=3D=3D?=
X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-05f45.templateTenant
X-MS-Exchange-CrossTenant-Network-Message-Id: 788d8520-7c0f-4b5d-6195-08dbeff3ca73
X-MS-Exchange-CrossTenant-AuthSource: TYCP286MB2146.JPNP286.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2023 09:24:15.8717
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY1P286MB3405
X-Spam-Status: No, score=0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,FORGED_HOTMAIL_RCVD2,FREEMAIL_FORGED_FROMDOMAIN,
	FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email
To:     unlisted-recipients:; (no To-header on input)
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Tue, 28 Nov 2023 01:24:29 -0800 (PST)

From: Peng Liu <liupeng17@lenovo.com>

tick_nohz_lowres_handler() does the same work as tick_nohz_highres_handler()
plus the clockevent device reprogramming, so should reuse the latter.

Signed-off-by: Peng Liu <liupeng17@lenovo.com>
---
Changes in v2:
- Fix build warning: Function parameter or member 'mode' not described in 'tick_setup_sched_timer'
- Fix build error: use of undeclared identifier 'tick_nohz_highres_handler'
- Fix build error: use of undeclared identifier 'sched_skew_tick'
---
 kernel/time/tick-sched.c | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 96fcf5cb1b49..c2142b38c31d 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -1383,36 +1383,25 @@ void tick_nohz_idle_exit(void)
 	local_irq_enable();
 }
 
+static enum hrtimer_restart tick_nohz_highres_handler(struct hrtimer *timer);
+
 /*
  * In low-resolution mode, the tick handler must be implemented directly
  * at the clockevent level. hrtimer can't be used instead, because its
  * infrastructure actually relies on the tick itself as a backend in
  * low-resolution mode (see hrtimer_run_queues()).
  *
- * This low-resolution handler still makes use of some hrtimer APIs meanwhile
- * for convenience with expiration calculation and forwarding.
+ * This low-resolution handler still reuse tick_nohz_highres_handler() since
+ * most of the work is independent of the clockevent level.
  */
 static void tick_nohz_lowres_handler(struct clock_event_device *dev)
 {
 	struct tick_sched *ts = this_cpu_ptr(&tick_cpu_sched);
-	struct pt_regs *regs = get_irq_regs();
-	ktime_t now = ktime_get();
 
 	dev->next_event = KTIME_MAX;
 
-	tick_sched_do_timer(ts, now);
-	tick_sched_handle(ts, regs);
-
-	/*
-	 * In dynticks mode, tick reprogram is deferred:
-	 * - to the idle task if in dynticks-idle
-	 * - to IRQ exit if in full-dynticks.
-	 */
-	if (likely(!ts->tick_stopped)) {
-		hrtimer_forward(&ts->sched_timer, now, TICK_NSEC);
+	if (likely(tick_nohz_highres_handler(&ts->sched_timer) == HRTIMER_RESTART))
 		tick_program_event(hrtimer_get_expires(&ts->sched_timer), 1);
-	}
-
 }
 
 static inline void tick_nohz_activate(struct tick_sched *ts, int mode)
@@ -1481,10 +1470,7 @@ void tick_irq_enter(void)
 	tick_nohz_irq_enter();
 }
 
-/*
- * High resolution timer specific code
- */
-#ifdef CONFIG_HIGH_RES_TIMERS
+#if defined CONFIG_NO_HZ_COMMON || defined CONFIG_HIGH_RES_TIMERS
 /*
  * We rearm the timer until we get disabled by the idle code.
  * Called with interrupts disabled.
@@ -1519,9 +1505,7 @@ static enum hrtimer_restart tick_nohz_highres_handler(struct hrtimer *timer)
 
 	return HRTIMER_RESTART;
 }
-#endif /* HIGH_RES_TIMERS */
 
-#if defined CONFIG_NO_HZ_COMMON || defined CONFIG_HIGH_RES_TIMERS
 static int sched_skew_tick;
 
 static int __init skew_tick(char *str)
-- 
2.34.1