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

!15040 gve: guard XSK operations on the existence of queues 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Liang <wangliang74@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/VCZZRWTT5LV7Q3E7RN542RPWEJW5VH5Y/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBJ6P5 
 
Link:https://gitee.com/openeuler/kernel/pulls/15040

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 91bb88ce 8973854b

drivers/net/ethernet/google/gve/gve_main.c

+10 −12
Original line number Diff line number Diff line
@@ -1528,8 +1528,8 @@ static int gve_xsk_pool_enable(struct net_device *dev, 
	if (err)

		return err;



	/* If XDP prog is not installed, return */

	if (!priv->xdp_prog)

	/* If XDP prog is not installed or interface is down, return. */

	if (!priv->xdp_prog || !netif_running(dev))

		return 0;



	rx = &priv->rx[qid];
@@ -1574,21 +1574,16 @@ static int gve_xsk_pool_disable(struct net_device *dev, 
	if (qid >= priv->rx_cfg.num_queues)

		return -EINVAL;



	/* If XDP prog is not installed, unmap DMA and return */

	if (!priv->xdp_prog)

		goto done;



	tx_qid = gve_xdp_tx_queue_id(priv, qid);

	if (!netif_running(dev)) {

		priv->rx[qid].xsk_pool = NULL;

		xdp_rxq_info_unreg(&priv->rx[qid].xsk_rxq);

		priv->tx[tx_qid].xsk_pool = NULL;

	/* If XDP prog is not installed or interface is down, unmap DMA and

	 * return.

	 */

	if (!priv->xdp_prog || !netif_running(dev))

		goto done;

	}



	napi_rx = &priv->ntfy_blocks[priv->rx[qid].ntfy_id].napi;

	napi_disable(napi_rx); /* make sure current rx poll is done */



	tx_qid = gve_xdp_tx_queue_id(priv, qid);

	napi_tx = &priv->ntfy_blocks[priv->tx[tx_qid].ntfy_id].napi;

	napi_disable(napi_tx); /* make sure current tx poll is done */
@@ -1616,6 +1611,9 @@ static int gve_xsk_wakeup(struct net_device *dev, u32 queue_id, u32 flags) 
	struct gve_priv *priv = netdev_priv(dev);

	int tx_queue_id = gve_xdp_tx_queue_id(priv, queue_id);



	if (!gve_get_napi_enabled(priv))

		return -ENETDOWN;



	if (queue_id >= priv->rx_cfg.num_queues || !priv->xdp_prog)

		return -EINVAL;