net: introduce rps_default_mask
Subsystems (4)
Paolo Abeni
maintainerPATCH 2/3 net/core: introduce default_rps_mask netns attribute
In reply to Paolo AbeniIf RPS is enabled, this allows configuring a default rps mask, which is effective since receive queue creation time.
A default RPS mask allows the system admin to ensure proper isolation, avoiding races at network namespace or device creation time.
The default RPS mask is initially empty, and can be modified via a newly added sysctl entry.
--- Documentation/admin-guide/sysctl/net.rst | 6 +++ net/core/net-sysfs.c | 9 ++++ net/core/sysctl_net_core.c | 58 ++++++++++++++++++++++++ 3 files changed, 73 insertions(+)
Documentation/admin-guide/sysctl/net.rst +6 -0
@@ -211,6 +211,12 @@ rmem_max The maximum receive socket buffer size in bytes. +rps_default_mask +---------------- + +The default RPS CPU mask used on newly created network devices. An empty +mask means RPS disabled by default. + tstamp_allow_data ----------------- Allow processes to receive tx timestamps looped together with the original
net/core/net-sysfs.c +9 -0
@@ -715,6 +715,8 @@ static const struct sysfs_ops rx_queue_sysfs_ops = { };#ifdef CONFIG_RPS +extern struct cpumask rps_default_mask; +static ssize_t show_rps_map (struct netdev_rx_queue *queue,char *buf) {struct rps_map *map;
@@ -983,6 +985,13 @@ static int rx_queue_add_kobject(struct net_device *dev, int index) goto err; } +#if IS_ENABLED (CONFIG_RPS ) &&IS_ENABLED (CONFIG_SYSCTL ) +if (!cpumask_empty (&rps_default_mask)) { + error =netdev_rx_queue_set_rps_mask (queue, &rps_default_mask); +if (error) + goto err; + } +#endif kobject_uevent (kobj,KOBJ_ADD );return error;
net/core/sysctl_net_core.c +58 -0
82 lines not on this page · raw message
Signature · 1 line
2.26.2
Paolo Abeni
maintainerPATCH 1/3 net/sysctl: factor-out netdev_rx_queue_set_rps_mask() helper
In reply to Paolo AbeniWill simplify the following patch. No functional change intended.
--- net/core/net-sysfs.c | 66 ++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 30 deletions(-)
net/core/net-sysfs.c +36 -30
@@ -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,
Signature · 1 line
2.26.2
Paolo Abeni
maintainerPATCH 3/3 self-tests: introduce self-tests for RPS default mask
In reply to Paolo AbeniEnsure that RPS default mask changes take place on all newly created netns/devices and don't affect existing ones.
--- tools/testing/selftests/net/Makefile | 1 + tools/testing/selftests/net/config | 3 + .../testing/selftests/net/rps_default_mask.sh | 57 +++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 tools/testing/selftests/net/rps_default_mask.sh
tools/testing/selftests/net/Makefile +1 -0
@@ -21,6 +21,7 @@ TEST_PROGS += rxtimestamp.sh TEST_PROGS += devlink_port_split.py TEST_PROGS += drop_monitor_tests.sh TEST_PROGS += vrf_route_leaking.sh +TEST_PROGS += rps_default_mask.sh TEST_PROGS_EXTENDED := in_netns.sh TEST_GEN_FILES = socket nettest TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy reuseport_addr_any
tools/testing/selftests/net/config +3 -0
@@ -34,3 +34,6 @@ CONFIG_TRACEPOINTS=y CONFIG_NET_DROP_MONITOR=m CONFIG_NETDEVSIM=m CONFIG_NET_FOU=m +CONFIG_RPS=y +CONFIG_SYSFS=y +CONFIG_PROC_SYSCTL=y
tools/testing/selftests/net/rps_default_mask.sh new file +57 -0
57 lines not on this page · raw message
Signature · 1 line
2.26.2
Paolo Abeni
maintainercover net: introduce rps_default_mask
Real-time setups try hard to ensure proper isolation between time critical applications and e.g. network processing performed by the network stack in softirq and RPS is used to move the softirq activity away from the isolated core.
If the network configuration is dynamic, with netns and devices routinely created at run-time, enforcing the correct RPS setting on each newly created device allowing to transient bad configuration became complex.
These series try to address the above, introducing a new sysctl knob: rps_default_mask. The new sysctl entry allows configuring a systemwide RPS mask, to be enforced since receive queue creation time without any fourther per device configuration required.
Additionally, a simple self-test is introduced to check the rps_default_mask behavior.
Paolo Abeni (3):
net/sysctl: factor-out netdev_rx_queue_set_rps_mask() helper net/core: introduce default_rps_mask netns attribute
self-tests: introduce self-tests for RPS default mask
Documentation/admin-guide/sysctl/net.rst | 6 ++ net/core/net-sysfs.c | 75 +++++++++++-------- net/core/sysctl_net_core.c | 58 ++++++++++++++ tools/testing/selftests/net/Makefile | 1 + tools/testing/selftests/net/config | 3 + .../testing/selftests/net/rps_default_mask.sh | 57 ++++++++++++++ 6 files changed, 170 insertions(+), 30 deletions(-) create mode 100644 tools/testing/selftests/net/rps_default_mask.sh
Signature · 1 line
2.26.2
Jakub Kicinski
maintainerRe: [PATCH net-next 2/3] net/core: introduce default_rps_mask netns attribute
In reply to Paolo Abeninet/core/sysctl_net_core.c int sysctl_devconf_inherit_init_net __read_mostly; · line 50
Quoted 5 lines · On Wed, 28 Oct 2020 18:46:02 +0100 Paolo Abeni wrote:
net/core/sysctl_net_core.c +1
-0@@ -46,6 +47,54 @@ int sysctl_devconf_inherit_init_net __read_mostly;EXPORT_SYMBOL (sysctl_devconf_inherit_init_net);#ifdef CONFIG_RPS +struct cpumask rps_default_mask;
net/core/sysctl_net_core.c:50:16: warning: symbol 'rps_default_mask' was not declared. Should it be static?
Paolo Abeni
maintainerRe: [PATCH net-next 2/3] net/core: introduce default_rps_mask netns attribute
Quoted 8 lines · Jakub Kicinski
net/core/sysctl_net_core.c int sysctl_devconf_inherit_init_net __read_mostly; · line 50
Quoted 5 lines · On Wed, 28 Oct 2020 18:46:02 +0100 Paolo Abeni wrote:
net/core/sysctl_net_core.c +1
-0@@ -46,6 +47,54 @@ int sysctl_devconf_inherit_init_net __read_mostly;EXPORT_SYMBOL (sysctl_devconf_inherit_init_net);#ifdef CONFIG_RPS +struct cpumask rps_default_mask;
net/core/sysctl_net_core.c:50:16: warning: symbol 'rps_default_mask' was not declared. Should it be static?
Thank you for the feedback! I'll address that in v2.
Cheers,
Paolo