Skip to content

Commit d33fe17

Browse files
Dawei Likuba-moo
authored andcommitted
net/dpaa2: Avoid explicit cpumask var allocation on stack
For CONFIG_CPUMASK_OFFSTACK=y kernel, explicit allocation of cpumask variable on stack is not recommended since it can cause potential stack overflow. Instead, kernel code should always use *cpumask_var API(s) to allocate cpumask var in config-neutral way, leaving allocation strategy to CONFIG_CPUMASK_OFFSTACK. Use *cpumask_var API(s) to address it. Signed-off-by: Dawei Li <dawei.li@shingroup.cn> Link: https://lore.kernel.org/r/20240331053441.1276826-3-dawei.li@shingroup.cn Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent be4e130 commit d33fe17

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2896,11 +2896,14 @@ static int dpaa2_eth_xdp_xmit(struct net_device *net_dev, int n,
28962896
static int update_xps(struct dpaa2_eth_priv *priv)
28972897
{
28982898
struct net_device *net_dev = priv->net_dev;
2899-
struct cpumask xps_mask;
2900-
struct dpaa2_eth_fq *fq;
29012899
int i, num_queues, netdev_queues;
2900+
struct dpaa2_eth_fq *fq;
2901+
cpumask_var_t xps_mask;
29022902
int err = 0;
29032903

2904+
if (!alloc_cpumask_var(&xps_mask, GFP_KERNEL))
2905+
return -ENOMEM;
2906+
29042907
num_queues = dpaa2_eth_queue_count(priv);
29052908
netdev_queues = (net_dev->num_tc ? : 1) * num_queues;
29062909

@@ -2910,16 +2913,17 @@ static int update_xps(struct dpaa2_eth_priv *priv)
29102913
for (i = 0; i < netdev_queues; i++) {
29112914
fq = &priv->fq[i % num_queues];
29122915

2913-
cpumask_clear(&xps_mask);
2914-
cpumask_set_cpu(fq->target_cpu, &xps_mask);
2916+
cpumask_clear(xps_mask);
2917+
cpumask_set_cpu(fq->target_cpu, xps_mask);
29152918

2916-
err = netif_set_xps_queue(net_dev, &xps_mask, i);
2919+
err = netif_set_xps_queue(net_dev, xps_mask, i);
29172920
if (err) {
29182921
netdev_warn_once(net_dev, "Error setting XPS queue\n");
29192922
break;
29202923
}
29212924
}
29222925

2926+
free_cpumask_var(xps_mask);
29232927
return err;
29242928
}
29252929

0 commit comments

Comments
 (0)