From patchwork Tue Jul 25 12:28:45 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: 125602 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2444165vqg; Tue, 25 Jul 2023 05:50:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlHRKTBzqyzx8WA9PfYuRRNIN0580qmXUV9ck3bBpYmipOtt9KBcn7vcRc4f0mG6YAJ0ZFAh X-Received: by 2002:a17:903:1112:b0:1bb:b832:4bed with SMTP id n18-20020a170903111200b001bbb8324bedmr3232278plh.20.1690289448328; Tue, 25 Jul 2023 05:50:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690289448; cv=none; d=google.com; s=arc-20160816; b=TNXA/mqUHdNqV5swfDl1kPUInxmCqmqITRy+/7DF1RuVkh/Hep4olkLT0Pgb5upkO2 8KFfANdnTZfsH9Z+Lt7M8XSKs6iN4zUZfz/FCX5orWl0sX2hHYww5k8Dtx5fnLORD2as cnSETaET+hcQW1Rj4GStNoYNQPaQ2HZGr6EviOzr/EkYSIA8QRCiCq+DwqqjZw3pJ0c0 5ppajcXA0gPWVxXBTIkKFJ8ViRnnW7y25AEKCa8Zri+0zHUjZDGPUdX/BNUwXuVdZKRt ESIqMJ8qeXv9yVJzisCiPC3EufWq60V5WCn6aFFTWht/pw2yjU3IcmcfPXkbnLFCX3pS P0zw== 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=oT7zrKgEkSdMtqdKcld0uEilXTEtuvjV3fRfLJNLrvg=; fh=T7dEL3nzzun/bikXiToJA1taQfjMATyuiMozDiPdFd8=; b=rBY2Yk+zF42+qBCu/eeWdM3agTiMNGS2PMhxpsvK2jU70UiIkwlyg7pfePiUIhTiSA YPS7mDelP4QwGMyyZrRRlEAoIRM7KMfpIDDBzpOd93fFYTDQK5rTEOH+e49PN3KTRsQp Xi4tZzWu+pGKdpxFlJYPE110Qpx4DJBRWltJPZhz3ORGSF8xlfHg3Mh20yk978wzZjI5 hKjCCRcx4X1vmIDwnCGaiCSrrBWnOJL2Y81Y03th/gAxDkafe1Fzp6LkrSwJBEipwDJY gDGBY1BQXJEljPNfb+Sv2vQQWtjLkN1W95TqVzUW7w1Yc0YJJ1l8QavijcXv2rRchNYV B61w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=B817jbKE; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=dYzEa9JZ; 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 jz8-20020a170903430800b001b89b7ce902si10717376plb.305.2023.07.25.05.50.31; Tue, 25 Jul 2023 05:50:48 -0700 (PDT) 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=B817jbKE; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=dYzEa9JZ; 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 S231247AbjGYM2x (ORCPT + 99 others); Tue, 25 Jul 2023 08:28:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229666AbjGYM2v (ORCPT ); Tue, 25 Jul 2023 08:28:51 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF240A7; Tue, 25 Jul 2023 05:28:48 -0700 (PDT) Date: Tue, 25 Jul 2023 12:28:45 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690288125; 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=oT7zrKgEkSdMtqdKcld0uEilXTEtuvjV3fRfLJNLrvg=; b=B817jbKEvbwKUnn5Uwmc+HfTSDcbxTBWXxXFahWHVrg60/Ay5zaicnIKIcKEnIKEOVHiqd 5avdaPbEJ4MBlZZNZPMeYLOvpawys/sbr8GTkynLCqdOVG2Z3OXiQOFJ//jrKDm2YgYKl8 vDo/bUSPreks3Xn1J3hD9ndtrJekaXhejjd4N4TlYASiD3guN8F5vjr57TpTjSvAMTp5r/ jMgk20Dgli2BL3DAsAIxdz5+0D/Bt0Go1DECk/sBIJSdJe0TCXJguNsO+ofmx7ZYaf44n3 ma5al1T9xTouYBYvwpBsle5zLOSk+/oqlKYlmixC9c9YpRM6LGccghvhflWFsw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690288125; 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=oT7zrKgEkSdMtqdKcld0uEilXTEtuvjV3fRfLJNLrvg=; b=dYzEa9JZyXy1N1NST23hvDSefJ3dFJ4A1NUAoDT4t+pAmZnDrtS+/VFfHT0mIlf9cUdqro phmwtBS2gM28tvCg== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/urgent] Revert "sched/fair: Move unused stub functions to header" Cc: Arnd Bergmann , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169028812500.28540.5616011722424800278.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1772396948687245669 X-GMAIL-MSGID: 1772396948687245669 The following commit has been merged into the sched/urgent branch of tip: Commit-ID: 7c1541e5f8330b0b94cafc5c68cf27ff358a1663 Gitweb: https://git.kernel.org/tip/7c1541e5f8330b0b94cafc5c68cf27ff358a1663 Author: Peter Zijlstra AuthorDate: Mon, 24 Jul 2023 21:30:54 +02:00 Committer: Peter Zijlstra CommitterDate: Mon, 24 Jul 2023 21:42:42 +02:00 Revert "sched/fair: Move unused stub functions to header" Revert commit 7aa55f2a5902 ("sched/fair: Move unused stub functions to header"), for while it has the right Changelog, the actual patch content a revert of the previous 4 patches: f7df852ad6db ("sched: Make task_vruntime_update() prototype visible") c0bdfd72fbfb ("sched/fair: Hide unused init_cfs_bandwidth() stub") 378be384e01f ("sched: Add schedule_user() declaration") d55ebae3f312 ("sched: Hide unused sched_update_scaling()") So in effect this is a revert of a revert and re-applies those patches. Fixes: 7aa55f2a5902 ("sched/fair: Move unused stub functions to header") Reported-by: Arnd Bergmann Signed-off-by: Peter Zijlstra (Intel) --- kernel/sched/fair.c | 6 +++--- kernel/sched/sched.h | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index b3e25be..695f8e5 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -684,7 +684,7 @@ struct sched_entity *__pick_last_entity(struct cfs_rq *cfs_rq) /************************************************************** * Scheduling class statistics methods: */ - +#ifdef CONFIG_SMP int sched_update_scaling(void) { unsigned int factor = get_update_sysctl_factor(); @@ -702,6 +702,7 @@ int sched_update_scaling(void) return 0; } #endif +#endif /* * delta /= w @@ -6186,9 +6187,8 @@ static inline int throttled_lb_pair(struct task_group *tg, return 0; } -void init_cfs_bandwidth(struct cfs_bandwidth *cfs_b) {} - #ifdef CONFIG_FAIR_GROUP_SCHED +void init_cfs_bandwidth(struct cfs_bandwidth *cfs_b) {} static void init_cfs_rq_runtime(struct cfs_rq *cfs_rq) {} #endif diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index e93e006..44b540a 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1245,6 +1245,7 @@ static inline raw_spinlock_t *__rq_lockp(struct rq *rq) bool cfs_prio_less(const struct task_struct *a, const struct task_struct *b, bool fi); +void task_vruntime_update(struct rq *rq, struct task_struct *p, bool in_fi); /* * Helpers to check if the CPU's core cookie matches with the task's cookie @@ -2398,6 +2399,7 @@ static inline struct cpuidle_state *idle_get_state(struct rq *rq) #endif extern void schedule_idle(void); +asmlinkage void schedule_user(void); extern void sysrq_sched_debug_show(void); extern void sched_init_granularity(void);