Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
Message-ID: <1297008e-b31c-4833-b446-fcd4036d1e64@intel.com>
Date:   Tue, 28 Nov 2023 14:22:26 -0800
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v2 24/26] selftests/resctrl: Rename resource ID to domain
 ID
Content-Language: en-US
To:     =?UTF-8?Q?Ilpo_J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>,
        <linux-kselftest@vger.kernel.org>, Shuah Khan <shuah@kernel.org>,
        "Shaopeng Tan" <tan.shaopeng@jp.fujitsu.com>,
        =?UTF-8?Q?Maciej_Wiecz=C3=B3r-Retman?= 
        <maciej.wieczor-retman@intel.com>,
        Fenghua Yu <fenghua.yu@intel.com>
CC:     <linux-kernel@vger.kernel.org>
References: <20231120111340.7805-1-ilpo.jarvinen@linux.intel.com>
 <20231120111340.7805-25-ilpo.jarvinen@linux.intel.com>
From:   Reinette Chatre <reinette.chatre@intel.com>
In-Reply-To: <20231120111340.7805-25-ilpo.jarvinen@linux.intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?REdkdThkTFNkMDRWamY1MnFhUmlqd0VnUkxBcFNFSnNmYUpNUXJHL2twKzJE?=
 =?utf-8?B?dDBac0QrbTRRUWl4VktSNGRML0szUXVrQlMxczd5dWFXZlFoNzE4Qmc1ZzdF?=
 =?utf-8?B?R2U5dHY3NDBrbU13NGZNbDJHNm14WUthQk9UeWRRelpadTA2a2IxSm9yOEN6?=
 =?utf-8?B?VUtwNWJZdkszNkFOcFhSc3VPZUZ4cmNwaUN0V3NjdDhFV1E2SjYxRmwyeVlr?=
 =?utf-8?B?MktmUGJyak9SenhZL1RiUmFrOXZRczR0YXB1Z2swZ01VMWQ1d0M4MXVMSUk4?=
 =?utf-8?B?YURlZnlGYk4ydVJRcjh1N0x6UTJPcVMwL1JXazV1VzBUUU5VRGMrNWM3Vmd6?=
 =?utf-8?B?UUN5eTNVMXhiMDUxUWFOSHlUMXNjTlg3c2FjRVFiWGxJNHdVZ1hxMzYwOTJk?=
 =?utf-8?B?aWVLYVd6VHpqRi9BNENOc0wwcyt1L01LOWdUQm1vWjBwT3lJRm02L2ZJODBU?=
 =?utf-8?B?TG9TajBTSGZncFJwcnAwTnBqLy8xSjQrNDVDMk5BOVFGaVFqWEdQTDg2VDRX?=
 =?utf-8?B?ZEJDT2FXbEp0NXptUGVVN3RRdGdETVRNWFM5RXAwYXlreHduM0tmblJ3blpU?=
 =?utf-8?B?TzAyYWVLLzFDSm0wRjllNFlmOUJUVm9MM3JIdEZKbEtmRXNrWlB0OG9TU05E?=
 =?utf-8?B?NFh5ZWoxSjYxVnNidGlxaW4rOVZQbmd0amNXNEw3RWFMUmIyUHhIS0E2SjAr?=
 =?utf-8?B?VDhUdVNUMzA3Qmd3YnRXRTFORnFyTWJSMkMxU2xUamIvTXFiTXV6SktpMUhx?=
 =?utf-8?B?ZHZrbUFab2lpOW9UcmF3cit5c2pOM2Jpcm1qdzRKSUdTb1krRE5DUExSbU9m?=
 =?utf-8?B?QzVHSVUvSWtmVnNTWVI1WDQrN0NQdk5Yc21RL1hoYm14VHVaNFV6Vk9kajR3?=
 =?utf-8?B?NFBMbnd0WkVEY05ydGp3NmMyQU00VURRSjE0RWJtcWdSZWZjcGVraWZPS0ZD?=
 =?utf-8?B?Q3Fkc0ZCbkZMellnS3M1bWFHaTBGcHUxUGhXUmVTRWlXbDBEYlZqbFh5ekNQ?=
 =?utf-8?B?T2pVNUhEZkdtdWh6WXpFdnFwS2FXOUFpS3hCODBhMlBBRFdTSEVuQVV6THA2?=
 =?utf-8?B?SnVQNnNXbVVmQ1lGN1VMN2VnWFAvTDhWTTJBSG54VzJ0OThXUUE2bll5TzNN?=
 =?utf-8?B?U2lHZW8vaTRSNlg5Q0ZNZmt5WFk3M0tBT0c3SS95RVJsNS9ZU29ueEdOVm9h?=
 =?utf-8?B?ZExNcTVjK0tFOVh1TWNLT0VpZDdmdlJ2dmVBSjdDMzQveEdscUk2eE5iR0tG?=
 =?utf-8?B?em5uTE95c3pFZVJBTDJpaEVXNTBsZ2xNZjZYUmZ6RExLWEFXTEwxeW45bEtI?=
 =?utf-8?B?Q0p6eDc5dC9ScUlteHZhRVZPcm5xRUJqb2NEL0pLT1FvMC90ajd1THIvQUg4?=
 =?utf-8?B?TXFYTkNDb2VaMDZBeHNoUWFBUEM1ZnpZdDNUUU01UmxXSkNSUUpUTGQrTURs?=
 =?utf-8?B?RjZiVnA0VStvaDY4SG04TEVXVmNpeFZNeTVDVlQxL21sWngra25jMU5uS055?=
 =?utf-8?B?Y3J6UXg3NVVBcnp4ajdXNTBXL0V4b1dHeEJKeVBhMEVHb3ZHR25DcE1qZHZr?=
 =?utf-8?B?QStUWUZYTUZsQTVBSzBUVDdQNXQrazl2a293SkpxQmVqcUlyNmdZTmkrRTh4?=
 =?utf-8?B?NzFpQ1B3UzJVWXN4YjJwQ1FuSTEyMXBzeTlUekJpMjgxU2JPZVZ1TThLV002?=
 =?utf-8?B?S0lqQW5UZVp5dDFNeXdCdlpIVHJCY1VIc0JXMGZmMWd1ckM5ZzRGSmd6OVdu?=
 =?utf-8?B?eEhuMFFlQ21Gdi9NWjY4QlFlMVF2K2hxbWRuckxSbzc4UW9FeXF6eEl5aW9E?=
 =?utf-8?B?QWxXZUhKcUk2TkMyaGRDOHc5cThMa1NJQVVLVDdHVkJ2ME5TYktSWXMrZ1kr?=
 =?utf-8?B?SWhmTlVEVFBqYkJEcnJkWTlyM21qejRZd0JpR0N2Mk9DTWdFckRWbUE0YW1X?=
 =?utf-8?B?ME1KR2NCK1U4TTF4czUybXZWTnpkY003SzBhaGhsSVBQeHYrMUdMcUhwb0d0?=
 =?utf-8?B?ZzdZOGpNSHhleTlaMmwxK2dZbVMxV3hjZUhTNzdUWXg0TXh4OVN0TEx6ZFBT?=
 =?utf-8?B?bVhvSlJlcUNIU3hJUHU0dnE3U0lLTzVWK0EwUEU0dmtVaVk0Y0Qzak9JTW5v?=
 =?utf-8?B?WU1Wd3hYRzh0NVhxQWlGMmxKdGVwOW0rSi9uaXkyZFd0TkRrVStTL1dzMHM3?=
 =?utf-8?B?eEE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 2318fedb-7294-41f6-d485-08dbf06080f8
