fm10k: don't try to stop queues if we've lost hw_addr
Subsystems (2)
PATCH 1/1 fm10k: don't try to stop queues if we've lost hw_addr
In the event of a surprise remove, we expect the driver to go down, which includes calling .stop_hw(). However, this function will return an error because the queues won't appear to cleanly disable. Prevent this and avoid the unnecessary checks by just returning when FM10K_REMOVED(hw->hw_addr) is true.
--- drivers/net/ethernet/intel/fm10k/fm10k_common.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/intel/fm10k/fm10k_common.c +3 -0
@@ -207,6 +207,9 @@ s32 fm10k_disable_queues_generic(struct fm10k_hw *hw, u16 q_cnt)/* clear tx_ready to prevent any false hits for reset */ hw->mac.tx_ready = false; +if (FM10K_REMOVED (hw->hw_addr)) +return 0 ; +/* clear the enable bit for all rings */ for (i =0 ; i < q_cnt; i++) { reg =fm10k_read_reg (hw,FM10K_TXDCTL (i));
Signature · 1 line
2.9.0.rc1.405.g81f467e
PATCH 1/2 fm10k: rework vxlan_port offload before adding geneve support
In preparation for adding Geneve Rx offload support, refactor the current VXLAN offload flow to be a bit more generic so that it will be easier to add the new Geneve code. The fm10k hardware supports one VXLAN and one Geneve tunnel, so we will eventually treat the VXLAN and Geneve tunnels identically. To this end, factor out the code that handles the current list so that we can use the generic flow for both tunnels in the next patch.
--- drivers/net/ethernet/intel/fm10k/fm10k.h | 6 +- drivers/net/ethernet/intel/fm10k/fm10k_main.c | 4 +- drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 167 +++++++++++++----------- 3 files changed, 94 insertions(+), 83 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k.h +2 -4
@@ -240,9 +240,7 @@ struct fm10k_iov_data {struct fm10k_vf_info vf_info[0 ]; }; -#define fm10k_vxlan_port_for_each (vp, intfc) \ - list_for_each_entry(vp, &(intfc)->vxlan_port, list) -struct fm10k_vxlan_port { +struct fm10k_udp_port {struct list_head list;sa_family_t sa_family;__be16 port;
@@ -335,7 +333,7 @@ struct fm10k_intfc {u32 reta[FM10K_RETA_SIZE ];u32 rssrk[FM10K_RSSRK_SIZE ]; -/* VXLAN port tracking information */ +/* UDP encapsulation port tracking information */ struct list_head vxlan_port;#ifdef CONFIG_DEBUG_FS
drivers/net/ethernet/intel/fm10k/fm10k_main.c +2 -2
@@ -651,11 +651,11 @@ static int fm10k_clean_rx_irq(struct fm10k_q_vector *q_vector,static struct ethhdr *fm10k_port_is_vxlan (struct sk_buff *skb) {struct fm10k_intfc *interface =netdev_priv (skb->dev); -struct fm10k_vxlan_port *vxlan_port; +struct fm10k_udp_port *vxlan_port;/* we can only offload a vxlan if we recognize it as such */ vxlan_port =list_first_entry_or_null (&interface->vxlan_port, - struct fm10k_vxlan_port, list); + struct fm10k_udp_port, list);if (!vxlan_port)return NULL ;
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +90 -77
252 lines not on this page · raw message
Signature · 1 line
2.9.0.rc1.405.g81f467e
Singh
PATCH 1/2 fm10k: rework vxlan_port offload before adding geneve support
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Jacob Keller
Sent: Thursday, June 23, 2016 1:54 PM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH 1/2] fm10k: rework vxlan_port offload before adding geneve support
In preparation for adding Geneve Rx offload support, refactor the current VXLAN offload flow to be a bit more generic so that it will be easier to add the new Geneve code. The fm10k hardware supports one VXLAN and one Geneve tunnel, so we will eventually treat the VXLAN and Geneve tunnels identically. To this end, factor out the code that handles the current list so that we can use the generic flow for both tunnels in the next patch.
---
PATCH 2/2 fm10k: add support for Rx offloads on one Geneve tunnel
In reply to Jacob KellerSimilar to how we handle VXLAN offload, enable support for a single Geneve tunnel.
--- drivers/net/ethernet/intel/fm10k/fm10k.h | 1 + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 30 ++++++++++++++++++++++--- drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 3 ++- drivers/net/ethernet/intel/fm10k/fm10k_type.h | 1 + 4 files changed, 31 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k.h +1 -0
@@ -335,6 +335,7 @@ struct fm10k_intfc {/* UDP encapsulation port tracking information */ struct list_head vxlan_port; +struct list_head geneve_port;#ifdef CONFIG_DEBUG_FS struct dentry *dbg_intfc;
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +27 -3
@@ -387,7 +387,7 @@ static void fm10k_request_glort_range(struct fm10k_intfc *interface)* fm10k_free_udp_port_info * @interface: board private structure * -* This function frees the entire vxlan_port list +* This function frees both geneve_port and vxlan_port structures **/ static void fm10k_free_udp_port_info (struct fm10k_intfc *interface) {
@@ -403,6 +403,17 @@ static void fm10k_free_udp_port_info(struct fm10k_intfc *interface) struct fm10k_udp_port, list); } + +/* flush all entries from geneve list */ + port =list_first_entry_or_null (&interface->geneve_port, + struct fm10k_udp_port, list); +while (port) { +list_del (&port->list); +kfree (port); + port =list_first_entry_or_null (&interface->vxlan_port, + struct fm10k_udp_port, + list); + } }/**
@@ -427,6 +438,13 @@ static void fm10k_restore_udp_port_info(struct fm10k_intfc *interface)fm10k_write_reg (hw,FM10K_TUNNEL_CFG , (port ?ntohs (port->port) :0 ) | (ETH_P_TEB <<FM10K_TUNNEL_CFG_NVGRE_SHIFT )); + + port =list_first_entry_or_null (&interface->geneve_port, + struct fm10k_udp_port, list); + +/* restore Geneve tunnel configuration register */ +fm10k_write_reg (hw,FM10K_TUNNEL_CFG_GENEVE , + (port ?ntohs (port->port) :0 )); } static struct fm10k_udp_port *
@@ -472,8 +490,8 @@ static void fm10k_insert_tunnel_port(struct list_head *ports,* @ti: Tunnel endpoint information * * This function is called when a new UDP tunnel port has been added. -* Currently we only support VXLAN and only one port will actually be -* offloaded due to hardware restrictions. +* Due to hardware restrictions, only one port per type can be offloaded at +* once. **/ static void fm10k_udp_tunnel_add (struct net_device *dev,struct udp_tunnel_info *ti)
@@ -488,6 +506,9 @@ static void fm10k_udp_tunnel_add(struct net_device *dev,case UDP_TUNNEL_TYPE_VXLAN :fm10k_insert_tunnel_port (&interface->vxlan_port, ti);break ; +case UDP_TUNNEL_TYPE_GENEVE : +fm10k_insert_tunnel_port (&interface->geneve_port, ti); +break ;default :return ; }
@@ -517,6 +538,9 @@ static void fm10k_udp_tunnel_del(struct net_device *dev,case UDP_TUNNEL_TYPE_VXLAN : port =fm10k_remove_tunnel_port (&interface->vxlan_port, ti);break ; +case UDP_TUNNEL_TYPE_GENEVE : + port =fm10k_remove_tunnel_port (&interface->geneve_port, ti); +break ;default :return ; }
drivers/net/ethernet/intel/fm10k/fm10k_pci.c +2 -1
@@ -1835,8 +1835,9 @@ static int fm10k_sw_init(struct fm10k_intfc *interface, interface->tx_itr =FM10K_TX_ITR_DEFAULT ; interface->rx_itr =FM10K_ITR_ADAPTIVE |FM10K_RX_ITR_DEFAULT ; -/* initialize vxlan_port list */ +/* initialize udp port lists */ INIT_LIST_HEAD (&interface->vxlan_port); +INIT_LIST_HEAD (&interface->geneve_port);netdev_rss_key_fill (rss_key,sizeof (rss_key));memcpy (interface->rssrk, rss_key,sizeof (rss_key));
drivers/net/ethernet/intel/fm10k/fm10k_type.h +1 -0
@@ -154,6 +154,7 @@ struct fm10k_hw;#define FM10K_DGLORTDEC_INNERRSS_ENABLE 0x08000000#define FM10K_TUNNEL_CFG 0x0040#define FM10K_TUNNEL_CFG_NVGRE_SHIFT 16 +#define FM10K_TUNNEL_CFG_GENEVE 0x0041#define FM10K_SWPRI_MAP (_n) ((_n) + 0x0050)#define FM10K_SWPRI_MAX 16#define FM10K_RSSRK (_n, _m) (((_n) * 0x10) + (_m) + 0x0800)
Signature · 1 line
2.9.0.rc1.405.g81f467e
Singh
PATCH 2/2 fm10k: add support for Rx offloads on one Geneve tunnel
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Jacob Keller
Sent: Thursday, June 23, 2016 1:54 PM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH 2/2] fm10k: add support for Rx offloads on one Geneve tunnel
Similar to how we handle VXLAN offload, enable support for a single Geneve tunnel.
---
Singh
PATCH 1/1 fm10k: don't try to stop queues if we've lost hw_addr
In reply to Jacob Keller-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Jacob Keller
Sent: Thursday, June 23, 2016 1:54 PM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH] fm10k: don't try to stop queues if we've lost hw_addr
In the event of a surprise remove, we expect the driver to go down, which includes calling .stop_hw(). However, this function will return an error because the queues won't appear to cleanly disable. Prevent this and avoid the unnecessary checks by just returning when FM10K_REMOVED(hw->hw_addr) is true.
---