[PATCH v2 2/4] net: merge XPS_CPU_DEV_MAPS_SIZE and XPS_RXQ_DEV_MAPS_SIZE macros

From: Yury Norov
Date: Thu Oct 13 2022 - 19:44:20 EST


The macros are used in a single place, and merging them
would simplify the code.

Signed-off-by: Yury Norov <yury.norov@xxxxxxxxx>
---
include/linux/netdevice.h | 7 ++-----
net/core/dev.c | 3 +--
2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index a36edb0ec199..53d738f66159 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -825,11 +825,8 @@ struct xps_dev_maps {
struct xps_map __rcu *attr_map[]; /* Either CPUs map or RXQs map */
};

-#define XPS_CPU_DEV_MAPS_SIZE(_tcs) (sizeof(struct xps_dev_maps) + \
- (nr_cpu_ids * (_tcs) * sizeof(struct xps_map *)))
-
-#define XPS_RXQ_DEV_MAPS_SIZE(_tcs, _rxqs) (sizeof(struct xps_dev_maps) +\
- (_rxqs * (_tcs) * sizeof(struct xps_map *)))
+#define XPS_DEV_MAPS_SIZE(_tcs, nr) (sizeof(struct xps_dev_maps) +\
+ ((nr) * (_tcs) * sizeof(struct xps_map *)))

#endif /* CONFIG_XPS */

diff --git a/net/core/dev.c b/net/core/dev.c
index 70fa12c6551c..9dc6fcb0d48a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2564,15 +2564,14 @@ int __netif_set_xps_queue(struct net_device *dev, const unsigned long *mask,
}

if (type == XPS_RXQS) {
- maps_sz = XPS_RXQ_DEV_MAPS_SIZE(num_tc, dev->num_rx_queues);
nr_ids = dev->num_rx_queues;
} else {
- maps_sz = XPS_CPU_DEV_MAPS_SIZE(num_tc);
if (num_possible_cpus() > 1)
online_mask = cpumask_bits(cpu_online_mask);
nr_ids = nr_cpu_ids;
}

+ maps_sz = XPS_DEV_MAPS_SIZE(num_tc, nr_ids);
if (maps_sz < L1_CACHE_BYTES)
maps_sz = L1_CACHE_BYTES;

--
2.34.1