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;
Message-ID: <94b54f42-a70b-498b-ca05-62528a98cea8@intel.com>
Date:   Fri, 31 Mar 2023 16:28:49 -0700
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Firefox/102.0 Thunderbird/102.9.1
Subject: Re: [PATCH v3 12/19] x86/resctrl: Make resctrl_mounted checks
 explicit
Content-Language: en-US
To:     James Morse <james.morse@arm.com>, <x86@kernel.org>,
        <linux-kernel@vger.kernel.org>
CC:     Fenghua Yu <fenghua.yu@intel.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        H Peter Anvin <hpa@zytor.com>,
        Babu Moger <Babu.Moger@amd.com>,
        <shameerali.kolothum.thodi@huawei.com>,
        D Scott Phillips OS <scott@os.amperecomputing.com>,
        <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 <quic_jiles@quicinc.com>,
        Xin Hao <xhao@linux.alibaba.com>, <peternewman@google.com>
References: <20230320172620.18254-1-james.morse@arm.com>
 <20230320172620.18254-13-james.morse@arm.com>
From:   Reinette Chatre <reinette.chatre@intel.com>
In-Reply-To: <20230320172620.18254-13-james.morse@arm.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WTl3Mlp6U2habHlaRHlzTERNd2VwcjkwZEdHOXlyWTRkYjI4S3MzR0FTTHdo?=
 =?utf-8?B?V3RZV0lFWXU0THlySWVQVUZ6WG4wV2xzVVhvbEtpMHZwZ3I1bWhlNHplWU03?=
 =?utf-8?B?NW5kWEppNU45RGF6OEJFRTE1SXJGK1NpdENUMWF0NFlkcDVWandsVytRdHJy?=
 =?utf-8?B?cWR0TGR2TXlBaDBGQmlPTmt3OFgya1NNdkFEYnR4bURiMFloeG5NelVRUlUy?=
 =?utf-8?B?Tmwxek9USldmbFdUc3ZnZm8zUEZIdmFYTXBYUHJ5dlBzM1pEM0gzMDJkZHZH?=
 =?utf-8?B?eVAxWE9FVkxscVhxRFdzRDFORUVRRmhoR2dRb3JXeTN0US9qYWVuWS9OKzBm?=
 =?utf-8?B?TFJQcGNmdEdQZlUwZnltL1I1N2FCUUhUL1c0cDk3RFIzNUVUOGRab01JZi8x?=
 =?utf-8?B?cDNNUjlTV0EzYVp1cGVhNU9OWWtIR1B6NGowRWRHM2xmKzRkTnh0b0FWcXBQ?=
 =?utf-8?B?Mk43UVM3WEFqU1BnNGc3MDBCN3VJSnFxOWdLSGwzclBTcUhaRVdmc1RIT3Ew?=
 =?utf-8?B?dThsNUdHZ1FIWXpCOUdkODZnNFQyQ1dLLzY4T1BSVVpUeDZ5VDQ5T2UyOWE0?=
 =?utf-8?B?K3o5anRuZVJTQlpMZEZRR1Y1ejVjTTdRbW4zdmlBNUx1eXpBQytxemgrRTVq?=
 =?utf-8?B?NjdTSXVKNUFTS05UekxzSWVyU0dvT0REdURocnY1MjM3aW9PbHdKNkRzaS83?=
 =?utf-8?B?ajhZMVhGVHAxYnJHeVhCUFNvVlZVdWcvNDhWWlFJWWE0dk9najhVU3MzSERE?=
 =?utf-8?B?dFUwbTFhb1RaZjRndmIwUldUZ2xJVWsrUWdaeUFqY1Vzc3hsUHZ4NVBhQUkx?=
 =?utf-8?B?dTRIV05ObTlQaHRVR1V3bnpNeFZudFJGK0hnVm90dVVXckozWUlQRUIybmhB?=
 =?utf-8?B?NWc1N2w3eGl0NFdxaDBEYmM1amJjTVExUk5NMGR1eHc4UWg0RzJwRTVobzJS?=
 =?utf-8?B?N0sxYlFsb3V4VWJpekN0dzFiZkJLQlpTRGJ6R29NMGkyOGROOTIwUmRrdGdh?=
 =?utf-8?B?NlFkcGhFMjVhdGdOUVRWQWJvOGlCSE1pNlFIbUpMV1IyQ3RiU0dSUWE5L0xZ?=
 =?utf-8?B?dFIwRTVxSHRJZ2lhQ01kbnl4Y3ZNRXhrVDQ5TzQwQW9LWW9QZ1NyK21sUlZv?=
 =?utf-8?B?ZWI3NmU4RFh5cFBVcGVjS1UzbVc5TGtuZEF2NmtCS0ovbk9EcjZsM1NQU1ps?=
 =?utf-8?B?bXFPYnBDRVpmYTZZcUFIWEU4RWR5VWdJNFBYNkRQU0hrL2hrNEdwaE1IRlNI?=
 =?utf-8?B?clpQanFuZldWbldaZUNIamZ0anlKak1YeWQvZmRzMGw1YlpuOWVKSDhVV084?=
 =?utf-8?B?M1o3VW1adXllMU5lTS9uN0JXMDBjQkdkWTR6Zm8xY1BTa2JFaGpCaTVySXcw?=
 =?utf-8?B?ajdPNTZFUk1sb1VUVnpGWlY3S1ZXK3Y2Z1htSTBtNXhpUHZzRDEzYW9kR05t?=
 =?utf-8?B?VjJBVXBYWEpYUVF5OUltMUxjRDdOLzV2THdhTmIwZW1rV2RTTWpKbHBvMWpw?=
 =?utf-8?B?dTdjMVYzenc5dGNETlpuUzlHd0QrUWFzWHlLcTEvWjV0aE43akg0N1ZVblMz?=
 =?utf-8?B?V2QzMzRPcWd0M0xscVh1LzR6WU1FL2FaQ2hiSWhseExTQkZiY0hJN29UMGtn?=
 =?utf-8?B?OG1ndlhqTXBiYS9Nbjh2ZjhpVzhYbkU0SDZ6V2EwM1BtMmh2NW5HSDhEaWdH?=
 =?utf-8?B?OGljM2M2ZFU3T280ZjF1eWlxOFh1bjNHdDAyZXh4aEkxL2ppM3crTGtQclNL?=
 =?utf-8?B?anhQSExxUjRudWZuWVVaV25WdUpCTklJTnNjN2tVQkRSQTZRUktoRm5jSVhY?=
 =?utf-8?B?ZTRlNFBRMmFMTHh1ZmRSRnNoWURNRStPV28zS21EMnRpK2d5dnF5Umh4SFZV?=
 =?utf-8?B?VE5ydjBlZnFsbUhkK3JiTTRvWjRjM1lUMmFXcGdVZndHSUhULzNxVUJ2Q3l0?=
 =?utf-8?B?NHFOZy9uV1RmdWVjSHpGNnpZbkU4RHJPOWVaUnA0bHdqTU91MXlyR3MwYjJy?=
 =?utf-8?B?WFVzL1luUU8wQUJIR2dSQmFHQ1VTd2RERElBR0NzK1BNV3Jqdk1uLzUyT0Jj?=
 =?utf-8?B?MGZZQTVjMjRZZUhkOXhpa3E3UFZFWlJRU2NkSjVoNFovd1lhK2hNR21jNFZE?=
 =?utf-8?B?ditJTWJ1a000cHRHT1Y2UjVma0ppZDNPRnNPcTFFNnJYRWxNSHFhWndBTWF0?=
 =?utf-8?B?eWc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 199d6115-a76c-4b4a-a7e5-08db323fb118
