| Message ID | 20250109233107.17519-4-ahmed.zaki@intel.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: napi: add CPU affinity to napi->config | expand |
Hi Ahmed, kernel test robot noticed the following build errors: [auto build test ERROR on net-next/main] url: https://github.com/intel-lab-lkp/linux/commits/Ahmed-Zaki/net-move-ARFS-rmap-management-to-core/20250110-073339 base: net-next/main patch link: https://lore.kernel.org/r/20250109233107.17519-4-ahmed.zaki%40intel.com patch subject: [Intel-wired-lan] [PATCH net-next v4 3/6] net: napi: add CPU affinity to napi_config config: s390-randconfig-001-20250110 (https://download.01.org/0day-ci/archive/20250110/202501101042.2q2geY9c-lkp@intel.com/config) compiler: s390-linux-gcc (GCC) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250110/202501101042.2q2geY9c-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202501101042.2q2geY9c-lkp@intel.com/ All errors (new ones prefixed by >>): net/core/dev.c: In function 'netif_napi_affinity_release': >> net/core/dev.c:6795:42: error: 'struct net_device' has no member named 'rx_cpu_rmap' 6795 | struct cpu_rmap *rmap = napi->dev->rx_cpu_rmap; | ^~ >> net/core/dev.c:6797:23: error: 'struct napi_struct' has no member named 'napi_rmap_idx' 6797 | rmap->obj[napi->napi_rmap_idx] = NULL; | ^~ vim +6795 net/core/dev.c 064d6072cac4f49 Ahmed Zaki 2025-01-09 6789 064d6072cac4f49 Ahmed Zaki 2025-01-09 6790 static void 064d6072cac4f49 Ahmed Zaki 2025-01-09 6791 netif_napi_affinity_release(struct kref *ref) 064d6072cac4f49 Ahmed Zaki 2025-01-09 6792 { 064d6072cac4f49 Ahmed Zaki 2025-01-09 6793 struct napi_struct *napi = 064d6072cac4f49 Ahmed Zaki 2025-01-09 6794 container_of(ref, struct napi_struct, notify.kref); 064d6072cac4f49 Ahmed Zaki 2025-01-09 @6795 struct cpu_rmap *rmap = napi->dev->rx_cpu_rmap; 064d6072cac4f49 Ahmed Zaki 2025-01-09 6796 064d6072cac4f49 Ahmed Zaki 2025-01-09 @6797 rmap->obj[napi->napi_rmap_idx] = NULL; 064d6072cac4f49 Ahmed Zaki 2025-01-09 6798 cpu_rmap_put(rmap); 064d6072cac4f49 Ahmed Zaki 2025-01-09 6799 } 064d6072cac4f49 Ahmed Zaki 2025-01-09 6800
Hi Ahmed, kernel test robot noticed the following build errors: [auto build test ERROR on net-next/main] url: https://github.com/intel-lab-lkp/linux/commits/Ahmed-Zaki/net-move-ARFS-rmap-management-to-core/20250110-073339 base: net-next/main patch link: https://lore.kernel.org/r/20250109233107.17519-4-ahmed.zaki%40intel.com patch subject: [Intel-wired-lan] [PATCH net-next v4 3/6] net: napi: add CPU affinity to napi_config config: arm-randconfig-003-20250110 (https://download.01.org/0day-ci/archive/20250110/202501101047.KVl1kI5I-lkp@intel.com/config) compiler: clang version 19.1.3 (https://github.com/llvm/llvm-project ab51eccf88f5321e7c60591c5546b254b6afab99) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250110/202501101047.KVl1kI5I-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202501101047.KVl1kI5I-lkp@intel.com/ All errors (new ones prefixed by >>): >> net/core/dev.c:6795:37: error: no member named 'rx_cpu_rmap' in 'struct net_device' 6795 | struct cpu_rmap *rmap = napi->dev->rx_cpu_rmap; | ~~~~~~~~~ ^ >> net/core/dev.c:6797:18: error: no member named 'napi_rmap_idx' in 'struct napi_struct' 6797 | rmap->obj[napi->napi_rmap_idx] = NULL; | ~~~~ ^ 2 errors generated. vim +6795 net/core/dev.c 064d6072cac4f4 Ahmed Zaki 2025-01-09 6789 064d6072cac4f4 Ahmed Zaki 2025-01-09 6790 static void 064d6072cac4f4 Ahmed Zaki 2025-01-09 6791 netif_napi_affinity_release(struct kref *ref) 064d6072cac4f4 Ahmed Zaki 2025-01-09 6792 { 064d6072cac4f4 Ahmed Zaki 2025-01-09 6793 struct napi_struct *napi = 064d6072cac4f4 Ahmed Zaki 2025-01-09 6794 container_of(ref, struct napi_struct, notify.kref); 064d6072cac4f4 Ahmed Zaki 2025-01-09 @6795 struct cpu_rmap *rmap = napi->dev->rx_cpu_rmap; 064d6072cac4f4 Ahmed Zaki 2025-01-09 6796 064d6072cac4f4 Ahmed Zaki 2025-01-09 @6797 rmap->obj[napi->napi_rmap_idx] = NULL; 064d6072cac4f4 Ahmed Zaki 2025-01-09 6798 cpu_rmap_put(rmap); 064d6072cac4f4 Ahmed Zaki 2025-01-09 6799 } 064d6072cac4f4 Ahmed Zaki 2025-01-09 6800
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index c789218cca5d..82da827b5ec6 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -351,6 +351,7 @@ struct napi_config { u64 gro_flush_timeout; u64 irq_suspend_timeout; u32 defer_hard_irqs; + cpumask_t affinity_mask; unsigned int napi_id; }; @@ -392,8 +393,8 @@ struct napi_struct { struct list_head dev_list; struct hlist_node napi_hash_node; int irq; -#ifdef CONFIG_RFS_ACCEL struct irq_affinity_notify notify; +#ifdef CONFIG_RFS_ACCEL int napi_rmap_idx; #endif int index; @@ -2402,6 +2403,7 @@ struct net_device { struct lock_class_key *qdisc_tx_busylock; bool proto_down; bool threaded; + bool irq_affinity_auto; #ifdef CONFIG_RFS_ACCEL bool rx_cpu_rmap_auto; #endif @@ -2637,6 +2639,11 @@ static inline void netdev_set_ml_priv(struct net_device *dev, dev->ml_priv_type = type; } +static inline void netif_enable_irq_affinity(struct net_device *dev) +{ + dev->irq_affinity_auto = true; +} + /* * Net namespace inlines */ diff --git a/net/core/dev.c b/net/core/dev.c index 1d4378962857..72b3caf0e79f 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6761,22 +6761,30 @@ int netif_enable_cpu_rmap(struct net_device *dev, unsigned int num_irqs) return 0; } EXPORT_SYMBOL(netif_enable_cpu_rmap); +#endif static void -netif_irq_cpu_rmap_notify(struct irq_affinity_notify *notify, - const cpumask_t *mask) +netif_napi_irq_notify(struct irq_affinity_notify *notify, + const cpumask_t *mask) { struct napi_struct *napi = container_of(notify, struct napi_struct, notify); +#ifdef CONFIG_RFS_ACCEL struct cpu_rmap *rmap = napi->dev->rx_cpu_rmap; int err; +#endif + if (napi->config && napi->dev->irq_affinity_auto) + cpumask_copy(&napi->config->affinity_mask, mask); + +#ifdef CONFIG_RFS_ACCEL if (rmap && napi->dev->rx_cpu_rmap_auto) { err = cpu_rmap_update(rmap, napi->napi_rmap_idx, mask); if (err) pr_warn("%s: RMAP update failed (%d)\n", __func__, err); } +#endif } static void @@ -6790,6 +6798,7 @@ netif_napi_affinity_release(struct kref *ref) cpu_rmap_put(rmap); } +#ifdef CONFIG_RFS_ACCEL static int napi_irq_cpu_rmap_add(struct napi_struct *napi, int irq) { struct cpu_rmap *rmap = napi->dev->rx_cpu_rmap; @@ -6797,7 +6806,7 @@ static int napi_irq_cpu_rmap_add(struct napi_struct *napi, int irq) if (!napi || !rmap) return -EINVAL; - napi->notify.notify = netif_irq_cpu_rmap_notify; + napi->notify.notify = netif_napi_irq_notify; napi->notify.release = netif_napi_affinity_release; cpu_rmap_get(rmap); rc = cpu_rmap_add(rmap, napi); @@ -6821,9 +6830,8 @@ static int napi_irq_cpu_rmap_add(struct napi_struct *napi, int irq) void netif_napi_set_irq(struct napi_struct *napi, int irq) { -#ifdef CONFIG_RFS_ACCEL int rc; -#endif + napi->irq = irq; #ifdef CONFIG_RFS_ACCEL @@ -6834,8 +6842,18 @@ void netif_napi_set_irq(struct napi_struct *napi, int irq) rc); netif_disable_cpu_rmap(napi->dev); } - } + } else if (irq > 0 && napi->config && napi->dev->irq_affinity_auto) { +#else + if (irq > 0 && napi->config && napi->dev->irq_affinity_auto) { #endif + napi->notify.notify = netif_napi_irq_notify; + napi->notify.release = netif_napi_affinity_release; + + rc = irq_set_affinity_notifier(irq, &napi->notify); + if (rc) + netdev_warn(napi->dev, "Unable to set IRQ notifier (%d)\n", + rc); + } } EXPORT_SYMBOL(netif_napi_set_irq); @@ -6844,6 +6862,10 @@ static void napi_restore_config(struct napi_struct *n) n->defer_hard_irqs = n->config->defer_hard_irqs; n->gro_flush_timeout = n->config->gro_flush_timeout; n->irq_suspend_timeout = n->config->irq_suspend_timeout; + + if (n->irq > 0 && n->dev->irq_affinity_auto) + irq_set_affinity(n->irq, &n->config->affinity_mask); + /* a NAPI ID might be stored in the config, if so use it. if not, use * napi_hash_add to generate one for us. */ @@ -6860,6 +6882,10 @@ static void napi_save_config(struct napi_struct *n) n->config->defer_hard_irqs = n->defer_hard_irqs; n->config->gro_flush_timeout = n->gro_flush_timeout; n->config->irq_suspend_timeout = n->irq_suspend_timeout; + + if (n->irq > 0 && n->dev->irq_affinity_auto) + irq_set_affinity_notifier(n->irq, NULL); + napi_hash_del(n); } @@ -11358,7 +11384,7 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name, { struct net_device *dev; size_t napi_config_sz; - unsigned int maxqs; + unsigned int maxqs, i, numa; BUG_ON(strlen(name) >= sizeof(dev->name)); @@ -11454,6 +11480,10 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name, dev->napi_config = kvzalloc(napi_config_sz, GFP_KERNEL_ACCOUNT); if (!dev->napi_config) goto free_all; + numa = dev_to_node(&dev->dev); + for (i = 0; i < maxqs; i++) + cpumask_set_cpu(cpumask_local_spread(i, numa), + &dev->napi_config[i].affinity_mask); strscpy(dev->name, name); dev->name_assign_type = name_assign_type;
A common task for most drivers is to remember the user-set CPU affinity to its IRQs. On each netdev reset, the driver should re-assign the user's settings to the IRQs. Add CPU affinity mask to napi_config. To delegate the CPU affinity management to the core, drivers must: 1 - set the new netdev flag "irq_affinity_auto": netif_enable_irq_affinity(netdev) 2 - create the napi with persistent config: netif_napi_add_config() 3 - bind an IRQ to the napi instance: netif_napi_set_irq() the core will then make sure to use re-assign affinity to the napi's IRQ. The default IRQ mask is set to one cpu starting from the closest NUMA. Signed-off-by: Ahmed Zaki <ahmed.zaki@intel.com> --- include/linux/netdevice.h | 9 +++++++- net/core/dev.c | 44 ++++++++++++++++++++++++++++++++------- 2 files changed, 45 insertions(+), 8 deletions(-)