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

!15041 gve: guard XDP xmit NDO on existence of xdp 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/JC2356LUBGF33KN5PHZGD4QQNKQWVLI4/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBJ6O9 
 
Link:https://gitee.com/openeuler/kernel/pulls/15041

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 07fd50ba d4697885

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

+3 −0
Original line number Diff line number Diff line
@@ -1755,6 +1755,9 @@ static void gve_turndown(struct gve_priv *priv) 


	gve_clear_napi_enabled(priv);

	gve_clear_report_stats(priv);



	/* Make sure that all traffic is finished processing. */

	synchronize_net();

}



static void gve_turnup(struct gve_priv *priv)

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

+4 −1
Original line number Diff line number Diff line
@@ -777,9 +777,12 @@ int gve_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames, 
	struct gve_tx_ring *tx;

	int i, err = 0, qid;



	if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK))

	if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK) || !priv->xdp_prog)

		return -EINVAL;



	if (!gve_get_napi_enabled(priv))

		return -ENETDOWN;



	qid = gve_xdp_tx_queue_id(priv,

				  smp_processor_id() % priv->num_xdp_queues);