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

ixgbe: Fix passing 0 to ERR_PTR in ixgbe_run_xdp() 



ixgbe_run_xdp() converts customed xdp action to a negative error code
with the sk_buff pointer type which be checked with IS_ERR in
ixgbe_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-11-anthony.l.nguyen@intel.com


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

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+9 −14
Original line number Diff line number Diff line
@@ -1923,10 +1923,6 @@ bool ixgbe_cleanup_headers(struct ixgbe_ring *rx_ring, 
{

	struct net_device *netdev = rx_ring->netdev;



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

	if (IS_ERR(skb))

		return true;



	/* Verify netdev is present, and that packet does not have any

	 * errors that would be unacceptable to the netdev.

	 */
@@ -2234,7 +2230,7 @@ static struct sk_buff *ixgbe_build_skb(struct ixgbe_ring *rx_ring, 
	return skb;

}



static struct sk_buff *ixgbe_run_xdp(struct ixgbe_adapter *adapter,

static int ixgbe_run_xdp(struct ixgbe_adapter *adapter,

			 struct ixgbe_ring *rx_ring,

			 struct xdp_buff *xdp)

{
@@ -2286,7 +2282,7 @@ static struct sk_buff *ixgbe_run_xdp(struct ixgbe_adapter *adapter, 
		break;

	}

xdp_out:

	return ERR_PTR(-result);

	return result;

}



static unsigned int ixgbe_rx_frame_truesize(struct ixgbe_ring *rx_ring,
@@ -2344,6 +2340,7 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, 
	unsigned int offset = rx_ring->rx_offset;

	unsigned int xdp_xmit = 0;

	struct xdp_buff xdp;

	int xdp_res = 0;



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

#if (PAGE_SIZE < 8192)
@@ -2389,12 +2386,10 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, 
			/* At larger PAGE_SIZE, frame_sz depend on len size */

			xdp.frame_sz = ixgbe_rx_frame_truesize(rx_ring, size);

#endif

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

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

		}



		if (IS_ERR(skb)) {

			unsigned int xdp_res = -PTR_ERR(skb);



		if (xdp_res) {

			if (xdp_res & (IXGBE_XDP_TX | IXGBE_XDP_REDIR)) {

				xdp_xmit |= xdp_res;

				ixgbe_rx_buffer_flip(rx_ring, rx_buffer, size);
@@ -2414,7 +2409,7 @@ static int ixgbe_clean_rx_irq(struct ixgbe_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;
@@ -2428,7 +2423,7 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, 
			continue;



		/* verify the packet layout is correct */

		if (ixgbe_cleanup_headers(rx_ring, rx_desc, skb))

		if (xdp_res || ixgbe_cleanup_headers(rx_ring, rx_desc, skb))

			continue;



		/* probably a little skewed due to removing CRC */