Skip to contentSkip to conversation

FAILED: patch "[PATCH] x86/resctrl: Free the ctrlval arrays when" failed to apply to 5.4-stable tree

PATCH [email protected] 1 participant 1 message Oct 11, 2021

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 64e87d4bd3201bf8a4685083ee4daf5c0d001452 Mon Sep 17 00:00:00 2001
From: James Morse <[email protected]>
Date: Fri, 17 Sep 2021 16:59:58 +0000
Subject: [PATCH] x86/resctrl: Free the ctrlval arrays when
domain_setup_mon_state() fails

domain_add_cpu() is called whenever a CPU is brought online. The earlier call to domain_setup_ctrlval() allocates the control value arrays.

If domain_setup_mon_state() fails, the control value arrays are not freed.

Add the missing kfree() calls.

Fixes 1bd2a63b4f0de ("x86/intel_rdt/mba_sc: Add initialization support")
Fixes edf6fa1c4a951 ("x86/intel_rdt/cqm: Add RMID (Resource monitoring ID) management")
arch/x86/kernel/cpu/resctrl/core.c +2 -0
index 4b8813bafffd..b5de5a6c115c 100644
@@ -532,6 +532,8 @@ static void domain_add_cpu(int cpu, struct rdt_resource *r)
 	}
 
 	if (r->mon_capable && domain_setup_mon_state(r, d)) {
+		kfree(hw_dom->ctrl_val);
+		kfree(hw_dom->mbps_val);
 		kfree(d);
 		return;
 	}