From patchwork Mon Mar 20 17:26:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 72330 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1349672wrt; Mon, 20 Mar 2023 10:51:26 -0700 (PDT) X-Google-Smtp-Source: AK7set+WtcRXRoY1hEGMAhKwEamJhtlMcGqetjruj3eK4CCzSqXrd2k7DkjY073P6323csMImwrx X-Received: by 2002:a05:6a20:be04:b0:da:4e05:768 with SMTP id ge4-20020a056a20be0400b000da4e050768mr898146pzb.38.1679334686118; Mon, 20 Mar 2023 10:51:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679334686; cv=none; d=google.com; s=arc-20160816; b=DohdJ7oZunIF44YALVySyH5DemBv5PolzPEPBLE53K1Ql24YHkUoSegTf3dSEB9Ijl PysREPbgOA34qJcACJbuXQYfSasd8oP5FmzT1QSgqQmMcVjhivaKkGyo6wIlmxWmSCpm KsfWveGMaIIaK10mPP3xJFKvRxOfo7gV3NvKFE3KiX+y4dVyyno+p7uzHJHf4GLIXiPK f0BnZepQGQhKe348Th97BPPeHLkgEhbUNLLVstlWKo3/cEeKFOja7iVGyYdSBb9369hh gFeTN6aIXJ1ArBZj29ZcU5Twj41ZGJmBLB4ljN/qV+sDJcUuCMeuUyE8+WMZvtppHZ1U wr5Q== 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=ma4uYYCOowIicwUrsnuZ1uhKdExQW+zW8u8t+9tWLZg=; b=BsEjLjd5SwDTd7YzJQzOSFPAwjNnlzVoJSahj0w+ED/yXfRa8AAM61vLjrN5J/Xpt+ VRz5Y8acu9obKQ/wBQM+uq/0yuRk4JfcV6hh3r0ovJg5yvE5Nb4deGoy99w48oGwHfgb b+8BwjxOqHwGhc9V/PQx2fjBgmFgxd+8+gJK+0Z9wIHjjTVz/4kbgBdZAVENgzjOqqkj 0Sz6AnDxzdV9LZYXYPxGz3zxYm10Oj1jWRP4vO+qKmxJEtLPHvhlqK45r6ucK0/bfQ8q UTIPkKxJXV4PTnkWcdKavwuhz4wg2cQCgkpfeyBhv6nqG1wgGt2nL+J6tNw6O6e0G59v IaWQ== 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 h9-20020a631209000000b00502e4278d61si10938759pgl.648.2023.03.20.10.51.09; Mon, 20 Mar 2023 10:51:26 -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 S229842AbjCTRqb (ORCPT + 99 others); Mon, 20 Mar 2023 13:46:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229799AbjCTRqA (ORCPT ); Mon, 20 Mar 2023 13:46:00 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 785263431A for ; Mon, 20 Mar 2023 10:41:58 -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 08F5A1BC0; Mon, 20 Mar 2023 10:28:40 -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 810733F67D; Mon, 20 Mar 2023 10:27:53 -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 Subject: [PATCH v3 16/19] x86/resctrl: Add cpu online callback for resctrl work Date: Mon, 20 Mar 2023 17:26:17 +0000 Message-Id: <20230320172620.18254-17-james.morse@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230320172620.18254-1-james.morse@arm.com> References: <20230320172620.18254-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 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?1760910047643348816?= X-GMAIL-MSGID: =?utf-8?q?1760910047643348816?= The resctrl architecture specific code may need to create a domain when a CPU comes online, it also needs to reset the CPUs PQR_ASSOC register. The resctrl filesystem code needs to update the rdtgroup_default cpu mask when cpus are brought online. Currently this is all done in one function, resctrl_online_cpu(). This will need to be split into architecture and filesystem parts before resctrl can be moved to /fs/. Pull the rdtgroup_default update work out as a filesystem specific cpu_online helper. resctrl_online_cpu() is the obvious name for this, which means the version in core.c needs renaming. resctrl_online_cpu() is called by the arch code once it has done the work to add the new cpu to any domains. In future patches, resctrl_online_cpu() will take the rdtgroup_mutex itself. Tested-by: Shaopeng Tan Signed-off-by: James Morse --- arch/x86/kernel/cpu/resctrl/core.c | 11 ++++++----- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 10 ++++++++++ include/linux/resctrl.h | 1 + 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c index 351319403f84..8e25ea49372e 100644 --- a/arch/x86/kernel/cpu/resctrl/core.c +++ b/arch/x86/kernel/cpu/resctrl/core.c @@ -603,19 +603,20 @@ static void clear_closid_rmid(int cpu) wrmsr(MSR_IA32_PQR_ASSOC, RESCTRL_RESERVED_CLOSID, 0); } -static int resctrl_online_cpu(unsigned int cpu) +static int resctrl_arch_online_cpu(unsigned int cpu) { struct rdt_resource *r; + int err; mutex_lock(&rdtgroup_mutex); for_each_capable_rdt_resource(r) domain_add_cpu(cpu, r); - /* The cpu is set in default rdtgroup after online. */ - cpumask_set_cpu(cpu, &rdtgroup_default.cpu_mask); clear_closid_rmid(cpu); + + err = resctrl_online_cpu(cpu); mutex_unlock(&rdtgroup_mutex); - return 0; + return err; } static void clear_childcpus(struct rdtgroup *r, unsigned int cpu) @@ -965,7 +966,7 @@ static int __init resctrl_late_init(void) state = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "x86/resctrl/cat:online:", - resctrl_online_cpu, resctrl_offline_cpu); + resctrl_arch_online_cpu, resctrl_offline_cpu); if (state < 0) return state; diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 8f319e03b449..410b2b451c30 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -3698,6 +3698,16 @@ int resctrl_online_domain(struct rdt_resource *r, struct rdt_domain *d) return 0; } +int resctrl_online_cpu(unsigned int cpu) +{ + lockdep_assert_held(&rdtgroup_mutex); + + /* The cpu is set in default rdtgroup after online. */ + cpumask_set_cpu(cpu, &rdtgroup_default.cpu_mask); + + return 0; +} + /* * rdtgroup_init - rdtgroup initialization * diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h index 03e4f41cd336..5a66d034aa61 100644 --- a/include/linux/resctrl.h +++ b/include/linux/resctrl.h @@ -222,6 +222,7 @@ u32 resctrl_arch_get_config(struct rdt_resource *r, struct rdt_domain *d, u32 closid, enum resctrl_conf_type type); int resctrl_online_domain(struct rdt_resource *r, struct rdt_domain *d); void resctrl_offline_domain(struct rdt_resource *r, struct rdt_domain *d); +int resctrl_online_cpu(unsigned int cpu); /** * resctrl_arch_rmid_read() - Read the eventid counter corresponding to rmid