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 A8ECDECAAD3 for ; Wed, 7 Sep 2022 06:27:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229484AbiIGG1J (ORCPT ); Wed, 7 Sep 2022 02:27:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229684AbiIGG1H (ORCPT ); Wed, 7 Sep 2022 02:27:07 -0400 Received: from out199-9.us.a.mail.aliyun.com (out199-9.us.a.mail.aliyun.com [47.90.199.9]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 375DB7C306 for ; Tue, 6 Sep 2022 23:27:04 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R171e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046051;MF=xhao@linux.alibaba.com;NM=1;PH=DS;RN=19;SR=0;TI=SMTPD_---0VOwgIB2_1662532017; Received: from 30.240.98.182(mailfrom:xhao@linux.alibaba.com fp:SMTPD_---0VOwgIB2_1662532017) by smtp.aliyun-inc.com; Wed, 07 Sep 2022 14:26:59 +0800 Message-ID: <539cd9b3-9a2b-47c2-7436-89aedef33d1c@linux.alibaba.com> Date: Wed, 7 Sep 2022 14:26:57 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.1.2 Subject: Re: [PATCH v6 20/21] x86/resctrl: Add resctrl_rmid_realloc_limit to abstract x86's boot_cpu_data To: James Morse , x86@kernel.org, linux-kernel@vger.kernel.org Cc: Fenghua Yu , Reinette Chatre , Thomas Gleixner , Ingo Molnar , Borislav Petkov , H Peter Anvin , Babu Moger , shameerali.kolothum.thodi@huawei.com, D Scott Phillips OS , lcherian@marvell.com, bobo.shaobowang@huawei.com, tan.shaopeng@fujitsu.com, Jamie Iles , Cristian Marussi , xingxin.hx@openanolis.org, baolin.wang@linux.alibaba.com References: <20220902154829.30399-1-james.morse@arm.com> <20220902154829.30399-21-james.morse@arm.com> From: haoxin In-Reply-To: <20220902154829.30399-21-james.morse@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 在 2022/9/2 下午11:48, James Morse 写道: > resctrl_rmid_realloc_threshold can be set by user-space. The maximum > value is specified by the architecture. > > Currently max_threshold_occ_write() reads the maximum value from > boot_cpu_data.x86_cache_size, which is not portable to another > architecture. > > Add resctrl_rmid_realloc_limit to describe the maximum size in bytes > that user-space can set the threshold to. > > Reviewed-by: Jamie Iles > Tested-by: Xin Hao > Reviewed-by: Shaopeng Tan > Tested-by: Shaopeng Tan > Tested-by: Cristian Marussi > Reviewed-by: Reinette Chatre > Signed-off-by: James Morse > --- > arch/x86/kernel/cpu/resctrl/monitor.c | 9 +++++++-- > arch/x86/kernel/cpu/resctrl/rdtgroup.c | 2 +- > include/linux/resctrl.h | 1 + > 3 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c > index e91afe99b763..8d15568d7121 100644 > --- a/arch/x86/kernel/cpu/resctrl/monitor.c > +++ b/arch/x86/kernel/cpu/resctrl/monitor.c > @@ -67,6 +67,11 @@ unsigned int rdt_mon_features; > */ > unsigned int resctrl_rmid_realloc_threshold; > > +/* > + * This is the maximum value for the reallocation threshold, in bytes. > + */ > +unsigned int resctrl_rmid_realloc_limit; > + > #define CF(cf) ((unsigned long)(1048576 * (cf) + 0.5)) > > /* > @@ -747,10 +752,10 @@ int rdt_get_mon_l3_config(struct rdt_resource *r) > { > unsigned int mbm_offset = boot_cpu_data.x86_cache_mbm_width_offset; > struct rdt_hw_resource *hw_res = resctrl_to_arch_res(r); > - unsigned int cl_size = boot_cpu_data.x86_cache_size; > unsigned int threshold; > int ret; > > + resctrl_rmid_realloc_limit = boot_cpu_data.x86_cache_size * 1024; Use SZ_1K instead ? > hw_res->mon_scale = boot_cpu_data.x86_cache_occ_scale; > r->num_rmid = boot_cpu_data.x86_cache_max_rmid + 1; > hw_res->mbm_width = MBM_CNTR_WIDTH_BASE; > @@ -767,7 +772,7 @@ int rdt_get_mon_l3_config(struct rdt_resource *r) > * > * For a 35MB LLC and 56 RMIDs, this is ~1.8% of the LLC. > */ > - threshold = cl_size * 1024 / r->num_rmid; > + threshold = resctrl_rmid_realloc_limit / r->num_rmid; > > /* > * Because num_rmid may not be a power of two, round the value > diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c > index 849bdec37217..e5a48f05e787 100644 > --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c > +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c > @@ -1059,7 +1059,7 @@ static ssize_t max_threshold_occ_write(struct kernfs_open_file *of, > if (ret) > return ret; > > - if (bytes > (boot_cpu_data.x86_cache_size * 1024)) > + if (bytes > resctrl_rmid_realloc_limit) > return -EINVAL; > > resctrl_rmid_realloc_threshold = resctrl_arch_round_mon_val(bytes); > diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h > index 9995d043650a..cb857f753322 100644 > --- a/include/linux/resctrl.h > +++ b/include/linux/resctrl.h > @@ -251,5 +251,6 @@ void resctrl_arch_reset_rmid(struct rdt_resource *r, struct rdt_domain *d, > u32 rmid, enum resctrl_event_id eventid); > > extern unsigned int resctrl_rmid_realloc_threshold; > +extern unsigned int resctrl_rmid_realloc_limit; > > #endif /* _RESCTRL_H */