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;
Received-SPF: Pass (protection.outlook.com: domain of amd.com designates
 165.204.84.17 as permitted sender) receiver=protection.outlook.com;
 client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C
Subject: [PATCH v6 5/8] x86/resctrl: Unwind the errors inside rdt_enable_ctx
From:   Babu Moger <babu.moger@amd.com>
To:     <corbet@lwn.net>, <reinette.chatre@intel.com>,
        <tglx@linutronix.de>, <mingo@redhat.com>, <bp@alien8.de>
CC:     <fenghua.yu@intel.com>, <dave.hansen@linux.intel.com>,
        <x86@kernel.org>, <hpa@zytor.com>, <paulmck@kernel.org>,
        <akpm@linux-foundation.org>, <quic_neeraju@quicinc.com>,
        <rdunlap@infradead.org>, <damien.lemoal@opensource.wdc.com>,
        <songmuchun@bytedance.com>, <peterz@infradead.org>,
        <jpoimboe@kernel.org>, <pbonzini@redhat.com>, <babu.moger@amd.com>,
        <chang.seok.bae@intel.com>, <pawan.kumar.gupta@linux.intel.com>,
        <jmattson@google.com>, <daniel.sneddon@linux.intel.com>,
        <sandipan.das@amd.com>, <tony.luck@intel.com>,
        <james.morse@arm.com>, <linux-doc@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <bagasdotme@gmail.com>,
        <eranian@google.com>, <christophe.leroy@csgroup.eu>,
        <pawan.kumar.gupta@linux.intel.com>, <jarkko@kernel.org>,
        <adrian.hunter@intel.com>, <quic_jiles@quicinc.com>,
        <peternewman@google.com>, <babu.moger@amd.com>
Date:   Wed, 19 Jul 2023 18:22:03 -0500
Message-ID: <168980892326.1619861.2405779251348138586.stgit@bmoger-ubuntu>
In-Reply-To: <168980872063.1619861.420806535295905172.stgit@bmoger-ubuntu>
References: <168980872063.1619861.420806535295905172.stgit@bmoger-ubuntu>
User-Agent: StGit/1.1.dev103+g5369f4c
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2023 23:22:07.5720
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: cac4c581-50c2-4519-b385-08db88aef86f
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com]
X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT051.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5231
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no 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

rdt_enable_ctx() takes care of enabling the features provided during=0A=
resctrl mount. The error unwinding of rdt_enable_ctx is done from the=0A=
caller rdt_get_tree. This is not ideal and can cause some error unwinding=
=0A=
to be omitted.=0A=
=0A=
Fix this by moving all the error unwinding inside rdt_enable_ctx.=0A=
=0A=
Suggested-by: Reinette Chatre <reinette.chatre@intel.com>=0A=
Signed-off-by: Babu Moger <babu.moger@amd.com>=0A=
---=0A=
 arch/x86/kernel/cpu/resctrl/rdtgroup.c |   31 +++++++++++++++++++++++-----=
---=0A=
 1 file changed, 23 insertions(+), 8 deletions(-)=0A=
=0A=
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/r=
esctrl/rdtgroup.c=0A=
index 3010e3a1394d..9a7204f71d2d 100644=0A=
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c=0A=
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c=0A=
@@ -2381,15 +2381,31 @@ static int rdt_enable_ctx(struct rdt_fs_context *ct=
x)=0A=
 {=0A=
 	int ret =3D 0;=0A=
 =0A=
-	if (ctx->enable_cdpl2)=0A=
+	if (ctx->enable_cdpl2) {=0A=
 		ret =3D resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L2, true);=0A=
+		if (ret)=0A=
+			goto out;=0A=
+	}=0A=
 =0A=
-	if (!ret && ctx->enable_cdpl3)=0A=
+	if (ctx->enable_cdpl3) {=0A=
 		ret =3D resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L3, true);=0A=
+		if (ret)=0A=
+			goto out_cdpl2;=0A=
+	}=0A=
 =0A=
-	if (!ret && ctx->enable_mba_mbps)=0A=
+	if (ctx->enable_mba_mbps) {=0A=
 		ret =3D set_mba_sc(true);=0A=
+		if (ret)=0A=
+			goto out_cdpl3;=0A=
+	}=0A=
 =0A=
+	return 0;=0A=
+=0A=
+out_cdpl3:=0A=
+	resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L3, false);=0A=
+out_cdpl2:=0A=
+	resctrl_arch_set_cdp_enabled(RDT_RESOURCE_L2, false);=0A=
+out:=0A=
 	return ret;=0A=
 }=0A=
 =0A=
@@ -2497,13 +2513,13 @@ static int rdt_get_tree(struct fs_context *fc)=0A=
 	}=0A=
 =0A=
 	ret =3D rdt_enable_ctx(ctx);=0A=
-	if (ret < 0)=0A=
-		goto out_cdp;=0A=
+	if (ret)=0A=
+		goto out;=0A=
 =0A=
 	ret =3D schemata_list_create();=0A=
 	if (ret) {=0A=
 		schemata_list_destroy();=0A=
-		goto out_mba;=0A=
+		goto out_ctx;=0A=
 	}=0A=
 =0A=
 	closid_init();=0A=
@@ -2562,10 +2578,9 @@ static int rdt_get_tree(struct fs_context *fc)=0A=
 	kernfs_remove(kn_info);=0A=
 out_schemata_free:=0A=
 	schemata_list_destroy();=0A=
-out_mba:=0A=
+out_ctx:=0A=
 	if (ctx->enable_mba_mbps)=0A=
 		set_mba_sc(false);=0A=
-out_cdp:=0A=
 	cdp_disable_all();=0A=
 out:=0A=
 	rdt_last_cmd_clear();=0A=
=0A=