Change Log
Subsystems (2)
cover Change Log
V4: Submission to Jeff's tree
V5: Re-ordered patches
V6: Sync with Jeff's latest tree
V7: Changes to patches 1 and 2 as per community feedback
V8: Changes to patch 3 as per community feedback
drivers/net/ethernet/intel/i40e/i40e_adminq.c | 12 ++ drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 55 +++++- drivers/net/ethernet/intel/i40e/i40e_common.c | 201 ++++++++++++++++++--- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 154 ++++++++++++++++ drivers/net/ethernet/intel/i40e/i40e_main.c | 7 + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 9 + drivers/net/ethernet/intel/i40e/i40e_type.h | 19 ++ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 97 +++++++--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 5 +- .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 55 +++++- drivers/net/ethernet/intel/i40evf/i40e_common.c | 69 +++++++ drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 9 + drivers/net/ethernet/intel/i40evf/i40e_type.h | 20 ++ drivers/net/ethernet/intel/i40evf/i40evf.h | 4 + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 38 +++- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 97 +++++++++- .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 44 ++++- 17 files changed, 827 insertions(+), 68 deletions(-)
Signature · 1 line
2.9.4
PATCH 1/12 i40e: Fix reporting of supported link modes
From: Filip Sadowski <[email protected]>
This patch fixes incorrect reporting of supported link modes on some NICs.
--- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 20 ++++++++++++++++++-- drivers/net/ethernet/intel/i40e/i40e_common.c | 11 ++++++++++- drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 20 ++++++++++++++++++-- 3 files changed, 46 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h +18 -2
@@ -1734,6 +1734,8 @@ enum i40e_aq_phy_type {I40E_PHY_TYPE_10GBASE_CR1_CU =0xB ,I40E_PHY_TYPE_10GBASE_AOC =0xC ,I40E_PHY_TYPE_40GBASE_AOC =0xD , +I40E_PHY_TYPE_UNRECOGNIZED =0xE , +I40E_PHY_TYPE_UNSUPPORTED =0xF ,I40E_PHY_TYPE_100BASE_TX =0x11 ,I40E_PHY_TYPE_1000BASE_T =0x12 , I40E_PHY_TYPE_10GBASE_T = 0x13,
@@ -1752,6 +1754,8 @@ enum i40e_aq_phy_type {I40E_PHY_TYPE_25GBASE_CR =0x20 ,I40E_PHY_TYPE_25GBASE_SR =0x21 ,I40E_PHY_TYPE_25GBASE_LR =0x22 , +I40E_PHY_TYPE_EMPTY =0xFE , +I40E_PHY_TYPE_DEFAULT =0xFF , I40E_PHY_TYPE_MAX };
@@ -1942,19 +1946,31 @@ struct i40e_aqc_get_link_status {#define I40E_AQ_25G_SERDES_UCODE_ERR 0X04#define I40E_AQ_25G_NIMB_UCODE_ERR 0X05u8 loopback;/* use defines from i40e_aqc_set_lb_mode */ +/* Since firmware API 1.7 loopback field keeps power class info as well */ +#define I40E_AQ_LOOPBACK_MASK 0x07 +#define I40E_AQ_PWR_CLASS_SHIFT_LB 6 +#define I40E_AQ_PWR_CLASS_MASK_LB (0x03 << I40E_AQ_PWR_CLASS_SHIFT_LB)__le16 max_frame_size;u8 config;#define I40E_AQ_CONFIG_FEC_KR_ENA 0x01#define I40E_AQ_CONFIG_FEC_RS_ENA 0x02#define I40E_AQ_CONFIG_CRC_ENA 0x04#define I40E_AQ_CONFIG_PACING_MASK 0x78 -u8 power_desc; +union { +struct { +u8 power_desc;#define I40E_AQ_LINK_POWER_CLASS_1 0x00#define I40E_AQ_LINK_POWER_CLASS_2 0x01#define I40E_AQ_LINK_POWER_CLASS_3 0x02#define I40E_AQ_LINK_POWER_CLASS_4 0x03#define I40E_AQ_PWR_CLASS_MASK 0x03 -u8 reserved[4 ]; +u8 reserved[4 ]; + }; +struct { +u8 link_type[4 ]; +u8 link_type_ext; + }; + }; };I40E_CHECK_CMD_LENGTH (i40e_aqc_get_link_status);
drivers/net/ethernet/intel/i40e/i40e_common.c +10 -1
@@ -1826,7 +1826,7 @@ i40e_status i40e_aq_get_link_info(struct i40e_hw *hw, hw_link_info->fec_info = resp->config & (I40E_AQ_CONFIG_FEC_KR_ENA |I40E_AQ_CONFIG_FEC_RS_ENA ); hw_link_info->ext_info = resp->ext_info; - hw_link_info->loopback = resp->loopback; + hw_link_info->loopback = resp->loopback &I40E_AQ_LOOPBACK_MASK ; hw_link_info->max_frame_size =le16_to_cpu (resp->max_frame_size); hw_link_info->pacing = resp->config &I40E_AQ_CONFIG_PACING_MASK ;
@@ -1857,6 +1857,15 @@ i40e_status i40e_aq_get_link_info(struct i40e_hw *hw, hw->aq.fw_min_ver < 40)) && hw_link_info->phy_type == 0xE) hw_link_info->phy_type = I40E_PHY_TYPE_10GBASE_SFPP_CU; +if (hw->aq.api_maj_ver ==I40E_FW_API_VERSION_MAJOR && + hw->aq.api_min_ver >=7 ) { +__le32 tmp; + +memcpy (&tmp, resp->link_type,sizeof (tmp)); + hw->phy.phy_types =le32_to_cpu (tmp); + hw->phy.phy_types |= ((u64 )resp->link_type_ext <<32 ); + } +/* save link status information */ if (link) *link = *hw_link_info;
drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h +18 -2
@@ -1730,6 +1730,8 @@ enum i40e_aq_phy_type {I40E_PHY_TYPE_10GBASE_CR1_CU =0xB ,I40E_PHY_TYPE_10GBASE_AOC =0xC ,I40E_PHY_TYPE_40GBASE_AOC =0xD , +I40E_PHY_TYPE_UNRECOGNIZED =0xE , +I40E_PHY_TYPE_UNSUPPORTED =0xF ,I40E_PHY_TYPE_100BASE_TX =0x11 ,I40E_PHY_TYPE_1000BASE_T =0x12 , I40E_PHY_TYPE_10GBASE_T = 0x13,
@@ -1748,6 +1750,8 @@ enum i40e_aq_phy_type {I40E_PHY_TYPE_25GBASE_CR =0x20 ,I40E_PHY_TYPE_25GBASE_SR =0x21 ,I40E_PHY_TYPE_25GBASE_LR =0x22 , +I40E_PHY_TYPE_EMPTY =0xFE , +I40E_PHY_TYPE_DEFAULT =0xFF , I40E_PHY_TYPE_MAX };
@@ -1938,19 +1942,31 @@ struct i40e_aqc_get_link_status {#define I40E_AQ_25G_SERDES_UCODE_ERR 0X04#define I40E_AQ_25G_NIMB_UCODE_ERR 0X05u8 loopback;/* use defines from i40e_aqc_set_lb_mode */ +/* Since firmware API 1.7 loopback field keeps power class info as well */ +#define I40E_AQ_LOOPBACK_MASK 0x07 +#define I40E_AQ_PWR_CLASS_SHIFT_LB 6 +#define I40E_AQ_PWR_CLASS_MASK_LB (0x03 << I40E_AQ_PWR_CLASS_SHIFT_LB)__le16 max_frame_size;u8 config;#define I40E_AQ_CONFIG_FEC_KR_ENA 0x01#define I40E_AQ_CONFIG_FEC_RS_ENA 0x02#define I40E_AQ_CONFIG_CRC_ENA 0x04#define I40E_AQ_CONFIG_PACING_MASK 0x78 -u8 power_desc; +union { +struct { +u8 power_desc;#define I40E_AQ_LINK_POWER_CLASS_1 0x00#define I40E_AQ_LINK_POWER_CLASS_2 0x01#define I40E_AQ_LINK_POWER_CLASS_3 0x02#define I40E_AQ_LINK_POWER_CLASS_4 0x03#define I40E_AQ_PWR_CLASS_MASK 0x03 -u8 reserved[4 ]; +u8 reserved[4 ]; + }; +struct { +u8 link_type[4 ]; +u8 link_type_ext; + }; + }; };I40E_CHECK_CMD_LENGTH (i40e_aqc_get_link_status);
Signature · 1 line
2.9.4
Bowers
PATCH 1/12 i40e: Fix reporting of supported link modes
Quoted 14 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, August 22, 2017 3:58 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Sadowski, Filip <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S78-V8 01/12] i40e: Fix reporting of supported link modesFrom: Filip Sadowski <[email protected]>
This patch fixes incorrect reporting of supported link modes on some NICs.
Quoted 8 lines
Signed-off-by Filip Sadowski <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 20 ++++++++++++++++++-- drivers/net/ethernet/intel/i40e/i40e_common.c | 11 ++++++++++- drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 20 ++++++++++++++++++-- 3 files changed, 46 insertions(+), 5 deletions(-)
PATCH 2/12 i40e: Add support for 'ethtool -m'
In reply to Alice MichaelFrom: Filip Sadowski <[email protected]>
This patch adds support for 'ethtool -m' command which displays information about (Q)SFP+ module plugged into NIC's cage.
--- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 18 +++ drivers/net/ethernet/intel/i40e/i40e_common.c | 69 +++++++++ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 154 +++++++++++++++++++++ drivers/net/ethernet/intel/i40e/i40e_prototype.h | 9 ++ drivers/net/ethernet/intel/i40e/i40e_type.h | 12 ++ .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 18 +++ drivers/net/ethernet/intel/i40evf/i40e_common.c | 69 +++++++++ drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 9 ++ drivers/net/ethernet/intel/i40evf/i40e_type.h | 12 ++ 9 files changed, 370 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h +18 -0
@@ -244,6 +244,8 @@ enum i40e_admin_queue_opc { i40e_aqc_opc_set_phy_debug =0x0622 , i40e_aqc_opc_upload_ext_phy_fm =0x0625 , i40e_aqc_opc_run_phy_activity =0x0626 , + i40e_aqc_opc_set_phy_register =0x0628 , + i40e_aqc_opc_get_phy_register =0x0629 ,/* NVM commands */ i40e_aqc_opc_nvm_read = 0x0701,
@@ -2053,6 +2055,22 @@ struct i40e_aqc_run_phy_activity {I40E_CHECK_CMD_LENGTH (i40e_aqc_run_phy_activity); +/* Set PHY Register command (0x0628) */ +/* Get PHY Register command (0x0629) */ +struct i40e_aqc_phy_register_access { +u8 phy_interface; +#define I40E_AQ_PHY_REG_ACCESS_INTERNAL 0 +#define I40E_AQ_PHY_REG_ACCESS_EXTERNAL 1 +#define I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE 2 +u8 dev_address; +u8 reserved1[2 ]; +__le32 reg_address; +__le32 reg_value; +u8 reserved2[4 ]; +}; + +I40E_CHECK_CMD_LENGTH (i40e_aqc_phy_register_access); +/* NVM Read command (indirect 0x0701) * NVM Erase commands (direct 0x0702) * NVM Update commands (indirect 0x0703)
drivers/net/ethernet/intel/i40e/i40e_common.c +69 -0
75 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +154 -0
166 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_prototype.h +9 -0
@@ -362,6 +362,15 @@ i40e_status i40e_aq_rx_ctl_write_register(struct i40e_hw *hw, u32 reg_addr, u32 reg_val, struct i40e_asq_cmd_details *cmd_details);void i40e_write_rx_ctl (struct i40e_hw *hw,u32 reg_addr,u32 reg_val); +i40e_status i40e_aq_set_phy_register (struct i40e_hw *hw, +u8 phy_select,u8 dev_addr, +u32 reg_addr,u32 reg_val, +struct i40e_asq_cmd_details *cmd_details); +i40e_status i40e_aq_get_phy_register (struct i40e_hw *hw, +u8 phy_select,u8 dev_addr, +u32 reg_addr,u32 *reg_val, +struct i40e_asq_cmd_details *cmd_details); +i40e_status i40e_read_phy_register_clause22 (struct i40e_hw *hw,u16 reg,u8 phy_addr,u16 *value); i40e_status i40e_write_phy_register_clause22(struct i40e_hw *hw,
drivers/net/ethernet/intel/i40e/i40e_type.h +12 -0
@@ -428,6 +428,18 @@ struct i40e_nvm_access {u8 data[1 ]; }; +/* (Q)SFP module access definitions */ +#define I40E_I2C_EEPROM_DEV_ADDR 0xA0 +#define I40E_I2C_EEPROM_DEV_ADDR2 0xA2 +#define I40E_MODULE_TYPE_ADDR 0x00 +#define I40E_MODULE_REVISION_ADDR 0x01 +#define I40E_MODULE_SFF_8472_COMP 0x5E +#define I40E_MODULE_SFF_8472_SWAP 0x5C +#define I40E_MODULE_SFF_ADDR_MODE 0x04 +#define I40E_MODULE_TYPE_QSFP_PLUS 0x0D +#define I40E_MODULE_TYPE_QSFP28 0x11 +#define I40E_MODULE_QSFP_MAX_LEN 640 +/* PCI bus types */ enum i40e_bus_type { i40e_bus_type_unknown =0 ,
drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h +18 -0
@@ -244,6 +244,8 @@ enum i40e_admin_queue_opc { i40e_aqc_opc_set_phy_debug =0x0622 , i40e_aqc_opc_upload_ext_phy_fm =0x0625 , i40e_aqc_opc_run_phy_activity =0x0626 , + i40e_aqc_opc_set_phy_register =0x0628 , + i40e_aqc_opc_get_phy_register =0x0629 ,/* NVM commands */ i40e_aqc_opc_nvm_read = 0x0701,
@@ -2046,6 +2048,22 @@ struct i40e_aqc_run_phy_activity {I40E_CHECK_CMD_LENGTH (i40e_aqc_run_phy_activity); +/* Set PHY Register command (0x0628) */ +/* Get PHY Register command (0x0629) */ +struct i40e_aqc_phy_register_access { +u8 phy_interface; +#define I40E_AQ_PHY_REG_ACCESS_INTERNAL 0 +#define I40E_AQ_PHY_REG_ACCESS_EXTERNAL 1 +#define I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE 2 +u8 dev_address; +u8 reserved1[2 ]; +__le32 reg_address; +__le32 reg_value; +u8 reserved2[4 ]; +}; + +I40E_CHECK_CMD_LENGTH (i40e_aqc_phy_register_access); +/* NVM Read command (indirect 0x0701) * NVM Erase commands (direct 0x0702) * NVM Update commands (indirect 0x0703)
drivers/net/ethernet/intel/i40evf/i40e_common.c +69 -0
75 lines not on this page · raw message
drivers/net/ethernet/intel/i40evf/i40e_prototype.h +9 -0
@@ -111,6 +111,15 @@ i40e_status i40evf_aq_rx_ctl_write_register(struct i40e_hw *hw, u32 reg_addr, u32 reg_val, struct i40e_asq_cmd_details *cmd_details);void i40evf_write_rx_ctl (struct i40e_hw *hw,u32 reg_addr,u32 reg_val); +i40e_status i40e_aq_set_phy_register (struct i40e_hw *hw, +u8 phy_select,u8 dev_addr, +u32 reg_addr,u32 reg_val, +struct i40e_asq_cmd_details *cmd_details); +i40e_status i40e_aq_get_phy_register (struct i40e_hw *hw, +u8 phy_select,u8 dev_addr, +u32 reg_addr,u32 *reg_val, +struct i40e_asq_cmd_details *cmd_details); +i40e_status i40e_read_phy_register (struct i40e_hw *hw,u8 page,u16 reg,u8 phy_addr,u16 *value); i40e_status i40e_write_phy_register(struct i40e_hw *hw, u8 page,
drivers/net/ethernet/intel/i40evf/i40e_type.h +12 -0
@@ -401,6 +401,18 @@ struct i40e_nvm_access {u8 data[1 ]; }; +/* (Q)SFP module access definitions */ +#define I40E_I2C_EEPROM_DEV_ADDR 0xA0 +#define I40E_I2C_EEPROM_DEV_ADDR2 0xA2 +#define I40E_MODULE_TYPE_ADDR 0x00 +#define I40E_MODULE_REVISION_ADDR 0x01 +#define I40E_MODULE_SFF_8472_COMP 0x5E +#define I40E_MODULE_SFF_8472_SWAP 0x5C +#define I40E_MODULE_SFF_ADDR_MODE 0x04 +#define I40E_MODULE_TYPE_QSFP_PLUS 0x0D +#define I40E_MODULE_TYPE_QSFP28 0x11 +#define I40E_MODULE_QSFP_MAX_LEN 640 +/* PCI bus types */ enum i40e_bus_type { i40e_bus_type_unknown =0 ,
Signature · 1 line
2.9.4
Bowers
PATCH 2/12 i40e: Add support for 'ethtool -m'
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, August 22, 2017 3:58 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Sadowski, Filip <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S78-V8 02/12] i40e: Add support for 'ethtool -m'From: Filip Sadowski <[email protected]>
This patch adds support for 'ethtool -m' command which displays information about (Q)SFP+ module plugged into NIC's cage.
Signed-off-by Filip Sadowski <[email protected]>
Quoted 12 lines
--- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 18 +++ drivers/net/ethernet/intel/i40e/i40e_common.c | 69 +++++++++ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 154 +++++++++++++++++++++ drivers/net/ethernet/intel/i40e/i40e_prototype.h | 9 ++ drivers/net/ethernet/intel/i40e/i40e_type.h | 12 ++ .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 18 +++ drivers/net/ethernet/intel/i40evf/i40e_common.c | 69 +++++++++ drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 9 ++ drivers/net/ethernet/intel/i40evf/i40e_type.h | 12 ++ 9 files changed, 370 insertions(+)
PATCH 3/12 i40e: use admin queue for setting LEDs behavior
In reply to Alice MichaelFrom: Mariusz Stachura <[email protected]>
Instead of accessing register directly, use newly added AQC in order to blink LEDs. Introduce and utilize a new flag to prevent excessive API version checking.
--- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 6 ++ drivers/net/ethernet/intel/i40e/i40e_common.c | 115 ++++++++++++++++++++------ drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + drivers/net/ethernet/intel/i40evf/i40e_type.h | 2 + 4 files changed, 100 insertions(+), 24 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_adminq.c +6 -0
@@ -607,6 +607,12 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw) &oem_lo); hw->nvm.oem_ver = ((u32 )oem_hi <<16 ) | oem_lo; +if (hw->mac.type ==I40E_MAC_XL710 && + hw->aq.api_maj_ver ==I40E_FW_API_VERSION_MAJOR && + hw->aq.api_min_ver >=I40E_MINOR_VER_GET_LINK_INFO_XL710 ) { + hw->flags |=I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE ; + } +if (hw->aq.api_maj_ver >I40E_FW_API_VERSION_MAJOR ) { ret_code =I40E_ERR_FIRMWARE_API_VERSION ; goto init_adminq_free_arq;
drivers/net/ethernet/intel/i40e/i40e_common.c +91 -24
155 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_type.h +1 -0
@@ -610,6 +610,7 @@ struct i40e_hw {struct i40e_dcbx_config desired_dcbx_config;/* CEE Desired Cfg */ #define I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE BIT_ULL(0) +#define I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE BIT_ULL(2)u64 flags;/* debug mask */
drivers/net/ethernet/intel/i40evf/i40e_type.h +2 -0
@@ -568,6 +568,8 @@ struct i40e_hw {/* LLDP/DCBX Status */ u16 dcbx_status; +#define I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE BIT_ULL(2) +/* DCBX info */ struct i40e_dcbx_config local_dcbx_config;/* Oper/Local Cfg */ struct i40e_dcbx_config remote_dcbx_config;/* Peer Cfg */
Signature · 1 line
2.9.4
Bowers
PATCH 3/12 i40e: use admin queue for setting LEDs behavior
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, August 22, 2017 3:58 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Cc: Stachura, Mariusz <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S78-V8 03/12] i40e: use admin queue for setting LEDs behaviorFrom: Mariusz Stachura <[email protected]>
Instead of accessing register directly, use newly added AQC in order to blink LEDs. Introduce and utilize a new flag to prevent excessive API version checking.
Quoted 8 lines
Signed-off-by Mariusz Stachura <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 6 ++ drivers/net/ethernet/intel/i40e/i40e_common.c | 115 ++++++++++++++++++++------ drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + drivers/net/ethernet/intel/i40evf/i40e_type.h | 2 + 4 files changed, 100 insertions(+), 24 deletions(-)
PATCH 4/12 i40e: don't hold spinlock while resetting VF
In reply to Alice MichaelFrom: Jacob Keller <[email protected]>
When we refactored handling of the PVID in commit 9af52f60b2d9 ("i40e: use (add|rm)_vlan_all_mac helper functions when changing PVID") we introduced a scheduling while atomic regression.
This occurred because we now held the spinlock across a call to i40e_reset_vf(), which results in a usleep_range() call that triggers a scheduling while atomic bug. This was rare as it only occurred if the user configured a VLAN on a VF and also attempted to reconfigure the VF from the host system with a port VLAN.
We do need to hold the lock while calling i40e_is_vsi_in_vlan(), but we should not be holding it while we reset the VF.
We'll fix this by introducing a separate helper function i40e_vsi_has_vlans which checks whether we have a PVID and whether the VSI has configured VLANs. This helper function will manage its own need for the mac_filter_hash_lock.
Then, we can move the acquiring of the spinlock until after we reset the VF, which ensures that we do not sleep while holding the lock.
Using a separate function like this makes the code more clear and is easier to read than attempting to release and re-acquire the spinlock when we reset the VF.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 36 +++++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +32 -4
@@ -2923,6 +2923,34 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) }/** +* i40e_vsi_has_vlans - True if VSI has configured VLANs +* @vsi: pointer to the vsi +* +* Check if a VSI has configured any VLANs. False if we have a port VLAN or if +* we have no configured VLANs. Do not call while holding the +* mac_filter_hash_lock. +*/ +static bool i40e_vsi_has_vlans (struct i40e_vsi *vsi) +{ +bool have_vlans; + +/* If we have a port VLAN, then the VSI cannot have any VLANs +* configured, as all MAC/VLAN filters will be assigned to the PVID. +*/ +if (vsi->info.pvid) +return false; + +/* Since we don't have a PVID, we know that if the device is in VLAN +* mode it must be because of a VLAN filter configured on this VSI. +*/ +spin_lock_bh (&vsi->mac_filter_hash_lock); + have_vlans =i40e_is_vsi_in_vlan (vsi); +spin_unlock_bh (&vsi->mac_filter_hash_lock); + +return have_vlans; +} + +/** * i40e_ndo_set_vf_port_vlan * @netdev: network interface device structure * @vf_id: VF identifier
@@ -2974,10 +3002,7 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, int vf_id,/* duplicate request, so just return success */ goto error_pvid; -/* Locked once because multiple functions below iterate list */ -spin_lock_bh (&vsi->mac_filter_hash_lock); - -if (le16_to_cpu (vsi->info.pvid) ==0 &&i40e_is_vsi_in_vlan (vsi)) { +if (i40e_vsi_has_vlans (vsi)) {dev_err (&pf->pdev->dev,"VF %d has already configured VLAN filters and the administrator is requesting a port VLAN override.\nPlease unload and reload the VF driver for this change to take effect.\n" , vf_id);
@@ -2990,6 +3015,9 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, int vf_id, vsi = pf->vsi[vf->lan_vsi_idx]; } +/* Locked once because multiple functions below iterate list */ +spin_lock_bh (&vsi->mac_filter_hash_lock); +/* Check for condition where there was already a port VLAN ID * filter set and now it is being deleted by setting it to zero. * Additionally check for the condition where there was a port
Signature · 1 line
2.9.4
Bowers
PATCH 4/12 i40e: don't hold spinlock while resetting VF
Quoted 36 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, August 22, 2017 3:58 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S78-V8 04/12] i40e: don't hold spinlock while resetting VFFrom: Jacob Keller <[email protected]>
When we refactored handling of the PVID in commit
9af52f60b2d9("i40e: use (add|rm)_vlan_all_mac helper functions when changing PVID") we introduced a scheduling while atomic regression.This occurred because we now held the spinlock across a call to
i40e_reset_vf(), which results in ausleep_range()call that triggers a scheduling while atomic bug. This was rare as it only occurred if the user configured a VLAN on a VF and also attempted to reconfigure the VF from the host system with a port VLAN.We do need to hold the lock while calling
i40e_is_vsi_in_vlan(), but we should not be holding it while we reset the VF.We'll fix this by introducing a separate helper function
i40e_vsi_has_vlanswhich checks whether we have a PVID and whether the VSI has configured VLANs. This helper function will manage its own need for themac_filter_hash_lock.Then, we can move the acquiring of the spinlock until after we reset the VF, which ensures that we do not sleep while holding the lock.
Using a separate function like this makes the code more clear and is easier to read than attempting to release and re-acquire the spinlock when we reset the VF.
Quoted 5 lines
Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 36 +++++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-)
PATCH 5/12 i40e: drop i40e_pf *pf from i40e_vc_disable_vf()
In reply to Alice MichaelFrom: Jacob Keller <[email protected]>
It's never used, and the vf structure could get back to the PF if necessary. Lets just drop the extra unneeded parameter.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +3 -4
@@ -154,12 +154,11 @@ void i40e_vc_notify_vf_reset(struct i40e_vf *vf)/** * i40e_vc_disable_vf -* @pf: pointer to the PF info * @vf: pointer to the VF info * * Disable the VF through a SW reset **/ -static inline void i40e_vc_disable_vf (struct i40e_pf *pf,struct i40e_vf *vf) +static inline void i40e_vc_disable_vf (struct i40e_vf *vf) {i40e_vc_notify_vf_reset (vf);i40e_reset_vf (vf, false);
@@ -2915,7 +2914,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) }/* Force the VF driver stop so it has to reload with new MAC address */ -i40e_vc_disable_vf (pf, vf); +i40e_vc_disable_vf (vf);dev_info (&pf->pdev->dev,"Reload the VF driver to make this change effective.\n" ); error_param:
@@ -3010,7 +3009,7 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, int vf_id,* the right thing by reconfiguring his network correctly * and then reloading the VF driver. */ -i40e_vc_disable_vf (pf, vf); +i40e_vc_disable_vf (vf);/* During reset the VF got a new VSI, so refresh the pointer. */ vsi = pf->vsi[vf->lan_vsi_idx]; }
Signature · 1 line
2.9.4
Bowers
PATCH 5/12 i40e: drop i40e_pf *pf from i40e_vc_disable_vf()
Quoted 11 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, August 22, 2017 3:58 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S78-V8 05/12] i40e: dropi40e_pf*pf fromi40e_vc_disable_vf()From: Jacob Keller <[email protected]>
Quoted 7 lines
It's never used, and the vf structure could get back to the PF if necessary. Lets just drop the extra unneeded parameter.
Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
PATCH 6/12 i40e: make use of i40e_vc_disable_vf
In reply to Alice MichaelFrom: Jacob Keller <[email protected]>
Replace i40e_vc_notify_vf_reset and i40e_reset_vf with a call to i40e_vc_disable_vf which does this exact thing. This matches similar code patterns throughout the driver.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +1 -2
@@ -3385,8 +3385,7 @@ int i40e_ndo_set_vf_trust(struct net_device *netdev, int vf_id, bool setting) goto out; vf->trusted = setting; -i40e_vc_notify_vf_reset (vf); -i40e_reset_vf (vf, false); +i40e_vc_disable_vf (vf);dev_info (&pf->pdev->dev,"VF %u is now %strusted\n" , vf_id, setting ?"" :"un" ); out:
Signature · 1 line
2.9.4
Bowers
PATCH 6/12 i40e: make use of i40e_vc_disable_vf
Quoted 11 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, August 22, 2017 3:58 AM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S78-V8 06/12] i40e: make use ofi40e_vc_disable_vfFrom: Jacob Keller <[email protected]>
Quoted 8 lines
Replace
i40e_vc_notify_vf_resetandi40e_reset_vfwith a call toi40e_vc_disable_vfwhich does this exact thing. This matches similar code patterns throughout the driver.Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
PATCH 7/12 i40e: ensure reset occurs when disabling VF
In reply to Alice MichaelFrom: Jacob Keller <[email protected]>
It is possible although rare that we may not reset when i40e_vc_disable_vf() is called. This can lead to some weird circumstances with some values not being properly set. Modify i40e_reset_vf() to return a code indicating whether it reset or not.
Now, i40e_vc_disable_vf() can wait until a reset actually occurs. If it fails to free up within a reasonable timeframe we'll display a warning message.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 42 +++++++++++++++++----- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 4 +-- 2 files changed, 35 insertions(+), 11 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +33 -9
@@ -156,12 +156,28 @@ void i40e_vc_notify_vf_reset(struct i40e_vf *vf)* i40e_vc_disable_vf * @vf: pointer to the VF info * -* Disable the VF through a SW reset +* Disable the VF through a SW reset. **/ static inline void i40e_vc_disable_vf (struct i40e_vf *vf) { +int i; +i40e_vc_notify_vf_reset (vf); -i40e_reset_vf (vf, false); + +/* We want to ensure that an actual reset occurs initiated after this +* function was called. However, we do not want to wait forever, so +* we'll give a reasonable time and print a message if we failed to +* ensure a reset. +*/ +for (i =0 ; i <20 ; i++) { +if (i40e_reset_vf (vf, false)) +return ; +usleep_range (10000 ,20000 ); + } + +dev_warn (&vf->pf->pdev->dev, +"Failed to initiate reset for VF %d after 200 milliseconds\n" , + vf->vf_id); }/**
@@ -1048,9 +1064,9 @@ static void i40e_cleanup_reset_vf(struct i40e_vf *vf)* @vf: pointer to the VF structure * @flr: VFLR was issued or not * -* reset the VF +* Returns true if the VF is reset, false otherwise. **/ -void i40e_reset_vf (struct i40e_vf *vf,bool flr) +bool i40e_reset_vf (struct i40e_vf *vf,bool flr) {struct i40e_pf *pf = vf->pf;struct i40e_hw *hw = &pf->hw;
@@ -1058,9 +1074,11 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr)u32 reg;int i; -/* If VFs have been disabled, there is no need to reset */ +/* If the VFs have been disabled, this means something else is +* resetting the VF, so we shouldn't continue. +*/ if (test_and_set_bit (__I40E_VF_DISABLE, pf->state)) -return ; +return false;i40e_trigger_vf_reset (vf, flr);
@@ -1097,6 +1115,8 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr)i40e_flush (hw);clear_bit (__I40E_VF_DISABLE, pf->state); + +return true; }/**
@@ -1108,8 +1128,10 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr)* VF, then do all the waiting in one chunk, and finally finish restoring each * VF after the wait. This is useful during PF routines which need to reset * all VFs, as otherwise it must perform these resets in a serialized fashion. +* +* Returns true if any VFs were reset, and false otherwise. **/ -void i40e_reset_all_vfs (struct i40e_pf *pf,bool flr) +bool i40e_reset_all_vfs (struct i40e_pf *pf,bool flr) {struct i40e_hw *hw = &pf->hw;struct i40e_vf *vf;
@@ -1118,11 +1140,11 @@ void i40e_reset_all_vfs(struct i40e_pf *pf, bool flr)/* If we don't have any VFs, then there is nothing to reset */ if (!pf->num_alloc_vfs) -return ; +return false;/* If VFs have been disabled, there is no need to reset */ if (test_and_set_bit (__I40E_VF_DISABLE, pf->state)) -return ; +return false;/* Begin reset on all VFs at once */ for (v =0 ; v < pf->num_alloc_vfs; v++)
@@ -1197,6 +1219,8 @@ void i40e_reset_all_vfs(struct i40e_pf *pf, bool flr)i40e_flush (hw);clear_bit (__I40E_VF_DISABLE, pf->state); + +return true; }/**
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h +2 -2
@@ -122,8 +122,8 @@ int i40e_alloc_vfs(struct i40e_pf *pf, u16 num_alloc_vfs);int i40e_vc_process_vf_msg (struct i40e_pf *pf,s16 vf_id,u32 v_opcode,u32 v_retval,u8 *msg,u16 msglen);int i40e_vc_process_vflr_event (struct i40e_pf *pf); -void i40e_reset_vf (struct i40e_vf *vf,bool flr); -void i40e_reset_all_vfs (struct i40e_pf *pf,bool flr); +bool i40e_reset_vf (struct i40e_vf *vf,bool flr); +bool i40e_reset_all_vfs (struct i40e_pf *pf,bool flr);void i40e_vc_notify_vf_reset (struct i40e_vf *vf);/* VF configuration related iplink handlers */
Signature · 1 line
2.9.4
Bowers
PATCH 7/12 i40e: ensure reset occurs when disabling VF
Quoted 19 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, August 22, 2017 3:58 AM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S78-V8 07/12] i40e: ensure reset occurs when disabling VFFrom: Jacob Keller <[email protected]>
It is possible although rare that we may not reset when
i40e_vc_disable_vf()is called. This can lead to some weird circumstances with some values not being properly set. Modifyi40e_reset_vf()to return a code indicating whether it reset or not.Now,
i40e_vc_disable_vf()can wait until a reset actually occurs. If it fails to free up within a reasonable timeframe we'll display a warning message.
Quoted 6 lines
Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 42 +++++++++++++++++----- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 4 +-- 2 files changed, 35 insertions(+), 11 deletions(-)
PATCH 8/12 i40evf: Enable VF to request an alternate queue allocation
In reply to Alice MichaelFrom: Alan Brady <[email protected]>
Currently the VF gets a default number of allocated queues from HW on init and it could choose to enable or disable those allocated queues. This makes it such that the VF can request more or less underlying allocated queues from the PF.
First the VF negotiates the number of queues it wants that can be supported by the PF and if successful asks for a reset. During reset the PF will reallocate the HW queues for the VF and will then remap the new queues.
--- drivers/net/ethernet/intel/i40evf/i40evf.h | 4 + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 38 ++++++++- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 94 ++++++++++++++++++++-- .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 44 +++++++++- 4 files changed, 173 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/i40evf/i40evf.h +4 -0
@@ -102,6 +102,7 @@ struct i40e_vsi {#define I40E_TX_CTXTDESC (R , i) \ (&(((struct i40e_tx_context_desc *)((R)->desc))[i]))#define MAX_QUEUES 16 +#define I40EVF_MAX_REQ_QUEUES 4#define I40EVF_HKEY_ARRAY_SIZE ((I40E_VFQF_HKEY_MAX_INDEX + 1) * 4)#define I40EVF_HLUT_ARRAY_SIZE ((I40E_VFQF_HLUT_MAX_INDEX + 1) * 4)
@@ -200,6 +201,7 @@ struct i40evf_adapter {struct list_head vlan_filter_list;char misc_vector_name[IFNAMSIZ +9 ];int num_active_queues; +int num_req_queues;/* TX */ struct i40e_ring *tx_rings;
@@ -235,6 +237,7 @@ struct i40evf_adapter {#define I40EVF_FLAG_PROMISC_ON BIT(13)#define I40EVF_FLAG_ALLMULTI_ON BIT(14)#define I40EVF_FLAG_LEGACY_RX BIT(15) +#define I40EVF_FLAG_REINIT_ITR_NEEDED BIT(16)/* duplicates for common code */ #define I40E_FLAG_DCB_ENABLED 0#define I40E_FLAG_RX_CSUM_ENABLED I40EVF_FLAG_RX_CSUM_ENABLED
@@ -349,6 +352,7 @@ void i40evf_deconfigure_queues(struct i40evf_adapter *adapter);void i40evf_enable_queues (struct i40evf_adapter *adapter);void i40evf_disable_queues (struct i40evf_adapter *adapter);void i40evf_map_queues (struct i40evf_adapter *adapter); +int i40evf_request_queues (struct i40evf_adapter *adapter,int num);void i40evf_add_ether_addrs (struct i40evf_adapter *adapter);void i40evf_del_ether_addrs (struct i40evf_adapter *adapter);void i40evf_add_vlans (struct i40evf_adapter *adapter);
drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c +37 -1
@@ -669,7 +669,7 @@ static void i40evf_get_channels(struct net_device *netdev,struct i40evf_adapter *adapter =netdev_priv (netdev);/* Report maximum channels */ - ch->max_combined = adapter->num_active_queues; + ch->max_combined =I40EVF_MAX_REQ_QUEUES ; ch->max_other =NONQ_VECS ; ch->other_count =NONQ_VECS ;
@@ -678,6 +678,41 @@ static void i40evf_get_channels(struct net_device *netdev, }/** +* i40evf_set_channels: set the new channel count +* @netdev: network interface device structure +* @ch: channel information structure +* +* Negotiate a new number of channels with the PF then do a reset. During +* reset we'll realloc queues and fix the RSS table. Returns 0 on success, +* negative on failure. +**/ +static int i40evf_set_channels (struct net_device *netdev, +struct ethtool_channels *ch) +{ +struct i40evf_adapter *adapter =netdev_priv (netdev); +int num_req = ch->combined_count; + +if (num_req != adapter->num_active_queues && + !(adapter->vf_res->vf_cap_flags & +VIRTCHNL_VF_OFFLOAD_REQ_QUEUES )) { +dev_info (&adapter->pdev->dev,"PF is not capable of queue negotiation.\n" ); +return -EINVAL ; + } + +/* All of these should have already been checked by ethtool before this +* even gets to us, but just to be sure. +*/ +if (num_req <=0 || num_req >I40EVF_MAX_REQ_QUEUES ) +return -EINVAL ; + +if (ch->rx_count || ch->tx_count || ch->other_count !=NONQ_VECS ) +return -EINVAL ; + + adapter->num_req_queues = num_req; +return i40evf_request_queues (adapter, num_req); +} + +/** * i40evf_get_rxfh_key_size - get the RSS hash key size * @netdev: network interface device structure *
@@ -785,6 +820,7 @@ static const struct ethtool_ops i40evf_ethtool_ops = { .get_rxfh = i40evf_get_rxfh, .set_rxfh = i40evf_set_rxfh, .get_channels = i40evf_get_channels, + .set_channels = i40evf_set_channels, .get_rxfh_key_size = i40evf_get_rxfh_key_size, .get_link_ksettings = i40evf_get_link_ksettings, };
drivers/net/ethernet/intel/i40evf/i40evf_main.c +89 -5
133 lines not on this page · raw message
drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c +43 -1
62 lines not on this page · raw message
Signature · 1 line
2.9.4
Bowers
PATCH 8/12 i40evf: Enable VF to request an alternate queue allocation
Quoted 20 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, August 22, 2017 3:58 AM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S78-V8 08/12] i40evf: Enable VF to request an alternate queue allocationFrom: Alan Brady <[email protected]>
Currently the VF gets a default number of allocated queues from HW on init and it could choose to enable or disable those allocated queues. This makes it such that the VF can request more or less underlying allocated queues from the PF.
First the VF negotiates the number of queues it wants that can be supported by the PF and if successful asks for a reset. During reset the PF will reallocate the HW queues for the VF and will then remap the new queues.
Quoted 8 lines
Signed-off-by Alan Brady <[email protected]>--- drivers/net/ethernet/intel/i40evf/i40evf.h | 4 + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 38 ++++++++- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 94 ++++++++++++++++++++-- .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 44 +++++++++- 4 files changed, 173 insertions(+), 7 deletions(-)
PATCH 9/12 i40e: make i40evf_map_rings_to_vectors void
In reply to Alice MichaelFrom: Mitch Williams <[email protected]>
This function cannot fail, so why is it returning a value? And why are we checking it? Why shouldn't we just make it void? Why is this commit message made up of only questions?
--- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/i40evf/i40evf_main.c +2 -7
@@ -430,12 +430,11 @@ i40evf_map_vector_to_txq(struct i40evf_adapter *adapter, int v_idx, int t_idx)* group the rings as "efficiently" as possible. You would add new * mapping configurations in here. **/ -static int i40evf_map_rings_to_vectors (struct i40evf_adapter *adapter) +static void i40evf_map_rings_to_vectors (struct i40evf_adapter *adapter) {int rings_remaining = adapter->num_active_queues;int ridx =0 , vidx =0 ;int q_vectors; -int err =0 ; q_vectors = adapter->num_msix_vectors -NONQ_VECS ;
@@ -451,8 +450,6 @@ static int i40evf_map_rings_to_vectors(struct i40evf_adapter *adapter) } adapter->aq_required |=I40EVF_FLAG_AQ_MAP_VECTORS ; - -return err; }#ifdef CONFIG_NET_POLL_CONTROLLER
@@ -1578,9 +1575,7 @@ static int i40evf_reinit_interrupt_scheme(struct i40evf_adapter *adapter)set_bit (__I40E_VSI_DOWN, adapter->vsi.state); - err =i40evf_map_rings_to_vectors (adapter); -if (err) - goto err; +i40evf_map_rings_to_vectors (adapter);if (RSS_AQ (adapter)) adapter->aq_required |=I40EVF_FLAG_AQ_CONFIGURE_RSS ;
Signature · 1 line
2.9.4
Bowers
PATCH 9/12 i40e: make i40evf_map_rings_to_vectors void
Quoted 12 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, August 22, 2017 3:58 AM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Cc: Williams, Mitch A <[email protected]>
Subject: [Intel-wired-lan] [next PATCH S78-V8 09/12] i40e: makei40evf_map_rings_to_vectorsvoidFrom: Mitch Williams <[email protected]>
Quoted 8 lines
This function cannot fail, so why is it returning a value? And why are we checking it? Why shouldn't we just make it void? Why is this commit message made up of only questions?
Signed-off-by Mitch Williams <[email protected]>--- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
PATCH 10/12 i40e: fix handling of vf_states variable
In reply to Alice MichaelFrom: Alan Brady <[email protected]>
Currently we inappropriately clear the vf_states variable with a null assignment. This is problematic because we should be using atomic bitops on this variable and we don't actually want to clear all the flags. We should just clear the ones we know we want to clear. Additionally remove the I40E_VF_STATE_FCOEENA bit because it is no longer being used.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 5 ++++- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 - 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +4 -1
@@ -876,7 +876,8 @@ static void i40e_free_vf_res(struct i40e_vf *vf) }/* reset some of the state variables keeping track of the resources */ vf->num_queue_pairs =0 ; - vf->vf_states =0 ; +clear_bit (I40E_VF_STATE_MC_PROMISC , &vf->vf_states); +clear_bit (I40E_VF_STATE_UC_PROMISC , &vf->vf_states); }/**
@@ -1583,6 +1584,8 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg) (vf->driver_caps & VIRTCHNL_VF_OFFLOAD_IWARP)) { vfres->vf_cap_flags |= VIRTCHNL_VF_OFFLOAD_IWARP; set_bit(I40E_VF_STATE_IWARPENA, &vf->vf_states); + } else { +clear_bit (I40E_VF_STATE_IWARPENA , &vf->vf_states); }if (vf->driver_caps &VIRTCHNL_VF_OFFLOAD_RSS_PF ) {
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h +0 -1
@@ -56,7 +56,6 @@ enum i40e_vf_states {I40E_VF_STATE_INIT =0 ,I40E_VF_STATE_ACTIVE ,I40E_VF_STATE_IWARPENA , -I40E_VF_STATE_FCOEENA ,I40E_VF_STATE_DISABLED ,I40E_VF_STATE_MC_PROMISC , I40E_VF_STATE_UC_PROMISC,
Signature · 1 line
2.9.4
Bowers
PATCH 10/12 i40e: fix handling of vf_states variable
Quoted 18 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, August 22, 2017 3:58 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S78-V8 10/12] i40e: fix handling ofvf_statesvariableFrom: Alan Brady <[email protected]>
Currently we inappropriately clear the
vf_statesvariable with a null assignment. This is problematic because we should be using atomic bitops on this variable and we don't actually want to clear all the flags. We should just clear the ones we know we want to clear.
Additionally remove theI40E_VF_STATE_FCOEENAbit because it is no longer being used.
Quoted 5 lines
Signed-off-by Alan Brady <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 5 ++++- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 - 2 files changed, 4 insertions(+), 2 deletions(-)
PATCH 11/12 i40e: fix client notify of VF reset
In reply to Alice MichaelFrom: Alan Brady <[email protected]>
Currently there is a bug in which the PF driver fails to inform clients of a VF reset which then causes clients to leak resources. The bug exists because we were incorrectly checking the I40E_VF_STATE_PRE_ENABLE bit.
When a VF is first init we go through a reset to initialize variables and allocate resources but we don't want to inform clients of this first reset since the client isn't fully enabled yet so we set a state bit signifying we're in a "pre-enabled" client state. During the first reset we should be clearing the bit, allowing all following resets to notify the client of the reset when the bit is not set. This patch fixes the issue by negating the 'test_and_clear_bit' check to accurately reflect the behavior we want.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +2 -2
@@ -1047,8 +1047,8 @@ static void i40e_cleanup_reset_vf(struct i40e_vf *vf)set_bit (I40E_VF_STATE_ACTIVE , &vf->vf_states);clear_bit (I40E_VF_STATE_DISABLED , &vf->vf_states);/* Do not notify the client during VF init */ -if (test_and_clear_bit (I40E_VF_STATE_PRE_ENABLE , - &vf->vf_states)) +if (!test_and_clear_bit (I40E_VF_STATE_PRE_ENABLE , + &vf->vf_states))i40e_notify_client_of_vf_reset (pf, abs_vf_id); vf->num_vlan =0 ; }
Signature · 1 line
2.9.4
Bowers
PATCH 11/12 i40e: fix client notify of VF reset
Quoted 23 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, August 22, 2017 3:58 AM
To: Michael, Alice <[email protected]>; intel-wired-
lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S78-V8 11/12] i40e: fix client notify of VF resetFrom: Alan Brady <[email protected]>
Currently there is a bug in which the PF driver fails to inform clients of a VF reset which then causes clients to leak resources. The bug exists because we were incorrectly checking the
I40E_VF_STATE_PRE_ENABLEbit.When a VF is first init we go through a reset to initialize variables and allocate resources but we don't want to inform clients of this first reset since the client isn't fully enabled yet so we set a state bit signifying we're in a "pre- enabled" client state. During the first reset we should be clearing the bit, allowing all following resets to notify the client of the reset when the bit is not set. This patch fixes the issue by negating the '
test_and_clear_bit' check to accurately reflect the behavior we want.
Quoted 4 lines
Signed-off-by Alan Brady <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
PATCH 12/12 i40e: Stop dropping 802.1ad tags (eth proto 0x88a8
In reply to Alice MichaelFrom: Scott Peterson <[email protected]>
Enable i40e to pass traffic with VLAN tags using the 802.1ad ethernet protocol ID (0x88a8).
This requires NIC firmware providing version 1.7 of the API. With older NIC firmware 802.1ad tagged packets will continue to be dropped.
No VLAN offloads nor RSS are supported for 802.1ad VLANs.
--- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 6 ++++++ drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 17 ++++++++++++++++- drivers/net/ethernet/intel/i40e/i40e_common.c | 6 +++++- drivers/net/ethernet/intel/i40e/i40e_main.c | 7 +++++++ drivers/net/ethernet/intel/i40e/i40e_type.h | 6 ++++++ drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 17 ++++++++++++++++- drivers/net/ethernet/intel/i40evf/i40e_type.h | 6 ++++++ 7 files changed, 62 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_adminq.c +6 -0
@@ -613,6 +613,12 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw) hw->flags |=I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE ; } +/* The ability to RX (not drop) 802.1ad frames was added in API 1.7 */ +if ((hw->aq.api_maj_ver >1 ) || + ((hw->aq.api_maj_ver ==1 ) && + (hw->aq.api_min_ver >=7 ))) + hw->flags |=I40E_HW_FLAG_802_1AD_CAPABLE ; +if (hw->aq.api_maj_ver >I40E_FW_API_VERSION_MAJOR ) { ret_code =I40E_ERR_FIRMWARE_API_VERSION ; goto init_adminq_free_arq;
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h +16 -1
@@ -775,7 +775,22 @@ struct i40e_aqc_set_switch_config {#define I40E_AQ_SET_SWITCH_CFG_PROMISC 0x0001#define I40E_AQ_SET_SWITCH_CFG_L2_FILTER 0x0002__le16 valid_flags; -u8 reserved[12 ]; +/* The ethertype in switch_tag is dropped on ingress and used +* internally by the switch. Set this to zero for the default +* of 0x88a8 (802.1ad). Should be zero for firmware API +* versions lower than 1.7. +*/ +__le16 switch_tag; +/* The ethertypes in first_tag and second_tag are used to +* match the outer and inner VLAN tags (respectively) when HW +* double VLAN tagging is enabled via the set port parameters +* AQ command. Otherwise these are both ignored. Set them to +* zero for their defaults of 0x8100 (802.1Q). Should be zero +* for firmware API versions lower than 1.7. +*/ +__le16 first_tag; +__le16 second_tag; +u8 reserved[6 ]; };I40E_CHECK_CMD_LENGTH (i40e_aqc_set_switch_config);
drivers/net/ethernet/intel/i40e/i40e_common.c +5 -1
@@ -2407,7 +2407,11 @@ enum i40e_status_code i40e_aq_set_switch_config(struct i40e_hw *hw, i40e_aqc_opc_set_switch_config); scfg->flags =cpu_to_le16 (flags); scfg->valid_flags =cpu_to_le16 (valid_flags); - +if (hw->flags &I40E_HW_FLAG_802_1AD_CAPABLE ) { + scfg->switch_tag =cpu_to_le16 (hw->switch_tag); + scfg->first_tag =cpu_to_le16 (hw->first_tag); + scfg->second_tag =cpu_to_le16 (hw->second_tag); + } status =i40e_asq_send_command (hw, &desc,NULL ,0 , cmd_details);return status;
drivers/net/ethernet/intel/i40e/i40e_main.c +7 -0
@@ -11362,6 +11362,13 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) hw->bus.bus_id = pdev->bus->number; pf->instance = pfs_found; +/* Select something other than the 802.1ad ethertype for the +* switch to use internally and drop on ingress. +*/ + hw->switch_tag =0xffff ; + hw->first_tag =ETH_P_8021AD ; + hw->second_tag =ETH_P_8021Q ; +INIT_LIST_HEAD (&pf->l3_flex_pit_list);INIT_LIST_HEAD (&pf->l4_flex_pit_list);
drivers/net/ethernet/intel/i40e/i40e_type.h +6 -0
@@ -610,9 +610,15 @@ struct i40e_hw {struct i40e_dcbx_config desired_dcbx_config;/* CEE Desired Cfg */ #define I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE BIT_ULL(0) +#define I40E_HW_FLAG_802_1AD_CAPABLE BIT_ULL(1)#define I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE BIT_ULL(2)u64 flags; +/* Used in set switch config AQ command */ +u16 switch_tag; +u16 first_tag; +u16 second_tag; +/* debug mask */ u32 debug_mask;char err_str[16 ];
drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h +16 -1
@@ -771,7 +771,22 @@ struct i40e_aqc_set_switch_config {#define I40E_AQ_SET_SWITCH_CFG_PROMISC 0x0001#define I40E_AQ_SET_SWITCH_CFG_L2_FILTER 0x0002__le16 valid_flags; -u8 reserved[12 ]; +/* The ethertype in switch_tag is dropped on ingress and used +* internally by the switch. Set this to zero for the default +* of 0x88a8 (802.1ad). Should be zero for firmware API +* versions lower than 1.7. +*/ +__le16 switch_tag; +/* The ethertypes in first_tag and second_tag are used to +* match the outer and inner VLAN tags (respectively) when HW +* double VLAN tagging is enabled via the set port parameters +* AQ command. Otherwise these are both ignored. Set them to +* zero for their defaults of 0x8100 (802.1Q). Should be zero +* for firmware API versions lower than 1.7. +*/ +__le16 first_tag; +__le16 second_tag; +u8 reserved[6 ]; };I40E_CHECK_CMD_LENGTH (i40e_aqc_set_switch_config);
drivers/net/ethernet/intel/i40evf/i40e_type.h +6 -0
@@ -568,6 +568,7 @@ struct i40e_hw {/* LLDP/DCBX Status */ u16 dcbx_status; +#define I40E_HW_FLAG_802_1AD_CAPABLE BIT_ULL(1)#define I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE BIT_ULL(2)/* DCBX info */
@@ -575,6 +576,11 @@ struct i40e_hw {struct i40e_dcbx_config remote_dcbx_config;/* Peer Cfg */ struct i40e_dcbx_config desired_dcbx_config;/* CEE Desired Cfg */ +/* Used in set switch config AQ command */ +u16 switch_tag; +u16 first_tag; +u16 second_tag; +/* debug mask */ u32 debug_mask;char err_str[16 ];
Signature · 1 line
2.9.4
Bowers
PATCH 12/12 i40e: Stop dropping 802.1ad tags (eth proto 0x88a8
Quoted 20 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Alice Michael
Sent: Tuesday, August 22, 2017 3:58 AM
To: Michael, Alice <[email protected]>; intel-wired- lan at lists.osuosl.org
Subject: [Intel-wired-lan] [next PATCH S78-V8 12/12] i40e: Stop dropping 802.1ad tags (eth proto0x88a8From: Scott Peterson <[email protected]>
Enable i40e to pass traffic with VLAN tags using the 802.1ad ethernet protocol ID (
0x88a8).This requires NIC firmware providing version 1.7 of the API. With older NIC firmware 802.1ad tagged packets will continue to be dropped.
No VLAN offloads nor RSS are supported for 802.1ad VLANs.
Signed-off-by Scott Peterson <[email protected]>
Quoted 11 lines
--- drivers/net/ethernet/intel/i40e/i40e_adminq.c | 6 ++++++ drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 17 ++++++++++++++++- drivers/net/ethernet/intel/i40e/i40e_common.c | 6 +++++- drivers/net/ethernet/intel/i40e/i40e_main.c | 7 +++++++ drivers/net/ethernet/intel/i40e/i40e_type.h | 6 ++++++ drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 17 ++++++++++++++++- drivers/net/ethernet/intel/i40evf/i40e_type.h | 6 ++++++ 7 files changed, 62 insertions(+), 3 deletions(-)