i40e/i40evf: RSS changes for X722
Subsystems (2)
PATCH v2 5/10 i40e/i40evf: RSS changes for X722
From: Anjali Singhai Jain <[email protected]>
X722 uses the admin queue to configure RSS. This patch adds the necessary flow changes to configure RSS through AQ. It also adds the separate VMDQ2 lookup tables and hash key programming for X722.
X722 also exposes a different set of PCTYPES for RSS, this patch accommodates those changes.
---
v2: Use adapter->num_active_queues instead of adapter->vsi_res->num_queue_pairs
in i40evf.
drivers/net/ethernet/intel/i40e/i40e.h | 7 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 156 ++++++++++++++----- drivers/net/ethernet/intel/i40e/i40e_txrx.h | 12 ++ drivers/net/ethernet/intel/i40e/i40e_type.h | 15 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 11 +- drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 12 ++ drivers/net/ethernet/intel/i40evf/i40e_type.h | 15 +- drivers/net/ethernet/intel/i40evf/i40evf.h | 2 + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 166 ++++++++++++++++----- 9 files changed, 307 insertions(+), 89 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +5 -2
@@ -79,10 +79,13 @@#define I40E_MIN_MSIX 2#define I40E_DEFAULT_NUM_VMDQ_VSI 8/* max 256 VSIs */ #define I40E_MIN_VSI_ALLOC 51/* LAN, ATR, FCOE, 32 VF, 16 VMDQ */ -#define I40E_DEFAULT_QUEUES_PER_VMDQ 2/* max 16 qps */ +/* max 16 qps */ +#define i40e_default_queues_per_vmdq (pf) \ + (((pf)->flags & I40E_FLAG_RSS_AQ_CAPABLE) ? 4 : 1)#define I40E_DEFAULT_QUEUES_PER_VF 4#define I40E_DEFAULT_QUEUES_PER_TC 1/* should be a power of 2 */ -#define I40E_MAX_QUEUES_PER_TC 64/* should be a power of 2 */ +#define i40e_pf_get_max_q_per_tc (pf) \ + (((pf)->flags & I40E_FLAG_128_QP_RSS_CAPABLE) ? 128 : 64)#define I40E_FDIR_RING 0#define I40E_FDIR_RING_COUNT 32#ifdef I40E_FCOE
drivers/net/ethernet/intel/i40e/i40e_main.c +118 -38
202 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_txrx.h +12 -0
@@ -78,6 +78,18 @@ enum i40e_dyn_idx_t { BIT_ULL(I40E_FILTER_PCTYPE_FRAG_IPV6) | \ BIT_ULL(I40E_FILTER_PCTYPE_L2_PAYLOAD)) +#define I40E_DEFAULT_RSS_HENA_EXPANDED (I40E_DEFAULT_RSS_HENA | \ + BIT(I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK) | \ + BIT(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) | \ + BIT(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP) | \ + BIT(I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK) | \ + BIT(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) | \ + BIT(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP)) + +#define i40e_pf_get_default_rss_hena (pf) \ + (((pf)->flags & I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE) ? \ + I40E_DEFAULT_RSS_HENA_EXPANDED : I40E_DEFAULT_RSS_HENA) +/* Supported Rx Buffer Sizes */ #define I40E_RXBUFFER_512 512/* Used for packet split */ #define I40E_RXBUFFER_2048 2048
drivers/net/ethernet/intel/i40e/i40e_type.h +12 -3
@@ -973,15 +973,24 @@ struct i40e_filter_program_desc {/* Packet Classifier Types for filters */ enum i40e_filter_pctype { -/* Note: Values 0-30 are reserved for future use */ +/* Note: Values 0-28 are reserved for future use. +* Value 29, 30, 32 are not supported on XL710 and X710. +*/ +I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP =29 , +I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP =30 ,I40E_FILTER_PCTYPE_NONF_IPV4_UDP =31 , -/* Note: Value 32 is reserved for future use */ +I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK =32 ,I40E_FILTER_PCTYPE_NONF_IPV4_TCP =33 ,I40E_FILTER_PCTYPE_NONF_IPV4_SCTP =34 ,I40E_FILTER_PCTYPE_NONF_IPV4_OTHER =35 ,I40E_FILTER_PCTYPE_FRAG_IPV4 =36 , -/* Note: Values 37-40 are reserved for future use */ +/* Note: Values 37-38 are reserved for future use. +* Value 39, 40, 42 are not supported on XL710 and X710. +*/ +I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP =39 , +I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP =40 ,I40E_FILTER_PCTYPE_NONF_IPV6_UDP =41 , +I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK =42 ,I40E_FILTER_PCTYPE_NONF_IPV6_TCP =43 ,I40E_FILTER_PCTYPE_NONF_IPV6_SCTP =44 ,I40E_FILTER_PCTYPE_NONF_IPV6_OTHER =45 ,
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +8 -3
@@ -1177,9 +1177,14 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg) vfres->vf_offload_flags =I40E_VIRTCHNL_VF_OFFLOAD_L2 ; vsi = pf->vsi[vf->lan_vsi_idx];if (!vsi->info.pvid) - vfres->vf_offload_flags |=I40E_VIRTCHNL_VF_OFFLOAD_VLAN | -I40E_VIRTCHNL_VF_OFFLOAD_RSS_REG ; - + vfres->vf_offload_flags |=I40E_VIRTCHNL_VF_OFFLOAD_VLAN ; +if (pf->flags &I40E_FLAG_RSS_AQ_CAPABLE ) { +if (vf->driver_caps &I40E_VIRTCHNL_VF_OFFLOAD_RSS_AQ ) + vfres->vf_offload_flags |= +I40E_VIRTCHNL_VF_OFFLOAD_RSS_AQ ; + }else { + vfres->vf_offload_flags |=I40E_VIRTCHNL_VF_OFFLOAD_RSS_REG ; + } vfres->num_vsis = num_vsis; vfres->num_queue_pairs = vf->num_queue_pairs; vfres->max_vectors = pf->hw.func_caps.num_msix_vectors_vf;
drivers/net/ethernet/intel/i40evf/i40e_txrx.h +12 -0
@@ -78,6 +78,18 @@ enum i40e_dyn_idx_t { BIT_ULL(I40E_FILTER_PCTYPE_FRAG_IPV6) | \ BIT_ULL(I40E_FILTER_PCTYPE_L2_PAYLOAD)) +#define I40E_DEFAULT_RSS_HENA_EXPANDED (I40E_DEFAULT_RSS_HENA | \ + BIT(I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK) | \ + BIT(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) | \ + BIT(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP) | \ + BIT(I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK) | \ + BIT(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) | \ + BIT(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP)) + +#define i40e_pf_get_default_rss_hena (pf) \ + (((pf)->flags & I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE) ? \ + I40E_DEFAULT_RSS_HENA_EXPANDED : I40E_DEFAULT_RSS_HENA) +/* Supported Rx Buffer Sizes */ #define I40E_RXBUFFER_512 512/* Used for packet split */ #define I40E_RXBUFFER_2048 2048
drivers/net/ethernet/intel/i40evf/i40e_type.h +12 -3
@@ -967,15 +967,24 @@ struct i40e_filter_program_desc {/* Packet Classifier Types for filters */ enum i40e_filter_pctype { -/* Note: Values 0-30 are reserved for future use */ +/* Note: Values 0-28 are reserved for future use. +* Value 29, 30, 32 are not supported on XL710 and X710. +*/ +I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP =29 , +I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP =30 ,I40E_FILTER_PCTYPE_NONF_IPV4_UDP =31 , -/* Note: Value 32 is reserved for future use */ +I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK =32 ,I40E_FILTER_PCTYPE_NONF_IPV4_TCP =33 ,I40E_FILTER_PCTYPE_NONF_IPV4_SCTP =34 ,I40E_FILTER_PCTYPE_NONF_IPV4_OTHER =35 ,I40E_FILTER_PCTYPE_FRAG_IPV4 =36 , -/* Note: Values 37-40 are reserved for future use */ +/* Note: Values 37-38 are reserved for future use. +* Value 39, 40, 42 are not supported on XL710 and X710. +*/ +I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP =39 , +I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP =40 ,I40E_FILTER_PCTYPE_NONF_IPV6_UDP =41 , +I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK =42 ,I40E_FILTER_PCTYPE_NONF_IPV6_TCP =43 ,I40E_FILTER_PCTYPE_NONF_IPV6_SCTP =44 ,I40E_FILTER_PCTYPE_NONF_IPV6_OTHER =45 ,
drivers/net/ethernet/intel/i40evf/i40evf.h +2 -0
@@ -101,6 +101,8 @@ struct i40e_vsi {#define MAX_RX_QUEUES 8#define MAX_TX_QUEUES MAX_RX_QUEUES +#define I40EVF_HKEY_ARRAY_SIZE ((I40E_VFQF_HKEY_MAX_INDEX + 1) * 4) +/* MAX_MSIX_Q_VECTORS of these are allocated, * but we only use one per queue-specific vector. */
drivers/net/ethernet/intel/i40evf/i40evf_main.c +126 -40
196 lines not on this page · raw message
Signature · 1 line
1.9.3
Young
PATCH v2 5/10 i40e/i40evf: RSS changes for X722
Quoted 26 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Tuesday, June 23, 2015 4:00 PM
To: intel-wired-lan at lists.osuosl.org
Cc: Singhai, Anjali
Subject: [Intel-wired-lan] [intel-wired-lan][net-next PATCH S07 v2 05/10] i40e/i40evf: RSS changes for X722From: Anjali Singhai Jain <[email protected]>
X722 uses the admin queue to configure RSS. This patch adds the necessary flow changes to configure RSS through AQ. It also adds the separate VMDQ2 lookup tables and hash key programming for X722.
X722 also exposes a different set of PCTYPES for RSS, this patch accommodates those changes.
Signed-off-by Anjali Singhai Jain <[email protected]>Signed-off-by Catherine Sullivan <[email protected]>Signed-off-by Mitch Williams <[email protected]>---
v2: Useadapter->num_active_queuesinstead of adapter->vsi_res-Quoted 1 line
num_queue_pairsin i40evf.
Quoted 13 lines
drivers/net/ethernet/intel/i40e/i40e.h | 7 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 156 ++++++++++++++---- - drivers/net/ethernet/intel/i40e/i40e_txrx.h | 12 ++ drivers/net/ethernet/intel/i40e/i40e_type.h | 15 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 11 +- drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 12 ++ drivers/net/ethernet/intel/i40evf/i40e_type.h | 15 +- drivers/net/ethernet/intel/i40evf/i40evf.h | 2 + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 166 ++++++++++++++++----- 9 files changed, 307 insertions(+), 89 deletions(-)