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

!8514 net: ena: Fix incorrect descriptor free behavior 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Huafei <lihuafei1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/AW4WWDY2YBVR3CY2JSNCNQDSRWFVSIG6/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9QRO8 
 
Link:https://gitee.com/openeuler/kernel/pulls/8514

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 9ef090a3 57d1bade

drivers/net/ethernet/amazon/ena/ena_netdev.c

+11 −3
Original line number Diff line number Diff line
@@ -1104,8 +1104,11 @@ static void ena_unmap_tx_buff(struct ena_ring *tx_ring, 
static void ena_free_tx_bufs(struct ena_ring *tx_ring)

{

	bool print_once = true;

	bool is_xdp_ring;

	u32 i;



	is_xdp_ring = ENA_IS_XDP_INDEX(tx_ring->adapter, tx_ring->qid);



	for (i = 0; i < tx_ring->ring_size; i++) {

		struct ena_tx_buffer *tx_info = &tx_ring->tx_buffer_info[i];
@@ -1125,8 +1128,13 @@ static void ena_free_tx_bufs(struct ena_ring *tx_ring) 


		ena_unmap_tx_buff(tx_ring, tx_info);



		if (is_xdp_ring)

			xdp_return_frame(tx_info->xdpf);

		else

			dev_kfree_skb_any(tx_info->skb);

	}



	if (!is_xdp_ring)

		netdev_tx_reset_queue(netdev_get_tx_queue(tx_ring->netdev,

							  tx_ring->qid));

}