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;
From:   "Yu, Fenghua" <fenghua.yu@intel.com>
To:     James Morse <james.morse@arm.com>,
        "x86@kernel.org" <x86@kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     "Chatre, Reinette" <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" 
        <shameerali.kolothum.thodi@huawei.com>,
        D Scott Phillips OS <scott@os.amperecomputing.com>,
        "carl@os.amperecomputing.com" <carl@os.amperecomputing.com>,
        "lcherian@marvell.com" <lcherian@marvell.com>,
        "bobo.shaobowang@huawei.com" <bobo.shaobowang@huawei.com>,
        "tan.shaopeng@fujitsu.com" <tan.shaopeng@fujitsu.com>,
        "xingxin.hx@openanolis.org" <xingxin.hx@openanolis.org>,
        "baolin.wang@linux.alibaba.com" <baolin.wang@linux.alibaba.com>,
        Jamie Iles <quic_jiles@quicinc.com>,
        Xin Hao <xhao@linux.alibaba.com>,
        "peternewman@google.com" <peternewman@google.com>
Subject: RE: [PATCH v2 04/18] x86/resctrl: Move rmid allocation out of
 mkdir_rdt_prepare()
Thread-Topic: [PATCH v2 04/18] x86/resctrl: Move rmid allocation out of
 mkdir_rdt_prepare()
Thread-Index: AQHZJ3hQClxQPZZwV06267jEE779pK6hLBBQ
Date:   Tue, 17 Jan 2023 18:28:51 +0000
Message-ID: <IA1PR11MB609785B819CB4558F211DDAC9BC69@IA1PR11MB6097.namprd11.prod.outlook.com>
References: <20230113175459.14825-1-james.morse@arm.com>
 <20230113175459.14825-5-james.morse@arm.com>
