From patchwork Fri Oct 28 06:42:21 2022 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: 12112 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp659206wru; Thu, 27 Oct 2022 23:45:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5ZeLnJMIKAoupp01ay8326D++5YKyrBTeL5PJIyLDqW4JXRSN3jS4q/KgZ01Cpdio13T06 X-Received: by 2002:a17:903:22d2:b0:17f:7dea:985f with SMTP id y18-20020a17090322d200b0017f7dea985fmr54221932plg.68.1666939503377; Thu, 27 Oct 2022 23:45:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666939503; cv=none; d=google.com; s=arc-20160816; b=VI4n6pqdaXxDfk+/YTRVDpC+Ll+yVVmqGToXPDS02W6AQheH7mFDPM9MHov3/Vxji/ QnTNIjD+oiY4RrmNnVAXKEpD4x26Ujv8goaKY2ZbQ3o5qwaOSzgXHAcELfijGLT9hkTI CQ/VXACqAAQAjC/NO5lbhCOWfItTA9BRX3p+ggArvLhka+O+jGbh9lZEo/1g9CpSUX77 /YvDXLJwhrWg2FgkHH7+gg5obi8a0hmSvlumS5TT9iXTqPNdORepUlLtsj3gHcatP5uX xXzOAmjXoDKm5kQTbasPqeGJ+ys8woMw3c17yaaketWZnIkmCmwZtxNsGbtCWSsIf3gv epRw== 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=paomVjnwcOpcLbLpq2hi1hHo+xtC3pC3+oxZmc1/UX0=; b=elxrOa0qkUbSOAYYakoEz1UlenAdq+L4gGx6/zIdK0iNgTXpaxlyfeOvpg6LC1jTcp /XHM+FBe3HXOu7pt4GnDE5nBwBMz5vnbD8z9nGQh/NCogvvpdZ6xJqfoOKWmOaznGsEH NzvrVU9e4g1YF/WQvPcE3cDWgJsffQMvNObqvf27cuK04YSJjtZBexA3EK4iSerowYSp StrtBNRNkrLKRtLpL6S85TSv4v3OrUff9khhgnWrS06kv6Gm+0n0lAUVYhgQapDXwiaV lmaFeL2kl2r6nslq+OI+y9AboX/IR9BRcwZ+ZcpWCbAU5si67Igyu68KMb0Hl2/ST54n JPeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=I2fyfSxH; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=HEJuKJMF; 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 u16-20020a632350000000b00434dfe7b75esi4385300pgm.223.2022.10.27.23.44.50; Thu, 27 Oct 2022 23:45:03 -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=I2fyfSxH; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=HEJuKJMF; 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 S230116AbiJ1GoY (ORCPT + 99 others); Fri, 28 Oct 2022 02:44:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229832AbiJ1Gm3 (ORCPT ); Fri, 28 Oct 2022 02:42:29 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA6F11BB579; Thu, 27 Oct 2022 23:42:23 -0700 (PDT) Date: Fri, 28 Oct 2022 06:42:21 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1666939342; 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=paomVjnwcOpcLbLpq2hi1hHo+xtC3pC3+oxZmc1/UX0=; b=I2fyfSxHPu7Ipw2MBvPqrpHK8kRU32SZ2o+UzAZ8DE+vMrErnRyKV0Yx0wU8LnsvdoxFJq ommpQYFnS5MbccHtIXZ9B2ppNk97imU+gSp5YAoGGYHA3OPAZZExd7/sRwC8lzYTI45vdO Z/ZrhZ3PuTAQ6Z7yz5ym4HAAU9tnZkZwbQzvWS4b7eLR6uidavMeQbMKps5KSQ+JrGE5FN PEb7cPWU6+SvVWJPE7gYIrxGLcuCtwAA3ogqn4CP5vsFZ65/B2+f0t5b6P4ZL58PlHc0wS cnnsxy6b2T87cRAKVl0vQ2Rv981/Ec61wc9rjioA7vUsi47CWzRngVLMjsGBDQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1666939342; 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=paomVjnwcOpcLbLpq2hi1hHo+xtC3pC3+oxZmc1/UX0=; b=HEJuKJMFMlkLe0RX0maIGNNynpAkWiSCsdh1UtpWN/iVXW6AQwT8j5RrM5orVxHltBfYkQ ghHD9Nio6kftKnBg== From: "tip-bot2 for Qais Yousef" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched/uclamp: Make asym_fits_capacity() use util_fits_cpu() Cc: Qais Yousef , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20220804143609.515789-6-qais.yousef@arm.com> References: <20220804143609.515789-6-qais.yousef@arm.com> MIME-Version: 1.0 Message-ID: <166693934105.29415.595582803729187121.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?1747912756691537487?= X-GMAIL-MSGID: =?utf-8?q?1747912756691537487?= The following commit has been merged into the sched/core branch of tip: Commit-ID: a2e7f03ed28fce26c78b985f87913b6ce3accf9d Gitweb: https://git.kernel.org/tip/a2e7f03ed28fce26c78b985f87913b6ce3accf9d Author: Qais Yousef AuthorDate: Thu, 04 Aug 2022 15:36:05 +01:00 Committer: Peter Zijlstra CommitterDate: Thu, 27 Oct 2022 11:01:19 +02:00 sched/uclamp: Make asym_fits_capacity() use util_fits_cpu() Use the new util_fits_cpu() to ensure migration margin and capacity pressure are taken into account correctly when uclamp is being used otherwise we will fail to consider CPUs as fitting in scenarios where they should. s/asym_fits_capacity/asym_fits_cpu/ to better reflect what it does now. Fixes: b4c9c9f15649 ("sched/fair: Prefer prev cpu in asymmetric wakeup path") Signed-off-by: Qais Yousef Signed-off-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20220804143609.515789-6-qais.yousef@arm.com --- kernel/sched/fair.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index c877bbf..cabbdac 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6807,10 +6807,13 @@ select_idle_capacity(struct task_struct *p, struct sched_domain *sd, int target) return best_cpu; } -static inline bool asym_fits_capacity(unsigned long task_util, int cpu) +static inline bool asym_fits_cpu(unsigned long util, + unsigned long util_min, + unsigned long util_max, + int cpu) { if (sched_asym_cpucap_active()) - return fits_capacity(task_util, capacity_of(cpu)); + return util_fits_cpu(util, util_min, util_max, cpu); return true; } @@ -6822,7 +6825,7 @@ static int select_idle_sibling(struct task_struct *p, int prev, int target) { bool has_idle_core = false; struct sched_domain *sd; - unsigned long task_util; + unsigned long task_util, util_min, util_max; int i, recent_used_cpu; /* @@ -6831,7 +6834,9 @@ static int select_idle_sibling(struct task_struct *p, int prev, int target) */ if (sched_asym_cpucap_active()) { sync_entity_load_avg(&p->se); - task_util = uclamp_task_util(p); + task_util = task_util_est(p); + util_min = uclamp_eff_value(p, UCLAMP_MIN); + util_max = uclamp_eff_value(p, UCLAMP_MAX); } /* @@ -6840,7 +6845,7 @@ static int select_idle_sibling(struct task_struct *p, int prev, int target) lockdep_assert_irqs_disabled(); if ((available_idle_cpu(target) || sched_idle_cpu(target)) && - asym_fits_capacity(task_util, target)) + asym_fits_cpu(task_util, util_min, util_max, target)) return target; /* @@ -6848,7 +6853,7 @@ static int select_idle_sibling(struct task_struct *p, int prev, int target) */ if (prev != target && cpus_share_cache(prev, target) && (available_idle_cpu(prev) || sched_idle_cpu(prev)) && - asym_fits_capacity(task_util, prev)) + asym_fits_cpu(task_util, util_min, util_max, prev)) return prev; /* @@ -6863,7 +6868,7 @@ static int select_idle_sibling(struct task_struct *p, int prev, int target) in_task() && prev == smp_processor_id() && this_rq()->nr_running <= 1 && - asym_fits_capacity(task_util, prev)) { + asym_fits_cpu(task_util, util_min, util_max, prev)) { return prev; } @@ -6875,7 +6880,7 @@ static int select_idle_sibling(struct task_struct *p, int prev, int target) cpus_share_cache(recent_used_cpu, target) && (available_idle_cpu(recent_used_cpu) || sched_idle_cpu(recent_used_cpu)) && cpumask_test_cpu(p->recent_used_cpu, p->cpus_ptr) && - asym_fits_capacity(task_util, recent_used_cpu)) { + asym_fits_cpu(task_util, util_min, util_max, recent_used_cpu)) { return recent_used_cpu; }