net: Decouple HK_FLAG_WQ and HK_FLAG_DOMAIN cpumask fetch

To prepare for supporting each feature of the housekeeping cpumask
toward cpuset, prepare each of the HK_FLAG_* entries to move to their
own cpumask with enforcing to fetch them individually. The new
constraint is that multiple HK_FLAG_* entries can't be mixed together
anymore in a single call to housekeeping cpumask().

This will later allow, for example, to runtime modify the cpulist passed
through "isolcpus=", "nohz_full=" and "rcu_nocbs=" kernel boot
parameters.

Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Juri Lelli <juri.lelli@redhat.com>
Reviewed-by: Phil Auld <pauld@redhat.com>
Link: https://lore.kernel.org/r/20220207155910.527133-4-frederic@kernel.org

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 53ea262ecafd0c1e537a7e63f313745fb7ba53bb..ed8da7b8d35bfc6e536ad972e883b01e6575c7b0 100644 (file)
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -823,7 +823,7 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue,
 {
        struct rps_map *old_map, *map;
        cpumask_var_t mask;
-       int err, cpu, i, hk_flags;
+       int err, cpu, i;
        static DEFINE_MUTEX(rps_map_mutex);
 
        if (!capable(CAP_NET_ADMIN))
@@ -839,8 +839,8 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue,
        }
 
        if (!cpumask_empty(mask)) {
-               hk_flags = HK_FLAG_DOMAIN | HK_FLAG_WQ;
-               cpumask_and(mask, mask, housekeeping_cpumask(hk_flags));
+               cpumask_and(mask, mask, housekeeping_cpumask(HK_FLAG_DOMAIN));
+               cpumask_and(mask, mask, housekeeping_cpumask(HK_FLAG_WQ));
                if (cpumask_empty(mask)) {
                        free_cpumask_var(mask);
                        return -EINVAL;