From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4933CC7EE22 for ; Thu, 4 May 2023 16:11:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229602AbjEDQLp (ORCPT ); Thu, 4 May 2023 12:11:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229463AbjEDQLl (ORCPT ); Thu, 4 May 2023 12:11:41 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA06F4C24 for ; Thu, 4 May 2023 09:11:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683216700; x=1714752700; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=E4rAAIn8gnIQkYgR+pnMvP2Kv1Kl0qcueSQjiIL0uLg=; b=BsA6lh+SwQ4vf4CZecmjYeECNbknBjIF/Dhr/nsnR9mY0T+mHEHtsR2Q LKkKWS4LSgZj2or4amj4BXDL8Zbe5MADmA7u23o9bl2Kod7lsJ2agV9Lv c49Ff/BUBkdKSPWzt5cj86yn+ddI1lHMq29KV4fK2eRQpFajGGKWlj3hJ 6DbVUuZJCSGsDPYTKLTqr/RhPT0XzDorZaxe4mxhaHZXh2HwAeapTVZlb 3HJ2wHKKwrG3eUmqonh7UvSv9Q2qvhkJTvdC2KA7zagJKrGsW8/ZkQ3u1 +ea/7akBgUQkQi6atvpu438TpQzNuQYOmbp6cPxmT/mIfHdB48pY+YbCt g==; X-IronPort-AV: E=McAfee;i="6600,9927,10700"; a="377049021" X-IronPort-AV: E=Sophos;i="5.99,249,1677571200"; d="scan'208";a="377049021" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 May 2023 09:09:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10700"; a="766633506" X-IronPort-AV: E=Sophos;i="5.99,249,1677571200"; d="scan'208";a="766633506" Received: from b04f130c83f2.jf.intel.com ([10.165.154.98]) by fmsmga004.fm.intel.com with ESMTP; 04 May 2023 09:09:29 -0700 From: Tim Chen To: Peter Zijlstra Cc: Tim C Chen , Juri Lelli , Vincent Guittot , Ricardo Neri , "Ravi V . Shankar" , Ben Segall , Daniel Bristot de Oliveira , Dietmar Eggemann , Len Brown , Mel Gorman , "Rafael J . Wysocki" , Srinivas Pandruvada , Steven Rostedt , Valentin Schneider , Ionela Voinescu , x86@kernel.org, linux-kernel@vger.kernel.org, Shrikanth Hegde , Srikar Dronamraju , naveen.n.rao@linux.vnet.ibm.com, Yicong Yang , Barry Song , Ricardo Neri Subject: [PATCH 1/6] sched/topology: Propagate SMT flags when removing degenerate domain Date: Thu, 4 May 2023 09:09:51 -0700 Message-Id: <73cf0959eafa53c02e7ef6bf805d751d9190e55d.1683156492.git.tim.c.chen@linux.intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tim C Chen When a degenerate cluster domain for core with SMT CPUs is removed, the SD_SHARE_CPUCAPACITY flag in the local child sched group was not propagated to the new parent. We need this flag to properly determine whether the local sched group is SMT. Set the flag in the local child sched group of the new parent sched domain. Reviewed-by: Ricardo Neri Signed-off-by: Tim Chen --- kernel/sched/topology.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index 051aaf65c749..6d5628fcebcf 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -719,8 +719,13 @@ cpu_attach_domain(struct sched_domain *sd, struct root_domain *rd, int cpu) if (sd_parent_degenerate(tmp, parent)) { tmp->parent = parent->parent; - if (parent->parent) + + if (parent->parent) { parent->parent->child = tmp; + if (tmp->flags & SD_SHARE_CPUCAPACITY) + parent->parent->groups->flags |= SD_SHARE_CPUCAPACITY; + } + /* * Transfer SD_PREFER_SIBLING down in case of a * degenerate parent; the spans match for this -- 2.32.0