From patchwork Sat Jan 7 10:53:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 40363 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1247281wrt; Sat, 7 Jan 2023 02:55:58 -0800 (PST) X-Google-Smtp-Source: AMrXdXsGxf1X+DO3cEw/Q6dn95PR8amwyJ7PcPPu2ZNfharJNVc4dQgssiA5xWvgiV5e418UqExP X-Received: by 2002:a05:6a20:13a0:b0:9d:efbe:a0f5 with SMTP id w32-20020a056a2013a000b0009defbea0f5mr92475244pzh.5.1673088957951; Sat, 07 Jan 2023 02:55:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673088957; cv=none; d=google.com; s=arc-20160816; b=U3yQGhB7DvsLPJGq5nX/BAbF5EQwwz9I38d4hriQLSYmhs5jz87HmKH3OaAyDs4GLG Oq2ko+XRgy9GaXh70fDWW0UbBtrlKM0sOlUkoNRDCyd2ReBN7bX5lUHj7of6AGlCHry5 OW78bXTX2VpVAZZkK0+xuIdu93ig14L7EZ910/bDgMsJbWG3ZS21rD3pnTE6Ux42glCa tX1/NK9k7K42k2++EPQY0fLv/Z+seTvWG4YyPRrEwlTgLffifDbT8znHjBmQGcFtuQ+U 1rWwsJ5YqfBANAbHX2tHwkNZ9FfT8TjTudYCk2mRlamFhRNzor8QArAy7l8knQ82Yw9b LAmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=w0hbxGvGjMIjbt4FTfD3Ps6daJ72yuL+fgskg9oAX1U=; b=Tp2xsd0hUqh8ar/ihvRkSzUjpuZCYeTThcTOQuAqoabkgtJzYIVv9oywFh2bWPO+SD IB1S8q4eyTWURrXAtcG7g8ro0AEgtD/1nLixwiywhMB3IOkZjbQcDjYQKJw0aIA0vaRA CCIYEQraypv3NENTNkJbOEY1jhBCVMKyCr9AkDkDZt9ug6N352tsyS8yX4i9/PspnIDy VA+or46jdj8MvIjGYn4ZqyJczf25HhhSFqGd9xOVOR5t1vY7jAArQ6mSiYuhqsn14Oxs woNduvzsZXm+H8XaurxEliuHpYnAEhWdX4D2eL2MruZ6LQtQRtMFMSKMxekOHxCcHF0w TWoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=H6YqhTbd; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=MjyibKep; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f9-20020a639c09000000b0047943c39fc2si4061985pge.160.2023.01.07.02.55.44; Sat, 07 Jan 2023 02:55:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=H6YqhTbd; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=MjyibKep; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231987AbjAGKxI (ORCPT + 99 others); Sat, 7 Jan 2023 05:53:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229475AbjAGKxE (ORCPT ); Sat, 7 Jan 2023 05:53:04 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B9BB1AD9F; Sat, 7 Jan 2023 02:53:02 -0800 (PST) Date: Sat, 07 Jan 2023 10:53:00 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1673088780; 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=w0hbxGvGjMIjbt4FTfD3Ps6daJ72yuL+fgskg9oAX1U=; b=H6YqhTbd/u28DWwnVjmhCSi9Vu78Zaqc6moAxlAM3gcAedZ6t9gexZOlDKFhZI9rpSnscL 3P/d4rcB7k4E4va1Z2Pz8jQzlf94nj+FaeqP2J4wMXs8titnxLlDejVgG/kHXR/ThxpRMT uyIcb3PPo+FaiTDBb/GQb8anrInNkQ3GPxCheDmfrwW1GrRuu4NlkdtWlJ+Qb7KC/BGFfr LLuGiKXmMUyEYS3N7mp7RvGy2GjnMrNt0Bi6tmE+26GZJHBb/ud8gxfqlFLOPqjtUukdaw eiGeKD/A5KV4zAVKWCOFxAdXy3YSXLxKQASNRIb4Pf81hNs86OxeB357pZHN/A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1673088780; 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=w0hbxGvGjMIjbt4FTfD3Ps6daJ72yuL+fgskg9oAX1U=; b=MjyibKepqwBhBAagsbJWCGA3udE36swVvZSwHyzJeQpsA2Y4ieR+FebWlSUkxkQdGU+Kpa eVMv7I6hnzM2OECQ== From: "tip-bot2 for Chengming Zhou" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched/core: Micro-optimize ttwu_runnable() Cc: Valentin Schneider , Peter Zijlstra , Chengming Zhou , Ingo Molnar , "Steven Rostedt (Google)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221223103257.4962-1-zhouchengming@bytedance.com> References: <20221223103257.4962-1-zhouchengming@bytedance.com> MIME-Version: 1.0 Message-ID: <167308878060.4906.15196822670119776065.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754360927110697931?= X-GMAIL-MSGID: =?utf-8?q?1754360927110697931?= The following commit has been merged into the sched/core branch of tip: Commit-ID: efe09385864f3441c71711f91e621992f9423c01 Gitweb: https://git.kernel.org/tip/efe09385864f3441c71711f91e621992f9423c01 Author: Chengming Zhou AuthorDate: Fri, 23 Dec 2022 18:32:56 +08:00 Committer: Ingo Molnar CommitterDate: Sat, 07 Jan 2023 10:48:38 +01:00 sched/core: Micro-optimize ttwu_runnable() ttwu_runnable() is used as a fast wakeup path when the wakee task is running on CPU or runnable on RQ, in both cases we can just set its state to TASK_RUNNING to prevent a sleep. If the wakee task is on_cpu running, we don't need to update_rq_clock() or check_preempt_curr(). But if the wakee task is on_rq && !on_cpu (e.g. an IRQ hit before the task got to schedule() and the task been preempted), we should check_preempt_curr() to see if it can preempt the current running. This also removes the class->task_woken() callback from ttwu_runnable(), which wasn't required per the RT/DL implementations: any required push operation would have been queued during class->set_next_task() when p got preempted. ttwu_runnable() also loses the update to rq->idle_stamp, as by definition the rq cannot be idle in this scenario. Suggested-by: Valentin Schneider Suggested-by: Peter Zijlstra Signed-off-by: Chengming Zhou Signed-off-by: Ingo Molnar Reviewed-by: Valentin Schneider Reviewed-by: Steven Rostedt (Google) Link: https://lore.kernel.org/r/20221223103257.4962-1-zhouchengming@bytedance.com --- kernel/sched/core.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index f99ee69..255a318 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3720,9 +3720,16 @@ static int ttwu_runnable(struct task_struct *p, int wake_flags) rq = __task_rq_lock(p, &rf); if (task_on_rq_queued(p)) { - /* check_preempt_curr() may use rq clock */ - update_rq_clock(rq); - ttwu_do_wakeup(rq, p, wake_flags, &rf); + if (!task_on_cpu(rq, p)) { + /* + * When on_rq && !on_cpu the task is preempted, see if + * it should preempt the task that is current now. + */ + update_rq_clock(rq); + check_preempt_curr(rq, p, wake_flags); + } + WRITE_ONCE(p->__state, TASK_RUNNING); + trace_sched_wakeup(p); ret = 1; } __task_rq_unlock(rq, &rf);