aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Dumazet <[email protected]>2020-08-11 18:34:40 -0700
committerDavid S. Miller <[email protected]>2020-08-12 13:18:16 -0700
commit2e0d8fef5f76bce0887c73b824d9e625a08e7406 (patch)
tree34030d3e8b5153aa60cf42f1163a96e3f111c06c
parentae8bd3021c34a40a5e63df90f6ac5a0efedc04fe (diff)
net: accept an empty mask in /sys/class/net/*/queues/rx-*/rps_cpus
We must accept an empty mask in store_rps_map(), or we are not able to disable RPS on a queue. Fixes: 07bbecb34106 ("net: Restrict receive packets queuing to housekeeping CPUs") Signed-off-by: Eric Dumazet <[email protected]> Reported-by: Maciej Żenczykowski <[email protected]> Cc: Alex Belits <[email protected]> Cc: Nitesh Narayan Lal <[email protected]> Cc: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Maciej Żenczykowski <[email protected]> Acked-by: Peter Zijlstra (Intel) <[email protected]> Acked-by: Nitesh Narayan Lal <[email protected]> Signed-off-by: David S. Miller <[email protected]>
-rw-r--r--net/core/net-sysfs.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 9de33b594ff2..efec66fa78b7 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -757,11 +757,13 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue,
return err;
}
- 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;
+ 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;
+ }
}
map = kzalloc(max_t(unsigned int,