[PATCH v10 12/17] x86/resctrl: Prepare to handle nested mount requests

[Tony Luck <tony.luck@intel.com>]

There is no upper level serialization of mount(2) system calls.

mount/unmount operations can happen in parallel with CPU hotplug events
that need to add/remove files and directories when domains are added or
removed.

Use cpus_read_lock() plus mutex_lock(&domain_list_lock) to protect
architecture code from races.

Signed-off-by: Tony Luck <tony.luck@intel.com>
---
v10:
	New patch

 include/linux/resctrl.h            |  2 +-
 arch/x86/kernel/cpu/resctrl/core.c | 40 ++++++++++++++++++++++++------
 drivers/resctrl/mpam_resctrl.c     |  3 ++-
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h
index 568a650c0224..65245f2fdad0 100644
--- a/include/linux/resctrl.h
+++ b/include/linux/resctrl.h
@@ -579,7 +579,7 @@ void resctrl_offline_cpu(unsigned int cpu);
  * Architecture hook called at beginning of first file system mount attempt.
  * No locks are held.
  */
-void resctrl_arch_pre_mount(void);
+int resctrl_arch_pre_mount(void);
 
 /*
  * Architecture hook called when mount fails, or on unmount.
diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
index e335a143f3e5..906aa4dfc363 100644
--- a/arch/x86/kernel/cpu/resctrl/core.c
+++ b/arch/x86/kernel/cpu/resctrl/core.c
@@ -16,7 +16,6 @@
 
 #define pr_fmt(fmt)	"resctrl: " fmt
 
-#include <linux/cleanup.h>
 #include <linux/cpu.h>
 #include <linux/slab.h>
 #include <linux/err.h>
@@ -807,25 +806,47 @@ static int resctrl_arch_offline_cpu(unsigned int cpu)
 	return 0;
 }
 
-void resctrl_arch_pre_mount(void)
+/*
+ * Linux provides no synchronization for mount(2) system calls.
+ * resctrl_arch_pre_mount() and resctrl_arch_unmount() are called
+ * with no locks held. Mount/unmount may also race with CPU hotplug
+ * events that add/remove per-domain files and directories.
+ *
+ * Use cpus_read_lock() plus domain_list_lock to protect operations.
+ *
+ * Keep track locally at the architecture level whether the file
+ * system is mounted (or in process of being mounted).
+ */
+static bool arch_mounted;
+
+int resctrl_arch_pre_mount(void)
 {
 	struct rdt_resource *r = &rdt_resources_all[RDT_RESOURCE_PERF_PKG].r_resctrl;
+	int ret = -EBUSY;
 	int cpu;
 
+	cpus_read_lock();
+	mutex_lock(&domain_list_lock);
+	if (arch_mounted)
+		goto unlock;
+	arch_mounted = true;
+	ret = 0;
+
 	if (!intel_aet_pre_mount())
-		return;
+		goto unlock;
 
 	/*
 	 * Late discovery of telemetry events means the domains for the
 	 * resource were not built. Do that now.
 	 */
-	cpus_read_lock();
-	mutex_lock(&domain_list_lock);
 	r->mon_capable = true;
 	for_each_online_cpu(cpu)
 		domain_add_cpu_mon(cpu, r);
+unlock:
 	mutex_unlock(&domain_list_lock);
 	cpus_read_unlock();
+
+	return ret;
 }
 
 void resctrl_arch_unmount(void)
@@ -833,16 +854,19 @@ void resctrl_arch_unmount(void)
 	struct rdt_resource *r = &rdt_resources_all[RDT_RESOURCE_PERF_PKG].r_resctrl;
 	int cpu;
 
+	cpus_read_lock();
+	mutex_lock(&domain_list_lock);
+	arch_mounted = false;
+
 	if (!r->mon_capable)
-		return;
+		goto unlock;
 
 	intel_aet_unmount();
 
-	cpus_read_lock();
-	mutex_lock(&domain_list_lock);
 	for_each_online_cpu(cpu)
 		domain_remove_cpu_mon(cpu, r);
 	r->mon_capable = false;
+unlock:
 	mutex_unlock(&domain_list_lock);
 	cpus_read_unlock();
 }
diff --git a/drivers/resctrl/mpam_resctrl.c b/drivers/resctrl/mpam_resctrl.c
index 5859cc0f5e37..71125779484f 100644
--- a/drivers/resctrl/mpam_resctrl.c
+++ b/drivers/resctrl/mpam_resctrl.c
@@ -158,8 +158,9 @@ bool resctrl_arch_get_io_alloc_enabled(struct rdt_resource *r)
 	return false;
 }
 
-void resctrl_arch_pre_mount(void)
+int resctrl_arch_pre_mount(void)
 {
+	return 0;
 }
 
 void resctrl_arch_unmount(void)
-- 
2.55.0