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 6C1EECE79AB for ; Wed, 20 Sep 2023 07:36:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233825AbjITHga (ORCPT ); Wed, 20 Sep 2023 03:36:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233790AbjITHgT (ORCPT ); Wed, 20 Sep 2023 03:36:19 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 767D4C9; Wed, 20 Sep 2023 00:36:13 -0700 (PDT) Date: Wed, 20 Sep 2023 07:36:11 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1695195372; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xkErl+ldBpVOFQLYfLc4+s4u3o3sDTlBynk6F5XnIVI=; b=HkzMRkQSyu1diMapdr8DdhMVRj/xoen19An/M+ulL9V5LBukkwEsOjCScfw1V2bBzeSAFy /5fARBSnaznDK1OLsb40dI27c0TSUuGG+MJd7M2vVBwuq9Ayry6YhGbgG1Jbg2P7kVhbx1 +Fc3NWe7HFKv30sO6EASKmMzZKT6XKoNLwyjovIN3PHKhLk96H7cL+7TemPJAeHK9O4G6X 36dvCAG1PnhoVNd8h1X9fml3z21jy7TKg/Fdn2zdFICH8+7VH6OR/LSvhCJvdixdFhnhgf rHYYZAmngjrwPozRpw23A82v1e/KkWhQvt401cbT2Jq0Wu+RzV2ltVYNtdI5DQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695195372; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xkErl+ldBpVOFQLYfLc4+s4u3o3sDTlBynk6F5XnIVI=; b=e700XXZ40ze5dCUWGbIhuB/MSvQBeQ8jmQ6OzNwby3kDYHqGZmqVgPIM7Tz8kHKbpq5YSC rkQmMD0ZCmcldzAw== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] sched: Extract __schedule_loop() Cc: Thomas Gleixner , Sebastian Andrzej Siewior , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230908162254.999499-4-bigeasy@linutronix.de> References: <20230908162254.999499-4-bigeasy@linutronix.de> MIME-Version: 1.0 Message-ID: <169519537134.27769.9940843211389031126.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the locking/core branch of tip: Commit-ID: de1474b46d889ee0367f6e71d9adfeb0711e4a8d Gitweb: https://git.kernel.org/tip/de1474b46d889ee0367f6e71d9adfeb0711e4a8d Author: Thomas Gleixner AuthorDate: Fri, 08 Sep 2023 18:22:50 +02:00 Committer: Peter Zijlstra CommitterDate: Wed, 20 Sep 2023 09:31:12 +02:00 sched: Extract __schedule_loop() There are currently two implementations of this basic __schedule() loop, and there is soon to be a third. Signed-off-by: Thomas Gleixner Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20230908162254.999499-4-bigeasy@linutronix.de --- kernel/sched/core.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index d555640..1ea7ba5 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6770,16 +6770,21 @@ static void sched_update_worker(struct task_struct *tsk) } } -asmlinkage __visible void __sched schedule(void) +static __always_inline void __schedule_loop(unsigned int sched_mode) { - struct task_struct *tsk = current; - - sched_submit_work(tsk); do { preempt_disable(); - __schedule(SM_NONE); + __schedule(sched_mode); sched_preempt_enable_no_resched(); } while (need_resched()); +} + +asmlinkage __visible void __sched schedule(void) +{ + struct task_struct *tsk = current; + + sched_submit_work(tsk); + __schedule_loop(SM_NONE); sched_update_worker(tsk); } EXPORT_SYMBOL(schedule); @@ -6843,11 +6848,7 @@ void __sched schedule_preempt_disabled(void) #ifdef CONFIG_PREEMPT_RT void __sched notrace schedule_rtlock(void) { - do { - preempt_disable(); - __schedule(SM_RTLOCK_WAIT); - sched_preempt_enable_no_resched(); - } while (need_resched()); + __schedule_loop(SM_RTLOCK_WAIT); } NOKPROBE_SYMBOL(schedule_rtlock); #endif