Received-SPF: pass (google.com: domain of linux-kernel+bounces-37630-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <6635c607-cab2-45f4-a0fe-ff4f53b36849@intel.com>
Date: Wed, 24 Jan 2024 12:04:31 -0800
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] x86/resctrl: Fix unneeded variable warning reported by
 kernel test robot
Content-Language: en-US
To: Borislav Petkov <bp@alien8.de>
CC: Babu Moger <babu.moger@amd.com>, <corbet@lwn.net>, <fenghua.yu@intel.com>,
	<tglx@linutronix.de>, <mingo@redhat.com>, <dave.hansen@linux.intel.com>,
	<x86@kernel.org>, <hpa@zytor.com>, <paulmck@kernel.org>,
	<rdunlap@infradead.org>, <tj@kernel.org>, <peterz@infradead.org>,
	<yanjiewtw@gmail.com>, <kim.phillips@amd.com>, <lukas.bulwahn@gmail.com>,
	<seanjc@google.com>, <jmattson@google.com>, <leitao@debian.org>,
	<jpoimboe@kernel.org>, <rick.p.edgecombe@intel.com>,
	<kirill.shutemov@linux.intel.com>, <jithu.joseph@intel.com>,
	<kai.huang@intel.com>, <kan.liang@linux.intel.com>,
	<daniel.sneddon@linux.intel.com>, <pbonzini@redhat.com>,
	<sandipan.das@amd.com>, <ilpo.jarvinen@linux.intel.com>,
	<peternewman@google.com>, <maciej.wieczor-retman@intel.com>,
	<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<eranian@google.com>
References: <202401241810.jbd8Ipa1-lkp@intel.com>
 <84128a3c83654493f637b8349153af10d69e2752.1706118776.git.babu.moger@amd.com>
 <39c4501e-4937-49de-b12b-742e6201df6f@intel.com>
 <20240124183153.GFZbFXmTKTLEpwZshW@fat_crate.local>
 <e96df7ac-f0b4-4300-8546-7c1df836dea2@intel.com>
 <20240124191429.GGZbFhldYr3K85H9cg@fat_crate.local>
