Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ad78292 authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

fm10k: add support for Rx offloads on one Geneve tunnel 



Similar to how we handle VXLAN offload, enable support for a single
Geneve tunnel.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarKrishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f92e0e48

drivers/net/ethernet/intel/fm10k/fm10k.h

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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)