From patchwork Mon Jul 17 12:56:11 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: 121278 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1091932vqt; Mon, 17 Jul 2023 05:58:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlEyxKKJXVcO4FCM+bnroAryZ9ireGzPWqhDgaMryY8KBey0xljRQihlqc/kyV+ubjYrMBPf X-Received: by 2002:a05:6a00:24c8:b0:644:d775:60bb with SMTP id d8-20020a056a0024c800b00644d77560bbmr14211838pfv.20.1689598723094; Mon, 17 Jul 2023 05:58:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689598723; cv=none; d=google.com; s=arc-20160816; b=DA0NM5AhlbGRHo2rCxKzGQWbiBSuPzsJDUGYP8f7pkVNxXOnFtsa24MW6CIw+AzZW4 n939vu9Oe2J9eD7qXFMII4mWVdDRDVvjvZZ1SXq6ayi/XtTszl+ivp2nRJiN6DO8zqrG Rk+Gp3fQVlveU8OWxl1DOJHeWdHZZ67hWGczmjvxZ/uB/fwwQdqGW1SHf5o9MfdJ0lZU xDgw7tEhd98ntyi6KTbwaS2GhSsdTLyURz8K6kk6s2CwKGFPdtDWv9XqtxtfGeE6WS1+ uw+U3k0EMyuXG2qo9Ml94nRssJqsb9zNtlwCG7vtMm6dv+4MzqUd2hiV6ELS5724PvWP hwsQ== 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=Mhe5ES5whgtkOTR4E5hxUtbSDZVzln4/4eHipoIvoVU=; fh=z30sPVIoLbqP8iiKwaBnj1bbiXX6MFU5bo/mhtNsVCM=; b=N84RAbgYOr2asa7HgGzubhL2AgZ1kyJYP+Kk/r3wKRyPgv8yBToOvG24VVq1nrsau2 d7GhxGQ2JlwBP/tTyD6k2iboaa6OOLvVcYmWIpdi3rway8wMAdsg7gIkeKLj1vG4k058 lMcTzh2ira9d6eQc2IzhPZG0RPDX5g1wIB+SjzYymCRSXyzZ0kK2Nwtqep9W21PmRqj8 TBtxj4s9uIFSfXAOU57kYu0n5OvACMvm0MhwOZuEdD+WOV6olgMUETJ8P6w0Fnkrm97c sXem2bjb0JghjbWaxFXd9zC8gEx20DW62/Ictc8XnCyVNaIrbQlVCTuLR24sKQmsMy/w P1EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="NCtk3/OF"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 a5-20020a056a000c8500b006689f8a9047si6301193pfv.125.2023.07.17.05.58.30; Mon, 17 Jul 2023 05:58:43 -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="NCtk3/OF"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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 S230284AbjGQM5C (ORCPT + 99 others); Mon, 17 Jul 2023 08:57:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230273AbjGQM46 (ORCPT ); Mon, 17 Jul 2023 08:56:58 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EE7F172E; Mon, 17 Jul 2023 05:56:26 -0700 (PDT) Date: Mon, 17 Jul 2023 12:56:11 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1689598572; 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=Mhe5ES5whgtkOTR4E5hxUtbSDZVzln4/4eHipoIvoVU=; b=NCtk3/OFFobB3/3UrgHq8T1Eeb00+EzlGnZOns3XnptovFqwDpldNnLce43NcAS6Gjzdr1 P878cM7A1HDxCwEQLS2oD2oB77cBAf6TKwy4L/6luS5TWGTc4Fy61cd6CR2q1DQj/JFP9m P3P3GfLI/tCxurJtxx+rvWjicndfH89G7eGJ5L6i1/qfcUrBHBOdfJ2aIfWAyJlHbBKw/M QrWv2iFiMbfXD6umQ/BZE/wJ1JVxTj/yQTCqzcCl3VzgNTXfT+g3+bO6qnTIL0+hk2Z39a JIHXwJDz1qKeQ6iO7G+UQU2cyGDBbsmt+InyZgWIlgZEOTfhOo07m0eh74Z+0w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1689598572; 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=Mhe5ES5whgtkOTR4E5hxUtbSDZVzln4/4eHipoIvoVU=; b=uLf2oNpPVNaUSZKJIwkk1Btuvscwf7/yiELtwukr75q8C+8w+biO06Jy5KBbyidt5IDbjy lBfMStO0+4rkzHCg== 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/core] x86/sched: Enable cluster scheduling on Hybrid Cc: "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <168959857149.28540.1815236085673081260.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: 1771672670769101802 X-GMAIL-MSGID: 1771672670769101802 The following commit has been merged into the sched/core branch of tip: Commit-ID: 17953249bf02448efaed75b097aa2e9086ca7685 Gitweb: https://git.kernel.org/tip/17953249bf02448efaed75b097aa2e9086ca7685 Author: Peter Zijlstra AuthorDate: Sat, 08 Jul 2023 14:43:45 +02:00 Committer: Peter Zijlstra CommitterDate: Thu, 13 Jul 2023 15:21:53 +02:00 x86/sched: Enable cluster scheduling on Hybrid With the SMT vs non-SMT balancing issues sorted, also enable the cluster domain for Hybrid machines. Signed-off-by: Peter Zijlstra (Intel) --- arch/x86/kernel/smpboot.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index e1aa2cd..4c31447 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -632,14 +632,9 @@ static void __init build_sched_topology(void) }; #endif #ifdef CONFIG_SCHED_CLUSTER - /* - * For now, skip the cluster domain on Hybrid. - */ - if (!cpu_feature_enabled(X86_FEATURE_HYBRID_CPU)) { - x86_topology[i++] = (struct sched_domain_topology_level){ - cpu_clustergroup_mask, x86_cluster_flags, SD_INIT_NAME(CLS) - }; - } + x86_topology[i++] = (struct sched_domain_topology_level){ + cpu_clustergroup_mask, x86_cluster_flags, SD_INIT_NAME(CLS) + }; #endif #ifdef CONFIG_SCHED_MC x86_topology[i++] = (struct sched_domain_topology_level){