From: Reinette Chatre <reinette.chatre@intel.com>
In-Reply-To: <20240124191429.GGZbFhldYr3K85H9cg@fat_crate.local>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MmlzYU1iWEE5TGFHb0ZpZDNHRW9wSmN1L3JZYTNwZXFBckY3WTMyQ1VMOEw3?=
 =?utf-8?B?WXJMMTVxSDczVUdTSFBIaG5iYmhSS29pVWlXNUw4VjkycGdGem9CbnVUMkJM?=
 =?utf-8?B?R1FPcHJkUDdzNDdlZTI5bmFyTDV3cTJ4cmV5VWF0bjBZdXJCSWord1B2aDY3?=
 =?utf-8?B?L2tIbm5wRmNiQnlodGVvR0RKRFZ1Q2ZuK2Q4N2VzSHRvMWU3QXBNOW11T0NK?=
 =?utf-8?B?UklQdERkRDhuZTlpWDRQSXp0ekJmOG1kWE9nWGc3WGM2d0t3a1JFQStWUmV1?=
 =?utf-8?B?N0xrVGExUy9rSVVMTTlTVzZFSzliYkxHeCtBK1RwVk1EM0RKRkxkQ09qaVA0?=
 =?utf-8?B?MVhXZFd4OWlxdlBCa3k2Wmh4dFMxRVhjaEt3VjFUVTZnMktUWWJKenRWbXF5?=
 =?utf-8?B?ZGhhRk9iaHY1WUU3NklEKzhWYThjbkxPM0xoM2xnSVlkOSt5WnVhTFFPc1VE?=
 =?utf-8?B?cFd0SVMrMUF0LzRIMjUxcEswSXpKcmdQRnY1aTR0dCtWZHhvVStac2I3Qlo1?=
 =?utf-8?B?dEV2aTlnbFVlOG9MVVFwc0NsVW9hWDZiYk1oSkt5RXE5dkIvbUlvME5OalRZ?=
 =?utf-8?B?QjIwNTFDMWFmZGV0ODJxTE5ITndaNGtEZUtPbXhRaXY1TEpqTHk2UWdJVWJY?=
 =?utf-8?B?ZHhISytaR1MyQThUeWdybGpLcXdjU0pxcGt1ZkY2S3Q2a1EwR21PcDhGd1Ix?=
 =?utf-8?B?dXpWS3gvV3BtMTNHS2kzR0FscG41dXdYdUVhVkJENEp2L2NYU2J2RC93aDFG?=
 =?utf-8?B?SWlHVE9jUVZMd2J4a1NmSUxzZ0Q1bjlCaFB6RGJ2MlNxVUhXNEF5a0YvazNy?=
 =?utf-8?B?aDZiWjdSdVNES0l3djA3TGRkZlJGSXN1MkhycC9RS3lwQ1NzS0lnaEE2THc0?=
 =?utf-8?B?TGpWL05XK2JNT3NyQWppcUVrTytaeWx0Ky9RZ3YvQklJVmY4bkFWREpnTytQ?=
 =?utf-8?B?NTdNUmZNaFV6NFRSd2hTR204Uzc3clJPRTg4RjhIczZTSi9FTW5MWWkxVHhY?=
 =?utf-8?B?L0NGMyt6RHNZODVVaWVGUm1lMWVuYWxxSC8yVGJmR3lPeXM4ZHFTOGhaZjlR?=
 =?utf-8?B?cDc4dlE2T2pZSHZ4eXBhV1NwUjk0OFFJSWY5NkJuU1h4Y3lNMmhLS05ZZVhB?=
 =?utf-8?B?MUd5a2NGbUQ4UHI1b3dibmhnaitLVVllK1VlNGh6L21pV1p2TjNYV2FYNHNU?=
 =?utf-8?B?YTFNRzhNRG0za3VNNlVjVWk4S2diRENNUGhkREJObkwzTkxudlY2VmdENXIv?=
 =?utf-8?B?OUd1bC9Ja1JRd2xaaXpubU5CdnZtUHNxcGN6QUtYUVhrZFRWQUl0UWlNVHpC?=
 =?utf-8?B?cjNOWlBQWklNUHZ6d1haY1NQUWd1NGRqU05zRnlnVkFETjRaUDQvVXBpQ2sz?=
 =?utf-8?B?QlFUYmUxN004OUhEbjZlSU9qTGFCMVYvd0lPMS9RVEx3OXd5cnFYUWMvalFX?=
 =?utf-8?B?Y01JVmlRelY1YnM5MEFRMTEycm9zK2F0eUxEbDlHbHYvNFMvclpUazlvMStE?=
 =?utf-8?B?aDdhQyszQm1BS213d0NzZnR2ZTdyY3phZEkxU1V1cXVTUGtHeXZxNmtBSW5R?=
 =?utf-8?B?Y3ZPaVFuT2I2L0E1MTQ2VXV1TXNhQlgzMkNUeEVlMGxFd1VBbGV2M25lSXFM?=
 =?utf-8?B?TDhKM1liVDFhUG9yU0FMTjJaaDh3MjRBSm41Nk9mVlVVbmVrZ1Z1VjVZN3Ns?=
 =?utf-8?B?KytXUWV2ei92TnFNcU8ybmlubEUvWjRxY1NvS05hcVJBdzhhdlF2S3ZOaVM2?=
 =?utf-8?B?Ymdydzg0TUR3b0g4VGx6eThadStWZEwxZnpmL2lNdlI0aXlQTkxYdW1FYmxy?=
 =?utf-8?B?Z1EyNDlQMVZLT0tmdkljMnhGUnRCNm5WcHRGT1hxVmc2WHRSQjg2RnBHU0hk?=
 =?utf-8?B?Q3NiaWNqbUFrVEtNSzlxNTZXc0NTMjRtakNhT0lrR0t1eFNkRytuT0dyZ3hP?=
 =?utf-8?B?TkwxL0dwNDhnejZodCs4ZWl1eWJMOEhSU1gwcGU1SUxYVGVEUnphN0syUEtV?=
 =?utf-8?B?NHY3YUtSQjlqTkVMUDM0N3dkUklkZitKNG1Ga2FQZnE5aFpITVlYb3ZKNlJR?=
 =?utf-8?B?ano2djJacDg1UUhSNFg3WE1IWW95Yks5Qm9JTS9ZRlJTOHY5NENuT0srY2s3?=
 =?utf-8?B?RUJBenp4RThYeTh2STBRam1MazllamtjekwybkdSRHcwNGY5WFNHa3R3Z2Nt?=
 =?utf-8?B?M0E9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: b8a15d74-ded9-410d-899c-08dc1d17afb5
