Commit 35f715cb authored by Yue Haibing's avatar Yue Haibing Committed by Jakub Kicinski
Browse files

ixgbevf: Fix passing 0 to ERR_PTR in ixgbevf_run_xdp() 



ixgbevf_run_xdp() converts customed xdp action to a negative error code
with the sk_buff pointer type which be checked with IS_ERR in
ixgbevf_clean_rx_irq(). Remove this error pointer handing instead use
plain int return value.

Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: Chandan Kumar Rout <chandanx.rout@intel.com> (A Contingent Worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Link: https://patch.msgid.link/20250106221929.956999-12-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c824125c

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+10 −13
Original line number Diff line number Diff line
@@ -737,10 +737,6 @@ static bool ixgbevf_cleanup_headers(struct ixgbevf_ring *rx_ring, 
				    union ixgbe_adv_rx_desc *rx_desc,

				    struct sk_buff *skb)

{

	/* XDP packets use error pointer so abort at this point */

	if (IS_ERR(skb))

		return true;



	/* verify that the packet does not have any known errors */

	if (unlikely(ixgbevf_test_staterr(rx_desc,

					  IXGBE_RXDADV_ERR_FRAME_ERR_MASK))) {
@@ -1049,7 +1045,7 @@ static int ixgbevf_xmit_xdp_ring(struct ixgbevf_ring *ring, 
	return IXGBEVF_XDP_TX;

}



static struct sk_buff *ixgbevf_run_xdp(struct ixgbevf_adapter *adapter,

static int ixgbevf_run_xdp(struct ixgbevf_adapter *adapter,

			   struct ixgbevf_ring *rx_ring,

			   struct xdp_buff *xdp)

{
@@ -1085,7 +1081,7 @@ static struct sk_buff *ixgbevf_run_xdp(struct ixgbevf_adapter *adapter, 
		break;

	}

xdp_out:

	return ERR_PTR(-result);

	return result;

}



static unsigned int ixgbevf_rx_frame_truesize(struct ixgbevf_ring *rx_ring,
@@ -1127,6 +1123,7 @@ static int ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector, 
	struct sk_buff *skb = rx_ring->skb;

	bool xdp_xmit = false;

	struct xdp_buff xdp;

	int xdp_res = 0;



	/* Frame size depend on rx_ring setup when PAGE_SIZE=4K */

#if (PAGE_SIZE < 8192)
@@ -1170,11 +1167,11 @@ static int ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector, 
			/* At larger PAGE_SIZE, frame_sz depend on len size */

			xdp.frame_sz = ixgbevf_rx_frame_truesize(rx_ring, size);

#endif

			skb = ixgbevf_run_xdp(adapter, rx_ring, &xdp);

			xdp_res = ixgbevf_run_xdp(adapter, rx_ring, &xdp);

		}



		if (IS_ERR(skb)) {

			if (PTR_ERR(skb) == -IXGBEVF_XDP_TX) {

		if (xdp_res) {

			if (xdp_res == IXGBEVF_XDP_TX) {

				xdp_xmit = true;

				ixgbevf_rx_buffer_flip(rx_ring, rx_buffer,

						       size);
@@ -1194,7 +1191,7 @@ static int ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector, 
		}



		/* exit if we failed to retrieve a buffer */

		if (!skb) {

		if (!xdp_res && !skb) {

			rx_ring->rx_stats.alloc_rx_buff_failed++;

			rx_buffer->pagecnt_bias++;

			break;
@@ -1208,7 +1205,7 @@ static int ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector, 
			continue;



		/* verify the packet layout is correct */

		if (ixgbevf_cleanup_headers(rx_ring, rx_desc, skb)) {

		if (xdp_res || ixgbevf_cleanup_headers(rx_ring, rx_desc, skb)) {

			skb = NULL;

			continue;

		}