net: accept an empty mask in /sys/class/net/*/queues/rx-*/rps_cpus
Subsystems (2)
PATCH 1/1 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.
--- net/core/net-sysfs.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
net/core/net-sysfs.c +7 -5
@@ -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,
Signature · 1 line
2.28.0.236.gb10cc79966-goog
Quoted 2 lines · Eric Dumazet
We must accept an empty mask in
store_rps_map(), or we are not able to disable RPS on a queue.
0 works. Is that not sufficient?
Quoted 6 lines · David Ahern
Quoted 2 lines · Eric Dumazet
We must accept an empty mask in
store_rps_map(), or we are not able to disable RPS on a queue.0 works. Is that not sufficient?
To re-phrase:
echo 0 > /sys/class/net/*/queues/rx-*/rps_cpus
works to disable rps. I don't get the difference in what you are changing here.
Before breakage, post fix:
sfp6:~# echo 0 > /sys/class/net/lo/queues/rx-0/rps_cpus
With breakage:
lpk17:~# echo 0 > /sys/class/net/lo/queues/rx-0/rps_cpus -bash: echo: write error: Invalid argument
Quoted 8 lines · Maciej Żenczykowski
Before breakage, post fix:
sfp6:~# echo 0 > /sys/class/net/lo/queues/rx-0/rps_cpusWith breakage:
lpk17:~# echo 0 > /sys/class/net/lo/queues/rx-0/rps_cpus -bash: echo: write error: Invalid argument
ah, so this is recent breakage with 5.9. I had not hit before hence the question. thanks for clarifying.
Quoted 6 lines · David Ahern
Quoted 4 lines · Maciej Żenczykowski
Before breakage, post fix:
sfp6:~# echo 0 > /sys/class/net/lo/queues/rx-0/rps_cpus
Quoted 7 lines
Quoted 4 lines
With breakage:
lpk17:~# echo 0 > /sys/class/net/lo/queues/rx-0/rps_cpus -bash: echo: write error: Invalid argumentah, so this is recent breakage with 5.9. I had not hit before hence the question. thanks for clarifying.
Yup, 07bbecb34106 ("net: Restrict receive packets queuing to housekeeping CPUs") has been merged only recently.
(This was not in David net-next tree btw, this is why it took us so long to come to this issue)
A message that is not in the archive (sent off-list or not yet received): CANP3RGc6Gz73Gt3v9M7KYNeNd57o--=3mF6yqdRjqOViG+TG7A@mail.gmail.com
[email protected]
Acked-byQuoted 27 lines · Maciej Żenczykowski
Quoted 25 lines · Eric Dumazet
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 tohousekeeping 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]>--- net/core/net-sysfs.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)net/core/net-sysfs.c +0
-0index
9de33b594ff2693c054022a42703c90084122444..efec66fa78b70b2fe5b0a5920317eb1d0415d9e3100644net/core/net-sysfs.c +0
-0@@ -757,11 +757,13 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue, return err; }
Quoted 13 lines
net/core/net-sysfs.c static ssize_t store_rps_map(struct netdev_rx_queue *queue, · line 767
Quoted 13 lines
net/core/net-sysfs.c +7
-5- 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 ; + } }
Ah indeed! Sorry about that.
Quoted 44 lines · On 8/12/20 1:00 AM, [email protected] wrote:
Quoted 27 lines · Maciej Żenczykowski
Quoted 25 lines · Eric Dumazet
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 tohousekeeping 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]>--- net/core/net-sysfs.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)net/core/net-sysfs.c +0
-0index
9de33b594ff2693c054022a42703c90084122444..efec66fa78b70b2fe5b0a5920317eb1d0415d9e3100644net/core/net-sysfs.c +0
-0@@ -757,11 +757,13 @@ static ssize_t store_rps_map(struct netdev_rx_queue *queue, return err; }Quoted 13 lines
net/core/net-sysfs.c static ssize_t store_rps_map(struct netdev_rx_queue *queue, · line 767
Quoted 13 lines
net/core/net-sysfs.c +7
-5- 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 ; + } }Ah indeed! Sorry about that.
Quoted 2 lines
No worries, thanks for the review guys.
We probably should add a test doing something like
echo ffffffff >/sys/class/net/lo/queues/rx-0/rps_cpus echo 0 >/sys/class/net/lo/queues/rx-0/rps_cpus
Quoted 26 lines · Eric Dumazet
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]>--- net/core/net-sysfs.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)net/core/net-sysfs.c +0
-5@@ -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 ;
net/core/net-sysfs.c static ssize_t store_rps_map(struct netdev_rx_queue *queue, · line 769
Quoted 10 lines
net/core/net-sysfs.c +7
-0+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,
Ah! my bad.
Thanks for the fix.
From: Eric Dumazet <[email protected]>
Date: Tue, 11 Aug 2020 18:34:40 -0700
Quoted 6 lines
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]>
Applied, thanks Eric.