X-MS-Exchange-CrossTenant-AuthSource: SJ2PR11MB7573.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2024 20:04:35.1425
 (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: PEDjvwUKa1uAY0U39CFB7WXPGRjrUxXg5nypgu+1J9uHyosjy56WXQqcq6BGlQ6+xyqszSudUw08HDMUOcx8jPPP17cxDlb497ReOw7fGPg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB8100
X-OriginatorOrg: intel.com

Hi Boris,

On 1/24/2024 11:14 AM, Borislav Petkov wrote:
> On Wed, Jan 24, 2024 at 10:51:49AM -0800, Reinette Chatre wrote:
>> Thank you very much. For what it is worth, I do agree with the actual fix
>> and you can add:
>> Acked-by: Reinette Chatre <reinette.chatre@intel.com>
> 
> Ok, have a look at the below, pls, and lemme know if that's ok too.
> 
> mbm_config_write_domain() only returns 0 so it can be void. So the
> callsite doesn't need to check retval either.

Thank you very much for looking further and catching this.

You may already have taken care of this after sending this version, but I
just have a couple of nitpick comments intended to help this patch in case it
requires a clean slate from some checks. 

> 
> Thx.
> 
> ---
> From: Babu Moger <babu.moger@amd.com>
> Date: Wed, 24 Jan 2024 11:52:56 -0600
> Subject: [PATCH] x86/resctrl: Remove redundant variable in
>  mbm_config_write_domain()
> 
> The kernel test robot reported the following warning after
> 
>   54e35eb8611c ("x86/resctrl: Read supported bandwidth sources from CPUID").

I think a "commit" prefix is required here and below.

> 
> even though the issue is present even in the original patch which added
> this function
> 
>   92bd5a139033 ("x86/resctrl: Add interface to write mbm_total_bytes_config")
> 
>   $ make C=1 CHECK=scripts/coccicheck arch/x86/kernel/cpu/resctrl/rdtgroup.o
>   ...
>   arch/x86/kernel/cpu/resctrl/rdtgroup.c:1621:5-8: Unneeded variable: "ret". Return "0" on line 1655
> 
> Remove the local variable 'ret'.
> 
>   [ bp: Massage commit message, make mbm_config_write_domain() void. ]
> 
> Fixes: 92bd5a139033 ("x86/resctrl: Add interface to write mbm_total_bytes_config")
> Closes: https://lore.kernel.org/oe-kbuild-all/202401241810.jbd8Ipa1-lkp@intel.com/
> Reported-by: kernel test robot <lkp@intel.com>

I do not know if this is something tip prefers but the general patch checkers prefer
that "Reported-by:" is followed by "Closes:".

> Signed-off-by: Babu Moger <babu.moger@amd.com>
> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
> Acked-by: Reinette Chatre <reinette.chatre@intel.com>
> Link: https://lore.kernel.org/r/202401241810.jbd8Ipa1-lkp@intel.com
> ---
>  arch/x86/kernel/cpu/resctrl/rdtgroup.c | 13 +++----------
>  1 file changed, 3 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> index 2b69e560b05f..c33eb77b6d70 100644
> --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> @@ -1614,11 +1614,10 @@ static void mon_event_config_write(void *info)
>  	wrmsr(MSR_IA32_EVT_CFG_BASE + index, mon_info->mon_config, 0);
>  }
>  
> -static int mbm_config_write_domain(struct rdt_resource *r,
> +static void mbm_config_write_domain(struct rdt_resource *r,
>  				   struct rdt_domain *d, u32 evtid, u32 val)

This shifts the alignment slightly to no longer match the open parenthesis.

>  {
>  	struct mon_config_info mon_info = {0};
> -	int ret = 0;
>  
>  	/*
>  	 * Read the current config value first. If both are the same then
> @@ -1627,7 +1626,7 @@ static int mbm_config_write_domain(struct rdt_resource *r,
>  	mon_info.evtid = evtid;
>  	mondata_config_read(d, &mon_info);
>  	if (mon_info.mon_config == val)
> -		goto out;
> +		return;
>  
>  	mon_info.mon_config = val;
>  
> @@ -1650,9 +1649,6 @@ static int mbm_config_write_domain(struct rdt_resource *r,
>  	 * mbm_local and mbm_total counts for all the RMIDs.
>  	 */
>  	resctrl_arch_reset_rmid_all(r, d);
> -
> -out:
> -	return ret;
>  }
>  
>  static int mon_config_write(struct rdt_resource *r, char *tok, u32 evtid)
> @@ -1661,7 +1657,6 @@ static int mon_config_write(struct rdt_resource *r, char *tok, u32 evtid)
>  	char *dom_str = NULL, *id_str;
>  	unsigned long dom_id, val;
>  	struct rdt_domain *d;
> -	int ret = 0;
>  
>  next:
>  	if (!tok || tok[0] == '\0')
> @@ -1690,9 +1685,7 @@ static int mon_config_write(struct rdt_resource *r, char *tok, u32 evtid)
>  
>  	list_for_each_entry(d, &r->domains, list) {
>  		if (d->id == dom_id) {
> -			ret = mbm_config_write_domain(r, d, evtid, val);
> -			if (ret)
> -				return -EINVAL;
> +			mbm_config_write_domain(r, d, evtid, val);
>  			goto next;
>  		}
>  	}

The core changes look good to me. Thank you very much for creating this fix.

Reinette