[PATCH net-next 1/3] net/sysctl: factor-out netdev_rx_queue_set_rps_mask() helper

[Paolo Abeni]

Will simplify the following patch. No functional change
intended.

Signed-off-by: Paolo Abeni <pab...@redhat.com>
---
 net/core/net-sysfs.c | 66 ++++++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 94fff0700bdd..b57426707216 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -737,42 +737,18 @@ static ssize_t show_rps_map(struct netdev_rx_queue 
*queue, char *buf)
        return len < PAGE_SIZE ? len : -EINVAL;
 }
 
-static ssize_t store_rps_map(struct netdev_rx_queue *queue,
-                            const char *buf, size_t len)
+static int netdev_rx_queue_set_rps_mask(struct netdev_rx_queue *queue,
+                                       cpumask_var_t mask)
 {
-       struct rps_map *old_map, *map;
-       cpumask_var_t mask;
-       int err, cpu, i, hk_flags;
        static DEFINE_MUTEX(rps_map_mutex);
-
-       if (!capable(CAP_NET_ADMIN))
-               return -EPERM;
-
-       if (!alloc_cpumask_var(&mask, GFP_KERNEL))
-               return -ENOMEM;
-
-       err = bitmap_parse(buf, len, cpumask_bits(mask), nr_cpumask_bits);
-       if (err) {
-               free_cpumask_var(mask);
-               return err;
-       }
-
-       if (!cpumask_empty(mask)) {
-               hk_flags = HK_FLAG_DOMAIN | HK_FLAG_WQ;
-               cpumask_and(mask, mask, housekeeping_cpumask(hk_flags));
-               if (cpumask_empty(mask)) {
-                       free_cpumask_var(mask);
-                       return -EINVAL;
-               }
-       }
+       struct rps_map *old_map, *map;
+       int cpu, i;
 
        map = kzalloc(max_t(unsigned int,
                            RPS_MAP_SIZE(cpumask_weight(mask)), L1_CACHE_BYTES),
                      GFP_KERNEL);
-       if (!map) {
-               free_cpumask_var(mask);
+       if (!map)
                return -ENOMEM;
-       }
 
        i = 0;
        for_each_cpu_and(cpu, mask, cpu_online_mask)
@@ -799,9 +775,39 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue,
 
        if (old_map)
                kfree_rcu(old_map, rcu);
+       return 0;
+}
+
+static ssize_t store_rps_map(struct netdev_rx_queue *queue,
+                            const char *buf, size_t len)
+{
+       cpumask_var_t mask;
+       int err, hk_flags;
+
+       if (!capable(CAP_NET_ADMIN))
+               return -EPERM;
+
+       if (!alloc_cpumask_var(&mask, GFP_KERNEL))
+               return -ENOMEM;
+
+       err = bitmap_parse(buf, len, cpumask_bits(mask), nr_cpumask_bits);
+       if (err)
+               goto out;
 
+       if (!cpumask_empty(mask)) {
+               hk_flags = HK_FLAG_DOMAIN | HK_FLAG_WQ;
+               cpumask_and(mask, mask, housekeeping_cpumask(hk_flags));
+               if (cpumask_empty(mask)) {
+                       err = -EINVAL;
+                       goto out;
+               }
+       }
+
+       err = netdev_rx_queue_set_rps_mask(queue, mask);
+
+out:
        free_cpumask_var(mask);
-       return len;
+       return err ? : len;
 }
 
 static ssize_t show_rps_dev_flow_table_cnt(struct netdev_rx_queue *queue,
-- 
2.26.2