X-MS-Exchange-CrossTenant-AuthSource: SJ2PR11MB7573.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2023 22:22:27.5381
 (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: o33V7XCcTSKpByb1NzVNz6M8KTdrGzLrQH8O585EeVUIvw6bx6uPSnHP60hVAPUaLv6dw1pDmxNGcS/sFm8fdF7A5BdAG1FN0++ATDKzLCA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR11MB8744
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Tue, 28 Nov 2023 14:23:23 -0800 (PST)

Hi Ilpo,

On 11/20/2023 3:13 AM, Ilpo Järvinen wrote:
> Kernel-side calls the instances of a resource domains.
> 
> Change the resource_id naming in the selftest code to domain_id to
> match the kernel side better.
> 
> Suggested-by: Maciej Wieczór-Retman <maciej.wieczor-retman@intel.com>
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> ---
>  tools/testing/selftests/resctrl/resctrl.h     |  2 +-
>  tools/testing/selftests/resctrl/resctrl_val.c | 30 +++++++++----------
>  tools/testing/selftests/resctrl/resctrlfs.c   | 18 +++++------
>  3 files changed, 25 insertions(+), 25 deletions(-)
> 
> diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h
> index ed7a69578daf..280ab6b6bd07 100644
> --- a/tools/testing/selftests/resctrl/resctrl.h
> +++ b/tools/testing/selftests/resctrl/resctrl.h
> @@ -124,7 +124,7 @@ extern char llc_occup_path[1024];
>  int get_vendor(void);
>  bool check_resctrlfs_support(void);
>  int filter_dmesg(void);
> -int get_resource_id(int cpu_no, int *resource_id);
> +int get_domain_id(int cpu_no, int *domain_id);
>  int mount_resctrlfs(void);
>  int umount_resctrlfs(void);
>  int validate_bw_report_request(char *bw_report);
> diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/testing/selftests/resctrl/resctrl_val.c
> index 4e0c356b7f18..f278f5c9195c 100644
> --- a/tools/testing/selftests/resctrl/resctrl_val.c
> +++ b/tools/testing/selftests/resctrl/resctrl_val.c
> @@ -387,20 +387,20 @@ static int get_mem_bw_imc(int cpu_no, char *bw_report, float *bw_imc)
>  	return 0;
>  }
>  
> -void set_mbm_path(const char *ctrlgrp, const char *mongrp, int resource_id)
> +void set_mbm_path(const char *ctrlgrp, const char *mongrp, int domain_id)
>  {
>  	if (ctrlgrp && mongrp)
>  		sprintf(mbm_total_path, CON_MON_MBM_LOCAL_BYTES_PATH,
> -			RESCTRL_PATH, ctrlgrp, mongrp, resource_id);
> +			RESCTRL_PATH, ctrlgrp, mongrp, domain_id);
>  	else if (!ctrlgrp && mongrp)
>  		sprintf(mbm_total_path, MON_MBM_LOCAL_BYTES_PATH, RESCTRL_PATH,
> -			mongrp, resource_id);
> +			mongrp, domain_id);
>  	else if (ctrlgrp && !mongrp)
>  		sprintf(mbm_total_path, CON_MBM_LOCAL_BYTES_PATH, RESCTRL_PATH,
> -			ctrlgrp, resource_id);
> +			ctrlgrp, domain_id);
>  	else if (!ctrlgrp && !mongrp)
>  		sprintf(mbm_total_path, MBM_LOCAL_BYTES_PATH, RESCTRL_PATH,
> -			resource_id);
> +			domain_id);
>  }
>  
>  /*
> @@ -413,23 +413,23 @@ void set_mbm_path(const char *ctrlgrp, const char *mongrp, int resource_id)
>  static void initialize_mem_bw_resctrl(const char *ctrlgrp, const char *mongrp,
>  				      int cpu_no, char *resctrl_val)
>  {
> -	int resource_id;
> +	int domain_id;
>  
> -	if (get_resource_id(cpu_no, &resource_id) < 0) {
> -		perror("Could not get resource_id");
> +	if (get_domain_id(cpu_no, &domain_id) < 0) {
> +		perror("Could not get domain ID");

I do not think perror() is appropriate here. It is too far away
from failing system call (for which perror() was already called
anyway).

>  		return;
>  	}
>  
>  	if (!strncmp(resctrl_val, MBM_STR, sizeof(MBM_STR)))
> -		set_mbm_path(ctrlgrp, mongrp, resource_id);
> +		set_mbm_path(ctrlgrp, mongrp, domain_id);
>  
>  	if (!strncmp(resctrl_val, MBA_STR, sizeof(MBA_STR))) {
>  		if (ctrlgrp)
>  			sprintf(mbm_total_path, CON_MBM_LOCAL_BYTES_PATH,
> -				RESCTRL_PATH, ctrlgrp, resource_id);
> +				RESCTRL_PATH, ctrlgrp, domain_id);
>  		else
>  			sprintf(mbm_total_path, MBM_LOCAL_BYTES_PATH,
> -				RESCTRL_PATH, resource_id);
> +				RESCTRL_PATH, domain_id);
>  	}
>  }
>  
> @@ -582,15 +582,15 @@ static void set_cmt_path(const char *ctrlgrp, const char *mongrp, char sock_num)
>  static void initialize_llc_occu_resctrl(const char *ctrlgrp, const char *mongrp,
>  					int cpu_no, char *resctrl_val)
>  {
> -	int resource_id;
> +	int domain_id;
>  
> -	if (get_resource_id(cpu_no, &resource_id) < 0) {
> -		perror("# Unable to resource_id");
> +	if (get_domain_id(cpu_no, &domain_id) < 0) {
> +		perror("# Could not get domain ID");

here also

>  		return;
>  	}
>  
>  	if (!strncmp(resctrl_val, CMT_STR, sizeof(CMT_STR)))
> -		set_cmt_path(ctrlgrp, mongrp, resource_id);
> +		set_cmt_path(ctrlgrp, mongrp, domain_id);
>  }
>  
>  static int measure_vals(const struct user_params *uparams,

Reinette