Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
Message-ID: <2b5e62a3-3b5c-c98a-6b5e-909a021a8d4e@amd.com>
Date:   Thu, 5 Oct 2023 15:13:42 -0500
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.5.0
Reply-To: babu.moger@amd.com
Subject: Re: [PATCH v6 10/24] x86/resctrl: Allocate the cleanest CLOSID by
 searching closid_num_dirty_rmid
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>,
        Reinette Chatre <reinette.chatre@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,
        dfustini@baylibre.com, amitsinght@marvell.com
References: <20230914172138.11977-1-james.morse@arm.com>
 <20230914172138.11977-11-james.morse@arm.com>
From:   "Moger, Babu" <bmoger@amd.com>
In-Reply-To: <20230914172138.11977-11-james.morse@arm.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NFZBNU11eVQxM2x1ZEhId2lNSUIvMU9Zc01uYnJ5bStSRFhnUzg5QUhHOWUr?=
 =?utf-8?B?ZW0vTXhxMzllL08vVkE4SWd2VytweVlUZGFHaXJsd1FLZ0Fwb0FkeHRrbG9L?=
 =?utf-8?B?WGdzSjhzendsREowTUJvYWh6Y0dOT3FtRm5zN3lKZ2o1RjBtdW9ZRE1mUjJP?=
 =?utf-8?B?L2poOGJ2OUQrZys2N01XbWRXVGt6ZUJyTEpKUkdLb0lFMzlTcmZFQTVNNGQ0?=
 =?utf-8?B?b3RhcHRKRWlWNDJxc1dwT0Qwb3JhU2tUY05DZklYRkxPYStvWlNVSXc4Z0sr?=
 =?utf-8?B?ZitHSVZNRURQWDg5RDU1R2pDaExDVkRPL2xsU2tkZFlucmF2YllYUnprS0NO?=
 =?utf-8?B?TStDTFkzTnV2TUpRa0Q3T2svV2RtWDFmMEQwVHpMQWJjNnNHQnF3K3ZCTGRy?=
 =?utf-8?B?U045bHhQMmdqOWRscFc0SzY0bkIwNW16czd4M1RKWmQwUUVhY1c5dmFIM2xC?=
 =?utf-8?B?TFpTaXQ3Z01XaFBVeEpRdFRLMVB3aHROSkxqcWNyVnpydmhqQVMxMnpKSzFF?=
 =?utf-8?B?NE9HdS9ISTlMSGs3NFlNUzNoejJYaUZNWXQ0dFpZNE5BbGsrYTZuRHFjblJC?=
 =?utf-8?B?UnRPZy9MWWdPUFg0MGNsQk12NkE3Tng5ell4clkyK0pBT1FpUS9zNDdQbDN1?=
 =?utf-8?B?bVBaUERabTVCVCtmck04WHhKSWVneiswSzNpeHJFd2RhRjltbkZoRGZFU1VK?=
 =?utf-8?B?RXRrbXpMeEtsSTBtVGZxcjVhSm9rOVFZdUNHRnhsWFhNb20xLytEclFUd2NE?=
 =?utf-8?B?cmNEcDh1Q3ROL0MyQVYrUFYvRk1sK29tWGszRGVKbHlqa0R0SWI5Q1FyTXha?=
 =?utf-8?B?V2NDdExZUDVDbG50M3IwQnNrL3ZFSVZHc0Y1UkhBMTZHMkh0d0txWjNhQVpE?=
 =?utf-8?B?dmoxUG14WjJsUmFrZ1BzQ1Y3WVFGcUx3Z3YrcEZZRWVncG85TS94RTZHYTVU?=
 =?utf-8?B?bTA3UnhzUk16THBqYlA0NTRkSk5GS3ptWjFRVFlqNTBJbjVreFNqQVl5QlZ5?=
 =?utf-8?B?aExjaWg1akZUUUxpLzV5SU96OGhURWpJWkhkQTc3dyttZVVrajljSUVtbXhs?=
 =?utf-8?B?dnVUM2JiWENRdlpkUk51ZktRR0RrUUxmVU5HUmpqZG1CTVpzZkpaTlIzWXpP?=
 =?utf-8?B?VUF2R1lxMi9WaE9scVRKUnBtc2paaTVpUzdiY0xhenVlRk0yM0RoZ1Q4NnZ3?=
 =?utf-8?B?V0ZzK3dPMkUzQkU5WlhjUW1Wa3V0SkJmWnNTVUZFQmo5aGlRUUxkWG91OS8x?=
 =?utf-8?B?aDVWcGNhd3VMMEZIZ0Fxck9NR1NsbFk4UzM4TzVBbVRoZlRqbnVETHJUcisr?=
 =?utf-8?B?bTBCR1hrcnZKeUVFSE1odTFDTlVJZUZEU1FQQmRhVHYveEtkODB0cHZwY0pQ?=
 =?utf-8?B?UUxFNWVoZ3ZrUE80N3FOa1RFL1hyMjg5TUpaandwSHFPY2tyOFR6UlhadlBS?=
 =?utf-8?B?MkdkdEhkcTA5WUZYWjEzbWtFYTRjS1Jubml2eVhPNCtBWnJoNXNUWUJQSEVu?=
 =?utf-8?B?SHpXdU8rRXdweFFDMGZ0TW1IZ2NjUGRPNVZjSE9NK2VraXlvMzZETldzV0Fq?=
 =?utf-8?B?cXg4ci9wZTF0cVRZWERUa1c5c3RJOWFqZHJVQ1VJYzdvTnFVdGZOYmxNaTVK?=
 =?utf-8?B?bHV0N0ZUcGk2c29BWERPai96QzdGMnpsVXNSaVptUUlORE95ekVGa3hCbUNM?=
 =?utf-8?B?ejRRcVhPaW96WUM5dXhPdkNucnI1akVKa1hvTXc1R3ZId21yN1dQTVJ5SGxv?=
 =?utf-8?B?YTFRMjV1WWM2blBsRyszN2p4cjBEd1RoQm9uUTFWdlVic0p2SUhjMnl2UmJa?=
 =?utf-8?B?UURrOXd4WWY3V096YXV3Q2VzRGh5RStycU5selVZM0xKS3pxMFl1bDJGZ1NC?=
 =?utf-8?B?UUJFMlhybWJRclo0ZVRJSktrQnpmQlg5NTZkRXVQR1kxZDVtTWtVTWJFVmFN?=
 =?utf-8?B?d0dCSnA1ZVc4YkJYeGs1bGx1NXQ5d3AxS3JZb01YUUxJQWZSUWt3Z2JwY1N3?=
 =?utf-8?B?N2ZLOFJNd1lHRU1HdHZVWXFJS21PQm9tNnFvUnlDcE82cHdXTkxTajI1YVdn?=
 =?utf-8?B?b2NzL1pFS0ZCNVF1YmdKWlFXS0VzUzVmclVwSzhuL2QwNHVsMWs1VExLNDhH?=
 =?utf-8?Q?Qocc=3D?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 62d11312-bd4c-4da3-88b4-08dbc5df950b