In-Reply-To: <20230113175459.14825-5-james.morse@arm.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?A+kqgUYhacql/eOqbhx3RnBwdMi/MJCYL18ehPGsv21Jl7FLKShA4O4MlHmV?=
 =?us-ascii?Q?0b6RbltpwasXUh0iU7ufp0hntSbcIHWYiV3VrXozN85zYzDP3XuhtLdwsmtt?=
 =?us-ascii?Q?TJ+SkpdLVE2fUzDXV7jCgMA6PBFdpTFXnucUb4wPGOzBYRy3puxIHE1eYgHs?=
 =?us-ascii?Q?+yI9zbCXHrsgK1Oev5cMAODUH5hgW+wyO35BGac08CdlRReqe9sV/2oqNYS3?=
 =?us-ascii?Q?38A2oPt3t2NyOCW3dB+tgC1QunKgIMQ/7Ur0BLz4jbtjZTE3qpIEQNUa0fO/?=
 =?us-ascii?Q?AD5Go6hzNNa+RcjT8tn94K+AuxXElE7TCaaCpGYomCBOafxtD8qIUKYZyn4O?=
 =?us-ascii?Q?AkM9LvXDwGXnoUhnnvekGKUFc2BawTa7ZVarkemQSW0gil+N1GOF1aExKXcP?=
 =?us-ascii?Q?ilRxg+t8ecXkIyRSQ01cK2wQ09Z1XRjj0VdYfhAzE0+l4uu5EgiyL0p4bCOJ?=
 =?us-ascii?Q?JeBMaRFLyeAKInY/2I9JO2dJOGc2Fa232l2y/kYyQjN20PyK89nq61Sie4EE?=
 =?us-ascii?Q?EA3oZficSW9ew3LlarM6ByZicpB6nFJkyFAGcCna6EBktdPKPre8qjwQTjEc?=
 =?us-ascii?Q?el7tniLVLVWWqofH1nktgytHIP+GxA390gxZvgLoO8to2LZCVSdZwddzWL5F?=
 =?us-ascii?Q?WRNg+rKuPjyf7sMI016u0VS0hDS1C8YgAo41TsKkVcqzBatnKmLNTvp46G3j?=
 =?us-ascii?Q?jhOTcD+HO+0Akbu+522IPjMX57wQqcFk4kvCGg+hPr1Bj2D3QetJeVJVxonm?=
 =?us-ascii?Q?ekmkm+iqyVud5GbSoDCdTEd2ZqO1Uc1qniX1bA+F+CixydL2SvnlFuQtPmac?=
 =?us-ascii?Q?quARIlg0RnU62GUvyvJ8uHHy5nSbP9LBA+EXbEgUJBJue9F+biFtsqUUqUGI?=
 =?us-ascii?Q?eEqtgN6aMZb9KNVuFeQV/9W8wcAkJqUlFpvACYfBHw4PuUihUYZk448ix2MY?=
 =?us-ascii?Q?RTngU3IUErDVZT0a1W4WXDn2gCmGdYJoqaK78y9WtbTZqB6fgb9O1BLeJTeK?=
 =?us-ascii?Q?xbueS0SDDEwJA6HLzY4N5414F+vpKVHKfkzguyGLWeQJ8JfO89r1M7N96eYX?=
 =?us-ascii?Q?zZ9fQF97796Z/jSpH+ncJCkDhiB9qbZhaI6kUwYF1YkvugKz6Jb+UXA+ukXm?=
 =?us-ascii?Q?LHYdPdvbC9qx3BKdV26CJq6MQsHdol15bwnDXSJmVG++y/DBpGjRaXbqjWoL?=
 =?us-ascii?Q?TIL7gdrhZKU/RJgsiMe8kDyINhUN24YWYWG+wAu9me3pg1OWwykb2qtMbzKQ?=
 =?us-ascii?Q?r5FOQdbiFuTW16BCf6qaGGg2JD1dA3Tm80ueEEDzaNoCoD9iwm2NuFEGNtSB?=
 =?us-ascii?Q?3niAhpnLPXch/t787X2Six6j4XpZ8/Xa7WeVrN+BEpM8Kf4FdoptJavF7plY?=
 =?us-ascii?Q?P/+nactZLfWJKcWMd+TJ8EHF7HljL2YKOA5zFRMRQn29g/fXxGkQVbmZbXdB?=
 =?us-ascii?Q?3jlVNm8QX8p8kMxbGX5wVcEEcUYmjXMHIM9UcbDDh2H04I08x8B7dL0kN7Ow?=
 =?us-ascii?Q?DBmArkwP9R7UJlqPLBuBnjr4RqvvTaXuGlX39argSPK9YeoIvYRU+lXeKFis?=
 =?us-ascii?Q?7CUJxFT2U0ulfY1Oi5dTwi3/tgz5dco3fbjj0PnT?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: IA1PR11MB6097.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6f980f4f-88cc-47a1-7875-08daf8b8aef9
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jan 2023 18:28:51.9133
 (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: NDzAbCXXcDG3GrkrdouCxuT+7Z6f78Pmxyy0dgn2EGePcy3Iatmj1dE+gzUW7zG2CsCZa+YIJYqYEEpaY6Sqig==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB7541
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,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, James,

> RMID are allocated for each monitor or control group directory, because e=
ach
> of these needs its own RMID. For control groups,
> rdtgroup_mkdir_ctrl_mon() later goes on to allocate the CLOSID.
>=20
> MPAM's equivalent of RMID are not an independent number, so can't be

s/are/is/?

> allocated until the closid is known. An RMID allocation for one CLOSID ma=
y fail,

s/closid/CLOSID/

> whereas another may succeed depending on how many monitor groups a
> control group has.
>=20
> The RMID allocation needs to move to be after the CLOSID has been allocat=
ed.
>=20
> Move the RMID allocation out of mkdir_rdt_prepare() to occur in its calle=
r, after
> the mkdir_rdt_prepare() call. This allows the RMID allocator to know the =
CLOSID.
>=20
> Tested-by: Shaopeng Tan <tan.shaopeng@fujitsu.com>
> Signed-off-by: James Morse <james.morse@arm.com>
> ---
>  arch/x86/kernel/cpu/resctrl/rdtgroup.c | 29 +++++++++++++++++++-------
>  1 file changed, 22 insertions(+), 7 deletions(-)
>=20
> diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> index 841294ad6263..c67083a8a5f5 100644
> --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
> @@ -2892,6 +2892,12 @@ static int mkdir_rdt_prepare_rmid_alloc(struct
> rdtgroup *rdtgrp)
>  	return 0;
>  }
>=20
> +static void mkdir_rdt_prepare_rmid_free(struct rdtgroup *rgrp) {
> +	if (rdt_mon_capable)
> +		free_rmid(rgrp->closid, rgrp->mon.rmid); }
> +
>  static int mkdir_rdt_prepare(struct kernfs_node *parent_kn,
>  			     const char *name, umode_t mode,
>  			     enum rdt_group_type rtype, struct rdtgroup **r)
> @@ -2957,10 +2963,6 @@ static int mkdir_rdt_prepare(struct kernfs_node
> *parent_kn,
>  		goto out_destroy;
>  	}
>=20
> -	ret =3D mkdir_rdt_prepare_rmid_alloc(rdtgrp);
> -	if (ret)
> -		goto out_destroy;
> -
>  	kernfs_activate(kn);
>=20
>  	/*
> @@ -2981,7 +2983,6 @@ static int mkdir_rdt_prepare(struct kernfs_node
> *parent_kn,  static void mkdir_rdt_prepare_clean(struct rdtgroup *rgrp)  =
{
>  	kernfs_remove(rgrp->kn);
> -	free_rmid(rgrp->closid, rgrp->mon.rmid);
>  	rdtgroup_remove(rgrp);
>  }
>=20
> @@ -3003,12 +3004,19 @@ static int rdtgroup_mkdir_mon(struct kernfs_node
> *parent_kn,
>  	prgrp =3D rdtgrp->mon.parent;
>  	rdtgrp->closid =3D prgrp->closid;
>=20
> +	ret =3D mkdir_rdt_prepare_rmid_alloc(rdtgrp);
> +	if (ret) {
> +		mkdir_rdt_prepare_clean(rdtgrp);
> +		goto out_unlock;
> +	}
> +
>  	/*
>  	 * Add the rdtgrp to the list of rdtgrps the parent
>  	 * ctrl_mon group has to track.
>  	 */
>  	list_add_tail(&rdtgrp->mon.crdtgrp_list, &prgrp->mon.crdtgrp_list);
>=20
> +out_unlock:
>  	rdtgroup_kn_unlock(parent_kn);
>  	return ret;
>  }
> @@ -3039,10 +3047,15 @@ static int rdtgroup_mkdir_ctrl_mon(struct
> kernfs_node *parent_kn,
>  	ret =3D 0;
>=20
>  	rdtgrp->closid =3D closid;
> -	ret =3D rdtgroup_init_alloc(rdtgrp);
> -	if (ret < 0)
> +
> +	ret =3D mkdir_rdt_prepare_rmid_alloc(rdtgrp);
> +	if (ret)
>  		goto out_id_free;
>=20
> +	ret =3D rdtgroup_init_alloc(rdtgrp);
> +	if (ret < 0)
> +		goto out_rmid_free;
> +
>  	list_add(&rdtgrp->rdtgroup_list, &rdt_all_groups);
>=20
>  	if (rdt_mon_capable) {
> @@ -3061,6 +3074,8 @@ static int rdtgroup_mkdir_ctrl_mon(struct
> kernfs_node *parent_kn,
>=20
>  out_del_list:
>  	list_del(&rdtgrp->rdtgroup_list);
> +out_rmid_free:
> +	mkdir_rdt_prepare_rmid_free(rdtgrp);
>  out_id_free:
>  	closid_free(closid);
>  out_common_fail:
> --
> 2.30.2

Thanks.

-Fenghua