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: <ddc5535e-a67b-9079-c147-9f290fce2e3f@intel.com>
Date:   Fri, 16 Dec 2022 17:10:11 -0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Firefox/102.0 Thunderbird/102.6.0
Subject: Re: [PATCH v2 2/2] x86/resctrl: Avoid redundant counter read in
 __mon_event_count()
Content-Language: en-US
To:     Peter Newman <peternewman@google.com>, <fenghua.yu@intel.com>
CC:     <Babu.Moger@amd.com>, <bp@alien8.de>,
        <dave.hansen@linux.intel.com>, <eranian@google.com>,
        <hpa@zytor.com>, <james.morse@arm.com>,
        <linux-kernel@vger.kernel.org>, <mingo@redhat.com>,
        <quic_jiles@quicinc.com>, <tan.shaopeng@fujitsu.com>,
        <tglx@linutronix.de>, <x86@kernel.org>
References: <20221214160856.2164207-1-peternewman@google.com>
 <20221214160856.2164207-2-peternewman@google.com>
From:   Reinette Chatre <reinette.chatre@intel.com>
In-Reply-To: <20221214160856.2164207-2-peternewman@google.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?Qm9DWjErUFNDVzlZMkZLSTZZM2MwR1pBUzlIZ0tEZ3VyMGJtc3hCY0RpbDRh?=
 =?utf-8?B?QURYZUlmK2dubkVBeW9TSDJRU3RpVG1xcDRDZjhnZG9oNkZEdzV3WWc0MHFN?=
 =?utf-8?B?RFhna2lQcWlZbWRDN3VwUGpRT3BZK0kydlh4OE4wTVd1cVV2ZjM5UkdIRDRP?=
 =?utf-8?B?QmlxaWJuWGRZYks4aTUwdlNrWUhDdm50RWYwcStlRE8veXJqamo3RWJVU2g4?=
 =?utf-8?B?WTZNY1VnY2d2bk0rT1VkczFDSkpaUWZPR3JuL2ZZbmlLenlTd3A4ZWJ5bFc0?=
 =?utf-8?B?RWVZbjAySDViMU9zT2pDVHFhVUI0dExrTkZ3SE5VQ3c3YS9jUTA4T29pcU55?=
 =?utf-8?B?aHV6TnRadmYrZC8wcXZTOGplV3owZDlySmVod25KSVo4THBLRTFqTVFNWEFI?=
 =?utf-8?B?djVuRXY3MFk3Tk1KS3dSSTh1eWFuQkZMd3BxeFVYV2VHRUFQcWxORWxwTHFh?=
 =?utf-8?B?SExvLzBzWWFxcVVOT2FSWDJjR1BhNC9jUkRldTdJT1RIUWsyRFE4QnpvMVd0?=
 =?utf-8?B?Y1R5MFRpN2xtUVFDMFBHLy93RjgwbkxkWkVOdWhqWWFZeEs5VTZqbEMzSFVD?=
 =?utf-8?B?UE9ZZGlRSGs4U0x6VVhrVjVYMTBjSlg0WENaR2lMcWNhT3NjTWVXRFBzREc1?=
 =?utf-8?B?TjBWeUxMWTRQTnhhLzRhSGFCczErbi8wMjU3dUswUnROamtDU2ZHRFlCSml6?=
 =?utf-8?B?THM3cEVmd09Ca0gyNk83QUlXQzE1SFJQS05PN2JHbUdEZ3ZZeDR4MWZxTGpQ?=
 =?utf-8?B?dHEvMFpaNW93OWhvdHA3Vm1vVjJwVmlrK1hUT2RodTRieHZSS1poOHIxNGdl?=
 =?utf-8?B?REF6OXB2cWdDVXphQUZIb2VkQ01COVRhQURmTWZTcTcydlZYemIwVWpjWXVT?=
 =?utf-8?B?bzZvK1huMWo3SVlMVmpBUnoxVnEvaHVNTjM4aTYycFE1b1h2QkR3YkF3WDE4?=
 =?utf-8?B?Mzdjb1hqNld4bG90MVpPb0pUNmJOdW5OMnhBNExNcUpzQkhFSitQblNXS09K?=
 =?utf-8?B?c05wYkg3T1J5MGJnNnpCaUZhdGcxVkNLNE4waW1JMFZkY2QyTm9odlFWd3Vk?=
 =?utf-8?B?bW82c2ozYmVsRjVZWFVNczVmRnVENWlLdG11K2toRUttd2RMeWpUT1RuWXgy?=
 =?utf-8?B?Yk9kcmM0Vlp0RzdLMFNveEsxaWQ4QlB2eUdFeXpwQm52N1o0TnRIakZSZDFj?=
 =?utf-8?B?M1JUK1ZWZDRTOEQ1NEJKeUVScndYb1pDaU5VbEJKQ1RjU0Y4dWdRbVpYVTQ5?=
 =?utf-8?B?M1Z5aU51NFZ3YjRmTVQ0YmNjWlcybnRRMk8vSDVNV0ZOK3E2dTQrQTlDdXAz?=
 =?utf-8?B?bU43TFV2c2hYY1Rja1BJL0RkbkxKcjhkUndobzRBM0JGOE4vUEtUcDE0ancz?=
 =?utf-8?B?NFAxUXlzTWN2VytaTmdjQVZ4SVJYZ1dsalhTQlBYbzZFNjkxQmJBVTVEUXd4?=
 =?utf-8?B?T0pjMFl6MGUrbHU2ZVBQZDlqeDh4MFVvTXgvalFKQWpSZ3BLbVR4ZWhpTzBj?=
 =?utf-8?B?TXRQRkZuOWFJeDFFRUdqN003NzRCaUNXRnA2SkF3NnJxM1VYN2lQOGJCMVJM?=
 =?utf-8?B?cUthc0NNTlJhZkYxVkdaZUNQUDdhcHM5NkZRMUdHa0F3OUpPa2JRR3U4VHhk?=
 =?utf-8?B?dFRPNVFrdGd3ZnBzRnhCZk50VmxJbGgwQTloRjNsdE1KVm9EUXd2a3JUejNp?=
 =?utf-8?B?bkpXU2NkVTQvTFhtcHR5T1FNV0p3UldJd3dVL0RiSkxhelZZbkJteGtwblpi?=
 =?utf-8?B?dFkxSzdjU0ZJZEdJM1ZQYWVEckVzZGlDK3pPR0pyOHptRTUwL255UjlMNEFB?=
 =?utf-8?B?aEJ2aUx5bWdWOHpqTGZOYU15NjFvak84NGJmdUtyQzBaU1RDc3BGWkw3UjlZ?=
 =?utf-8?B?aklZTVdSVjEwc3prakt1UW8rbDNoWlRYcDZWc2xNK2xWenVieUFsSTlwbTFM?=
 =?utf-8?B?aC9WYkx5c3hUMDRaaWhYekx2a2k5MlZYS0pFMmxUS0tLQmREd0Q3Mm0vUGJM?=
 =?utf-8?B?VFBINVphWUMyNlgxdE1STDZpcnNVcExucklSSVhGNFZuMjczWE5iWVBsZ3Va?=
 =?utf-8?B?S1E2WGo2ZGMyaFdZQXNiN3hMVWQ2ZGxWM21EUjF4bnhBL3JadVNUOUZHcUIy?=
 =?utf-8?B?bWRrUmdvL2VuaGZseVlFSnZ1dmRHMmVRTTNUV05RNzNWd2JFR3ZldWZETWhY?=
 =?utf-8?B?V0E9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 207e16f7-a823-4360-363d-08dadfcb73fe