X-MS-Exchange-CrossTenant-AuthSource: MW3PR12MB4553.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2023 20:13:47.4014
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: zy/yU7DK9zwr0SjL1YdaPryynFfCX0hsGtPxUxB1c6/Pp/hsYz+jhWeJfoFKpJW8
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4510
X-Spam-Status: No, score=-2.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.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 (fry.vger.email [0.0.0.0]); Thu, 05 Oct 2023 13:14:05 -0700 (PDT)

Hi James,

On 9/14/2023 12:21 PM, James Morse wrote:
> MPAM's PMG bits extend its PARTID space, meaning the same PMG value can be
> used for different control groups.
>
> This means once a CLOSID is allocated, all its monitoring ids may still be
> dirty, and held in limbo.
>
> Instead of allocating the first free CLOSID, on architectures where
> CONFIG_RESCTRL_RMID_DEPENDS_ON_COSID is enabled, search
> closid_num_dirty_rmid[] to find the cleanest CLOSID.
>
> The CLOSID found is returned to closid_alloc() for the free list
> to be updated.
>
> Reviewed-by: Shaopeng Tan <tan.shaopeng@fujitsu.com>
> Tested-by: Shaopeng Tan <tan.shaopeng@fujitsu.com>
> Tested-By: Peter Newman <peternewman@google.com>
> Signed-off-by: James Morse <james.morse@arm.com>
> ---
> Changes since v4:
>   * Dropped stale section from comment
> ---
>   arch/x86/kernel/cpu/resctrl/internal.h |  2 ++
>   arch/x86/kernel/cpu/resctrl/monitor.c  | 42 ++++++++++++++++++++++++++
>   arch/x86/kernel/cpu/resctrl/rdtgroup.c | 19 +++++++++---
>   3 files changed, 58 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
> index ad6e874d9ed2..f06d3d3e0808 100644
> --- a/arch/x86/kernel/cpu/resctrl/internal.h
> +++ b/arch/x86/kernel/cpu/resctrl/internal.h
> @@ -558,5 +558,7 @@ void rdt_domain_reconfigure_cdp(struct rdt_resource *r);
>   void __init thread_throttle_mode_init(void);
>   void __init mbm_config_rftype_init(const char *config);
>   void rdt_staged_configs_clear(void);
> +bool closid_allocated(unsigned int closid);
> +int resctrl_find_cleanest_closid(void);
>   
>   #endif /* _ASM_X86_RESCTRL_INTERNAL_H */
> diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
> index 0c783301d106..0bbed8c62d42 100644
> --- a/arch/x86/kernel/cpu/resctrl/monitor.c
> +++ b/arch/x86/kernel/cpu/resctrl/monitor.c
> @@ -388,6 +388,48 @@ static struct rmid_entry *resctrl_find_free_rmid(u32 closid)
>   	return ERR_PTR(-ENOSPC);
>   }
>   
> +/**
> + * resctrl_find_cleanest_closid() - Find a CLOSID where all the associated
> + *                                  RMID are clean, or the CLOSID that has
> + *                                  the most clean RMID.
> + *
> + * MPAM's equivalent of RMID are per-CLOSID, meaning a freshly allocated CLOSID
> + * may not be able to allocate clean RMID. To avoid this the allocator will
> + * choose the CLOSID with the most clean RMID.
> + *
> + * When the CLOSID and RMID are independent numbers, the first free CLOSID will
> + * be returned.
> + */
> +int resctrl_find_cleanest_closid(void)
> +{
> +	u32 cleanest_closid = ~0, iter_num_dirty;

Just naming num_dirty should have been fine.  I will leave it you.

> +	int i = 0;
> +
> +	lockdep_assert_held(&rdtgroup_mutex);
> +
> +	if (!IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID))
> +		return -EIO;
> +
> +	for (i = 0; i < closids_supported(); i++) {
> +		if (closid_allocated(i))
> +			continue;
> +
> +		iter_num_dirty = closid_num_dirty_rmid[i];
> +		if (iter_num_dirty == 0)
> +			return i;
> +
> +		if (cleanest_closid == ~0)
> +			cleanest_closid = i;
> +
> +		if (iter_num_dirty < closid_num_dirty_rmid[cleanest_closid])
> +			cleanest_closid = i;
> +	}
> +
> +	if (cleanest_closid == ~0)
> +		return -ENOSPC;
> +	return cleanest_closid;

