Since commit 431c69fac05b ("cpuset: Honour task_cpu_possible_mask()
in guarantee_online_cpus()"), task_cpu_possible_mask() is used within
the cpuset code. However, it is hard to find a arm64 system that can
actually makes task_cpu_possible_mask() return different cpu mask. As a
result, it is hard to exercise the correctness of the code that handle
exception cases due to task_cpu_possible_mask().
To help in exercising those code paths, we need a way to force
task_cpu_possible_mask() to return a different cpu mask. This patch adds
a new CONFIG_DEBUG_CPUSETS config option to enable some debug code to do
just that. The idea is to create a debugfs file "debug_cpu_possible_mask"
that holds the cpumask to be returned by task_cpu_possible_mask() when
a task with name started with the special prefix "cstest" is used as
the input argument. Userspace testing code is then able to exercise
the different code that is affected by task_cpu_possible_mask().
Signed-off-by: Waiman Long <longman@xxxxxxxxxx>
---
init/Kconfig | 5 +++
kernel/cgroup/cpuset.c | 76 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+)
diff --git a/init/Kconfig b/init/Kconfig
index 18f0bf50c468..2abaa830aff0 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1140,6 +1140,11 @@ config PROC_PID_CPUSET
depends on CPUSETS
default y
+config DEBUG_CPUSETS
+ bool "Enable cpuset debugging"
+ depends on CPUSETS && DEBUG_FS
+ default n
+
config CGROUP_DEVICE
bool "Device controller"
help
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index aa8225daf1d3..45051ebb6606 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -220,6 +220,29 @@ static inline bool is_prs_invalid(int prs_state)
return prs_state < 0;
}
+#ifdef CONFIG_DEBUG_CPUSETS
+static struct cpumask debug_cpu_possible_mask;
+
+/*
+ * Debugging code for testing code involving task_cpu_possible_mask()
+ */
+static inline const struct cpumask *
+__task_cpu_possible_mask(struct task_struct *p)
+{
+ const struct cpumask *mask = task_cpu_possible_mask(p);
+
+ if (mask != cpu_possible_mask)
+ return mask;
+ else if (!strncmp(p->comm, "cstest", 6))
+ return &debug_cpu_possible_mask;
+ else
+ return cpu_possible_mask;
+}
+
+#undef task_cpu_possible_mask
+#define task_cpu_possible_mask(p) __task_cpu_possible_mask(p)
+#endif /* CONFIG_DEBUG_CPUSETS */
+
/*
* Temporary cpumasks for working with partitions that are passed among
* functions to avoid memory allocation in inner functions.
@@ -4139,3 +4162,56 @@ void cpuset_task_status_allowed(struct seq_file *m, struct task_struct *task)
seq_printf(m, "Mems_allowed_list:\t%*pbl\n",
nodemask_pr_args(&task->mems_allowed));
}
+
+#ifdef CONFIG_DEBUG_CPUSETS
+#include <linux/debugfs.h>
+
+/*
+ * Add a debugfs file "debug_cpu_possible_mask" that allows user to set
+ * a debug mask for testing.
+ */
+static ssize_t read_debug_mask(struct file *file, char __user *user_buf,
+ size_t count, loff_t *ppos)
+{
+ char buf[80];
+ int len;
+
+ len = snprintf(buf, sizeof(buf) - 1, "%*pbl\n",
+ cpumask_pr_args(&debug_cpu_possible_mask));
+ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
+}
+
+static ssize_t write_debug_mask(struct file *file, const char __user *user_buf,
+ size_t count, loff_t *ppos)
+{
+ unsigned int len;
+ char buf[80];
+ int retval = 0;
+
+ len = min(count, sizeof(buf) - 1);
+ if (copy_from_user(buf, user_buf, len))
+ return -EFAULT;
+
+ if (!*buf)
+ cpumask_clear(&debug_cpu_possible_mask);
+ else
+ retval = cpulist_parse(buf, &debug_cpu_possible_mask);
+
+ return (retval < 0) ? retval : count;
+}
+
+static const struct file_operations fops_debug_mask = {
+ .read = read_debug_mask,
+ .write = write_debug_mask,
+ .llseek = default_llseek,
+};
+
+static int __init create_debug_cpu_possible_mask(void)
+{
+ cpumask_copy(&debug_cpu_possible_mask, cpu_possible_mask);
+ debugfs_create_file("debug_cpu_possible_mask", 0600, NULL, NULL,
+ &fops_debug_mask);
+ return 0;
+}
+late_initcall(create_debug_cpu_possible_mask);
+#endif /* CONFIG_DEBUG_CPUSETS */
--
2.31.1
