From patchwork Mon Jul 31 10:19:46 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: 128598 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1943444vqg; Mon, 31 Jul 2023 04:19:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlERaOaFTnOIdsqAep9Nz6Tl2bTftImJDWgjqNLgGpONBM3/cJ5tjE5WXLJm6zflARnxKhCD X-Received: by 2002:aa7:d506:0:b0:522:6e6c:68a2 with SMTP id y6-20020aa7d506000000b005226e6c68a2mr7876552edq.18.1690802392640; Mon, 31 Jul 2023 04:19:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690802392; cv=none; d=google.com; s=arc-20160816; b=mgHldKf/kyB5+zsv1pCQ3ilIFnh0NG5tt7vhhX5o9n4klQQHqe7vhgqsNn6b+LTmph sKMlc9hl5/QqCGlxyvvpDB4qLqrs1BB3taumKZXXZ2F1G/MBKxmMQf4+F+h8dwuv8nqj 4O5s19zMLJ8tLEBsTIThHkcL1CfVO45w8NoQXhI2giJMOBtH/PPnSyg0Mtc0+9wcEJgN zRv0ZfSh1S7XfemIZ0pJeFLpPlC92BLZ25JX4li+vc8Z6IhOGCKgEXfoEX2dU0fV423Z HT5w8fL7LRf54aom3YFdv5n7oBm3GOdUH7DK8H/rQ75fxF3uPIJMXtn67niAS3lSdqJa DUzA== 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=YrO9hhJgtNLYgb+mpIYPx1bgPRK8x56azMuQtTzFB8c=; fh=4hSzQ4SKoUUfG3o9WQZOoxVx1hxuhEo5YRbGNx2Akb4=; b=cM8J+MYTerlbsfeYsFLjlOpstEGLsnMOtz+X3LQU1I4vTvNxQa0fCNr3Njw7V7a2BY L1iY7QwLzljpY3a0OLDK6r98kpOXGSNpAWnjD6GIfaNYXwQbw6bIbPr2JH0Daknge9M8 qXdf37Rbuhk/JNcb+tdFXJ0UW6oY9w3xr4KkXyZEdTga4s/nuKzj6zxQwHHgqh1tsdRP s+NVSYQWlFNmWgXbs6auKcCOao5+rwKI4AxAjpb3RibGn5H1aVP5gDtWuB2rc1cU/doM pcnIRYRkvzbH3LCtTxjo/qUT6alXWSvXsg17xhjvFO/YJ3rpaNgGrU3Yn5nuNQC665yD LVsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="VOGA/bKy"; 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 u17-20020a056402111100b005222007595fsi6420444edv.87.2023.07.31.04.19.28; Mon, 31 Jul 2023 04:19:52 -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="VOGA/bKy"; 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 S232554AbjGaKU2 (ORCPT + 99 others); Mon, 31 Jul 2023 06:20:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232483AbjGaKUM (ORCPT ); Mon, 31 Jul 2023 06:20:12 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28C77E5A; Mon, 31 Jul 2023 03:19:48 -0700 (PDT) Date: Mon, 31 Jul 2023 10:19:46 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690798787; 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=YrO9hhJgtNLYgb+mpIYPx1bgPRK8x56azMuQtTzFB8c=; b=VOGA/bKyhdvuS+Jxbu6rrL/S6CnsjhFYYtrCyZGVa1qwa22ogAMf+Y16sHe+tU4uiNTk5Z CYssB2ZgGC0kaEJ+sdDMy0Qqk8qszTpn5kcUeIT1o52DKUfAUaqzPzNVAxd4gMj07OHtKR IY86OXb+jsVfMHegXu3QNtP6OXrIF+w8Wd+mhC8z3Cj58S9AuGjkEpt9yEmVXRekIqF0d+ TiJ4EGR/tryziVzTpSr5t4fpfftI+h7VpimQ4tQzoQYZOrz/cfc1OW9amiD1q3EosisrJu rfeFcttXU4iMwN+JEIFNFbo6BExOZRQi9OH89p9le96pYlKYAdQwiUIbe8ZRtw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690798787; 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=YrO9hhJgtNLYgb+mpIYPx1bgPRK8x56azMuQtTzFB8c=; b=u/rfeT5P17N6n6SBNX3zsKHUDLziwmSdWlgeG5GasOqnOGeJUkkCJGf+VyRdnCqy9J6se2 KZBztAi5wz5g7VBg== From: "tip-bot2 for Chen Yu" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched/topology: Align group flags when removing degenerate domain Cc: Yicong Yang , Ricardo Neri , Chen Yu , "Peter Zijlstra (Intel)" , Tim Chen , Yicong Yang , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230713013133.2314153-1-yu.c.chen@intel.com> References: <20230713013133.2314153-1-yu.c.chen@intel.com> MIME-Version: 1.0 Message-ID: <169079878649.28540.7562287481060360832.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: 1771239622377227002 X-GMAIL-MSGID: 1772934809985176312 The following commit has been merged into the sched/core branch of tip: Commit-ID: 4efcc8bc7e08c09c58a2f5cbc2096fbda5b7cf5e Gitweb: https://git.kernel.org/tip/4efcc8bc7e08c09c58a2f5cbc2096fbda5b7cf5e Author: Chen Yu AuthorDate: Thu, 13 Jul 2023 09:31:33 +08:00 Committer: Peter Zijlstra CommitterDate: Wed, 26 Jul 2023 12:28:51 +02:00 sched/topology: Align group flags when removing degenerate domain The flags of the child of a given scheduling domain are used to initialize the flags of its scheduling groups. When the child of a scheduling domain is degenerated, the flags of its local scheduling group need to be updated to align with the flags of its new child domain. The flag SD_SHARE_CPUCAPACITY was aligned in Commit bf2dc42d6beb ("sched/topology: Propagate SMT flags when removing degenerate domain"). Further generalize this alignment so other flags can be used later, such as in cluster-based task wakeup. [1] Reported-by: Yicong Yang Suggested-by: Ricardo Neri Signed-off-by: Chen Yu Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Tim Chen Reviewed-by: Yicong Yang Link: https://lore.kernel.org/r/20230713013133.2314153-1-yu.c.chen@intel.com --- kernel/sched/topology.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index 7cfcfe5..05a5bc6 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -722,8 +722,7 @@ cpu_attach_domain(struct sched_domain *sd, struct root_domain *rd, int cpu) if (parent->parent) { parent->parent->child = tmp; - if (tmp->flags & SD_SHARE_CPUCAPACITY) - parent->parent->groups->flags |= SD_SHARE_CPUCAPACITY; + parent->parent->groups->flags = tmp->flags; } /*