If 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.
v1 -> v2: - declare rps_default_mask in netdevice.h to avoid a sparse warning - Jakub
Signed-off-by: Paolo Abeni pabeni@redhat.com --- Documentation/admin-guide/sysctl/net.rst | 6 +++ include/linux/netdevice.h | 1 + net/core/net-sysfs.c | 7 +++ net/core/sysctl_net_core.c | 58 ++++++++++++++++++++++++ 4 files changed, 72 insertions(+)
diff --git a/Documentation/admin-guide/sysctl/net.rst b/Documentation/admin-guide/sysctl/net.rst index 57fd6ce68fe0..818cb2030a8b 100644 --- a/Documentation/admin-guide/sysctl/net.rst +++ b/Documentation/admin-guide/sysctl/net.rst @@ -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 diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 964b494b0e8d..2593689648d3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -200,6 +200,7 @@ struct net_device_stats { #include <linux/static_key.h> extern struct static_key_false rps_needed; extern struct static_key_false rfs_needed; +extern struct cpumask rps_default_mask; #endif
struct neighbour; diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index b57426707216..3f3d1d467fe0 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -983,6 +983,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; diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index d86d8d11cfe4..13451ac88a74 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c @@ -15,6 +15,7 @@ #include <linux/vmalloc.h> #include <linux/init.h> #include <linux/slab.h> +#include <linux/sched/isolation.h>
#include <net/ip.h> #include <net/sock.h> @@ -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; + +static int rps_default_mask_sysctl(struct ctl_table *table, int write, + void *buffer, size_t *lenp, loff_t *ppos) +{ + int len, err = 0; + + rtnl_lock(); + if (write) { + err = cpumask_parse(buffer, &rps_default_mask); + if (err) + goto done; + + if (!cpumask_empty(&rps_default_mask)) { + int hk_flags = HK_FLAG_DOMAIN | HK_FLAG_WQ; + cpumask_and(&rps_default_mask, &rps_default_mask, + housekeeping_cpumask(hk_flags)); + if (cpumask_empty(&rps_default_mask)) { + err = -EINVAL; + goto done; + } + } + } else { + char kbuf[128]; + + if (*ppos || !*lenp) { + *lenp = 0; + goto done; + } + + len = min(sizeof(kbuf) - 1, *lenp); + len = scnprintf(kbuf, len, "%*pb", cpumask_pr_args(&rps_default_mask)); + if (!len) { + *lenp = 0; + goto done; + } + if (len < *lenp) + kbuf[len++] = '\n'; + memcpy(buffer, kbuf, len); + *lenp = len; + *ppos += len; + } + +done: + rtnl_unlock(); + return err; +} + static int rps_sock_flow_sysctl(struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos) { @@ -466,6 +515,11 @@ static struct ctl_table net_core_table[] = { .mode = 0644, .proc_handler = rps_sock_flow_sysctl }, + { + .procname = "rps_default_mask", + .mode = 0644, + .proc_handler = rps_default_mask_sysctl + }, #endif #ifdef CONFIG_NET_FLOW_LIMIT { @@ -648,6 +702,10 @@ static __net_initdata struct pernet_operations sysctl_core_ops = {
static __init int sysctl_core_init(void) { +#if IS_ENABLED(CONFIG_RPS) + cpumask_copy(&rps_default_mask, cpu_none_mask); +#endif + register_net_sysctl(&init_net, "net/core", net_core_table); return register_pernet_subsys(&sysctl_core_ops); }