From patchwork Tue Sep 19 09:52:51 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: 141855 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp3345610vqi; Tue, 19 Sep 2023 05:28:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHnbFC8jSMDuY7QaKkqyAvrp5wMmJe1rwSBcAxauV79x0xjUx2MXL5vdPDxu/5QFCYVDNk4 X-Received: by 2002:a05:6a20:7d87:b0:158:17e6:7a6 with SMTP id v7-20020a056a207d8700b0015817e607a6mr15507137pzj.42.1695126511017; Tue, 19 Sep 2023 05:28:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695126511; cv=none; d=google.com; s=arc-20160816; b=Yq9jAICXXx85HYOYbJCEMhrT70KGjVJ8kM/b4R4wqAqWQy24Ws8POAN9abRS+wBrsN QV7JL6fsYijTSdYs0XPJyk6rkjwIgBjlafeZdeiVa0fGVi1VR9pEAv50umTyV8CCtoT3 /bfw3QzkPWoT0+6oVUQxkLAMruGeAAqE77DHGN6MmDnxcf0CjXLGWagLie31RyNzPUr+ 9S2zDnoDcy7AL47/fw267PKlaGSg2Z4R5JJPtK8LuT88z5i0xm8cXH20YOD9nVPJJt0m 7U3/qQKp8rOwH3cOjSwvcRSJ3Peo9qqD9A/5h2EtJKeQfjhFb5//y2uahUz4crPM82vF zXLg== 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:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=cEFNR0Ukbl7IOypHbZewrDZRApycDVjloKVSyI5Hom4=; fh=Pam2IjfvyNQmUlcyVVIWwJq0cvIPeS8mjV0w4Vu7gZU=; b=zsx8mHMMX7r2gfiVNuyb+wb98uJT8zNfndvW5lMHV4yTTQ1DLNAHXOCqQCaXboVf7y SoPRDpRVTVBYV9BWgGGhuZ7WNLWuKPN3R6KhwBUIuMPcvjJ6KOpkKS2TIa02A1/89IXa A0hVQWzfEYX+jrd1cHypNQI1wUCLbEFmSbJBtBt0RUvZGI0LPxKUEfBsQcGXBkVd8gII bWeGAgyTtqXXt5EAXa2+Pog5EPD0j6d3nuMpNq+/0jqJw6VnXuYVIIR7B/kRjO1LvFnK C47PHpVmHLlM6qTUQ1GqcFp14wzDPbHTrz9fU0VsnL5lHdKfyhwX6zuuc6pK+CqJDeMz 4OFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Vo4imZs0; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id j6-20020a63fc06000000b00565df122f43si9472169pgi.202.2023.09.19.05.28.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Sep 2023 05:28:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Vo4imZs0; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 64C748028FA1; Tue, 19 Sep 2023 02:53:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231717AbjISJxE (ORCPT + 26 others); Tue, 19 Sep 2023 05:53:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231631AbjISJw7 (ORCPT ); Tue, 19 Sep 2023 05:52:59 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 527B39E; Tue, 19 Sep 2023 02:52:53 -0700 (PDT) Date: Tue, 19 Sep 2023 09:52:51 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1695117171; 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; bh=cEFNR0Ukbl7IOypHbZewrDZRApycDVjloKVSyI5Hom4=; b=Vo4imZs04ubjsuMDrGCXarD3cQxO0w63RNPvvcY7qQo+BVxV7jiWWsa2F3ooJ8BmBJNQOG Q5Rlhx6v0aS2Dta1GkjY1h5pN6xGKqBBGPdWyI/pdcFIAwRVT2/VrS0P1ffpViXtHgstt0 K7naZEPrsKnODRpqkREAGbMLED61kJf2bhkF6fdKTKkeZfughf531UbgMCCLQYAACfN3gg 2EXVnrJ+E9Canlt8wt+qaSxyuXlI3yEypvTkNP3/TSLm5tN0ThCYwvkYrSEUSJFQvno6v4 X2tf8xbZ863DW3gQsqzqXMfo65bE8aLBfMC881wfd88JFQ2hHntF8Un7Oq+oMA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695117171; 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; bh=cEFNR0Ukbl7IOypHbZewrDZRApycDVjloKVSyI5Hom4=; b=G+oVv1Fip/kh2ykCwlkxTglerDyC8SfHn0zbG4M8Hmyx58YykU5Mo7JtQdoBwyccJP5/Qj q+fuupET9Oze6RDQ== From: "tip-bot2 for Ingo Molnar" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched/fair: Rename check_preempt_wakeup() to check_preempt_wakeup_fair() Cc: Ingo Molnar , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169511717117.27769.11799364824084021498.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Tue, 19 Sep 2023 02:53:52 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777468976353751330 X-GMAIL-MSGID: 1777468976353751330 The following commit has been merged into the sched/core branch of tip: Commit-ID: 82845683ca6a15fe8c7912c6264bb0e84ec6f5fb Gitweb: https://git.kernel.org/tip/82845683ca6a15fe8c7912c6264bb0e84ec6f5fb Author: Ingo Molnar AuthorDate: Tue, 19 Sep 2023 10:31:15 +02:00 Committer: Ingo Molnar CommitterDate: Tue, 19 Sep 2023 10:32:15 +02:00 sched/fair: Rename check_preempt_wakeup() to check_preempt_wakeup_fair() Other scheduling classes already postfix their similar methods with the class name. Signed-off-by: Ingo Molnar Acked-by: Peter Zijlstra (Intel) --- kernel/sched/fair.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index d087787..aeaf31e 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7994,7 +7994,7 @@ static void set_next_buddy(struct sched_entity *se) /* * Preempt the current task with a newly woken task if needed: */ -static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_flags) +static void check_preempt_wakeup_fair(struct rq *rq, struct task_struct *p, int wake_flags) { struct task_struct *curr = rq->curr; struct sched_entity *se = &curr->se, *pse = &p->se; @@ -12830,7 +12830,7 @@ DEFINE_SCHED_CLASS(fair) = { .yield_task = yield_task_fair, .yield_to_task = yield_to_task_fair, - .check_preempt_curr = check_preempt_wakeup, + .check_preempt_curr = check_preempt_wakeup_fair, .pick_next_task = __pick_next_task_fair, .put_prev_task = put_prev_task_fair,