From patchwork Thu May 25 18:02:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 99173 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp566082vqr; Thu, 25 May 2023 11:17:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5orkf9i8KJ920MjWtaNKlMXwAIspQZ7VRK7m8lhXy0Ts8dJzc3VzaD8eFLrFQxaK0OOJip X-Received: by 2002:a05:6a00:238c:b0:647:b6c9:179d with SMTP id f12-20020a056a00238c00b00647b6c9179dmr10885918pfc.21.1685038664139; Thu, 25 May 2023 11:17:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685038664; cv=none; d=google.com; s=arc-20160816; b=R2vyDmjVoAuPV1twSeEmF9bfu1xunX4cbRtENWf8ampLJpHLX3Q2wtF8kJcbnSWTPb hBTTEzaGS01lMXKGWIHbUgTZoRQIpxkZBvjtNhOEQ3avhBB1CBowXK8BV9mXmmd1ddDD mu8cx00obg120a2TPnmDZa4k+CjU1ADf5OEaaf2+Fxs1XJ0/nqlD/gZrLHqYN0BChQIc 52RM0IldkoT/Q0Eogq+u7RdcawW4iXiqQnaAm8Zoy/lQUaCg45iuNCQkoArR1iSnpYf3 /3DIVJ37X7qul9eWM9iT00gfHGUtOT4OyLEWpFQ93izpPA1eo7cakmUdYHY2QhIt5NMo HLhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=+ia4G99i06QSYj7wXRMFn1FjelIv4JM4yeR1Z+8Xwqw=; b=tGirr1YXpO+ga8+Ty8VwYHRQPfNr+K1ZMS03osOQeKwDlgqiEiZAIgiqeDfD5G8x71 ZbCKaSEm4piyv1UrL6OeV+DNQQzggDxojaOL2MJfhGs3iwd5uP7cZwsXceBkF6TrPEk1 1JAI/+l5XjuQdMCMgLyZxAnUqiyb57EtNUZttykRGQXqNXfeMNEemtUEoVPvIZ5cxkiW gw18zPScvZIYUIRw3gztiV/K4fpE0vgCauh6PiRGgnYBJ/VAMwMKJVvXMY3dhGetPhUM dJ0+x3tL154sTUjpa07uo2LOhsYAPqPxGCHsel594GkTNpQJ86yI/MlqMQAePTWpKhz/ TTXw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 20-20020a631854000000b005347aba7376si594115pgy.297.2023.05.25.11.17.29; Thu, 25 May 2023 11:17:44 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241261AbjEYSE1 (ORCPT + 99 others); Thu, 25 May 2023 14:04:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238954AbjEYSD4 (ORCPT ); Thu, 25 May 2023 14:03:56 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 15E17E78 for ; Thu, 25 May 2023 11:03:33 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B48211650; Thu, 25 May 2023 11:04:08 -0700 (PDT) Received: from merodach.members.linode.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EAE043F6C4; Thu, 25 May 2023 11:03:20 -0700 (PDT) From: James Morse To: x86@kernel.org, linux-kernel@vger.kernel.org Cc: Fenghua Yu , Reinette Chatre , Thomas Gleixner , Ingo Molnar , Borislav Petkov , H Peter Anvin , Babu Moger , James Morse , shameerali.kolothum.thodi@huawei.com, D Scott Phillips OS , carl@os.amperecomputing.com, lcherian@marvell.com, bobo.shaobowang@huawei.com, tan.shaopeng@fujitsu.com, xingxin.hx@openanolis.org, baolin.wang@linux.alibaba.com, Jamie Iles , Xin Hao , peternewman@google.com, dfustini@baylibre.com Subject: [PATCH v4 18/24] x86/resctrl: Make rdt_enable_key the arch's decision to switch Date: Thu, 25 May 2023 18:02:03 +0000 Message-Id: <20230525180209.19497-19-james.morse@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230525180209.19497-1-james.morse@arm.com> References: <20230525180209.19497-1-james.morse@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766891102297279997?= X-GMAIL-MSGID: =?utf-8?q?1766891102297279997?= rdt_enable_key is switched when resctrl is mounted. It was also previously used to prevent a second mount of the filesystem. Any other architecture that wants to support resctrl has to provide identical static keys. Now that there are helpers for enabling and disabling the alloc/mon keys, resctrl doesn't need to switch this extra key, it can be done by the arch code. Use the static-key increment and decrement helpers, and change resctrl to ensure the calls are balanced. Tested-by: Shaopeng Tan Signed-off-by: James Morse --- arch/x86/include/asm/resctrl.h | 4 ++++ arch/x86/kernel/cpu/resctrl/rdtgroup.c | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/resctrl.h b/arch/x86/include/asm/resctrl.h index 83ec2b5791f0..839b701cf7bd 100644 --- a/arch/x86/include/asm/resctrl.h +++ b/arch/x86/include/asm/resctrl.h @@ -45,21 +45,25 @@ DECLARE_STATIC_KEY_FALSE(rdt_mon_enable_key); static inline void resctrl_arch_enable_alloc(void) { static_branch_enable_cpuslocked(&rdt_alloc_enable_key); + static_branch_inc_cpuslocked(&rdt_enable_key); } static inline void resctrl_arch_disable_alloc(void) { static_branch_disable_cpuslocked(&rdt_alloc_enable_key); + static_branch_dec_cpuslocked(&rdt_enable_key); } static inline void resctrl_arch_enable_mon(void) { static_branch_enable_cpuslocked(&rdt_mon_enable_key); + static_branch_inc_cpuslocked(&rdt_enable_key); } static inline void resctrl_arch_disable_mon(void) { static_branch_disable_cpuslocked(&rdt_mon_enable_key); + static_branch_dec_cpuslocked(&rdt_enable_key); } /* diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 9e65248908d6..501b68b95aef 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -2533,10 +2533,8 @@ static int rdt_get_tree(struct fs_context *fc) if (rdt_mon_capable) resctrl_arch_enable_mon(); - if (rdt_alloc_capable || rdt_mon_capable) { - static_branch_enable_cpuslocked(&rdt_enable_key); + if (rdt_alloc_capable || rdt_mon_capable) resctrl_mounted = true; - } if (is_mbm_enabled()) { r = &rdt_resources_all[RDT_RESOURCE_L3].r_resctrl; @@ -2804,9 +2802,10 @@ static void rdt_kill_sb(struct super_block *sb) rdt_pseudo_lock_release(); rdtgroup_default.mode = RDT_MODE_SHAREABLE; schemata_list_destroy(); - resctrl_arch_disable_alloc(); - resctrl_arch_disable_mon(); - static_branch_disable_cpuslocked(&rdt_enable_key); + if (rdt_alloc_capable) + resctrl_arch_disable_alloc(); + if (rdt_mon_capable) + resctrl_arch_disable_mon(); resctrl_mounted = false; kernfs_kill_sb(sb); mutex_unlock(&rdtgroup_mutex);