From patchwork Tue Mar 29 09:15:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?546L5pOO?= X-Patchwork-Id: 1610554 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=vivo0.onmicrosoft.com header.i=@vivo0.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-vivo0-onmicrosoft-com header.b=RH9kn1OU; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KSP8X5206z9sBJ for ; Tue, 29 Mar 2022 20:17:00 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4KSP8X3d3Cz301M for ; Tue, 29 Mar 2022 20:17:00 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=vivo0.onmicrosoft.com header.i=@vivo0.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-vivo0-onmicrosoft-com header.b=RH9kn1OU; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vivo.com (client-ip=2a01:111:f403:704b::712; helo=apc01-tyz-obe.outbound.protection.outlook.com; envelope-from=wangqing@vivo.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=vivo0.onmicrosoft.com header.i=@vivo0.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-vivo0-onmicrosoft-com header.b=RH9kn1OU; dkim-atps=neutral Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on20712.outbound.protection.outlook.com [IPv6:2a01:111:f403:704b::712]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4KSP7T0hNcz2xCy for ; Tue, 29 Mar 2022 20:16:05 +1100 (AEDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WbVg798QMpPcbFRavjRByMxiYBJuEINRuj5tRWvP2Bt1NDtyI8jNis4lOXDVq9WTRICP/Nv/wfHRSFwLnX1IhSI6hIrLnWdy7oTDoux+VLvlLOYN5zE10bKSoMcV1H0cfntdRAtTNcZzhHKJWggQrtXBMCLhvt6sHWzOdKIfbs1KBuFHXgBgirdPlL43vAfjw+63/ZN6VRcQEuAJo+yVT6SeHTDJ/jsiZTUVMGSRzuTNXAzqp/R6BhPx+DhNaM1QApzUPayymvZSkS80Kb7BjCqqqfaQ7sT4qoRkEN7ufrNrcG86dSp1N1E2BGurX8Bm4L0LbnqEUks3HO26M2LoZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SJdJRvEwPqo8RlI6DpBDKNBZKqXxtMQySW1s9gdVT8Q=; b=jT9zxgZrShSG6RjEurpm5iYnQ+qhsdLni/OV9BU///XjR+9jxkR1hrajp4fqZGXiiKjrqJehJhU6cEdufo7fjWpHgFmY9nVkciPFM+CgufoQl//3RW6LtvNGF4fLLXOTnwQrYHpmyoI1rvX9/mYjltdCwpNWz/TEZtaTXZ4T/KuDsd0WQ4rZb9fzPb6gjTf+CIoY0J9K4hWZEeI/1GziW2a4UvtcewwTmF1WlM4OKJe405aBC9+sad7D2EODdXnECmh/G/Y7xUMxjB3BYv/E7gLHPrD6ABIGGpgNhbwBpUbU8YLNHBt1PZBj82wMbge4psOW6EiNVrCyC4WZSyoTUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo0.onmicrosoft.com; s=selector2-vivo0-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SJdJRvEwPqo8RlI6DpBDKNBZKqXxtMQySW1s9gdVT8Q=; b=RH9kn1OUxxp6XDB37LQqNrzPW41AhS9y9DVAWzK9C6N5yilsNcwQ4LyYErKa30/pj49nKA2JbMhkc0PrrCSq8eOaFhPV0imOoeKGopDpTFpoT7y8kjCpQVDjRQv22e4nEGrJvULJ2J1NB+k8etZcWb43Ry+awKgMpcSlF/IC9Vs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SL2PR06MB3082.apcprd06.prod.outlook.com (2603:1096:100:37::17) by KL1PR0601MB3875.apcprd06.prod.outlook.com (2603:1096:820:21::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.17; Tue, 29 Mar 2022 09:15:41 +0000 Received: from SL2PR06MB3082.apcprd06.prod.outlook.com ([fe80::49ef:baa:8c3b:cb3d]) by SL2PR06MB3082.apcprd06.prod.outlook.com ([fe80::49ef:baa:8c3b:cb3d%5]) with mapi id 15.20.5102.023; Tue, 29 Mar 2022 09:15:41 +0000 From: Qing Wang To: Catalin Marinas , Will Deacon , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Sudeep Holla , Greg Kroah-Hartman , "Rafael J. Wysocki" , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 1/3] sched: topology: add input parameter for sched_domain_flags_f() Date: Tue, 29 Mar 2022 02:15:19 -0700 Message-Id: <1648545322-14531-2-git-send-email-wangqing@vivo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1648545322-14531-1-git-send-email-wangqing@vivo.com> References: <1648545322-14531-1-git-send-email-wangqing@vivo.com> X-ClientProxiedBy: HK2PR02CA0214.apcprd02.prod.outlook.com (2603:1096:201:20::26) To SL2PR06MB3082.apcprd06.prod.outlook.com (2603:1096:100:37::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7777b578-e8a6-49d4-b80c-08da1164b234 X-MS-TrafficTypeDiagnostic: KL1PR0601MB3875:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /441SjkoX+Ny9slPCFJNrDU+XgmipscTvQbzgshuldXjW53uHqjKx0vYySgWVm0IKnnkfZm7pIU9flNNzlK7PlvZ4a+sLe5JObQ5SJf9uhfHawjYbY8zOe2f2d3G9l7lIc4poCVwPOsBQem87JZWuC5R/C4ufAYUU0BAeTXhJ8D3WzJNjd/XtV5HfJSdBSRfSQnsR+sXwRuRXC4m3Tm3CFk68OJy/sUt/KKTp1/dyGhbIe3tOKFqPjwm3nQemS9s6s/ER/rgcuo2uKvL2SvUvghvqu22G3DgVQ2a8r/A2MvYiYmmWPaZ/kBHxWoQiisrpXE71axLmvBmFcqCMslmAim67G59Um1fYpv2LV94qMJ8zGEC5CrX5GDmvpC8/OikRDyg0Aics2KpbcuBXG7eHA3Ft3iyAFbOuSHo4Hd7CtIldkMUhEfShowNleVd1EIQVUXlFlOtbyZ6+bL7koBfwgu1jsVacC37r6vov5mHWRAWdiHYAdY8fuOQEfB5rvt7aa4eDNcL0OqCsUDmowP6m43J//h+o3eEYUn+I12EqV7GtPW/tsFIx95UID9WnRCmnruUG6ugdXFuG10vYUzhwjacgUHKbQ51OEedx2flKDDzOStBkCkFswvCVtcotbnre3LNEq9UOS+JKBDvTr7NqL8PpdS7QRS4+lDLzsQVYoF1k/SBQsIfFYf6calMLLh0sVDAHErEN12CluLV3jf6OqaxOdzDcluxkQcVg5klV/U= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SL2PR06MB3082.apcprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(8936002)(5660300002)(66946007)(110136005)(6666004)(6486002)(83380400001)(508600001)(38350700002)(38100700002)(8676002)(66556008)(66476007)(4326008)(7416002)(86362001)(6512007)(921005)(36756003)(2616005)(52116002)(107886003)(2906002)(6506007)(316002)(186003)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PhBJKgt5FL2Y8Ibc46Cq1XMrtS3R7Qmoy98zYQkdcoJycBuZOEhtEQK7Ggv2wBKJ+d6a+Ndf7CQwGFir8xHYywEa61FzVHO0AEMjEDA2qChNnHC/yMZXdX0csN619elmKuil7XqzwhtJq1LXYahhdNutfANMU5/E0GW27k7XolTCfDbuxIUUWflQfgJXHuZrTAmvHvGR0shYZjXVVvyOM/reePCu2J/lTSYPAolrvdlNx5bd9g+vu53Z+HiuB0mQ4bKz5rgtT6SCeGVX8DtABb9fgbSlkYxpTZiQUXk5SYZvsqm4bhyMFIxB2ajy4l4UT1bhq+w+jKvfHRs9XQC1zeIBDb1DAh7+jZSD95/zIKDTk7M0dx1kLGJJ3LedH7Qi1UK1n1vm5wAbWNhsfMUc06U7hEeP81fqAt4QL1Y6yhvqB6nQP3o4Eus6SBLJUp/lAe1oPZ/VUKhJdqYWs04r1C4UaUkHfJjlNrcy4ihOR2Xux5HQRvk5ka3stbEYQR9QOTJOHmWDdEII4Ek7fQx3/FUJbzc10MLxJFwnyscBOiIT2mE62sw+jpuD9JsUikVretLlJRXODY7vAURrnVx/YG7cNobW32JRRFjeN/pR5hXZgWn0MII/oj0sGlPq5GhZRG8RZpKzZ/b2S6lbS6EsW6c2VYJECWZ+BPkbSCOyrda73epxvFsgcRwGdwb0sf1xVQM2wXvoW2rTr+2angIgoeDS4VkawYgupI/B6qIeEPHl/bAkGzXLjUisq3WWvlCxlReKickVnmLACJQQ4co2JttKFLaEPRV+bzhSc518SVPLThlVqPLZcFFhpffLAuNRK28WVDVbVZuM1mHQqK/EmpnCBQiQequhXgDGJmL/Z1oM+qnKeLsDu86Q4/aqfovT6hGZ44qFCsPqVqduZlEi0NLLkp9ICRKdayILVGe5Cjaj+xfxsAo1UP6SUlEGLrXpCYLAHuJX+/EUDc7TL9RK6NTq3FZSlK8CQc85j4VTCKGBrhrkBtfoDODCywPiOJF+ygNG7y2g9oF0YjEgm4Y51Xpvl5zbNkC4niUwYBTFhgfvhMcLvoHDbQz+L7AW6YxG4qVQ9xy/l2q0oFRv9lzHxCshXG3+6Ck9WbPd5bhfymawtVDgXCja9+O6/QuErHqfnsTL4DzQlKtF4bov4nKGIFf2EzLQ/m4m7FC/QYKR8tcYQU6e/RzMAP9fmCSWjcsqTkMBGK0K4LmCKXnNzZyAUyLIm7rHnmSnQye90OkQJdmrzQEwsB1MkpTXWiaBdFhCfzIILIoby7i95ow/XXSL+Lwpbws9lcNcXBDB82kD2cgabTuSJAATH8Hc/cEHPDAcPHYhSP9eU06dEHJdBJTQCiDrqSuHv6vyfo5K0IV1cE0FNkf5qi3KbYERfXLBBKUHIo5VUAKoYHJtlebK3f/Df5iAf+vEwWqJzyEi726R5R/qy8jT9K61raEBxXp/k862BC2DP+4uv1qTCo6f2nRKNUG61/Tec1jlSk44DH/stgOXcc6/CbSkv+SCrVP5xBCCoVn+h8paELHsOeqEvgedbYmfWi+ON62CL2EEJ09blYwf4MBesqgBj9uzUFtM+D0Bu2+qdDIpJ33OKt2HXw5LVHXdS9icnqowt0BP0Nw/4/Fw8npvPbKMeYekFqUsclqWfpv89vKkUkPLVa8Sj3PMFFoAqtAHfMjok4JOeGIvCZvDzMRmO/aynJ1s7mRtnlUPLseIt6wVU72f09w33ILV6w== X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7777b578-e8a6-49d4-b80c-08da1164b234 X-MS-Exchange-CrossTenant-AuthSource: SL2PR06MB3082.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2022 09:15:41.1797 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zkB7NIzlDSPNeOxa80qBw5x236F2y420RKK+VPv/+1yIwCm8HbzuN1oVnVJFlF+QyHqB1fAG0ZK3znmIctmdhQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB3875 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wang Qing Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Wang Qing sched_domain_flags_f() are statically set now, but actually, we can get a lot of necessary information based on the cpu_map. e.g. we can know whether its cache is shared. Allows custom extension without affecting current. Signed-off-by: Wang Qing --- arch/powerpc/kernel/smp.c | 4 ++-- arch/x86/kernel/smpboot.c | 8 ++++---- include/linux/sched/topology.h | 10 +++++----- kernel/sched/topology.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index de0f6f0..e503d23 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c @@ -1000,7 +1000,7 @@ static bool shared_caches; #ifdef CONFIG_SCHED_SMT /* cpumask of CPUs with asymmetric SMT dependency */ -static int powerpc_smt_flags(void) +static int powerpc_smt_flags(const struct cpumask *cpu_map) { int flags = SD_SHARE_CPUCAPACITY | SD_SHARE_PKG_RESOURCES; @@ -1018,7 +1018,7 @@ static int powerpc_smt_flags(void) * since the migrated task remains cache hot. We want to take advantage of this * at the scheduler level so an extra topology level is required. */ -static int powerpc_shared_cache_flags(void) +static int powerpc_shared_cache_flags(const struct cpumask *cpu_map) { return SD_SHARE_PKG_RESOURCES; } diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 2ef1477..c005a8e --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -535,25 +535,25 @@ static bool match_llc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o) #if defined(CONFIG_SCHED_SMT) || defined(CONFIG_SCHED_CLUSTER) || defined(CONFIG_SCHED_MC) -static inline int x86_sched_itmt_flags(void) +static inline int x86_sched_itmt_flags(const struct cpumask *cpu_map) { return sysctl_sched_itmt_enabled ? SD_ASYM_PACKING : 0; } #ifdef CONFIG_SCHED_MC -static int x86_core_flags(void) +static int x86_core_flags(const struct cpumask *cpu_map) { return cpu_core_flags() | x86_sched_itmt_flags(); } #endif #ifdef CONFIG_SCHED_SMT -static int x86_smt_flags(void) +static int x86_smt_flags(const struct cpumask *cpu_map) { return cpu_smt_flags() | x86_sched_itmt_flags(); } #endif #ifdef CONFIG_SCHED_CLUSTER -static int x86_cluster_flags(void) +static int x86_cluster_flags(const struct cpumask *cpu_map) { return cpu_cluster_flags() | x86_sched_itmt_flags(); } diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h index 56cffe4..6aa985a --- a/include/linux/sched/topology.h +++ b/include/linux/sched/topology.h @@ -36,28 +36,28 @@ extern const struct sd_flag_debug sd_flag_debug[]; #endif #ifdef CONFIG_SCHED_SMT -static inline int cpu_smt_flags(void) +static inline int cpu_smt_flags(const struct cpumask *cpu_map) { return SD_SHARE_CPUCAPACITY | SD_SHARE_PKG_RESOURCES; } #endif #ifdef CONFIG_SCHED_CLUSTER -static inline int cpu_cluster_flags(void) +static inline int cpu_cluster_flags(const struct cpumask *cpu_map) { return SD_SHARE_PKG_RESOURCES; } #endif #ifdef CONFIG_SCHED_MC -static inline int cpu_core_flags(void) +static inline int cpu_core_flags(const struct cpumask *cpu_map) { return SD_SHARE_PKG_RESOURCES; } #endif #ifdef CONFIG_NUMA -static inline int cpu_numa_flags(void) +static inline int cpu_numa_flags(const struct cpumask *cpu_map) { return SD_NUMA; } @@ -180,7 +180,7 @@ void free_sched_domains(cpumask_var_t doms[], unsigned int ndoms); bool cpus_share_cache(int this_cpu, int that_cpu); typedef const struct cpumask *(*sched_domain_mask_f)(int cpu); -typedef int (*sched_domain_flags_f)(void); +typedef int (*sched_domain_flags_f)(const struct cpumask *cpu_map); #define SDTL_OVERLAP 0x01 diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index 05b6c2a..34dfec4 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -1556,7 +1556,7 @@ sd_init(struct sched_domain_topology_level *tl, sd_weight = cpumask_weight(tl->mask(cpu)); if (tl->sd_flags) - sd_flags = (*tl->sd_flags)(); + sd_flags = (*tl->sd_flags)(tl->mask(cpu)); if (WARN_ONCE(sd_flags & ~TOPOLOGY_SD_FLAGS, "wrong sd_flags in topology description\n")) sd_flags &= TOPOLOGY_SD_FLAGS; From patchwork Tue Mar 29 09:15:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?546L5pOO?= X-Patchwork-Id: 1610555 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=vivo0.onmicrosoft.com header.i=@vivo0.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-vivo0-onmicrosoft-com header.b=mhynPiXC; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KSP9L3R3pz9sBJ for ; Tue, 29 Mar 2022 20:17:42 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4KSP9K6SmCz3c4Y for ; Tue, 29 Mar 2022 20:17:41 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=vivo0.onmicrosoft.com header.i=@vivo0.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-vivo0-onmicrosoft-com header.b=mhynPiXC; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vivo.com (client-ip=2a01:111:f403:704b::712; helo=apc01-tyz-obe.outbound.protection.outlook.com; envelope-from=wangqing@vivo.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=vivo0.onmicrosoft.com header.i=@vivo0.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-vivo0-onmicrosoft-com header.b=mhynPiXC; dkim-atps=neutral Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on20712.outbound.protection.outlook.com [IPv6:2a01:111:f403:704b::712]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4KSP7T3lF1z2xCy for ; Tue, 29 Mar 2022 20:16:05 +1100 (AEDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TIKVdUZnzI4nM1VjmEJaoO/sYa87t30wEOHUfI6UpVANtAPGJMRniFf1FjZfaduzOG3ipqB/VgdzZSCZadsFXSnQIMYqzj/IVb4nE/e6d5uA0SukI8/+VnxPKAZE2CMij2jVqzrRaT9CJx1NiEHKSxK2AwpkZxMa/VKU2SZu6ZqDHNdduRgYnPOcyfNVECxP2aC5GG0tzbd5nHCmA2/K6z2zeX/tdMDMgBARW1tw75/jryXadZyO0ewyrvHWAquUhoCKprO3FKxc2Lyzgo/WdEBpJWRQ2/MKHKneU7Sb7HoVah7yNxLQso7+OnuK95siGyky5v7e93bryIee09g7sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bacD8EkrrD3OdwjpWfHOF5YHsF/oPpRQEdyJIXbuY7E=; b=Np80S/rsXbLye2zuPAoFhV6FnV9ZR/9NAVVWUYDe+262I3FyzB8OH2KW/7QBHSA0Y5mOp6FXCYb16n1tr53vLeAEgpN1zOx6Y/XsFuEI8fuSA9hRqj/A/DxGC02b+9tpA7Q1p6bB4qmz7NrErgnv2zJzr2M67d1JvkdGyUV1VFcCGKx194evkE5XRcss46UfO/nqFOjhpDZh24yPB/ZW0f7swTJvE9tTigvQccpMCbh4/vZWY1cti+cUg2d0qyqWUUZbBftEQgBIwggCMivxym70EDLCHCptKcSQzE7vgmUuI1G++bOruAaBdyCPysQ8nmuBaDTcmMSoOXQfEp+sug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo0.onmicrosoft.com; s=selector2-vivo0-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bacD8EkrrD3OdwjpWfHOF5YHsF/oPpRQEdyJIXbuY7E=; b=mhynPiXCC5Yz4ITYrTYT45Inm7kO/kXZwptRLsHbhm5WyIJ17Me4B7lLZ9CSIoEpP/8m+Y2YReV7ljOJW/YH83gyjVFHNymG0Jfs2tmnjg0qSZvlqwXOzI780uSSFI6DIBGsZbi9Gq26ildr/lT/zze4q+/o9A4poxdwvRF1LhQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SL2PR06MB3082.apcprd06.prod.outlook.com (2603:1096:100:37::17) by KL1PR0601MB3875.apcprd06.prod.outlook.com (2603:1096:820:21::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.17; Tue, 29 Mar 2022 09:15:48 +0000 Received: from SL2PR06MB3082.apcprd06.prod.outlook.com ([fe80::49ef:baa:8c3b:cb3d]) by SL2PR06MB3082.apcprd06.prod.outlook.com ([fe80::49ef:baa:8c3b:cb3d%5]) with mapi id 15.20.5102.023; Tue, 29 Mar 2022 09:15:48 +0000 From: Qing Wang To: Catalin Marinas , Will Deacon , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Sudeep Holla , Greg Kroah-Hartman , "Rafael J. Wysocki" , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 2/3] arch_topology: support for describing cache topology from DT Date: Tue, 29 Mar 2022 02:15:20 -0700 Message-Id: <1648545322-14531-3-git-send-email-wangqing@vivo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1648545322-14531-1-git-send-email-wangqing@vivo.com> References: <1648545322-14531-1-git-send-email-wangqing@vivo.com> X-ClientProxiedBy: HK2PR02CA0214.apcprd02.prod.outlook.com (2603:1096:201:20::26) To SL2PR06MB3082.apcprd06.prod.outlook.com (2603:1096:100:37::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c38c5332-e7bb-4d1a-3abb-08da1164b676 X-MS-TrafficTypeDiagnostic: KL1PR0601MB3875:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lUF/s+FGS30k1Dp3QG6kZCwfWgkYK0rwkdVHCVi1Gh24vBUeH30uDAD6DLwi7rOzfgJ/1VnfQm7i2i3ozQdh1MKB2C+JvmdjuOMfmB2NsG1fzKWXuv35dGIMlbnHDV43pj9p9MdS2LxXCJOU/r9ZPRFHXRSFHpWIxPgkQnPBMqufwBSnQRAc56PZkZwqkuI2BFWRhrabrkICt88bVdvrNHRbjeI/LKUTHnsiMzQN84MWaWm8c1fandnPm0NsXYlCsS2UdladfP++2cxI8euysVZgpBPtuw1pwi8E3cCj4F9NZ15FQw4rJoCaC6kpKxGQke9GLAgbgxZRF3uUoAp2nLsy4s0LkBvcOrkCFxDW4Ktk5EXVe4O8GfYIwoFjSkUSl6Vxuv0ZHH8o5y9IhJ5foVNVeZdgKNHDffbYKA2o3N6dqDdZNNxbrIGel0+lQKfEZhw3mcuzHGER+QRDUzrTyFAKHI2nOJtqXjb5cfxlehugTU8kM6t9tcsAczzOkEC4xu8zkbQvFA2UieItw1ZuBuxMrmk9ciJ6JPYu89bitpb3H9iXhgdEbyvc2fIjDcxztXUTDyjU+E4XFgQlxQge9u8adLXOTxYrhEcfYUntOy5dymtk9Y54zH6AFqOHjOq0VjHK4DWAzS2oAUpXSbEvplHoHm3fZMxuIGOsSnGXkgme5Qnom4Re3gXCjVMAgZGjSshXSWJ4pVMrF5+W+r/Q/FOG+EUgcvJMRAwll54TnFY= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SL2PR06MB3082.apcprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(8936002)(5660300002)(66946007)(110136005)(6666004)(6486002)(83380400001)(508600001)(38350700002)(38100700002)(8676002)(66556008)(66476007)(4326008)(7416002)(86362001)(6512007)(921005)(36756003)(2616005)(52116002)(107886003)(2906002)(6506007)(316002)(186003)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vl7/hUNaQyS2do9pDKXqGI/qAEohsCeTnMP/fLL9wBTZts/BHAVSgEeFW6Vg4vAoPNdInEz4Kfayzi+BFSHMx52EIJlGqxPuzPtUjRVoG1Ozpp7RcEDlj/sA1+hsNyR3xmMppVX7Tz/Y/eA857Y+GYF0bIjP2ec5ljO4TAO3NhFTHiO7LUS3lXHgkqUQAZtVD/xzmnn3n3uQwZrelNmsoj21sg2szd6Jh6oARgfZwKaqVE3p/IioWxeBD75wLG4Dbb7ILVtNZ5k50nAexDazhAa+HTZSQPNd9vEQH4Yb/HjhkpJuIO4PEzYs0Cj40me32gmuh9PP5iGmB4hKakAsczYIT0CHxkOqJAjwUzYXskM571pZTlDPscZDDoXco2Frr60+S5RH/iZyccyrhN+fVFN87vC/lDJIBv4P134TS2/HLFTkQQS5mGSclBm6lsyQ7mTZbmPOmj5TgVyun1MsZ5sDOkAr/uKZfOotTUbGV8nRM1Y7n9dDmA3jxraZEB4V+ydmVu7Xe3CTaFgie6CvDoB0I6MDlrsS/cpFU0tfm81qiI2jsPN62MyDDs2fj0jBJ5Flq4zgcLeukZYTy7fwAg/CJr3kFxiJx4aAgFh2lHeTHNNa6wcBQR/Ob8fdZeGQwdH4AdNfAbE2wGO4znNzmz1LBnwrzDq9CYy9GUPyD2/usGoH3fCoytiWWYLt/8G6xF7KOkcMRDs3nBn4iYUzzOo+y8Fr76MAplggnkzaNiDHj786g9ZYo94/vB5fiTiTLKFWgQUGg63fcjeCFj7bofhRv+3eecKbOUJa2lGbeG5aoJDU3ax8vMcxBHRU9/IIz1LWp/OpoFmqEp0nsIYb74WFpM0phn991GmZPksp+8XU9Idj9DlA5vZbhs9F+DX0KM+VmsQ23LnF4PuakyozMA9ZmtZ+TAb/cbn/q7moR6Ifby/ZcnbdeCLCyXziEB0IBaQH9v6bKsSNNnfdDvwDYU3ckCiovPFjXGQH9KTvusSbW2lQ8VkLi7fGwgtIRgwNIoC/v1zdNZ0hLCN9el84kMaVKpzpvsNI+ek+CQBoHsd8nDsMQEvFO4DmLJDZ3/Bi+5/PVEZIahYp9JDSlwVUc7zTexsyIUKxo43v4qCjNxIDgzX4rwFnzFVKoREhZzZqNm+x5C9If5Du8kTTzKFS02UuJLuT3lO9uw3MdMom/dRNXE/g7enlHXLXUGtE6twJC2PYHV/FaxuFV+xRAFdYLlzqy/zbqMEwRse15sMN0SnyzShE4Oz6myLhLAqaaVb0pr+a2nldlX+0x6rv2BN1j8k5bVD42QvvxgEzq2R3ez9aQTYEcoKOpct+/LzhXtSooMvrOF0Xx2zcKjO7FUAjsrM8khnRscJDmiSCM5qWQdqxiL3KXp/3zb6sTswkjyVa16fON49/AicDjmQx6/+CsYRpndfarYJitzBBe+ve2TN99stYEjFIa6g1ji0kvoM7EO3LucVVbWVaVF66mW+7zxBJBc84bkYPhcPA8GVcghI52UKCZiWu1jqhxkCYjCiSj7jswihbFe4ppu5xvzvZXsBdA3M04YBXLZho6JmoOCC0B5/XGGcGdppEwj61ZLvC8BZGyxcOAKpHAZxdPNPOihbg5YlBObYdt4JZWSnGLDZjX6lmgRC1AbuPdmPzsZwifOJX2F6N0ChoshYQVBFUOyxkQwjUtA8fBD0fTNdgGsptWMb831zoLs3cBNTO/EmJGpbTHy8T8rWA7Y34eam6cw== X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: c38c5332-e7bb-4d1a-3abb-08da1164b676 X-MS-Exchange-CrossTenant-AuthSource: SL2PR06MB3082.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2022 09:15:48.3199 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5zgKXmdEdrZl0h0nN15JFsGEBRKl+uJ3bS1X7afqVPK70r6/zNWTXtL6EGrjqrV+wbTb2CZF7Sznuj+sFHVWOw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB3875 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wang Qing Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Wang Qing When ACPI is not enabled, we can get cache topolopy from DT like: * cpu0: cpu@000 { * next-level-cache = <&L2_1>; * L2_1: l2-cache { * compatible = "cache"; * next-level-cache = <&L3_1>; * }; * L3_1: l3-cache { * compatible = "cache"; * }; * }; * * cpu1: cpu@001 { * next-level-cache = <&L2_1>; * cpu-idle-states = <&clusteroff_l &mcusysoff * &system_mem &system_pll &system_bus * &s2idle>; * }; * cpu2: cpu@002 { * L2_2: l2-cache { * compatible = "cache"; * next-level-cache = <&L3_1>; * }; * }; * * cpu3: cpu@003 { * next-level-cache = <&L2_2>; * }; cache_topology hold the pointer describing "next-level-cache", it can describe the cache topology of every level. Signed-off-by: Wang Qing --- drivers/base/arch_topology.c | 89 ++++++++++++++++++++++++++++++++++++++++++- include/linux/arch_topology.h | 4 ++ 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index 1d6636e..41e0301 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -647,6 +647,92 @@ static int __init parse_dt_topology(void) } #endif + +/* + * cpu cache topology table + */ +#define MAX_CACHE_LEVEL 7 +struct device_node *cache_topology[NR_CPUS][MAX_CACHE_LEVEL]; + +void init_cpu_cache_topology(void) +{ + struct device_node *node_cpu, *node_cache; + int cpu; + int level = 0; + + for_each_possible_cpu(cpu) { + node_cpu = of_get_cpu_node(cpu, NULL); + if (!node_cpu) + continue; + + level = 0; + node_cache = node_cpu; + while (level < MAX_CACHE_LEVEL) { + node_cache = of_parse_phandle(node_cache, "next-level-cache", 0); + if (!node_cache) + break; + + cache_topology[cpu][level++] = node_cache; + } + of_node_put(node_cpu); + } +} + +/* + * private means only shared within cpu_mask + * Returns -1 if not described int DT. + */ +int cpu_share_private_cache(const struct cpumask *cpu_mask) +{ + int cache_level, cpu_id; + struct cpumask cache_mask; + int cpu = cpumask_first(cpu_mask); + + for (cache_level = 0; cache_level < MAX_CACHE_LEVEL; cache_level++) { + if (!cache_topology[cpu][cache_level]) + return -1; + + cpumask_clear(&cache_mask); + for (cpu_id = 0; cpu_id < NR_CPUS; cpu_id++) { + if (cache_topology[cpu][cache_level] == cache_topology[cpu_id][cache_level]) + cpumask_set_cpu(cpu_id, &cache_mask); + } + + if (cpumask_equal(cpu_mask, &cache_mask)) + return 1; + } + + return 0; +} + +bool cpu_share_llc(int cpu1, int cpu2) +{ + int cache_level; + + for (cache_level = MAX_CACHE_LEVEL - 1; cache_level > 0; cache_level--) { + if (!cache_topology[cpu1][cache_level]) + continue; + + if (cache_topology[cpu1][cache_level] == cache_topology[cpu2][cache_level]) + return true; + + return false; + } + + return false; +} + +bool cpu_share_l2c(int cpu1, int cpu2) +{ + if (!cache_topology[cpu1][0]) + return false; + + if (cache_topology[cpu1][0] == cache_topology[cpu2][0]) + return true; + + return false; +} + /* * cpu topology table */ @@ -684,7 +770,8 @@ void update_siblings_masks(unsigned int cpuid) for_each_online_cpu(cpu) { cpu_topo = &cpu_topology[cpu]; - if (cpuid_topo->llc_id == cpu_topo->llc_id) { + if ((cpuid_topo->llc_id != -1 && cpuid_topo->llc_id == cpu_topo->llc_id) + || (cpuid_topo->llc_id == -1 && cpu_share_llc(cpu, cpuid))) { cpumask_set_cpu(cpu, &cpuid_topo->llc_sibling); cpumask_set_cpu(cpuid, &cpu_topo->llc_sibling); } diff --git a/include/linux/arch_topology.h b/include/linux/arch_topology.h index 58cbe18..a402ff6 --- a/include/linux/arch_topology.h +++ b/include/linux/arch_topology.h @@ -86,6 +86,10 @@ extern struct cpu_topology cpu_topology[NR_CPUS]; #define topology_cluster_cpumask(cpu) (&cpu_topology[cpu].cluster_sibling) #define topology_llc_cpumask(cpu) (&cpu_topology[cpu].llc_sibling) void init_cpu_topology(void); +void init_cpu_cache_topology(void); +int cpu_share_private_cache(const struct cpumask *cpu_mask); +bool cpu_share_llc(int cpu1, int cpu2); +bool cpu_share_l2c(int cpu1, int cpu2); void store_cpu_topology(unsigned int cpuid); const struct cpumask *cpu_coregroup_mask(int cpu); const struct cpumask *cpu_clustergroup_mask(int cpu); From patchwork Tue Mar 29 09:15:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?546L5pOO?= X-Patchwork-Id: 1610556 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=vivo0.onmicrosoft.com header.i=@vivo0.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-vivo0-onmicrosoft-com header.b=nTKLFYP+; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KSPB70Wc1z9sBJ for ; Tue, 29 Mar 2022 20:18:23 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4KSPB66BjQz3c3B for ; Tue, 29 Mar 2022 20:18:22 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=vivo0.onmicrosoft.com header.i=@vivo0.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-vivo0-onmicrosoft-com header.b=nTKLFYP+; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vivo.com (client-ip=2a01:111:f403:704b::712; helo=apc01-tyz-obe.outbound.protection.outlook.com; envelope-from=wangqing@vivo.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=vivo0.onmicrosoft.com header.i=@vivo0.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-vivo0-onmicrosoft-com header.b=nTKLFYP+; dkim-atps=neutral Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on20712.outbound.protection.outlook.com [IPv6:2a01:111:f403:704b::712]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4KSP7V0Gpkz2xCy for ; Tue, 29 Mar 2022 20:16:06 +1100 (AEDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mresjIIuVNtApdY2hr8695raQbxAIRAv+VQNXm7r0gGEOr3Nqp+obeobD376PHumlJ+djwneAs05txWS4rh5PHoIvMTGLdyBM4bV5cXMLdcVkcV8SdTQD2dBH45CmgInWTQrH9UB5ZIQlX4TiLhodGiecTSXsKTuwhshZAiWFZHpueZlWdwLFzJJJiB0b04nPKk7KvrsbYpvqq4fNA6ObxLhUNLfLdd4sw4pzWSbzBKs1M/mLkiTAk0zMUKG0tFoVauq3P/kELCV0uQDslw+zbEp9DBImTKBUbid0owjSm441jfqwOxoR4xw2JcPUPzsLaiXGWgB1o99WwtCAWZ/2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tfxfMiE8KIP0uQqbk8jDdt0PDGO8YvrOLwwBhOLEFcE=; b=ZAheoA7n1U2Cd0y3Ire5K1jlEtmtGVUJx3IOlciWhDU/QZI9PF8YFi3Q6oNLd8uIuDFpzymB/msNBGHi5ZNotqOVQcBc7oC01Cm+V/ivC1/dYzH6gUrYU1GgUa7xtgghhuzHgr1JVSnUXKC44nhGp22IBnve3kpgf/NKITWy96g0GN2h9jjnx91EZHuUE4BpGciFq9bseeJxG6Q1kREJT3jvkjZ3dRRbHX5/Cm/X/twTcO+/lh8WNu+ZVFCLM7Z/sMlhyXP84Slqtfh0lcPf8HUccRHBO775ybGdPScN7/iaYTyy6LM67jz6p3EzM5XIoIdAKQseLuVGWm8KFptuGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo0.onmicrosoft.com; s=selector2-vivo0-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tfxfMiE8KIP0uQqbk8jDdt0PDGO8YvrOLwwBhOLEFcE=; b=nTKLFYP+FhN299dkAmTkmQvJhWbJ/eXLlAihEXY9P5uyQIh7sbX6RXoc84di49wMWhIxuk5FbiPRg9Y+S3esO+07ykySRbZCpLYJyL1INZUu98rS5hXarTPq4xTqInovpj+/pV/DLkOqioDC86WWk0Dh0ohf75bPCxfF2uC55Yw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SL2PR06MB3082.apcprd06.prod.outlook.com (2603:1096:100:37::17) by KL1PR0601MB3875.apcprd06.prod.outlook.com (2603:1096:820:21::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.17; Tue, 29 Mar 2022 09:15:53 +0000 Received: from SL2PR06MB3082.apcprd06.prod.outlook.com ([fe80::49ef:baa:8c3b:cb3d]) by SL2PR06MB3082.apcprd06.prod.outlook.com ([fe80::49ef:baa:8c3b:cb3d%5]) with mapi id 15.20.5102.023; Tue, 29 Mar 2022 09:15:53 +0000 From: Qing Wang To: Catalin Marinas , Will Deacon , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Sudeep Holla , Greg Kroah-Hartman , "Rafael J. Wysocki" , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 3/3] arm64: add arm64 default topology Date: Tue, 29 Mar 2022 02:15:21 -0700 Message-Id: <1648545322-14531-4-git-send-email-wangqing@vivo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1648545322-14531-1-git-send-email-wangqing@vivo.com> References: <1648545322-14531-1-git-send-email-wangqing@vivo.com> X-ClientProxiedBy: HK2PR02CA0214.apcprd02.prod.outlook.com (2603:1096:201:20::26) To SL2PR06MB3082.apcprd06.prod.outlook.com (2603:1096:100:37::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4f5c8c76-e270-4f3c-4abe-08da1164b93a X-MS-TrafficTypeDiagnostic: KL1PR0601MB3875:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nCMQ99KH1g+1HfV5LzBTOIMOsY/Bpbhjm2jhHQ51zsGPHIpVDrfBz7YQUDRcqnqYJpEIVLhNeZEyDaSNFTLFlglmZYHWtdrbgqs8xI/c4EtcSS6Qmqx1uDzJxE0FvR4p7qcacDpdXyq/8y2cNkFG0ApsdgdvGiZS51oyRmLdP6Y+HRwm779W1Dpv1+SbLIeQO6cVNgpvsu6u2eFHQrh4OnijkxJMMGnb4aoSHuzgdNnpywfttNDEnniDD/SQ+zDuxvJdDF5WTvdO+q2t5cPsokLhMTOoZqDQDzD4az4FUe5QwDCY/eudCGSHVn43OwdB/foV56fXzLjlFEmoWOBBIG5GtcZnhBjCkC5Vn+9rszgPJ0D7xyxiMfFrr17uYGpTVrjGp1pNaQe1IqtSUDZNCfSRE7kPq0JYAVvd6Y6itNizriHGY7hQWvESvqnWPy6R6Psuk7kfr6YsMng/518Q4QA96XpFYh07clLswO75Snhd7lBMYe8/rEo2Lg/MsY1zEjsXotrQqpwHVW5RWyN3EsJu1wICVVIlR9a3ze2a5Q9aYSPqbNU+bopp8LJl8Vj0p1nCrjOhZS8qF/FtlXavEbHufTE6QgaiZU0VtTdx6R/rbJ4RZvPSobT8ogd5Fa3eyx+mrKALIa3G6RF3wU2JC1PUi02sFDuEwEIqhLCSFjJXF1O+XhnMgX7YaEfZUzlnsrl2RDfOCp9fUYQRFrAkw0d2hn7Iul8vx0RlrUm1YMcunfYQKU15p0X9WohE8bwM X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SL2PR06MB3082.apcprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(8936002)(5660300002)(66946007)(110136005)(6666004)(6486002)(508600001)(38350700002)(38100700002)(8676002)(66556008)(66476007)(4326008)(7416002)(86362001)(6512007)(921005)(36756003)(2616005)(52116002)(107886003)(2906002)(6506007)(316002)(186003)(26005)(21314003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: N3HXbwc7rbDQOe2RnCG+MjqJO0jb+0ZPJh8Ev8pL2ESWw7xqxmXt14bo4u2f2Q4sWrEpddzjmmuOxWaukRVo7DMMik4dKLlqm03HlUL+vuB82qbJy5Gov8PckJW9VR0PtkzoxmGrXnU4hlRhQz/4L9XJh+YFfvNp6KMe9GX9Uns0J9CH1UWvy7Yqv+zQ11LSwaRMRE9WEHoQSULcgxP2HNIXdyLY/mAKA/jjbZOj/TWQAWnNQRp5k0jQB47SmhI9dDM809aINy/akzdK2LyKCUaNw1oMt6krmLmQZX1MXjW6qgBjEr2kBkp5k2kZmgZ72INtC774L/ldg+QWoqVH/iD0LaDwMLiMTtrNRF3QfVj6A8/Qnn2q7/R8Xk29URaJWYg3RRhSK5onBm6VKnbjuYkeUcEg2k2N562b0msSIZMmlxEpIXOBh5KJ4TZ+KeuvIXOFvqK8bn8HBTOGvZtXBWGo1Sq0QVIfHU7a8FpNfjIl/PwyJvl80/jG2MVm0JF9Cthm7nl0dfz0uKZ3N1hfWrXKm5HcmQ7mGlxdafPFhr9g/DGv8CUepq3hp9TfiTTOS9jfkmmaBDqRoskY4WvFFsxmylV6j59GeBFh+yryDjhr5tKiAX75/+h2PFeo4hynfbG0oQTnuJAIZc4sYrqRw2V4g4wauEvSTD2xTCgYRo3uzWNpIgwLxw/aBqp2X2CqokkVPkruCNGfI4MwPk9AK32jeLBNZkJZw0oZnlkqZM3xuhpN2cDdx/g662bDZyRBuCT1Msjl6kE5kI9kwRfizrLhzM1UWUK0YRT2z67J6Fev479YuHH+OLFEKDW8l8Hn5ax3SSRMz2vAGErgrO1UQ1nOdr6PgtsHDuM3jxqICx4MdOpWxzeJKqEA0tb1540GMmFkqC9+ej2QtdRoeh5c75OokUJdFtwi5b3uSl6LCIYr1eAtGBUKBQc92fhqgfrjMT/jNAZeiSjXBrzc7AiB9Vt5d0FYMx6XlkX0lMsFuveD4BAEKfUuGp+o3ILj6Py2RGdE+qT+GDC6+djj/93NJmRK/g2c5uu0szAZOOAChoR+PlUG6gVapeqgw2m1MbBqOfUI3F7opUalteC9io+IS3PxhBpsSlrETF+Mn/HwqSY/o281vcT8Lg4mIFyDOQLR45G74r7jeqPKi2eQlnty6DdAXdH84D+1dJjRKM+BllSuW4pxYFNgRavT+Flk9GaZ42WJ0AgreP3Ch8ULjNcP65f6iUmpWJDn4DFfjFnwCsMTsKMR22XSG28sn6w3lTLzUMFN2wk6oMFW/ppxXQsM35VYMTFh3K77fwakMW9/5gYFkJPjstZ1TlqdkouMPcEnonzkxpnHXXU6p1B8Z0IWEwqWxbXNai2o0UHy/lo3WKjqpy/BeELRsKHbzWTyd4iRS4q/cVtqdGbbWjYD6J4dslyIYxVLVgNGz/gMBNDG3cfm93R+6OyP3FJRlaYO+Q8Qk0H0h9Pk5r0vNaTrbFkNr8Lm0/JDMxLuazHkytmP/KPvJ3PsvkPb1TU5GzgQR4iChnCcfFQ8W1Su5NNxYkWvMdA963TRLWt8Hg6fUSRG5gS5OQM8l6PL/2HoYCsG86b36yJIFsVuUF/HTdRwFU2yRqY9ERmKmjqOuIp1RsoiVGhSTjRUb4Wagj3FKRuM+nOjgdraI/1KFNyLW/DtT/zqNuTwFUnhmJ4cESuBxAFG1hmPGpNm1Vkia1blkkrJDg49RvQj0w3EYeAQMQ1f/FB9FA== X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f5c8c76-e270-4f3c-4abe-08da1164b93a X-MS-Exchange-CrossTenant-AuthSource: SL2PR06MB3082.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2022 09:15:52.9915 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wl8/v+SKoEjnS3xvcBHnI2e23yk5dojU37v0Dbm+h9ZKXaTM1hB+gPI+Turjlph1ez9lA5KaAwJHJKZY61Lyrw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB3875 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wang Qing Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Wang Qing default_topology does not fit arm64, especially CPU and cache topology. Add arm64_topology, so we can do more based on CONFIG_GENERIC_ARCH_TOPOLOGY. arm64_xxx_flags() prefer to get the cache attribute from DT. Signed-off-by: Wang Qing --- arch/arm64/kernel/smp.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 27df5c1..d245012 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -715,6 +715,60 @@ void __init smp_init_cpus(void) } } +#ifdef CONFIG_SCHED_CLUSTER +static int arm64_cluster_flags(const struct cpumask *cpu_map) +{ + int flag = cpu_cluster_flags(); + int ret = cpu_share_private_cache(cpu_map); + if (ret == 1) + flag |= SD_SHARE_PKG_RESOURCES; + else if (ret == 0) + flag &= ~SD_SHARE_PKG_RESOURCES; + + return flag; +} +#endif + +#ifdef CONFIG_SCHED_MC +static int arm64_core_flags(const struct cpumask *cpu_map) +{ + int flag = cpu_core_flags(); + int ret = cpu_share_private_cache(cpu_map); + if (ret == 1) + flag |= SD_SHARE_PKG_RESOURCES; + else if (ret == 0) + flag &= ~SD_SHARE_PKG_RESOURCES; + + return flag; +} +#endif + +static int arm64_die_flags(const struct cpumask *cpu_map) +{ + int flag = 0; + int ret = cpu_share_private_cache(cpu_map); + if (ret == 1) + flag |= SD_SHARE_PKG_RESOURCES; + else if (ret == 0) + flag &= ~SD_SHARE_PKG_RESOURCES; + + return flag; +} + +static struct sched_domain_topology_level arm64_topology[] = { +#ifdef CONFIG_SCHED_SMT + { cpu_smt_mask, cpu_smt_flags, SD_INIT_NAME(SMT) }, +#endif +#ifdef CONFIG_SCHED_CLUSTER + { cpu_clustergroup_mask, arm64_cluster_flags, SD_INIT_NAME(CLS) }, +#endif +#ifdef CONFIG_SCHED_MC + { cpu_coregroup_mask, arm64_core_flags, SD_INIT_NAME(MC) }, +#endif + { cpu_cpu_mask, arm64_die_flags, SD_INIT_NAME(DIE) }, + { NULL, }, +}; + void __init smp_prepare_cpus(unsigned int max_cpus) { const struct cpu_operations *ops; @@ -723,6 +777,8 @@ void __init smp_prepare_cpus(unsigned int max_cpus) unsigned int this_cpu; init_cpu_topology(); + init_cpu_cache_topology(); + set_sched_topology(arm64_topology); this_cpu = smp_processor_id(); store_cpu_topology(this_cpu);