X-MS-Exchange-CrossTenant-AuthSource: CY4PR11MB1862.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2022 01:10:14.5460
 (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: pwrbgKETEj6iXGAkavyPkdr9nAaPyDvLYH/dPUGkQmVskWfu4ablP3QEkJE4bbLbFSXNWHrAbxN4tGS4fWBlRRfCwOXqv/Y5U96BDleJ0ow=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR11MB5694
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,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=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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Peter,

On 12/14/2022 8:08 AM, Peter Newman wrote:
> __mon_event_count() does the per-RMID, per-domain work for
> user-initiated event count reads and the initialization of new monitor
> groups.
> 
> In the initialization case, after resctrl_arch_reset_rmid() calls
> __rmid_read() to record an initial count for a new monitor group, it
> immediately calls resctrl_arch_rmid_read(). This re-read of the hardware
> counter is unnecessary.

"... and the following computations are ignored by the caller during
initialization."

> 
> Following return from resctrl_arch_reset_rmid(), just clear the
> mbm_state and return.
> 
> Also, move the mbm_state lookup into the rr->first case, as it's not
> needed for regular event count reads: the QOS_L3_OCCUP_EVENT_ID case was
> redundant with the accumulating logic at the end of the function.

Starting the above with "Also" creates impression that two logical
changes are merged into a single patch. Since this is not the case you
can avoid the impression with something like:

Following return from resctrl_arch_reset_rmid(), just clear the
mbm_state and return. This involves moving the mbm_state lookup into
the rr->first case, as it's not needed for regular event count reads:
the QOS_L3_OCCUP_EVENT_ID case was redundant with the accumulating logic
at the end of the function.


> 
> Signed-off-by: Peter Newman <peternewman@google.com>
> ---
>  arch/x86/kernel/cpu/resctrl/monitor.c | 43 ++++++++++++---------------
>  1 file changed, 19 insertions(+), 24 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
> index 77538abeb72a..e708df478077 100644
> --- a/arch/x86/kernel/cpu/resctrl/monitor.c
> +++ b/arch/x86/kernel/cpu/resctrl/monitor.c
> @@ -366,41 +366,36 @@ void free_rmid(u32 rmid)
>  		list_add_tail(&entry->list, &rmid_free_lru);
>  }
>  
> +static struct mbm_state *get_mbm_state(struct rdt_domain *d, u32 rmid,
> +				       enum resctrl_event_id evtid)
> +{
> +	switch (evtid) {
> +	case QOS_L3_MBM_TOTAL_EVENT_ID:
> +		return &d->mbm_total[rmid];
> +	case QOS_L3_MBM_LOCAL_EVENT_ID:
> +		return &d->mbm_local[rmid];
> +	default:
> +		return NULL;
> +	}
> +}
> +
>  static int __mon_event_count(u32 rmid, struct rmid_read *rr)
>  {
>  	struct mbm_state *m;
>  	u64 tval = 0;
>  
> -	if (rr->first)
> +	if (rr->first) {
>  		resctrl_arch_reset_rmid(rr->r, rr->d, rmid, rr->evtid);
> +		m = get_mbm_state(rr->d, rmid, rr->evtid);
> +		if (m)
> +			memset(m, 0, sizeof(struct mbm_state));
> +		return 0;
> +	}
>  
>  	rr->err = resctrl_arch_rmid_read(rr->r, rr->d, rmid, rr->evtid, &tval);
>  	if (rr->err)
>  		return rr->err;
>  
> -	switch (rr->evtid) {
> -	case QOS_L3_OCCUP_EVENT_ID:
> -		rr->val += tval;
> -		return 0;
> -	case QOS_L3_MBM_TOTAL_EVENT_ID:
> -		m = &rr->d->mbm_total[rmid];
> -		break;
> -	case QOS_L3_MBM_LOCAL_EVENT_ID:
> -		m = &rr->d->mbm_local[rmid];
> -		break;
> -	default:
> -		/*
> -		 * Code would never reach here because an invalid
> -		 * event id would fail in resctrl_arch_rmid_read().
> -		 */
> -		return -EINVAL;
> -	}
> -
> -	if (rr->first) {
> -		memset(m, 0, sizeof(struct mbm_state));
> -		return 0;
> -	}
> -
>  	rr->val += tval;
>  
>  	return 0;

Thank you very much.

Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>

Reinette