i40e/i40evf: Add capability exchange for outer checksum
Subsystems (2)
PATCH 1/1 i40e/i40evf: Add capability exchange for outer checksum
From: Preethi Banala <[email protected]>
This patch adds a capability negotiation between VF and PF using ENCAP/ ENCAP_CSUM offload flags in order for the VF to support outer checksum and TSO offloads for encapsulated packets. These capabilities were assumed by default and enabled in current hardware. Going forward, these features needs to be negotiated with PF before advertising to the stack. Additionally, strip out the mac.type checks for X722 since outer checksums are enabled based on the ENCAP_CSUM offload negotiation flag and maintain consistency between drivers in how the features are configured.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 52 +++++++++--------- drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 3 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 7 +++ drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 3 +- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 61 ++++++++++++---------- .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 4 +- 6 files changed, 74 insertions(+), 56 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +27 -25
@@ -9240,6 +9240,8 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)u8 broadcast[ETH_ALEN ];u8 mac_addr[ETH_ALEN ];int etherdev_size; +netdev_features_t hw_enc_features; +netdev_features_t hw_features; etherdev_size =sizeof (struct i40e_netdev_priv ); netdev =alloc_etherdev_mq (etherdev_size, vsi->alloc_queue_pairs);
@@ -9250,43 +9252,43 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) np =netdev_priv (netdev); np->vsi = vsi; - netdev->hw_enc_features |=NETIF_F_SG | -NETIF_F_IP_CSUM | -NETIF_F_IPV6_CSUM | -NETIF_F_HIGHDMA | -NETIF_F_SOFT_FEATURES | -NETIF_F_TSO | -NETIF_F_TSO_ECN | -NETIF_F_TSO6 | -NETIF_F_GSO_GRE | -NETIF_F_GSO_GRE_CSUM | -NETIF_F_GSO_IPXIP4 | -NETIF_F_GSO_IPXIP6 | -NETIF_F_GSO_UDP_TUNNEL | -NETIF_F_GSO_UDP_TUNNEL_CSUM | -NETIF_F_GSO_PARTIAL | -NETIF_F_SCTP_CRC | -NETIF_F_RXHASH | -NETIF_F_RXCSUM | -0 ; + hw_enc_features =NETIF_F_SG | +NETIF_F_IP_CSUM | +NETIF_F_IPV6_CSUM | +NETIF_F_HIGHDMA | +NETIF_F_SOFT_FEATURES | +NETIF_F_TSO | +NETIF_F_TSO_ECN | +NETIF_F_TSO6 | +NETIF_F_GSO_GRE | +NETIF_F_GSO_GRE_CSUM | +NETIF_F_GSO_PARTIAL | +NETIF_F_GSO_UDP_TUNNEL | +NETIF_F_GSO_UDP_TUNNEL_CSUM | +NETIF_F_SCTP_CRC | +NETIF_F_RXHASH | +NETIF_F_RXCSUM | +0 ;if (!(pf->flags &I40E_FLAG_OUTER_UDP_CSUM_CAPABLE )) netdev->gso_partial_features |=NETIF_F_GSO_UDP_TUNNEL_CSUM ; netdev->gso_partial_features |=NETIF_F_GSO_GRE_CSUM ; + netdev->hw_enc_features |= hw_enc_features; +/* record features VLANs can make use of */ - netdev->vlan_features |= netdev->hw_enc_features | -NETIF_F_TSO_MANGLEID ; + netdev->vlan_features |= hw_enc_features |NETIF_F_TSO_MANGLEID ;if (!(pf->flags &I40E_FLAG_MFP_ENABLED )) netdev->hw_features |=NETIF_F_NTUPLE ; + hw_features = hw_enc_features | +NETIF_F_HW_VLAN_CTAG_TX | +NETIF_F_HW_VLAN_CTAG_RX ; - netdev->hw_features |= netdev->hw_enc_features | -NETIF_F_HW_VLAN_CTAG_TX | -NETIF_F_HW_VLAN_CTAG_RX ; + netdev->hw_features |= hw_features; - netdev->features |= netdev->hw_features |NETIF_F_HW_VLAN_CTAG_FILTER ; + netdev->features |= hw_features |NETIF_F_HW_VLAN_CTAG_FILTER ; netdev->hw_enc_features |=NETIF_F_TSO_MANGLEID ;if (vsi->type ==I40E_VSI_MAIN ) {
drivers/net/ethernet/intel/i40e/i40e_virtchnl.h +2 -1
@@ -163,7 +163,8 @@ struct i40e_virtchnl_vsi_resource {#define I40E_VIRTCHNL_VF_OFFLOAD_RX_POLLING 0x00020000#define I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2 0x00040000#define I40E_VIRTCHNL_VF_OFFLOAD_RSS_PF 0X00080000 -#define I40E_VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM 0X00100000 +#define I40E_VIRTCHNL_VF_OFFLOAD_ENCAP 0X00100000 +#define I40E_VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM 0X00200000#define I40E_VF_BASE_MODE_OFFLOADS (I40E_VIRTCHNL_VF_OFFLOAD_L2 | \ I40E_VIRTCHNL_VF_OFFLOAD_VLAN | \
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +7 -0
@@ -1408,6 +1408,13 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2 ; } +if (vf->driver_caps &I40E_VIRTCHNL_VF_OFFLOAD_ENCAP ) + vfres->vf_offload_flags |=I40E_VIRTCHNL_VF_OFFLOAD_ENCAP ; + +if ((pf->flags &I40E_FLAG_OUTER_UDP_CSUM_CAPABLE ) && + (vf->driver_caps &I40E_VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM )) + vfres->vf_offload_flags |=I40E_VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM ; +if (vf->driver_caps &I40E_VIRTCHNL_VF_OFFLOAD_RX_POLLING ) {if (pf->flags &I40E_FLAG_MFP_ENABLED ) { dev_err(&pf->pdev->dev,
drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h +2 -1
@@ -163,7 +163,8 @@ struct i40e_virtchnl_vsi_resource {#define I40E_VIRTCHNL_VF_OFFLOAD_RX_POLLING 0x00020000#define I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2 0x00040000#define I40E_VIRTCHNL_VF_OFFLOAD_RSS_PF 0X00080000 -#define I40E_VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM 0X00100000 +#define I40E_VIRTCHNL_VF_OFFLOAD_ENCAP 0X00100000 +#define I40E_VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM 0X00200000#define I40E_VF_BASE_MODE_OFFLOADS (I40E_VIRTCHNL_VF_OFFLOAD_L2 | \ I40E_VIRTCHNL_VF_OFFLOAD_VLAN | \
drivers/net/ethernet/intel/i40evf/i40evf_main.c +33 -28
94 lines not on this page · raw message
drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c +3 -1
@@ -159,7 +159,9 @@ int i40evf_send_vf_config_msg(struct i40evf_adapter *adapter)I40E_VIRTCHNL_VF_OFFLOAD_RSS_REG |I40E_VIRTCHNL_VF_OFFLOAD_VLAN |I40E_VIRTCHNL_VF_OFFLOAD_WB_ON_ITR | -I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2 ; +I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2 | +I40E_VIRTCHNL_VF_OFFLOAD_ENCAP | +I40E_VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM ; adapter->current_op =I40E_VIRTCHNL_OP_GET_VF_RESOURCES ; adapter->aq_required &= ~I40EVF_FLAG_AQ_GET_CONFIG ;
Signature · 1 line
2.4.11
Bowers
PATCH 1/1 i40e/i40evf: Add capability exchange for outer checksum
Quoted 26 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Bimmy Pujari
Sent: Monday, March 27, 2017 2:43 PM
To: intel-wired-lan at lists.osuosl.org
Cc: Alexander Duyck <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S64 1/1] i40e/i40evf: Add capability exchange for outer checksumFrom: Preethi Banala <[email protected]>
This patch adds a capability negotiation between VF and PF using ENCAP/
ENCAP_CSUMoffload flags in order for the VF to support outer checksum and TSO offloads for encapsulated packets. These capabilities were assumed by default and enabled in current hardware. Going forward, these features needs to be negotiated with PF before advertising to the stack. Additionally, strip out the mac.type checks for X722 since outer checksums are enabled based on theENCAP_CSUMoffload negotiation flag and maintain consistency between drivers in how the features are configured.Signed-off-by Preethi Banala <[email protected]>Signed-off-by Alan Brady <[email protected]>Signed-off-by Alexander Duyck <[email protected]>Signed-off-by Jesse Brandeburg <[email protected]>Signed-off-by Jacob Keller <[email protected]>Change-ID Ie380a6f57eca557a2bb575b66b12fae36d308920
Quoted 9 lines
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 52 +++++++++--------- drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 3 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 7 +++ drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 3 +- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 61 ++++++++++++------- --- .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 4 +- 6 files changed, 74 insertions(+), 56 deletions(-)