Commit a94d9e22 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

ethernet/intel: Use eth_skb_pad and skb_put_padto helpers 



Update the Intel Ethernet drivers to use eth_skb_pad() and skb_put_padto
instead of doing their own implementations of the function.

Also this cleans up two other spots where skb_pad was called but the length
and tail pointers were being manipulated directly instead of just having
the padding length added via __skb_put.

Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@redhat.com>
Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9c0c1124

drivers/net/ethernet/intel/e1000/e1000_main.c

+2 −6
Original line number Diff line number Diff line
@@ -3136,12 +3136,8 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, 
	 * packets may get corrupted during padding by HW.

	 * To WA this issue, pad all small packets manually.

	 */

	if (skb->len < ETH_ZLEN) {

		if (skb_pad(skb, ETH_ZLEN - skb->len))

	if (eth_skb_pad(skb))

		return NETDEV_TX_OK;

		skb->len = ETH_ZLEN;

		skb_set_tail_pointer(skb, ETH_ZLEN);

	}



	mss = skb_shinfo(skb)->gso_size;

	/* The controller does a simple calculation to

drivers/net/ethernet/intel/e1000e/netdev.c

+2 −6
Original line number Diff line number Diff line
@@ -5554,12 +5554,8 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, 
	/* The minimum packet size with TCTL.PSP set is 17 bytes so

	 * pad skb in order to meet this minimum size requirement

	 */

	if (unlikely(skb->len < 17)) {

		if (skb_pad(skb, 17 - skb->len))

	if (skb_put_padto(skb, 17))

		return NETDEV_TX_OK;

		skb->len = 17;

		skb_set_tail_pointer(skb, 17);

	}



	mss = skb_shinfo(skb)->gso_size;

	if (mss) {

drivers/net/ethernet/intel/fm10k/fm10k_main.c

+3 −8
Original line number Diff line number Diff line
@@ -578,14 +578,9 @@ static bool fm10k_cleanup_headers(struct fm10k_ring *rx_ring, 
	if (skb_is_nonlinear(skb))

		fm10k_pull_tail(rx_ring, rx_desc, skb);



	/* if skb_pad returns an error the skb was freed */

	if (unlikely(skb->len < 60)) {

		int pad_len = 60 - skb->len;



		if (skb_pad(skb, pad_len))

	/* if eth_skb_pad returns an error the skb was freed */

	if (eth_skb_pad(skb))

		return true;

		__skb_put(skb, pad_len);

	}



	return false;

}

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+2 −6
Original line number Diff line number Diff line
@@ -2399,12 +2399,8 @@ netdev_tx_t i40e_lan_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 
	/* hardware can't handle really short frames, hardware padding works

	 * beyond this point

	 */

	if (unlikely(skb->len < I40E_MIN_TX_LEN)) {

		if (skb_pad(skb, I40E_MIN_TX_LEN - skb->len))

	if (skb_put_padto(skb, I40E_MIN_TX_LEN))

		return NETDEV_TX_OK;

		skb->len = I40E_MIN_TX_LEN;

		skb_set_tail_pointer(skb, I40E_MIN_TX_LEN);

	}



	return i40e_xmit_frame_ring(skb, tx_ring);

}

drivers/net/ethernet/intel/igb/igb_main.c

+5 −14
Original line number Diff line number Diff line
@@ -5091,12 +5091,8 @@ static netdev_tx_t igb_xmit_frame(struct sk_buff *skb, 
	/* The minimum packet size with TCTL.PSP set is 17 so pad the skb

	 * in order to meet this minimum size requirement.

	 */

	if (unlikely(skb->len < 17)) {

		if (skb_pad(skb, 17 - skb->len))

	if (skb_put_padto(skb, 17))

		return NETDEV_TX_OK;

		skb->len = 17;

		skb_set_tail_pointer(skb, 17);

	}



	return igb_xmit_frame_ring(skb, igb_tx_queue_mapping(adapter, skb));

}
@@ -6850,14 +6846,9 @@ static bool igb_cleanup_headers(struct igb_ring *rx_ring, 
	if (skb_is_nonlinear(skb))

		igb_pull_tail(rx_ring, rx_desc, skb);



	/* if skb_pad returns an error the skb was freed */

	if (unlikely(skb->len < 60)) {

		int pad_len = 60 - skb->len;



		if (skb_pad(skb, pad_len))

	/* if eth_skb_pad returns an error the skb was freed */

	if (eth_skb_pad(skb))

		return true;

		__skb_put(skb, pad_len);

	}



	return false;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE