Unverified Commit 68285598 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10738 net/dpaa2: Avoid explicit cpumask var allocation on stack 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhang Changzhong <zhangchangzhong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WX3SCHDFZWBSRV5XQW6R633I5AEXKTTA/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGEPB 
 
Link:https://gitee.com/openeuler/kernel/pulls/10738

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents ab5776e6 a156825c

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

+9 −5
Original line number Diff line number Diff line
@@ -2385,11 +2385,14 @@ static int dpaa2_eth_xdp_xmit(struct net_device *net_dev, int n, 
static int update_xps(struct dpaa2_eth_priv *priv)

{

	struct net_device *net_dev = priv->net_dev;

	struct cpumask xps_mask;

	struct dpaa2_eth_fq *fq;

	int i, num_queues, netdev_queues;

	struct dpaa2_eth_fq *fq;

	cpumask_var_t xps_mask;

	int err = 0;



	if (!alloc_cpumask_var(&xps_mask, GFP_KERNEL))

		return -ENOMEM;



	num_queues = dpaa2_eth_queue_count(priv);

	netdev_queues = (net_dev->num_tc ? : 1) * num_queues;
@@ -2399,16 +2402,17 @@ static int update_xps(struct dpaa2_eth_priv *priv) 
	for (i = 0; i < netdev_queues; i++) {

		fq = &priv->fq[i % num_queues];



		cpumask_clear(&xps_mask);

		cpumask_set_cpu(fq->target_cpu, &xps_mask);

		cpumask_clear(xps_mask);

		cpumask_set_cpu(fq->target_cpu, xps_mask);



		err = netif_set_xps_queue(net_dev, &xps_mask, i);

		err = netif_set_xps_queue(net_dev, xps_mask, i);

		if (err) {

			netdev_warn_once(net_dev, "Error setting XPS queue\n");

			break;

		}

	}



	free_cpumask_var(xps_mask);

	return err;

}