From patchwork Thu Aug 3 15:59:15 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: 130735 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp1272835vqx; Thu, 3 Aug 2023 09:44:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlHarFitAx5WeX+q13QML/Fc7RVHR6ZOitgCKK+U9SIRAmZ1HpTf2z1lh5xLHUVAwRLjhJoB X-Received: by 2002:a05:6a20:432b:b0:13e:e053:1050 with SMTP id h43-20020a056a20432b00b0013ee0531050mr7189941pzk.56.1691081057958; Thu, 03 Aug 2023 09:44:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691081057; cv=none; d=google.com; s=arc-20160816; b=dD1wfV7DFqugzRsW/EzK0YnQKnWLuCao59cjUdqx4mamUlsEofS5+z9s4+dYYZG6NZ vn/4czAxKX91BKf4FaYBal8+M7UlNvnvPPzk2d7qqdSArhd+KOLzGT5fRbOx3gmTgI3k 56DtgFPpy2oYE2YrSELK2z6/Wrd0bKDsPbWqlBVIUL2mUmrW2VmUyzIt21rboP5MjXE9 pJczUoW1H0PXDYnid7jszrfuvLeHROCpIQ3D7TwiPd7bqQyopur6OI+ycaXapy/3TN31 n6+tNHQgcMhP7MNtNhuXDYtrtU3e/W12dfbUjSTsGZjlObFe7eux94DGwmjIRIfVGKIV 8muQ== 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=QOYYpFCjIgnStr2qW66eWt25QWHWyNJ2vYvVd9dQEZU=; fh=CJEGJwNf5x322uQTLBnkN4T41e+pHU/1CqpP/TI7gMI=; b=aAO9wUX7WO2g8kban7cWv0VkrK5sfuYjWvTHFCr5Aw8hqkk01c2UPupvWskZwgvz5O iy8ht8HE4Rha/yg3o/qFyc9QDe0gyWZhQ0CY27EFs5JB1wl5FLS+uO+hePi7syPpbLLt cMYaif59Zs4G8C6NCn/hMQJzEvS2CcVCiigqC1TnB/ZpIMWuivJ3xR51n1Kd+o8FUJEM 4QMoZ5iXyDQwOPFxe2tr0VmPthfL4p/k3rUkP0G7W7B7iDudasXXSZ1BZTCNM1WvSkLP 7GBCQSLJPNwJRY0YaRQD+wa2QsJto1anlmz7WqogRalxXLWWtczFpLuQfYGvVdkP68ky NEMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="JcWL/HMT"; dkim=neutral (no key) header.i=@linutronix.de; 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 y20-20020a63ce14000000b0055bc23bdde5si169973pgf.176.2023.08.03.09.44.03; Thu, 03 Aug 2023 09:44:17 -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="JcWL/HMT"; dkim=neutral (no key) header.i=@linutronix.de; 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 S237316AbjHCP7f (ORCPT + 99 others); Thu, 3 Aug 2023 11:59:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233995AbjHCP7T (ORCPT ); Thu, 3 Aug 2023 11:59:19 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48403115; Thu, 3 Aug 2023 08:59:18 -0700 (PDT) Date: Thu, 03 Aug 2023 15:59:15 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691078355; 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=QOYYpFCjIgnStr2qW66eWt25QWHWyNJ2vYvVd9dQEZU=; b=JcWL/HMT4G1Gg5ivm/Dz8DXVPBBZ5j3u/KlspYkdOpZssvu+6WGe4rAAlw6czGDmSm67py ukkCs7qRT9/ttMKN8CWp5RjHzG3n7RHKsFLgTOIxxi3mqI2l+cTTDo2WaCIs66jQfXtNSo Y3K7iHVtcoTTwZslvjCdsyHFffsUh53ClfE1MaAdP+C0UAQ2zfE35kQk9DTdRKLcf82EKg c6JNq2+7nggSlIZJht664Z8UO7P4hV/U0ZNZffj/+T9qkV4z/uWOjDTxu3HEA3FohLQOZ9 0iJ4stJF6axqBr/rumSEmnCow3kcquj8uUlnOo7IxUme5G1hvmI/VQLi5ARgXw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691078355; 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=QOYYpFCjIgnStr2qW66eWt25QWHWyNJ2vYvVd9dQEZU=; b=Ir6WTfyub+vLdjLBsOY8fUze0fW1fRj98VNIR2aiKqNZqN10pVw8zlX9HEIvBq4ALXIZG5 +j3B1IZhoZBSRoCg== 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: x86/cleanups] Revert "sched/fair: Move unused stub functions to header" Cc: Arnd Bergmann , "Peter Zijlstra (Intel)" , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169107835534.28540.16435626638250235806.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 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: 1773227011632255000 X-GMAIL-MSGID: 1773227011632255000 The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 22dc02f81cddd19528fc1d4fbd7404defbf736c5 Gitweb: https://git.kernel.org/tip/22dc02f81cddd19528fc1d4fbd7404defbf736c5 Author: Peter Zijlstra AuthorDate: Mon, 24 Jul 2023 21:30:54 +02:00 Committer: Borislav Petkov (AMD) CommitterDate: Mon, 31 Jul 2023 11:47:08 +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) Signed-off-by: Borislav Petkov (AMD) --- 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);