X-MS-Exchange-CrossTenant-AuthSource: CY4PR11MB1862.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2023 23:28:54.0730
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: d3Hcu0mhDCYzwpKVD5IRGuGHWaQ5gr5ugFmuL3FwnXt8X/tM7Wr8P+z63xPfM/LAHaIg7inLz2qkZPxeeHJ6a0Aza0zmC0+JqJAyFS8a3N0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6426
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi James,

On 3/20/2023 10:26 AM, James Morse wrote:
> The rdt_enable_key is switched when resctrl is mounted, and used to
> prevent a second mount of the filesystem. It also enables the
> architecture's context switch code.
> 
> This requires another architecture to have the same set of static-keys,
> as resctrl depends on them too.
> 
> Make the resctrl_mounted checks explicit: resctrl can keep track of
> whether it has been mounted once. This doesn't need to be combined with
> whether the arch code is context switching the CLOSID.
> Tests against the rdt_mon_enable_key become a test that resctrl is
> mounted and that monitoring is enabled.

The last sentence above makes the code change hard to follow ...
(see below)

> 
> This will allow the static-key changing to be moved behind resctrl_arch_
> calls.
> 
> Tested-by: Shaopeng Tan <tan.shaopeng@fujitsu.com>
> Signed-off-by: James Morse <james.morse@arm.com>
> ---
>  arch/x86/kernel/cpu/resctrl/internal.h |  1 +
>  arch/x86/kernel/cpu/resctrl/monitor.c  |  5 +++--
>  arch/x86/kernel/cpu/resctrl/rdtgroup.c | 17 +++++++++++------
>  3 files changed, 15 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
> index 7262b355e128..7d5188e8bec3 100644
> --- a/arch/x86/kernel/cpu/resctrl/internal.h
> +++ b/arch/x86/kernel/cpu/resctrl/internal.h
> @@ -142,6 +142,7 @@ extern bool rdt_alloc_capable;
>  extern bool rdt_mon_capable;
>  extern unsigned int rdt_mon_features;
>  extern struct list_head resctrl_schema_all;
> +extern bool resctrl_mounted;
>  
>  enum rdt_group_type {
>  	RDTCTRL_GROUP = 0,
> diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
> index f38cd2f12285..6279f5c98b39 100644
> --- a/arch/x86/kernel/cpu/resctrl/monitor.c
> +++ b/arch/x86/kernel/cpu/resctrl/monitor.c
> @@ -834,7 +834,7 @@ void mbm_handle_overflow(struct work_struct *work)
>  
>  	mutex_lock(&rdtgroup_mutex);
>  
> -	if (!static_branch_likely(&rdt_mon_enable_key))
> +	if (!resctrl_mounted || !static_branch_likely(&rdt_mon_enable_key))

... considering the text in the changelog the "resctrl_mounted" check seems
unnecessary. Looking ahead I wonder if this check would not be more
appropriate in patch 15?

>  		goto out_unlock;
>  
>  	r = &rdt_resources_all[RDT_RESOURCE_L3].r_resctrl;
> @@ -867,8 +867,9 @@ void mbm_setup_overflow_handler(struct rdt_domain *dom, unsigned long delay_ms)
>  	unsigned long delay = msecs_to_jiffies(delay_ms);
>  	int cpu;
>  
> -	if (!static_branch_likely(&rdt_mon_enable_key))
> +	if (!resctrl_mounted || !static_branch_likely(&rdt_mon_enable_key))
>  		return;

same here

> +

This seems unnecessary.

>  	cpu = cpumask_any_housekeeping(&dom->cpu_mask);
>  	dom->mbm_work_cpu = cpu;
>  	schedule_delayed_work_on(cpu, &dom->mbm_over, delay);
> diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> index 2306fbc9a9bb..5176a85f281c 100644
> --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> @@ -42,6 +42,9 @@ LIST_HEAD(rdt_all_groups);
>  /* list of entries for the schemata file */
>  LIST_HEAD(resctrl_schema_all);
>  
> +/* the filesystem can only be mounted once */

Please start sentences with capital letters and end with period.

> +bool resctrl_mounted;
> +
>  /* Kernel fs node for "info" directory under root */
>  static struct kernfs_node *kn_info;
>  
> @@ -796,7 +799,7 @@ int proc_resctrl_show(struct seq_file *s, struct pid_namespace *ns,
>  	mutex_lock(&rdtgroup_mutex);
>  
>  	/* Return empty if resctrl has not been mounted. */
> -	if (!static_branch_unlikely(&rdt_enable_key)) {
> +	if (!resctrl_mounted) {
>  		seq_puts(s, "res:\nmon:\n");
>  		goto unlock;
>  	}
> @@ -2463,7 +2466,7 @@ static int rdt_get_tree(struct fs_context *fc)
>  	/*
>  	 * resctrl file system can only be mounted once.
>  	 */
> -	if (static_branch_unlikely(&rdt_enable_key)) {
> +	if (resctrl_mounted) {
>  		ret = -EBUSY;
>  		goto out;
>  	}
> @@ -2511,8 +2514,10 @@ static int rdt_get_tree(struct fs_context *fc)
>  	if (rdt_mon_capable)
>  		static_branch_enable_cpuslocked(&rdt_mon_enable_key);
>  
> -	if (rdt_alloc_capable || rdt_mon_capable)
> +	if (rdt_alloc_capable || rdt_mon_capable) {
>  		static_branch_enable_cpuslocked(&rdt_enable_key);
> +		resctrl_mounted = true;
> +	}
>  
>  	if (is_mbm_enabled()) {
>  		r = &rdt_resources_all[RDT_RESOURCE_L3].r_resctrl;
> @@ -2783,6 +2788,7 @@ static void rdt_kill_sb(struct super_block *sb)
>  	static_branch_disable_cpuslocked(&rdt_alloc_enable_key);
>  	static_branch_disable_cpuslocked(&rdt_mon_enable_key);
>  	static_branch_disable_cpuslocked(&rdt_enable_key);
> +	resctrl_mounted = false;
>  	kernfs_kill_sb(sb);
>  	mutex_unlock(&rdtgroup_mutex);
>  	cpus_read_unlock();
> @@ -3610,7 +3616,7 @@ void resctrl_offline_domain(struct rdt_resource *r, struct rdt_domain *d)
>  	 * If resctrl is mounted, remove all the
>  	 * per domain monitor data directories.
>  	 */
> -	if (static_branch_unlikely(&rdt_mon_enable_key))
> +	if (resctrl_mounted && static_branch_unlikely(&rdt_mon_enable_key))
>  		rmdir_mondata_subdir_allrdtgrp(r, d->id);
>  
>  	if (is_mbm_enabled())
> @@ -3687,8 +3693,7 @@ int resctrl_online_domain(struct rdt_resource *r, struct rdt_domain *d)
>  	if (is_llc_occupancy_enabled())
>  		INIT_DELAYED_WORK(&d->cqm_limbo, cqm_handle_limbo);
>  
> -	/* If resctrl is mounted, add per domain monitor data directories. */
> -	if (static_branch_unlikely(&rdt_mon_enable_key))
> +	if (resctrl_mounted && static_branch_unlikely(&rdt_mon_enable_key))
>  		mkdir_mondata_subdir_allrdtgrp(r, d);
>  
>  	return 0;

Above also, the resctrl_mounted check does not seem to be needed.

Reinette