i40e/i40evf updates
Subsystems (2)
cover i40e/i40evf updates
Anjali refines an error message in i40e.
Carolyn removes inccorect #ifdefs and fixes the compile errors that show up as a result. She also refactors the dynamic ITR code for i40e and i40evf.
Faisal adds support for pre-allocated pages for PD in i40e.
Greg updates the admin queue command header for i40e and i40evf.
Jesse improves i40e/i40evf tx and rx performance with a couple small tweaks.
Mitch modifies i40evf to allow for an abundance of vectors, moves adding MAC address filters from init to open, and to stop deleting all filters every time set_rx_mode was called. He also modified i40e to ignore duplicate port VLAN requests, to correctly program filters for VFs, to do a proper reset when disabling a VF, and to un-disable the VF after a reset.
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 24 ++-- drivers/net/ethernet/intel/i40e/i40e_hmc.c | 30 +++-- drivers/net/ethernet/intel/i40e/i40e_hmc.h | 4 +- drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 150 ++++++++++++--------- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 23 ++-- .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 18 +-- drivers/net/ethernet/intel/i40evf/i40e_hmc.h | 4 +- drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 117 ++++++++++------ drivers/net/ethernet/intel/i40evf/i40evf_main.c | 20 +-- 11 files changed, 236 insertions(+), 164 deletions(-)
Signature · 1 line
1.9.3
PATCH 1/15 i40e/i40evf: improve tx performance with a small tweak
From: Jesse Brandeburg <[email protected]>
Add a prefetch for the next tx descriptor to be used when we know there are more coming.
--- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 ++ drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_txrx.c +2 -0
@@ -2623,6 +2623,8 @@ static inline void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb, netif_xmit_stopped(netdev_get_tx_queue(tx_ring->netdev, tx_ring->queue_index)))writel (i, tx_ring->tail); + else + prefetchw(tx_desc + 1);return ;
drivers/net/ethernet/intel/i40evf/i40e_txrx.c +2 -0
@@ -1844,6 +1844,8 @@ static inline void i40evf_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb, netif_xmit_stopped(netdev_get_tx_queue(tx_ring->netdev, tx_ring->queue_index)))writel (i, tx_ring->tail); + else + prefetchw(tx_desc + 1);return ;
Signature · 1 line
1.9.3
Young
PATCH 1/15 i40e/i40evf: improve tx performance with a small tweak
Quoted 13 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Monday, April 27, 2015 11:57 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [net-next S5 01/15] i40e/i40evf: improve tx performance with a small tweakFrom: Jesse Brandeburg <[email protected]>
Add a prefetch for the next tx descriptor to be used when we know there are more coming.
Quoted 7 lines
Signed-off-by Jesse Brandeburg <[email protected]>Change-ID Ibb9acab11d508eec2db7da795df74debc16eeacb--- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 ++ drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 ++ 2 files changed, 4 insertions(+)
PATCH 2/15 i40evf: Allow for an abundance of vectors
In reply to Catherine SullivanFrom: Mitch Williams <[email protected]>
The driver currently only maps TX and RX queues to a single MSI-X vector per queue pair if there are exactly enough vectors for this. Unfortunately, if we have too many vectors it will fail and allocate queues to vectors in a suboptimal manner. Change the condition check to allow for excess vectors. In this case, the extras just won't be used.
--- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/intel/i40evf/i40evf_main.c +1 -1
@@ -405,7 +405,7 @@ static int i40evf_map_rings_to_vectors(struct i40evf_adapter *adapter)/* The ideal configuration... * We have enough vectors to map one per queue. */ -if (q_vectors == (rxr_remaining *2 )) { +if (q_vectors >= (rxr_remaining *2 )) {for (; rxr_idx < rxr_remaining; v_start++, rxr_idx++)i40evf_map_vector_to_rxq (adapter, v_start, rxr_idx);
Signature · 1 line
1.9.3
Young
PATCH 2/15 i40evf: Allow for an abundance of vectors
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Monday, April 27, 2015 11:57 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [net-next S5 02/15] i40evf: Allow for an abundance of vectorsFrom: Mitch Williams <[email protected]>
The driver currently only maps TX and RX queues to a single MSI-X vector per queue pair if there are exactly enough vectors for this. Unfortunately, if we have too many vectors it will fail and allocate queues to vectors in a suboptimal manner. Change the condition check to allow for excess vectors. In this case, the extras just won't be used.
Quoted 6 lines
Signed-off-by Mitch Williams <[email protected]>Change-ID I23e1e2955c64739c86612db88a25583e6a7e0b17--- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH 3/15 i40e: ignore duplicate port VLAN requests
In reply to Catherine SullivanFrom: Mitch Williams <[email protected]>
If user attempts to set a port VLAN on a VF that already has the same port VLAN configured, the driver will go through a completely unnecessary flurry of filter removals and filter adds. Just check for this condition and return success instead of doing a bunch of busywork.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +4 -0
@@ -2080,6 +2080,10 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, goto error_pvid; } +if (vsi->info.pvid == (vlan_id | (qos <<I40E_VLAN_PRIORITY_SHIFT ))) +/* duplicate request, so just return success */ + goto error_pvid; +if (vsi->info.pvid ==0 &&i40e_is_vsi_in_vlan (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",
Signature · 1 line
1.9.3
Young
PATCH 3/15 i40e: ignore duplicate port VLAN requests
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Monday, April 27, 2015 11:57 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [net-next S5 03/15] i40e: ignore duplicate port VLAN requestsFrom: Mitch Williams <[email protected]>
If user attempts to set a port VLAN on a VF that already has the same port VLAN configured, the driver will go through a completely unnecessary flurry of filter removals and filter adds. Just check for this condition and return success instead of doing a bunch of busywork.
Quoted 6 lines
Signed-off-by Mitch Williams <[email protected]>Change-ID Ia1a9e83e6ed48b3f4658bc20dfc6af0cf525d54a--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 ++++ 1 file changed, 4 insertions(+)
PATCH 4/15 i40e: Remove incorrect #ifdef's
In reply to Catherine SullivanFrom: Carolyn Wyborny <[email protected]>
This patch removes some #ifdef's that should not be there. They were stopping code that is needed from being compiled in.
With these #ifdef's removed, changes are needed in the driver to fix some compile errors: adding missing parameters to
the definition of ndo_bridge_setlink and a ndo_dflt_brige_getlink call.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +4 -11
@@ -7989,7 +7989,6 @@ static int i40e_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],return err; } -#ifdef HAVE_BRIDGE_ATTRIBS /** * i40e_ndo_bridge_setlink - Set the hardware bridge mode * @dev: the netdev being configured
@@ -8003,7 +8002,8 @@ static int i40e_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],* bridge mode enabled. **/ static int i40e_ndo_bridge_setlink (struct net_device *dev, -struct nlmsghdr *nlh) +struct nlmsghdr *nlh, +u16 flags) {struct i40e_netdev_priv *np =netdev_priv (dev);struct i40e_vsi *vsi = np->vsi;
@@ -8069,14 +8069,9 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev,* Return the mode in which the hardware bridge is operating in * i.e VEB or VEPA. **/ -#ifdef HAVE_BRIDGE_FILTER static int i40e_ndo_bridge_getlink (struct sk_buff *skb,u32 pid,u32 seq,struct net_device *dev,u32 __always_unused filter_mask) -#else -static int i40e_ndo_bridge_getlink (struct sk_buff *skb,u32 pid,u32 seq, - struct net_device *dev) -#endif /* HAVE_BRIDGE_FILTER */ {struct i40e_netdev_priv *np =netdev_priv (dev);struct i40e_vsi *vsi = np->vsi;
@@ -8097,9 +8092,9 @@ static int i40e_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,if (!veb)return 0 ; - return ndo_dflt_bridge_getlink(skb, pid, seq, dev, veb->bridge_mode); +return ndo_dflt_bridge_getlink (skb, pid, seq, dev, veb->bridge_mode,0 , +0 ); } -#endif /* HAVE_BRIDGE_ATTRIBS */ #define I40E_MAX_TUNNEL_HDR_LEN 80/**
@@ -8154,10 +8149,8 @@ static const struct net_device_ops i40e_netdev_ops = {#endif .ndo_get_phys_port_id = i40e_get_phys_port_id, .ndo_fdb_add = i40e_ndo_fdb_add, -#ifdef HAVE_BRIDGE_ATTRIBS .ndo_bridge_getlink = i40e_ndo_bridge_getlink, .ndo_bridge_setlink = i40e_ndo_bridge_setlink, -#endif /* HAVE_BRIDGE_ATTRIBS */ .ndo_features_check = i40e_features_check, };
Signature · 1 line
1.9.3
Young
PATCH 4/15 i40e: Remove incorrect #ifdef's
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Monday, April 27, 2015 11:57 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [net-next S5 04/15] i40e: Remove incorrect #ifdef'sFrom: Carolyn Wyborny <[email protected]>
This patch removes some #ifdef's that should not be there. They were stopping code that is needed from being compiled in.
With these #ifdef's removed, changes are needed in the driver to fix some compile errors: adding missing parameters to the definition of
ndo_bridge_setlinkand ando_dflt_brige_getlinkcall.
Quoted 7 lines
Signed-off-by Carolyn Wyborny <[email protected]>Signed-off-by Catherine Sullivan <[email protected]>Change-ID I5516614e1bc50b6bca0647cef971bc96161ba2de--- drivers/net/ethernet/intel/i40e/i40e_main.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
PATCH 5/15 i40e/i40evf: Update the admin queue command header
In reply to Catherine SullivanFrom: Greg Rose <[email protected]>
Make the necessary updates to i40e_adminq_cmd.h.
--- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 24 ++++++++++++---------- .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 18 +++++++--------- 2 files changed, 20 insertions(+), 22 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h +13 -11
@@ -34,7 +34,7 @@*/ #define I40E_FW_API_VERSION_MAJOR 0x0001 -#define I40E_FW_API_VERSION_MINOR 0x0002 +#define I40E_FW_API_VERSION_MINOR 0x0004struct i40e_aq_desc {__le16 flags;
@@ -132,12 +132,7 @@ enum i40e_admin_queue_opc { i40e_aqc_opc_list_func_capabilities =0x000A , i40e_aqc_opc_list_dev_capabilities =0x000B , - i40e_aqc_opc_set_cppm_configuration =0x0103 , - i40e_aqc_opc_set_arp_proxy_entry =0x0104 , - i40e_aqc_opc_set_ns_proxy_entry =0x0105 , -/* LAA */ - i40e_aqc_opc_mng_laa =0x0106 ,/* AQ obsolete */ i40e_aqc_opc_mac_address_read =0x0107 , i40e_aqc_opc_mac_address_write = 0x0108,
@@ -262,7 +257,6 @@ enum i40e_admin_queue_opc {/* Tunnel commands */ i40e_aqc_opc_add_udp_tunnel =0x0B00 , i40e_aqc_opc_del_udp_tunnel =0x0B01 , - i40e_aqc_opc_tunnel_key_structure =0x0B10 ,/* Async Events */ i40e_aqc_opc_event_lan_overflow = 0x1001,
@@ -274,8 +268,6 @@ enum i40e_admin_queue_opc { i40e_aqc_opc_oem_ocbb_initialize =0xFE03 ,/* debug commands */ - i40e_aqc_opc_debug_get_deviceid =0xFF00 , - i40e_aqc_opc_debug_set_mode =0xFF01 , i40e_aqc_opc_debug_read_reg =0xFF03 , i40e_aqc_opc_debug_write_reg =0xFF04 , i40e_aqc_opc_debug_modify_reg = 0xFF07,
@@ -509,7 +501,8 @@ struct i40e_aqc_mac_address_read {#define I40E_AQC_SAN_ADDR_VALID 0x20#define I40E_AQC_PORT_ADDR_VALID 0x40#define I40E_AQC_WOL_ADDR_VALID 0x80 -#define I40E_AQC_ADDR_VALID_MASK 0xf0 +#define I40E_AQC_MC_MAG_EN_VALID 0x100 +#define I40E_AQC_ADDR_VALID_MASK 0x1F0u8 reserved[6 ];__le32 addr_high;__le32 addr_low;
@@ -532,7 +525,9 @@ struct i40e_aqc_mac_address_write {#define I40E_AQC_WRITE_TYPE_LAA_ONLY 0x0000#define I40E_AQC_WRITE_TYPE_LAA_WOL 0x4000#define I40E_AQC_WRITE_TYPE_PORT 0x8000 -#define I40E_AQC_WRITE_TYPE_MASK 0xc000 +#define I40E_AQC_WRITE_TYPE_UPDATE_MC_MAG 0xC000 +#define I40E_AQC_WRITE_TYPE_MASK 0xC000 +__le16 mac_sah;__le32 mac_sal;u8 reserved[8 ];
@@ -1068,6 +1063,7 @@ struct i40e_aqc_set_vsi_promiscuous_modes {__le16 seid;#define I40E_AQC_VSI_PROM_CMD_SEID_MASK 0x3FF__le16 vlan_tag; +#define I40E_AQC_SET_VSI_VLAN_MASK 0x0FFF#define I40E_AQC_SET_VSI_VLAN_VALID 0x8000u8 reserved[8 ]; };
@@ -2064,6 +2060,12 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_start);#define I40E_AQC_CEE_PFC_STATUS_MASK (0x7 << I40E_AQC_CEE_PFC_STATUS_SHIFT)#define I40E_AQC_CEE_APP_STATUS_SHIFT 0x8#define I40E_AQC_CEE_APP_STATUS_MASK (0x7 << I40E_AQC_CEE_APP_STATUS_SHIFT) +#define I40E_AQC_CEE_FCOE_STATUS_SHIFT 0x8 +#define I40E_AQC_CEE_FCOE_STATUS_MASK (0x7 << I40E_AQC_CEE_FCOE_STATUS_SHIFT) +#define I40E_AQC_CEE_ISCSI_STATUS_SHIFT 0xA +#define I40E_AQC_CEE_ISCSI_STATUS_MASK (0x7 << I40E_AQC_CEE_ISCSI_STATUS_SHIFT) +#define I40E_AQC_CEE_FIP_STATUS_SHIFT 0x10 +#define I40E_AQC_CEE_FIP_STATUS_MASK (0x7 << I40E_AQC_CEE_FIP_STATUS_SHIFT)struct i40e_aqc_get_cee_dcb_cfg_v1_resp {u8 reserved1;u8 oper_num_tc;
drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h +7 -11
@@ -34,7 +34,7 @@*/ #define I40E_FW_API_VERSION_MAJOR 0x0001 -#define I40E_FW_API_VERSION_MINOR 0x0002 +#define I40E_FW_API_VERSION_MINOR 0x0004#define I40E_FW_API_VERSION_A0_MINOR 0x0000struct i40e_aq_desc {
@@ -133,12 +133,7 @@ enum i40e_admin_queue_opc { i40e_aqc_opc_list_func_capabilities =0x000A , i40e_aqc_opc_list_dev_capabilities =0x000B , - i40e_aqc_opc_set_cppm_configuration =0x0103 , - i40e_aqc_opc_set_arp_proxy_entry =0x0104 , - i40e_aqc_opc_set_ns_proxy_entry =0x0105 , -/* LAA */ - i40e_aqc_opc_mng_laa =0x0106 ,/* AQ obsolete */ i40e_aqc_opc_mac_address_read =0x0107 , i40e_aqc_opc_mac_address_write = 0x0108,
@@ -260,7 +255,6 @@ enum i40e_admin_queue_opc {/* Tunnel commands */ i40e_aqc_opc_add_udp_tunnel =0x0B00 , i40e_aqc_opc_del_udp_tunnel =0x0B01 , - i40e_aqc_opc_tunnel_key_structure =0x0B10 ,/* Async Events */ i40e_aqc_opc_event_lan_overflow = 0x1001,
@@ -272,8 +266,6 @@ enum i40e_admin_queue_opc { i40e_aqc_opc_oem_ocbb_initialize =0xFE03 ,/* debug commands */ - i40e_aqc_opc_debug_get_deviceid =0xFF00 , - i40e_aqc_opc_debug_set_mode =0xFF01 , i40e_aqc_opc_debug_read_reg =0xFF03 , i40e_aqc_opc_debug_write_reg =0xFF04 , i40e_aqc_opc_debug_modify_reg = 0xFF07,
@@ -507,7 +499,8 @@ struct i40e_aqc_mac_address_read {#define I40E_AQC_SAN_ADDR_VALID 0x20#define I40E_AQC_PORT_ADDR_VALID 0x40#define I40E_AQC_WOL_ADDR_VALID 0x80 -#define I40E_AQC_ADDR_VALID_MASK 0xf0 +#define I40E_AQC_MC_MAG_EN_VALID 0x100 +#define I40E_AQC_ADDR_VALID_MASK 0x1F0u8 reserved[6 ];__le32 addr_high;__le32 addr_low;
@@ -530,7 +523,9 @@ struct i40e_aqc_mac_address_write {#define I40E_AQC_WRITE_TYPE_LAA_ONLY 0x0000#define I40E_AQC_WRITE_TYPE_LAA_WOL 0x4000#define I40E_AQC_WRITE_TYPE_PORT 0x8000 -#define I40E_AQC_WRITE_TYPE_MASK 0xc000 +#define I40E_AQC_WRITE_TYPE_UPDATE_MC_MAG 0xC000 +#define I40E_AQC_WRITE_TYPE_MASK 0xC000 +__le16 mac_sah;__le32 mac_sal;u8 reserved[8 ];
@@ -1066,6 +1061,7 @@ struct i40e_aqc_set_vsi_promiscuous_modes {__le16 seid;#define I40E_AQC_VSI_PROM_CMD_SEID_MASK 0x3FF__le16 vlan_tag; +#define I40E_AQC_SET_VSI_VLAN_MASK 0x0FFF#define I40E_AQC_SET_VSI_VLAN_VALID 0x8000u8 reserved[8 ]; };
Signature · 1 line
1.9.3
Young
PATCH 5/15 i40e/i40evf: Update the admin queue command header
Quoted 12 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Monday, April 27, 2015 11:57 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [net-next S5 05/15] i40e/i40evf: Update the admin queue command headerFrom: Greg Rose <[email protected]>
Make the necessary updates to
i40e_adminq_cmd.h.
Quoted 8 lines
Signed-off-by Greg Rose <[email protected]>Change-ID Ib031c86cc6cab78e5aa44c64d8ce5474be8d7e42--- drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 24 ++++++++++++-- -------- .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 18 +++++++--------- 2 files changed, 20 insertions(+), 22 deletions(-)
PATCH 6/15 i40e: correctly program filters for VFs
In reply to Catherine SullivanFrom: Mitch Williams <[email protected]>
MAC filters for VFs were being programmed with 0 for the VLAN value when there was no VLAN assigned. This is incorrect and actually assigns the VF to VLAN 0. Instead, we must use -1 to indicate that no VLAN is in use. This change programs the filters correctly and gets rid of a bogus error message when setting a port VLAN on an active VF.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +6 -3
@@ -542,11 +542,13 @@ static int i40e_alloc_vsi_res(struct i40e_vf *vf, enum i40e_vsi_type type)if (vf->port_vlan_id)i40e_vsi_add_pvid (vsi, vf->port_vlan_id); f =i40e_add_filter (vsi, vf->default_lan_addr.addr, - vf->port_vlan_id, true, false); + vf->port_vlan_id ? vf->port_vlan_id :-1 , + true, false);if (!f)dev_info (&pf->pdev->dev,"Could not allocate VF MAC addr\n" ); - f =i40e_add_filter (vsi, brdcast, vf->port_vlan_id, + f =i40e_add_filter (vsi, brdcast, + vf->port_vlan_id ? vf->port_vlan_id :-1 , true, false);if (!f) dev_info(&pf->pdev->dev,
@@ -2015,7 +2017,8 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) }/* delete the temporary mac address */ -i40e_del_filter (vsi, vf->default_lan_addr.addr, vf->port_vlan_id, +i40e_del_filter (vsi, vf->default_lan_addr.addr, + vf->port_vlan_id ? vf->port_vlan_id :-1 , true, false);/* Delete all the filters for this VSI - we're going to kill it
Signature · 1 line
1.9.3
Young
PATCH 6/15 i40e: correctly program filters for VFs
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Monday, April 27, 2015 11:57 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [net-next S5 06/15] i40e: correctly program filters for VFsFrom: Mitch Williams <[email protected]>
MAC filters for VFs were being programmed with 0 for the VLAN value when there was no VLAN assigned. This is incorrect and actually assigns the VF to VLAN 0. Instead, we must use -1 to indicate that no VLAN is in use. This change programs the filters correctly and gets rid of a bogus error message when setting a port VLAN on an active VF.
Quoted 6 lines
Signed-off-by Mitch Williams <[email protected]>Change-ID Ica9a9906d768405377ff3308e27f7d0b5b2ea96e--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
PATCH 7/15 i40e: do a proper reset when disabling a VF
In reply to Catherine SullivanFrom: Mitch Williams <[email protected]>
The VF disable code was just whanging on the reset bit without properly cleaning up the VF, which would leave the VF in an indeterminate state from which it could not recover. Fix this by notifying the VF and then by calling the normal VF reset routine.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +2 -7
@@ -160,13 +160,8 @@ void i40e_vc_notify_vf_reset(struct i40e_vf *vf)**/ static inline void i40e_vc_disable_vf (struct i40e_pf *pf,struct i40e_vf *vf) { -struct i40e_hw *hw = &pf->hw; -u32 reg; - - reg =rd32 (hw,I40E_VPGEN_VFRTRIG (vf->vf_id)); - reg |=I40E_VPGEN_VFRTRIG_VFSWR_MASK ; -wr32 (hw,I40E_VPGEN_VFRTRIG (vf->vf_id), reg); -i40e_flush (hw); +i40e_vc_notify_vf_reset (vf); +i40e_reset_vf (vf, false); }/**
Signature · 1 line
1.9.3
Young
PATCH 7/15 i40e: do a proper reset when disabling a VF
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Monday, April 27, 2015 11:57 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [net-next S5 07/15] i40e: do a proper reset when disabling a VFFrom: Mitch Williams <[email protected]>
The VF disable code was just whanging on the reset bit without properly cleaning up the VF, which would leave the VF in an indeterminate state from which it could not recover. Fix this by notifying the VF and then by calling the normal VF reset routine.
Quoted 6 lines
Signed-off-by Mitch Williams <[email protected]>Change-ID I862b9dfa919368773cbdc212b805b520db2f7430--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
PATCH 8/15 i40e: un-disable VF after reset
In reply to Catherine SullivanFrom: Mitch Williams <[email protected]>
When a VF is disabled, there is no way for it to recover until either the PF driver is reloaded or SR-IOV is disabled and enabled. To correct this, enable the VF after a successful reset.
--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +1 -0
@@ -832,6 +832,7 @@ complete_reset:i40e_alloc_vf_res (vf);i40e_enable_vf_mappings (vf);set_bit (I40E_VF_STAT_ACTIVE , &vf->vf_states); +clear_bit (I40E_VF_STAT_DISABLED , &vf->vf_states);/* tell the VF the reset is done */ wr32 (hw,I40E_VFGEN_RSTAT1 (vf->vf_id),I40E_VFR_VFACTIVE );
Signature · 1 line
1.9.3
Young
PATCH 8/15 i40e: un-disable VF after reset
Quoted 13 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Monday, April 27, 2015 11:57 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [net-next S5 08/15] i40e: un-disable VF after resetFrom: Mitch Williams <[email protected]>
When a VF is disabled, there is no way for it to recover until either the PF driver is reloaded or SR-IOV is disabled and enabled. To correct this, enable the VF after a successful reset.
Quoted 6 lines
Signed-off-by Mitch Williams <[email protected]>Change-ID I9e0788476c4d53d5407961b503febdfff2b8a7c6--- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 1 + 1 file changed, 1 insertion(+)
PATCH 9/15 i40evf: don't delete all the filters
In reply to Catherine SullivanFrom: Mitch Williams <[email protected]>
Due to an inverted conditional, the driver was marking all of its MAC filters for deletion every time set_rx_mode was called. Depending upon the timing of the calls to set_rx_mode and the processing of the admin queue, the driver would (accidentally) end up with a varying number of functional filters.
Correct this logic so that MAC filters are added and removed correctly. Add a check for the driver's "hardware" MAC address so that this filter doesn't get removed incorrectly.
--- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40evf/i40evf_main.c +3 -1
@@ -891,8 +891,10 @@ static void i40evf_set_rx_mode(struct net_device *netdev)break ; } } +if (ether_addr_equal (f->macaddr, adapter->hw.mac.addr)) + found = true; } -if (found) { +if (!found) { f->remove = true; adapter->aq_required |=I40EVF_FLAG_AQ_DEL_MAC_FILTER ; }
Signature · 1 line
1.9.3
Young
PATCH 9/15 i40evf: don't delete all the filters
Quoted 19 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Monday, April 27, 2015 11:57 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [net-next S5 09/15] i40evf: don't delete all the filtersFrom: Mitch Williams <[email protected]>
Due to an inverted conditional, the driver was marking all of its MAC filters for deletion every time
set_rx_modewas called. Depending upon the timing of the calls toset_rx_modeand the processing of the admin queue, the driver would (accidentally) end up with a varying number of functional filters.Correct this logic so that MAC filters are added and removed correctly. Add a check for the driver's "hardware" MAC address so that this filter doesn't get removed incorrectly.
Quoted 6 lines
Signed-off-by Mitch Williams <[email protected]>Change-ID Ib3e7c4a5b53df6835f164fe44cb778cb71f8aff8--- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
PATCH 10/15 i40evf: add MAC address filter in open, not init
In reply to Catherine SullivanFrom: Mitch Williams <[email protected]>
During close, all of the MAC filters are cleared, so the driver would be unable to receive unicast packets after being closed and reopened.
Add the adapter's "hardware" MAC address filter in open, not init. This ensures that the correct filter is present each time.
--- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/net/ethernet/intel/i40evf/i40evf_main.c +1 -11
@@ -1835,6 +1835,7 @@ static int i40evf_open(struct net_device *netdev)if (err) goto err_req_irq; +i40evf_add_filter (adapter, adapter->hw.mac.addr);i40evf_configure (adapter); err =i40evf_up_complete (adapter);
@@ -2015,7 +2016,6 @@ static void i40evf_init_task(struct work_struct *work) struct i40evf_adapter, init_task.work);struct net_device *netdev = adapter->netdev; -struct i40evf_mac_filter *f;struct i40e_hw *hw = &adapter->hw;struct pci_dev *pdev = adapter->pdev;int i, err, bufsz;
@@ -2149,16 +2149,6 @@ static void i40evf_init_task(struct work_struct *work)ether_addr_copy (netdev->dev_addr, adapter->hw.mac.addr);ether_addr_copy (netdev->perm_addr, adapter->hw.mac.addr); - f =kzalloc (sizeof (*f),GFP_ATOMIC ); -if (!f) - goto err_sw_init; - -ether_addr_copy (f->macaddr, adapter->hw.mac.addr); - f->add = true; - adapter->aq_required |=I40EVF_FLAG_AQ_ADD_MAC_FILTER ; - -list_add (&f->list, &adapter->mac_filter_list); -init_timer (&adapter->watchdog_timer); adapter->watchdog_timer.function = &i40evf_watchdog_timer; adapter->watchdog_timer.data = (unsigned long )adapter;
Signature · 1 line
1.9.3
Young
PATCH 10/15 i40evf: add MAC address filter in open, not init
Quoted 13 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Monday, April 27, 2015 11:57 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [net-next S5 10/15] i40evf: add MAC address filter in open, not initFrom: Mitch Williams <[email protected]>
During close, all of the MAC filters are cleared, so the driver would be unable to receive unicast packets after being closed and reopened.
Quoted 8 lines
Add the adapter's "hardware" MAC address filter in open, not init. This ensures that the correct filter is present each time.
Signed-off-by Mitch Williams <[email protected]>Change-ID I51a11e9c1200139dab6f66a5353bd38c7d26f875--- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
PATCH 11/15 i40e/i40evf: Fix and refactor dynamic ITR code
In reply to Catherine SullivanFrom: Carolyn Wyborny <[email protected]>
This patch changes the switch statement for dynamic interrupt throttling and adds a default case. With this patch, we check the latency setting instead of the current ITR settings and the included refactor improves performance.
Without this patch, the ITR setting would never change dynamically, and there was no default.
--- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 146 ++++++++++++++++---------- drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 113 +++++++++++++------- 2 files changed, 161 insertions(+), 98 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_txrx.c +88 -58
@@ -892,7 +892,7 @@ static void i40e_set_new_dynamic_itr(struct i40e_ring_container *rc)* 20-1249MB/s bulk (8000 ints/s) */ bytes_per_int = rc->total_bytes / rc->itr; -switch (rc->itr) { +switch (new_latency_range) {case I40E_LOWEST_LATENCY :if (bytes_per_int >10 ) new_latency_range =I40E_LOW_LATENCY ;
@@ -905,9 +905,14 @@ static void i40e_set_new_dynamic_itr(struct i40e_ring_container *rc)break ;case I40E_BULK_LATENCY :if (bytes_per_int <=20 ) - rc->latency_range =I40E_LOW_LATENCY ; + new_latency_range =I40E_LOW_LATENCY ; +break ; +default : +if (bytes_per_int <=20 ) + new_latency_range =I40E_LOW_LATENCY ;break ; } + rc->latency_range = new_latency_range;switch (new_latency_range) {case I40E_LOWEST_LATENCY :
@@ -923,42 +928,14 @@ static void i40e_set_new_dynamic_itr(struct i40e_ring_container *rc)break ; } -if (new_itr != rc->itr) { -/* do an exponential smoothing */ - new_itr = (10 * new_itr * rc->itr) / - ((9 * new_itr) + rc->itr); - rc->itr = new_itr &I40E_MAX_ITR ; - } +if (new_itr != rc->itr) + rc->itr = new_itr; rc->total_bytes =0 ; rc->total_packets =0 ; }/** -* i40e_update_dynamic_itr - Adjust ITR based on bytes per int -* @q_vector: the vector to adjust -**/ -static void i40e_update_dynamic_itr (struct i40e_q_vector *q_vector) -{ -u16 vector = q_vector->vsi->base_vector + q_vector->v_idx; -struct i40e_hw *hw = &q_vector->vsi->back->hw; -u32 reg_addr; -u16 old_itr; - - reg_addr =I40E_PFINT_ITRN (I40E_RX_ITR , vector -1 ); - old_itr = q_vector->rx.itr; -i40e_set_new_dynamic_itr (&q_vector->rx); -if (old_itr != q_vector->rx.itr) -wr32 (hw, reg_addr, q_vector->rx.itr); - - reg_addr =I40E_PFINT_ITRN (I40E_TX_ITR , vector -1 ); - old_itr = q_vector->tx.itr; -i40e_set_new_dynamic_itr (&q_vector->tx); -if (old_itr != q_vector->tx.itr) -wr32 (hw, reg_addr, q_vector->tx.itr); -} - -/** * i40e_clean_programming_status - clean the programming status descriptor * @rx_ring: the rx ring that has this descriptor * @rx_desc: the rx descriptor written back by HW
@@ -1829,6 +1806,68 @@ static int i40e_clean_rx_irq_1buf(struct i40e_ring *rx_ring, int budget) }/** +* i40e_update_enable_itr - Update itr and re-enable MSIX interrupt +* @vsi: the VSI we care about +* @q_vector: q_vector for which itr is being updated and interrupt enabled +* +**/ +static inline void i40e_update_enable_itr (struct i40e_vsi *vsi, +struct i40e_q_vector *q_vector) +{ +struct i40e_hw *hw = &vsi->back->hw; +u16 old_itr; +int vector; +u32 val; + + vector = (q_vector->v_idx + vsi->base_vector); +if (ITR_IS_DYNAMIC (vsi->rx_itr_setting)) { + old_itr = q_vector->rx.itr; +i40e_set_new_dynamic_itr (&q_vector->rx); +if (old_itr != q_vector->rx.itr) { + val =I40E_PFINT_DYN_CTLN_INTENA_MASK | +I40E_PFINT_DYN_CTLN_CLEARPBA_MASK | + (I40E_RX_ITR << +I40E_PFINT_DYN_CTLN_ITR_INDX_SHIFT ) | + (q_vector->rx.itr << +I40E_PFINT_DYN_CTLN_INTERVAL_SHIFT ); + }else { + val =I40E_PFINT_DYN_CTLN_INTENA_MASK | +I40E_PFINT_DYN_CTLN_CLEARPBA_MASK | + (I40E_ITR_NONE << +I40E_PFINT_DYN_CTLN_ITR_INDX_SHIFT ); + } +if (!test_bit (__I40E_DOWN, &vsi->state)) +wr32 (hw,I40E_PFINT_DYN_CTLN (vector -1 ), val); + }else { +i40e_irq_dynamic_enable (vsi, + q_vector->v_idx + vsi->base_vector); + } +if (ITR_IS_DYNAMIC (vsi->tx_itr_setting)) { + old_itr = q_vector->tx.itr; +i40e_set_new_dynamic_itr (&q_vector->tx); +if (old_itr != q_vector->tx.itr) { + val =I40E_PFINT_DYN_CTLN_INTENA_MASK | +I40E_PFINT_DYN_CTLN_CLEARPBA_MASK | + (I40E_TX_ITR << +I40E_PFINT_DYN_CTLN_ITR_INDX_SHIFT ) | + (q_vector->tx.itr << +I40E_PFINT_DYN_CTLN_INTERVAL_SHIFT ); + }else { + val =I40E_PFINT_DYN_CTLN_INTENA_MASK | +I40E_PFINT_DYN_CTLN_CLEARPBA_MASK | + (I40E_ITR_NONE << +I40E_PFINT_DYN_CTLN_ITR_INDX_SHIFT ); + } +if (!test_bit (__I40E_DOWN, &vsi->state)) +wr32 (hw,I40E_PFINT_DYN_CTLN (q_vector->v_idx + + vsi->base_vector -1 ), val); + }else { +i40e_irq_dynamic_enable (vsi, + q_vector->v_idx + vsi->base_vector); + } +} + +/** * i40e_napi_poll - NAPI polling Rx/Tx cleanup routine * @napi: napi struct with our devices info in it * @budget: amount of work driver is allowed to do this pass, in packets
@@ -1884,33 +1923,24 @@ int i40e_napi_poll(struct napi_struct *napi, int budget)/* Work is done so exit the polling mode and re-enable the interrupt */ napi_complete (napi); -if (ITR_IS_DYNAMIC (vsi->rx_itr_setting) || -ITR_IS_DYNAMIC (vsi->tx_itr_setting)) -i40e_update_dynamic_itr (q_vector); - -if (!test_bit (__I40E_DOWN, &vsi->state)) { -if (vsi->back->flags &I40E_FLAG_MSIX_ENABLED ) { -i40e_irq_dynamic_enable (vsi, - q_vector->v_idx + vsi->base_vector); - }else { -struct i40e_hw *hw = &vsi->back->hw; -/* We re-enable the queue 0 cause, but -* don't worry about dynamic_enable -* because we left it on for the other -* possible interrupts during napi -*/ -u32 qval =rd32 (hw,I40E_QINT_RQCTL (0 )); - qval |=I40E_QINT_RQCTL_CAUSE_ENA_MASK ; -wr32 (hw,I40E_QINT_RQCTL (0 ), qval); - - qval =rd32 (hw,I40E_QINT_TQCTL (0 )); - qval |=I40E_QINT_TQCTL_CAUSE_ENA_MASK ; -wr32 (hw,I40E_QINT_TQCTL (0 ), qval); - -i40e_irq_dynamic_enable_icr0 (vsi->back); - } +if (vsi->back->flags &I40E_FLAG_MSIX_ENABLED ) { +i40e_update_enable_itr (vsi, q_vector); + }else {/* Legacy mode */ +struct i40e_hw *hw = &vsi->back->hw; +/* We re-enable the queue 0 cause, but +* don't worry about dynamic_enable +* because we left it on for the other +* possible interrupts during napi +*/ +u32 qval =rd32 (hw,I40E_QINT_RQCTL (0 )) | +I40E_QINT_RQCTL_CAUSE_ENA_MASK ; + +wr32 (hw,I40E_QINT_RQCTL (0 ), qval); + qval =rd32 (hw,I40E_QINT_TQCTL (0 )) | +I40E_QINT_TQCTL_CAUSE_ENA_MASK ; +wr32 (hw,I40E_QINT_TQCTL (0 ), qval); +i40e_irq_dynamic_enable_icr0 (vsi->back); } -return 0 ; }
drivers/net/ethernet/intel/i40evf/i40e_txrx.c +73 -40
150 lines not on this page · raw message
Signature · 1 line
1.9.3
Young
PATCH 11/15 i40e/i40evf: Fix and refactor dynamic ITR code
Quoted 24 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Monday, April 27, 2015 11:57 AM
To: intel-wired-lan at lists.osuosl.org
Cc: Singhai, Anjali; Abodunrin, Akeem G
Subject: [Intel-wired-lan] [net-next S5 11/15] i40e/i40evf: Fix and refactor dynamic ITR codeFrom: Carolyn Wyborny <[email protected]>
This patch changes the switch statement for dynamic interrupt throttling and adds a default case. With this patch, we check the latency setting instead of the current ITR settings and the included refactor improves performance.
Without this patch, the ITR setting would never change dynamically, and there was no default.
Signed-off-by Carolyn Wyborny <[email protected]>Signed-off-by Anjali Singhai Jain <[email protected]>Signed-off-by Akeem G Abodunrin <[email protected]>Signed-off-by Jesse Brandeburg <[email protected]>Change-ID Idb5a8a14c7109ec47c90f6e94bd43baa17d7ee37
Quoted 5 lines
--- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 146 ++++++++++++++++--------- - drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 113 +++++++++++++------- 2 files changed, 161 insertions(+), 98 deletions(-)
Patch failed
James.m.young at intel.com
PATCH 12/15 i40e/i40evf: Add support for pre-allocated pages for PD
In reply to Catherine SullivanFrom: Faisal Latif <[email protected]>
The i40e_add_pd_table_entry() routine is being modified to handle both cases where a backing page is passed and where backing page is allocated in i40e_add_pd_table_entry().
For PBLE resource management, it is more efficient for it to manage its backing pages. For VF, PBLE backing page addresses will be send to PF driver for PBLE resource.
The i40e_remove_pd_bp() is also modified to not free pre-allocated pages and free only ones which were allocated in i40e_add_pd_table_entry().
--- drivers/net/ethernet/intel/i40e/i40e_hmc.c | 30 +++++++++++++++++--------- drivers/net/ethernet/intel/i40e/i40e_hmc.h | 4 +++- drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 2 +- drivers/net/ethernet/intel/i40evf/i40e_hmc.h | 4 +++- 4 files changed, 27 insertions(+), 13 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_hmc.c +20 -10
@@ -116,6 +116,7 @@ exit:* @hw: pointer to our HW structure * @hmc_info: pointer to the HMC configuration information structure * @pd_index: which page descriptor index to manipulate +* @rsrc_pg: if not NULL, use preallocated page instead of allocating new one. * * This function: * 1. Initializes the pd entry
@@ -129,12 +130,14 @@ exit:**/ i40e_status i40e_add_pd_table_entry (struct i40e_hw *hw,struct i40e_hmc_info *hmc_info, -u32 pd_index) +u32 pd_index, +struct i40e_dma_mem *rsrc_pg) {i40e_status ret_code =0 ;struct i40e_hmc_pd_table *pd_table;struct i40e_hmc_pd_entry *pd_entry;struct i40e_dma_mem mem; +struct i40e_dma_mem *page = &mem;u32 sd_idx, rel_pd_idx;u64 *pd_addr;u64 page_desc;
@@ -155,18 +158,24 @@ i40e_status i40e_add_pd_table_entry(struct i40e_hw *hw, pd_table = &hmc_info->sd_table.sd_entry[sd_idx].u.pd_table; pd_entry = &pd_table->pd_entry[rel_pd_idx];if (!pd_entry->valid) { -/* allocate a 4K backing page */ - ret_code =i40e_allocate_dma_mem (hw, &mem, i40e_mem_bp, -I40E_HMC_PAGED_BP_SIZE , -I40E_HMC_PD_BP_BUF_ALIGNMENT ); -if (ret_code) - goto exit; +if (rsrc_pg) { + pd_entry->rsrc_pg = true; + page = rsrc_pg; + }else { +/* allocate a 4K backing page */ + ret_code =i40e_allocate_dma_mem (hw, page, i40e_mem_bp, +I40E_HMC_PAGED_BP_SIZE , +I40E_HMC_PD_BP_BUF_ALIGNMENT ); +if (ret_code) + goto exit; + pd_entry->rsrc_pg = false; + } - pd_entry->bp.addr = mem; + pd_entry->bp.addr = *page; pd_entry->bp.sd_pd_index = pd_index; pd_entry->bp.entry_type =I40E_SD_TYPE_PAGED ;/* Set page address and valid bit */ - page_desc = mem.pa |0x1 ; + page_desc = page->pa |0x1 ; pd_addr = (u64 *)pd_table->pd_page_addr.va; pd_addr += rel_pd_idx;
@@ -240,7 +249,8 @@ i40e_status i40e_remove_pd_bp(struct i40e_hw *hw,I40E_INVALIDATE_PF_HMC_PD (hw, sd_idx, idx);/* free memory here */ - ret_code =i40e_free_dma_mem (hw, &(pd_entry->bp.addr)); +if (!pd_entry->rsrc_pg) + ret_code =i40e_free_dma_mem (hw, &pd_entry->bp.addr);if (ret_code) goto exit;if (!pd_table->ref_cnt)
drivers/net/ethernet/intel/i40e/i40e_hmc.h +3 -1
@@ -62,6 +62,7 @@ struct i40e_hmc_bp {struct i40e_hmc_pd_entry {struct i40e_hmc_bp bp;u32 sd_index; +bool rsrc_pg;bool valid; };
@@ -218,7 +219,8 @@ i40e_status i40e_add_sd_table_entry(struct i40e_hw *hw,i40e_status i40e_add_pd_table_entry (struct i40e_hw *hw,struct i40e_hmc_info *hmc_info, -u32 pd_index); +u32 pd_index, +struct i40e_dma_mem *rsrc_pg);i40e_status i40e_remove_pd_bp (struct i40e_hw *hw,struct i40e_hmc_info *hmc_info,u32 idx);
drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c +1 -1
@@ -387,7 +387,7 @@ static i40e_status i40e_create_lan_hmc_object(struct i40e_hw *hw,/* update the pd table entry */ ret_code =i40e_add_pd_table_entry (hw, info->hmc_info, - i); + i,NULL );if (ret_code) { pd_error = true;break ;
drivers/net/ethernet/intel/i40evf/i40e_hmc.h +3 -1
@@ -62,6 +62,7 @@ struct i40e_hmc_bp {struct i40e_hmc_pd_entry {struct i40e_hmc_bp bp;u32 sd_index; +bool rsrc_pg;bool valid; };
@@ -218,7 +219,8 @@ i40e_status i40e_add_sd_table_entry(struct i40e_hw *hw,i40e_status i40e_add_pd_table_entry (struct i40e_hw *hw,struct i40e_hmc_info *hmc_info, -u32 pd_index); +u32 pd_index, +struct i40e_dma_mem *rsrc_pg);i40e_status i40e_remove_pd_bp (struct i40e_hw *hw,struct i40e_hmc_info *hmc_info,u32 idx);
Signature · 1 line
1.9.3
Young
PATCH 12/15 i40e/i40evf: Add support for pre-allocated pages for PD
Quoted 24 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Monday, April 27, 2015 11:57 AM
To: intel-wired-lan at lists.osuosl.org
Cc: Latif, Faisal
Subject: [Intel-wired-lan] [net-next S5 12/15] i40e/i40evf: Add support for pre-allocated pages for PDFrom: Faisal Latif <[email protected]>
The
i40e_add_pd_table_entry()routine is being modified to handle both cases where a backing page is passed and where backing page is allocated ini40e_add_pd_table_entry().For PBLE resource management, it is more efficient for it to manage its backing pages. For VF, PBLE backing page addresses will be send to PF driver for PBLE resource.
The
i40e_remove_pd_bp()is also modified to not free pre-allocated pages and free only ones which were allocated ini40e_add_pd_table_entry().Signed-off-by Faisal Latif <[email protected]>Change-ID Ie673f0403f22979e9406f5a94048dceb91bcf9a8
Quoted 8 lines
--- drivers/net/ethernet/intel/i40e/i40e_hmc.c | 30 +++++++++++++++++------- -- drivers/net/ethernet/intel/i40e/i40e_hmc.h | 4 +++- drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 2 +- drivers/net/ethernet/intel/i40evf/i40e_hmc.h | 4 +++- 4 files changed, 27 insertions(+), 13 deletions(-)
PATCH 13/15 i40e: Refine an error message to avoid confusion
In reply to Catherine SullivanFrom: Anjali Singhai Jain <[email protected]>
Change a warning message to indicate what may have really happened when the init_shared_code call fails.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +2 -1
@@ -9749,7 +9749,8 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err =i40e_init_shared_code (hw);if (err) { -dev_info (&pdev->dev,"init_shared_code failed: %d\n" , err); +dev_warn (&pdev->dev,"unidentified MAC or BLANK NVM: %d\n" , + err); goto err_pf_reset; }
Signature · 1 line
1.9.3
Young
PATCH 13/15 i40e: Refine an error message to avoid confusion
Quoted 11 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Monday, April 27, 2015 11:57 AM
To: intel-wired-lan at lists.osuosl.org
Cc: Singhai, Anjali
Subject: [Intel-wired-lan] [net-next S5 13/15] i40e: Refine an error message to avoid confusionFrom: Anjali Singhai Jain <[email protected]>
Quoted 9 lines
Change a warning message to indicate what may have really happened when the
init_shared_codecall fails.Signed-off-by Anjali Singhai Jain <[email protected]>Change-ID I616ace40fed120d0dec86dfc91ab2d7cde466904--- drivers/net/ethernet/intel/i40e/i40e_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
PATCH 14/15 i40e/i40evf: remove last_rx reference in receive
In reply to Catherine SullivanFrom: Jesse Brandeburg <[email protected]>
The driver was suffering a slow down in RX performance due to accessing this cache line from all receive queues, which resulted in a performance improvement for forwarding packets with this patch.
--- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 -- drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 -- 2 files changed, 4 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_txrx.c +0 -2
@@ -1658,7 +1658,6 @@ static int i40e_clean_rx_irq_ps(struct i40e_ring *rx_ring, int budget)skb_mark_napi_id (skb, &rx_ring->q_vector->napi);i40e_receive_skb (rx_ring, skb, vlan_tag); - rx_ring->netdev->last_rx = jiffies; rx_desc->wb.qword1.status_error_len =0 ; }while (likely (total_rx_packets < budget));
@@ -1791,7 +1790,6 @@ static int i40e_clean_rx_irq_1buf(struct i40e_ring *rx_ring, int budget)#endif i40e_receive_skb (rx_ring, skb, vlan_tag); - rx_ring->netdev->last_rx = jiffies; rx_desc->wb.qword1.status_error_len =0 ; }while (likely (total_rx_packets < budget));
drivers/net/ethernet/intel/i40evf/i40e_txrx.c +0 -2
@@ -1126,7 +1126,6 @@ static int i40e_clean_rx_irq_ps(struct i40e_ring *rx_ring, int budget)skb_mark_napi_id (skb, &rx_ring->q_vector->napi);i40e_receive_skb (rx_ring, skb, vlan_tag); - rx_ring->netdev->last_rx = jiffies; rx_desc->wb.qword1.status_error_len =0 ; }while (likely (total_rx_packets < budget));
@@ -1241,7 +1240,6 @@ static int i40e_clean_rx_irq_1buf(struct i40e_ring *rx_ring, int budget) : 0;i40e_receive_skb (rx_ring, skb, vlan_tag); - rx_ring->netdev->last_rx = jiffies; rx_desc->wb.qword1.status_error_len =0 ; }while (likely (total_rx_packets < budget));
Signature · 1 line
1.9.3
Young
PATCH 14/15 i40e/i40evf: remove last_rx reference in receive
Quoted 14 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Monday, April 27, 2015 11:57 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [net-next S5 14/15] i40e/i40evf: removelast_rxreference in receiveFrom: Jesse Brandeburg <[email protected]>
The driver was suffering a slow down in RX performance due to accessing this cache line from all receive queues, which resulted in a performance improvement for forwarding packets with this patch.
Quoted 7 lines
Signed-off-by Jesse Brandeburg <[email protected]>Change-ID Ie841a72289207eadf8a16b1013ffe83dfec6db1d--- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 -- drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 -- 2 files changed, 4 deletions(-)
Young
PATCH 14/15 i40e/i40evf: remove last_rx reference in receive
Quoted 30 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Young, James M
Sent: Friday, June 12, 2015 10:47 AM
To: Sullivan, Catherine; intel-wired-lan at lists.osuosl.org
Subject: Re: [Intel-wired-lan] [net-next S5 14/15] i40e/i40evf: removelast_rxreference in receiveQuoted 22 lines
-----Original Message-----
From: Intel-wired-lan
[mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Monday, April 27, 2015 11:57 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [net-next S5 14/15] i40e/i40evf: removelast_rxreference in receiveFrom: Jesse Brandeburg <[email protected]>
The driver was suffering a slow down in RX performance due to accessing this cache line from all receive queues, which resulted in a performance improvement for forwarding packets with this patch.
Signed-off-by Jesse Brandeburg <[email protected]>Change-ID Ie841a72289207eadf8a16b1013ffe83dfec6db1d--- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 -- drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 -- 2 files changed, 4 deletions(-)
This is a resend because the original "tested-by" email had a formatting error which prevented it from triggering the "tested" bit in patchwork.
PATCH 15/15 i40e/i40evf: Bump version to 1.3.6 for i40e and 1.3.2 for i40evf
In reply to Catherine SullivanBump.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -39,7 +39,7 @@ static const char i40e_driver_string[] =#define DRV_VERSION_MAJOR 1#define DRV_VERSION_MINOR 3 -#define DRV_VERSION_BUILD 4 +#define DRV_VERSION_BUILD 6#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \ __stringify(DRV_VERSION_MINOR) "." \ __stringify(DRV_VERSION_BUILD) DRV_KERN
drivers/net/ethernet/intel/i40evf/i40evf_main.c +1 -1
@@ -34,7 +34,7 @@ char i40evf_driver_name[] = "i40evf";static const char i40evf_driver_string[] ="Intel(R) XL710/X710 Virtual Function Network Driver" ; -#define DRV_VERSION "1.2.25" +#define DRV_VERSION "1.3.2"const char i40evf_driver_version[] =DRV_VERSION ;static const char i40evf_copyright[] ="Copyright (c) 2013 - 2014 Intel Corporation." ;
Signature · 1 line
1.9.3
Young
PATCH 15/15 i40e/i40evf: Bump version to 1.3.6 for i40e and 1.3.2 for i40evf
Quoted 8 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Catherine Sullivan
Sent: Monday, April 27, 2015 11:57 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [net-next S5 15/15] i40e/i40evf: Bump version to 1.3.6 for i40e and 1.3.2 for i40evf
Quoted 8 lines
Bump.
Signed-off-by Catherine Sullivan <[email protected]>Change-ID I84573d9fa51effc5b29bf5b8c74e3cc8b2673f48--- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
cover i40e/i40evf updates
In reply to Catherine SullivanQuoted 24 lines · Catherine Sullivan
Anjali refines an error message in i40e.
Carolyn removes inccorect #ifdefs and fixes the compile errors that show
up as a result. She also refactors the dynamic ITR code for i40e and i40evf.Faisal adds support for pre-allocated pages for PD in i40e.
Greg updates the admin queue command header for i40e and i40evf.
Jesse improves i40e/i40evf tx and rx performance with a couple small tweaks.
Mitch modifies i40evf to allow for an abundance of vectors, moves adding
MAC address filters from init to open, and to stop deleting all filters
every timeset_rx_modewas called. He also modified i40e to ignore duplicate
port VLAN requests, to correctly program filters for VFs, to do a proper reset
when disabling a VF, and to un-disable the VF after a reset.
Quoted 14 lines
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 24 ++-- drivers/net/ethernet/intel/i40e/i40e_hmc.c | 30 +++-- drivers/net/ethernet/intel/i40e/i40e_hmc.h | 4 +- drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 8 +- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 150 ++++++++++++--------- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 23 ++-- .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 18 +-- drivers/net/ethernet/intel/i40evf/i40e_hmc.h | 4 +- drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 117 ++++++++++------ drivers/net/ethernet/intel/i40evf/i40evf_main.c | 20 +-- 11 files changed, 236 insertions(+), 164 deletions(-)
Thanks Catherine, I have added your series to my queue.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20150502/c03b3bc6/attachment.asc>