Line before the return looks clean.

*       if (cleanest_closid == ~0)
+		return -ENOSPC;
+
+	return cleanest_closid;

Thanks
Babu

> +}
> +
>   /*
>    * For MPAM the RMID value is not unique, and has to be considered with
>    * the CLOSID. The (CLOSID, RMID) pair is allocated on all domains, which
> diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> index fa449ee0d1a7..1f8f1c417a4b 100644
> --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> @@ -132,11 +132,20 @@ static void closid_init(void)
>   
>   static int closid_alloc(void)
>   {
> -	u32 closid = ffs(closid_free_map);
> +	u32 closid;
> +	int err;
>   
> -	if (closid == 0)
> -		return -ENOSPC;
> -	closid--;
> +	if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) {
> +		err = resctrl_find_cleanest_closid();
> +		if (err < 0)
> +			return err;
> +		closid = err;
> +	} else {
> +		closid = ffs(closid_free_map);
> +		if (closid == 0)
> +			return -ENOSPC;
> +		closid--;
> +	}
>   	clear_bit(closid, &closid_free_map);
>   
>   	return closid;
> @@ -154,7 +163,7 @@ void closid_free(int closid)
>    * Return: true if @closid is currently associated with a resource group,
>    * false if @closid is free
>    */
> -static bool closid_allocated(unsigned int closid)
> +bool closid_allocated(unsigned int closid)
>   {
>   	return !test_bit(closid, &closid_free_map);
>   }