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

Commit 030824e0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'csums-next' 



Tom Herbert says:

====================
net: Checksum offload changes - Part VI

I am working on overhauling RX checksum offload. Goals of this effort
are:

- Specify what exactly it means when driver returns CHECKSUM_UNNECESSARY
- Preserve CHECKSUM_COMPLETE through encapsulation layers
- Don't do skb_checksum more than once per packet
- Unify GRO and non-GRO csum verification as much as possible
- Unify the checksum functions (checksum_init)
- Simplify code

What is in this sixth patch set:

- Clarify the specific requirements of devices returning
  CHECKSUM_UNNECESSARY (comments in skbuff.h).
- Add csum_level field to skbuff. This is used to express how
  many checksums are covered by CHECKSUM_UNNECESSARY (stores n - 1).
- Change __skb_checksum_validate_needed to "consume" each checksum
  as indicated by csum_level as layers of the the packet are parsed.
- Remove skb_pop_rcv_encapsulation, no longer needed in the new
  csum_level model.
- Allow GRO path to "consume" checksums provided in CHECKSUM_UNNECESSARY
  and to report new verfied checksums for use in normal path fallback.
- Add proper support to SCTP to accept CHECKSUM_UNNECESSARY to validate
  header CRC.
- Modify drivers to set skb->csum_level instead of setting
  skb->encapsulation to indicate validation of an encapsulated
  checksum on receive.

v2:

Allocate a new 16 bits for flags in skbuff.

Please review carefully and test if possible, mucking with basic
checksum functions is always a little precarious :-)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 96d49225 71d7a277

drivers/net/ethernet/emulex/benet/be_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1683,7 +1683,7 @@ static void be_rx_compl_process(struct be_rx_obj *rxo, struct napi_struct *napi, 
	if (netdev->features & NETIF_F_RXHASH)

		skb_set_hash(skb, rxcp->rss_hash, PKT_HASH_TYPE_L3);



	skb->encapsulation = rxcp->tunneled;

	skb->csum_level = rxcp->tunneled;

	skb_mark_napi_id(skb, napi);



	if (rxcp->vlanf)
@@ -1741,7 +1741,7 @@ static void be_rx_compl_process_gro(struct be_rx_obj *rxo, 
	if (adapter->netdev->features & NETIF_F_RXHASH)

		skb_set_hash(skb, rxcp->rss_hash, PKT_HASH_TYPE_L3);



	skb->encapsulation = rxcp->tunneled;

	skb->csum_level = rxcp->tunneled;

	skb_mark_napi_id(skb, napi);



	if (rxcp->vlanf)

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

+1 −1
Original line number Diff line number Diff line
@@ -1241,7 +1241,6 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi, 
	ipv6_tunnel = (rx_ptype > I40E_RX_PTYPE_GRENAT6_MAC_PAY3) &&

		      (rx_ptype < I40E_RX_PTYPE_GRENAT6_MACVLAN_IPV6_ICMP_PAY4);



	skb->encapsulation = ipv4_tunnel || ipv6_tunnel;

	skb->ip_summed = CHECKSUM_NONE;



	/* Rx csum enabled and ip headers found? */
@@ -1315,6 +1314,7 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi, 
	}



	skb->ip_summed = CHECKSUM_UNNECESSARY;

	skb->csum_level = ipv4_tunnel || ipv6_tunnel;



	return;

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

+1 −1
Original line number Diff line number Diff line
@@ -746,7 +746,6 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi, 
	ipv6_tunnel = (rx_ptype > I40E_RX_PTYPE_GRENAT6_MAC_PAY3) &&

		      (rx_ptype < I40E_RX_PTYPE_GRENAT6_MACVLAN_IPV6_ICMP_PAY4);



	skb->encapsulation = ipv4_tunnel || ipv6_tunnel;

	skb->ip_summed = CHECKSUM_NONE;



	/* Rx csum enabled and ip headers found? */
@@ -820,6 +819,7 @@ static inline void i40e_rx_checksum(struct i40e_vsi *vsi, 
	}



	skb->ip_summed = CHECKSUM_UNNECESSARY;

	skb->csum_level = ipv4_tunnel || ipv6_tunnel;



	return;

drivers/net/ethernet/mellanox/mlx4/en_rx.c

+3 −3
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud 
					gro_skb->ip_summed = CHECKSUM_UNNECESSARY;



					if (l2_tunnel)

						gro_skb->encapsulation = 1;

						gro_skb->csum_level = 1;

					if ((cqe->vlan_my_qpn &

					    cpu_to_be32(MLX4_CQE_VLAN_PRESENT_MASK)) &&

					    (dev->features & NETIF_F_HW_VLAN_CTAG_RX)) {
@@ -823,8 +823,8 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud 
		skb->protocol = eth_type_trans(skb, dev);

		skb_record_rx_queue(skb, cq->ring);



		if (l2_tunnel)

			skb->encapsulation = 1;

		if (l2_tunnel && ip_summed == CHECKSUM_UNNECESSARY)

			skb->csum_level = 1;



		if (dev->features & NETIF_F_RXHASH)

			skb_set_hash(skb,

drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c

+1 −1
Original line number Diff line number Diff line
@@ -1753,7 +1753,7 @@ qlcnic_83xx_process_rcv(struct qlcnic_adapter *adapter, 


	if (qlcnic_encap_length(sts_data[1]) &&

	    skb->ip_summed == CHECKSUM_UNNECESSARY) {

		skb->encapsulation = 1;

		skb->csum_level = 1;

		adapter->stats.encap_rx_csummed++;

	}