Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fad57330 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

i40e/i40evf: Clean-up Rx packet checksum handling 



This is mostly a minor clean-up for the Rx checksum path in order to avoid
some of the unnecessary conditional checks that were being applied.

Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 529f1f65

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

+10 −13
Original line number Diff line number Diff line
@@ -1389,13 +1389,7 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi, 
				    u16 rx_ptype)

{

	struct i40e_rx_ptype_decoded decoded = decode_rx_desc_ptype(rx_ptype);

	bool ipv4 = false, ipv6 = false;

	bool ipv4_tunnel, ipv6_tunnel;



	ipv4_tunnel = (rx_ptype >= I40E_RX_PTYPE_GRENAT4_MAC_PAY3) &&

		     (rx_ptype <= I40E_RX_PTYPE_GRENAT4_MACVLAN_IPV6_ICMP_PAY4);

	ipv6_tunnel = (rx_ptype >= I40E_RX_PTYPE_GRENAT6_MAC_PAY3) &&

		     (rx_ptype <= I40E_RX_PTYPE_GRENAT6_MACVLAN_IPV6_ICMP_PAY4);

	bool ipv4, ipv6, ipv4_tunnel, ipv6_tunnel;



	skb->ip_summed = CHECKSUM_NONE;
@@ -1411,12 +1405,10 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi, 
	if (!(decoded.known && decoded.outer_ip))

		return;



	if (decoded.outer_ip == I40E_RX_PTYPE_OUTER_IP &&

	    decoded.outer_ip_ver == I40E_RX_PTYPE_OUTER_IPV4)

		ipv4 = true;

	else if (decoded.outer_ip == I40E_RX_PTYPE_OUTER_IP &&

		 decoded.outer_ip_ver == I40E_RX_PTYPE_OUTER_IPV6)

		ipv6 = true;

	ipv4 = (decoded.outer_ip == I40E_RX_PTYPE_OUTER_IP) &&

	       (decoded.outer_ip_ver == I40E_RX_PTYPE_OUTER_IPV4);

	ipv6 = (decoded.outer_ip == I40E_RX_PTYPE_OUTER_IP) &&

	       (decoded.outer_ip_ver == I40E_RX_PTYPE_OUTER_IPV6);



	if (ipv4 &&

	    (rx_error & (BIT(I40E_RX_DESC_ERROR_IPE_SHIFT) |
@@ -1447,6 +1439,11 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi, 
	 * inner checksum report CHECKSUM_UNNECESSARY.

	 */



	ipv4_tunnel = (rx_ptype >= I40E_RX_PTYPE_GRENAT4_MAC_PAY3) &&

		     (rx_ptype <= I40E_RX_PTYPE_GRENAT4_MACVLAN_IPV6_ICMP_PAY4);

	ipv6_tunnel = (rx_ptype >= I40E_RX_PTYPE_GRENAT6_MAC_PAY3) &&

		     (rx_ptype <= I40E_RX_PTYPE_GRENAT6_MACVLAN_IPV6_ICMP_PAY4);



	skb->ip_summed = CHECKSUM_UNNECESSARY;

	skb->csum_level = ipv4_tunnel || ipv6_tunnel;

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

+10 −13
Original line number Diff line number Diff line
@@ -861,13 +861,7 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi, 
				    u16 rx_ptype)

{

	struct i40e_rx_ptype_decoded decoded = decode_rx_desc_ptype(rx_ptype);

	bool ipv4 = false, ipv6 = false;

	bool ipv4_tunnel, ipv6_tunnel;



	ipv4_tunnel = (rx_ptype >= I40E_RX_PTYPE_GRENAT4_MAC_PAY3) &&

		     (rx_ptype <= I40E_RX_PTYPE_GRENAT4_MACVLAN_IPV6_ICMP_PAY4);

	ipv6_tunnel = (rx_ptype >= I40E_RX_PTYPE_GRENAT6_MAC_PAY3) &&

		     (rx_ptype <= I40E_RX_PTYPE_GRENAT6_MACVLAN_IPV6_ICMP_PAY4);

	bool ipv4, ipv6, ipv4_tunnel, ipv6_tunnel;



	skb->ip_summed = CHECKSUM_NONE;
@@ -883,12 +877,10 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi, 
	if (!(decoded.known && decoded.outer_ip))

		return;



	if (decoded.outer_ip == I40E_RX_PTYPE_OUTER_IP &&

	    decoded.outer_ip_ver == I40E_RX_PTYPE_OUTER_IPV4)

		ipv4 = true;

	else if (decoded.outer_ip == I40E_RX_PTYPE_OUTER_IP &&

		 decoded.outer_ip_ver == I40E_RX_PTYPE_OUTER_IPV6)

		ipv6 = true;

	ipv4 = (decoded.outer_ip == I40E_RX_PTYPE_OUTER_IP) &&

	       (decoded.outer_ip_ver == I40E_RX_PTYPE_OUTER_IPV4);

	ipv6 = (decoded.outer_ip == I40E_RX_PTYPE_OUTER_IP) &&

	       (decoded.outer_ip_ver == I40E_RX_PTYPE_OUTER_IPV6);



	if (ipv4 &&

	    (rx_error & (BIT(I40E_RX_DESC_ERROR_IPE_SHIFT) |
@@ -919,6 +911,11 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi, 
	 * inner checksum report CHECKSUM_UNNECESSARY.

	 */



	ipv4_tunnel = (rx_ptype >= I40E_RX_PTYPE_GRENAT4_MAC_PAY3) &&

		     (rx_ptype <= I40E_RX_PTYPE_GRENAT4_MACVLAN_IPV6_ICMP_PAY4);

	ipv6_tunnel = (rx_ptype >= I40E_RX_PTYPE_GRENAT6_MAC_PAY3) &&

		     (rx_ptype <= I40E_RX_PTYPE_GRENAT6_MACVLAN_IPV6_ICMP_PAY4);



	skb->ip_summed = CHECKSUM_UNNECESSARY;

	skb->csum_level = ipv4_tunnel || ipv6_tunnel;