public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net-sysfs: convert xps_cpus_show to bitmap_zalloc

Browse source 
Use bitmap_zalloc instead of zalloc_cpumask_var in xps_cpus_show to
align with xps_rxqs_show. This will improve maintenance and allow us to
factorize the two functions. The function should behave the same.

Signed-off-by: Antoine Tenart <atenart@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Antoine Tenart 2021-03-18 19:37:40 +01:00 • committed by David S. Miller
parent 6859d91549
commit ea4fe7e842
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/core/net-sysfs.c
View file

@ -1367,8 +1367,7 @@ static ssize_t xps_cpus_show(struct netdev_queue *queue,
int cpu, len, ret, num_tc = 1, tc = 0; int cpu, len, ret, num_tc = 1, tc = 0;
struct net_device *dev = queue->dev; struct net_device *dev = queue->dev;
struct xps_dev_maps *dev_maps; struct xps_dev_maps *dev_maps;
cpumask_var_t mask; unsigned long *mask, index;
unsigned long index;
if (!netif_is_multiqueue(dev)) if (!netif_is_multiqueue(dev))
return -ENOENT; return -ENOENT;
@ -1396,7 +1395,8 @@ static ssize_t xps_cpus_show(struct netdev_queue *queue,
} }
} }
if (!zalloc_cpumask_var(&mask, GFP_KERNEL)) { mask = bitmap_zalloc(nr_cpu_ids, GFP_KERNEL);
if (!mask) {
ret = -ENOMEM; ret = -ENOMEM;
goto err_rtnl_unlock; goto err_rtnl_unlock;
} }
@ -1414,7 +1414,7 @@ static ssize_t xps_cpus_show(struct netdev_queue *queue,
for (i = map->len; i--;) { for (i = map->len; i--;) {
if (map->queues[i] == index) { if (map->queues[i] == index) {
cpumask_set_cpu(cpu, mask); set_bit(cpu, mask);
break; break;
} }
} }
@ -1424,8 +1424,8 @@ static ssize_t xps_cpus_show(struct netdev_queue *queue,
rtnl_unlock(); rtnl_unlock();
len = snprintf(buf, PAGE_SIZE, "%*pb\n", cpumask_pr_args(mask)); len = bitmap_print_to_pagebuf(false, buf, mask, nr_cpu_ids);
free_cpumask_var(mask); bitmap_free(mask);
return len < PAGE_SIZE ? len : -EINVAL; return len < PAGE_SIZE ? len : -EINVAL;
err_rtnl_unlock: err_rtnl_unlock: