Commit c371e7b4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5e-updates-2018-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5e-updates-2018-08-10

This series provides the following updates to mlx5e netdevice driver.

1) First 4 patches extends the support for ethtool rxnfc flow steering
   - Added ipv6 support
   - l4 proto ip field for both ip6 and ip4

2) Next 4 patches, reorganizing flow steering structures and declaration into
one header file, and add two Kconfig flags to allow disabling/enabling mlx5
netdevice rx flow steering at compile time:
CONFIG_MLX5_EN_ARFS for en_arfs.c
CONFIG_MLX5_EN_RXNFC for en_fs_ehtool.c

3) More kconfig flags dependencies
- vxlan.c depends on CONFIG_VXLAN
- clock.c depends on CONFIG_PTP_1588_CLOCK

4) Reorganize the Makefile
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 42c625a4 cf916ffb

drivers/net/ethernet/mellanox/mlx5/core/Kconfig

+19 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config MLX5_CORE 
	depends on MAY_USE_DEVLINK

	depends on PCI

	imply PTP_1588_CLOCK

	imply VXLAN

	default n

	---help---

	  Core driver for low level functionality of the ConnectX-4 and
@@ -35,6 +36,24 @@ config MLX5_CORE_EN 
	---help---

	  Ethernet support in Mellanox Technologies ConnectX-4 NIC.



config MLX5_EN_ARFS

	bool "Mellanox MLX5 ethernet accelerated receive flow steering (ARFS) support"

	depends on MLX5_CORE_EN && RFS_ACCEL

	default y

	---help---

	  Mellanox MLX5 ethernet hardware-accelerated receive flow steering support,

	  Enables ethernet netdevice arfs support and ntuple filtering.



config MLX5_EN_RXNFC

	bool "Mellanox MLX5 ethernet rx nfc flow steering support"

	depends on MLX5_CORE_EN

	default y

	---help---

	  Mellanox MLX5 ethernet rx nfc flow steering support

	  Enables ethtool receive network flow classification, which allows user defined

	  flow rules to direct traffic into arbitrary rx queue via ethtool set/get_rxnfc

	  API.



config MLX5_MPFS

        bool "Mellanox Technologies MLX5 MPFS support"

        depends on MLX5_CORE_EN

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+44 −16
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_MLX5_CORE)		+= mlx5_core.o

#

# Makefile for Mellanox 5th generation network adapters

# (ConnectX series) core & netdev driver

#



subdir-ccflags-y += -I$(src)



obj-$(CONFIG_MLX5_CORE) += mlx5_core.o



#

# mlx5 core basic

#

mlx5_core-y :=	main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \

		health.o mcg.o cq.o srq.o alloc.o qp.o port.o mr.o pd.o \

		mad.o transobj.o vport.o sriov.o fs_cmd.o fs_core.o \

		fs_counters.o rl.o lag.o dev.o wq.o lib/gid.o lib/clock.o \

		fs_counters.o rl.o lag.o dev.o wq.o lib/gid.o  \

		diag/fs_tracepoint.o diag/fw_tracer.o



mlx5_core-$(CONFIG_MLX5_ACCEL) += accel/ipsec.o accel/tls.o



mlx5_core-$(CONFIG_MLX5_FPGA) += fpga/cmd.o fpga/core.o fpga/conn.o fpga/sdk.o \

		fpga/ipsec.o fpga/tls.o



#

# Netdev basic

#

mlx5_core-$(CONFIG_MLX5_CORE_EN) += en_main.o en_common.o en_fs.o en_ethtool.o \

		en_tx.o en_rx.o en_dim.o en_txrx.o en/xdp.o en_stats.o \

		en_arfs.o en_fs_ethtool.o en_selftest.o en/port.o lib/vxlan.o

		en_selftest.o en/port.o



#

# Netdev extra

#

mlx5_core-$(CONFIG_MLX5_EN_ARFS)     += en_arfs.o

mlx5_core-$(CONFIG_MLX5_EN_RXNFC)    += en_fs_ethtool.o

mlx5_core-$(CONFIG_MLX5_CORE_EN_DCB) += en_dcbnl.o en/port_buffer.o

mlx5_core-$(CONFIG_MLX5_ESWITCH)     += en_rep.o en_tc.o



#

# Core extra

#

mlx5_core-$(CONFIG_MLX5_ESWITCH)   += eswitch.o eswitch_offloads.o

mlx5_core-$(CONFIG_MLX5_MPFS)      += lib/mpfs.o

mlx5_core-$(CONFIG_VXLAN)          += lib/vxlan.o

mlx5_core-$(CONFIG_PTP_1588_CLOCK) += lib/clock.o



mlx5_core-$(CONFIG_MLX5_ESWITCH) += eswitch.o eswitch_offloads.o en_rep.o en_tc.o

#

# Ipoib netdev

#

mlx5_core-$(CONFIG_MLX5_CORE_IPOIB) += ipoib/ipoib.o ipoib/ethtool.o ipoib/ipoib_vlan.o



mlx5_core-$(CONFIG_MLX5_CORE_EN_DCB) +=  en_dcbnl.o en/port_buffer.o

#

# Accelerations & FPGA

#

mlx5_core-$(CONFIG_MLX5_ACCEL) += accel/ipsec.o accel/tls.o



mlx5_core-$(CONFIG_MLX5_CORE_IPOIB) += ipoib/ipoib.o ipoib/ethtool.o ipoib/ipoib_vlan.o

mlx5_core-$(CONFIG_MLX5_FPGA) += fpga/cmd.o fpga/core.o fpga/conn.o fpga/sdk.o \

				 fpga/ipsec.o fpga/tls.o



mlx5_core-$(CONFIG_MLX5_EN_IPSEC) += en_accel/ipsec.o en_accel/ipsec_rxtx.o \

				     en_accel/ipsec_stats.o

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −202
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include "wq.h"

#include "mlx5_core.h"

#include "en_stats.h"

#include "en/fs.h"



struct page_pool;
@@ -626,152 +627,12 @@ struct mlx5e_channel_stats { 
	struct mlx5e_xdpsq_stats xdpsq;

} ____cacheline_aligned_in_smp;



enum mlx5e_traffic_types {

	MLX5E_TT_IPV4_TCP,

	MLX5E_TT_IPV6_TCP,

	MLX5E_TT_IPV4_UDP,

	MLX5E_TT_IPV6_UDP,

	MLX5E_TT_IPV4_IPSEC_AH,

	MLX5E_TT_IPV6_IPSEC_AH,

	MLX5E_TT_IPV4_IPSEC_ESP,

	MLX5E_TT_IPV6_IPSEC_ESP,

	MLX5E_TT_IPV4,

	MLX5E_TT_IPV6,

	MLX5E_TT_ANY,

	MLX5E_NUM_TT,

	MLX5E_NUM_INDIR_TIRS = MLX5E_TT_ANY,

};



enum mlx5e_tunnel_types {

	MLX5E_TT_IPV4_GRE,

	MLX5E_TT_IPV6_GRE,

	MLX5E_NUM_TUNNEL_TT,

};



enum {

	MLX5E_STATE_ASYNC_EVENTS_ENABLED,

	MLX5E_STATE_OPENED,

	MLX5E_STATE_DESTROYING,

};



struct mlx5e_l2_rule {

	u8  addr[ETH_ALEN + 2];

	struct mlx5_flow_handle *rule;

};



struct mlx5e_flow_table {

	int num_groups;

	struct mlx5_flow_table *t;

	struct mlx5_flow_group **g;

};



#define MLX5E_L2_ADDR_HASH_SIZE BIT(BITS_PER_BYTE)



struct mlx5e_tc_table {

	struct mlx5_flow_table		*t;



	struct rhashtable               ht;



	DECLARE_HASHTABLE(mod_hdr_tbl, 8);

	DECLARE_HASHTABLE(hairpin_tbl, 8);

};



struct mlx5e_vlan_table {

	struct mlx5e_flow_table		ft;

	DECLARE_BITMAP(active_cvlans, VLAN_N_VID);

	DECLARE_BITMAP(active_svlans, VLAN_N_VID);

	struct mlx5_flow_handle	*active_cvlans_rule[VLAN_N_VID];

	struct mlx5_flow_handle	*active_svlans_rule[VLAN_N_VID];

	struct mlx5_flow_handle	*untagged_rule;

	struct mlx5_flow_handle	*any_cvlan_rule;

	struct mlx5_flow_handle	*any_svlan_rule;

	bool			cvlan_filter_disabled;

};



struct mlx5e_l2_table {

	struct mlx5e_flow_table    ft;

	struct hlist_head          netdev_uc[MLX5E_L2_ADDR_HASH_SIZE];

	struct hlist_head          netdev_mc[MLX5E_L2_ADDR_HASH_SIZE];

	struct mlx5e_l2_rule	   broadcast;

	struct mlx5e_l2_rule	   allmulti;

	struct mlx5e_l2_rule	   promisc;

	bool                       broadcast_enabled;

	bool                       allmulti_enabled;

	bool                       promisc_enabled;

};



/* L3/L4 traffic type classifier */

struct mlx5e_ttc_table {

	struct mlx5e_flow_table  ft;

	struct mlx5_flow_handle	 *rules[MLX5E_NUM_TT];

	struct mlx5_flow_handle  *tunnel_rules[MLX5E_NUM_TUNNEL_TT];

};



#define ARFS_HASH_SHIFT BITS_PER_BYTE

#define ARFS_HASH_SIZE BIT(BITS_PER_BYTE)

struct arfs_table {

	struct mlx5e_flow_table  ft;

	struct mlx5_flow_handle	 *default_rule;

	struct hlist_head	 rules_hash[ARFS_HASH_SIZE];

};



enum  arfs_type {

	ARFS_IPV4_TCP,

	ARFS_IPV6_TCP,

	ARFS_IPV4_UDP,

	ARFS_IPV6_UDP,

	ARFS_NUM_TYPES,

};



struct mlx5e_arfs_tables {

	struct arfs_table arfs_tables[ARFS_NUM_TYPES];

	/* Protect aRFS rules list */

	spinlock_t                     arfs_lock;

	struct list_head               rules;

	int                            last_filter_id;

	struct workqueue_struct        *wq;

};



/* NIC prio FTS */

enum {

	MLX5E_VLAN_FT_LEVEL = 0,

	MLX5E_L2_FT_LEVEL,

	MLX5E_TTC_FT_LEVEL,

	MLX5E_INNER_TTC_FT_LEVEL,

	MLX5E_ARFS_FT_LEVEL

};



enum {

	MLX5E_TC_FT_LEVEL = 0,

	MLX5E_TC_TTC_FT_LEVEL,

};



struct mlx5e_ethtool_table {

	struct mlx5_flow_table *ft;

	int                    num_rules;

};



#define ETHTOOL_NUM_L3_L4_FTS 7

#define ETHTOOL_NUM_L2_FTS 4



struct mlx5e_ethtool_steering {

	struct mlx5e_ethtool_table      l3_l4_ft[ETHTOOL_NUM_L3_L4_FTS];

	struct mlx5e_ethtool_table      l2_ft[ETHTOOL_NUM_L2_FTS];

	struct list_head                rules;

	int                             tot_num_rules;

};



struct mlx5e_flow_steering {

	struct mlx5_flow_namespace      *ns;

	struct mlx5e_ethtool_steering   ethtool;

	struct mlx5e_tc_table           tc;

	struct mlx5e_vlan_table         vlan;

	struct mlx5e_l2_table           l2;

	struct mlx5e_ttc_table          ttc;

	struct mlx5e_ttc_table          inner_ttc;

	struct mlx5e_arfs_tables        arfs;

};



struct mlx5e_rqt {

	u32              rqtn;

	bool		 enabled;
@@ -905,23 +766,10 @@ mlx5e_skb_from_cqe_nonlinear(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe, 


void mlx5e_update_stats(struct mlx5e_priv *priv);



int mlx5e_create_flow_steering(struct mlx5e_priv *priv);

void mlx5e_destroy_flow_steering(struct mlx5e_priv *priv);

void mlx5e_init_l2_addr(struct mlx5e_priv *priv);

void mlx5e_destroy_flow_table(struct mlx5e_flow_table *ft);

int mlx5e_self_test_num(struct mlx5e_priv *priv);

void mlx5e_self_test(struct net_device *ndev, struct ethtool_test *etest,

		     u64 *buf);

int mlx5e_ethtool_get_flow(struct mlx5e_priv *priv, struct ethtool_rxnfc *info,

			   int location);

int mlx5e_ethtool_get_all_flows(struct mlx5e_priv *priv,

				struct ethtool_rxnfc *info, u32 *rule_locs);

int mlx5e_ethtool_flow_replace(struct mlx5e_priv *priv,

			       struct ethtool_rx_flow_spec *fs);

int mlx5e_ethtool_flow_remove(struct mlx5e_priv *priv,

			      int location);

void mlx5e_ethtool_init_steering(struct mlx5e_priv *priv);

void mlx5e_ethtool_cleanup_steering(struct mlx5e_priv *priv);

void mlx5e_set_rx_mode_work(struct work_struct *work);



int mlx5e_hwstamp_set(struct mlx5e_priv *priv, struct ifreq *ifr);
@@ -932,8 +780,6 @@ int mlx5e_vlan_rx_add_vid(struct net_device *dev, __always_unused __be16 proto, 
			  u16 vid);

int mlx5e_vlan_rx_kill_vid(struct net_device *dev, __always_unused __be16 proto,

			   u16 vid);

void mlx5e_enable_cvlan_filter(struct mlx5e_priv *priv);

void mlx5e_disable_cvlan_filter(struct mlx5e_priv *priv);

void mlx5e_timestamp_init(struct mlx5e_priv *priv);



struct mlx5e_redirect_rqt_param {
@@ -1050,32 +896,6 @@ void mlx5e_dcbnl_init_app(struct mlx5e_priv *priv); 
void mlx5e_dcbnl_delete_app(struct mlx5e_priv *priv);

#endif



#ifndef CONFIG_RFS_ACCEL

static inline int mlx5e_arfs_create_tables(struct mlx5e_priv *priv)

{

	return 0;

}



static inline void mlx5e_arfs_destroy_tables(struct mlx5e_priv *priv) {}



static inline int mlx5e_arfs_enable(struct mlx5e_priv *priv)

{

	return -EOPNOTSUPP;

}



static inline int mlx5e_arfs_disable(struct mlx5e_priv *priv)

{

	return -EOPNOTSUPP;

}

#else

int mlx5e_arfs_create_tables(struct mlx5e_priv *priv);

void mlx5e_arfs_destroy_tables(struct mlx5e_priv *priv);

int mlx5e_arfs_enable(struct mlx5e_priv *priv);

int mlx5e_arfs_disable(struct mlx5e_priv *priv);

int mlx5e_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,

			u16 rxq_index, u32 flow_id);

#endif



int mlx5e_create_tir(struct mlx5_core_dev *mdev,

		     struct mlx5e_tir *tir, u32 *in, int inlen);

void mlx5e_destroy_tir(struct mlx5_core_dev *mdev,
@@ -1096,27 +916,6 @@ int mlx5e_create_direct_tirs(struct mlx5e_priv *priv); 
void mlx5e_destroy_direct_tirs(struct mlx5e_priv *priv);

void mlx5e_destroy_rqt(struct mlx5e_priv *priv, struct mlx5e_rqt *rqt);



struct ttc_params {

	struct mlx5_flow_table_attr ft_attr;

	u32 any_tt_tirn;

	u32 indir_tirn[MLX5E_NUM_INDIR_TIRS];

	struct mlx5e_ttc_table *inner_ttc;

};



void mlx5e_set_ttc_basic_params(struct mlx5e_priv *priv, struct ttc_params *ttc_params);

void mlx5e_set_ttc_ft_params(struct ttc_params *ttc_params);

void mlx5e_set_inner_ttc_ft_params(struct ttc_params *ttc_params);



int mlx5e_create_ttc_table(struct mlx5e_priv *priv, struct ttc_params *params,

			   struct mlx5e_ttc_table *ttc);

void mlx5e_destroy_ttc_table(struct mlx5e_priv *priv,

			     struct mlx5e_ttc_table *ttc);



int mlx5e_create_inner_ttc_table(struct mlx5e_priv *priv, struct ttc_params *params,

				 struct mlx5e_ttc_table *ttc);

void mlx5e_destroy_inner_ttc_table(struct mlx5e_priv *priv,

				   struct mlx5e_ttc_table *ttc);



int mlx5e_create_tis(struct mlx5_core_dev *mdev, int tc,

		     u32 underlay_qpn, u32 *tisn);

void mlx5e_destroy_tis(struct mlx5_core_dev *mdev, u32 tisn);

drivers/net/ethernet/mellanox/mlx5/core/en/fs.h

0 → 100644
+210 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */

/* Copyright (c) 2018 Mellanox Technologies. */



#ifndef __MLX5E_FLOW_STEER_H__

#define __MLX5E_FLOW_STEER_H__



enum {

	MLX5E_TC_FT_LEVEL = 0,

	MLX5E_TC_TTC_FT_LEVEL,

};



struct mlx5e_tc_table {

	struct mlx5_flow_table		*t;



	struct rhashtable               ht;



	DECLARE_HASHTABLE(mod_hdr_tbl, 8);

	DECLARE_HASHTABLE(hairpin_tbl, 8);

};



struct mlx5e_flow_table {

	int num_groups;

	struct mlx5_flow_table *t;

	struct mlx5_flow_group **g;

};



struct mlx5e_l2_rule {

	u8  addr[ETH_ALEN + 2];

	struct mlx5_flow_handle *rule;

};



#define MLX5E_L2_ADDR_HASH_SIZE BIT(BITS_PER_BYTE)



struct mlx5e_vlan_table {

	struct mlx5e_flow_table		ft;

	DECLARE_BITMAP(active_cvlans, VLAN_N_VID);

	DECLARE_BITMAP(active_svlans, VLAN_N_VID);

	struct mlx5_flow_handle	*active_cvlans_rule[VLAN_N_VID];

	struct mlx5_flow_handle	*active_svlans_rule[VLAN_N_VID];

	struct mlx5_flow_handle	*untagged_rule;

	struct mlx5_flow_handle	*any_cvlan_rule;

	struct mlx5_flow_handle	*any_svlan_rule;

	bool			cvlan_filter_disabled;

};



struct mlx5e_l2_table {

	struct mlx5e_flow_table    ft;

	struct hlist_head          netdev_uc[MLX5E_L2_ADDR_HASH_SIZE];

	struct hlist_head          netdev_mc[MLX5E_L2_ADDR_HASH_SIZE];

	struct mlx5e_l2_rule	   broadcast;

	struct mlx5e_l2_rule	   allmulti;

	struct mlx5e_l2_rule	   promisc;

	bool                       broadcast_enabled;

	bool                       allmulti_enabled;

	bool                       promisc_enabled;

};



enum mlx5e_traffic_types {

	MLX5E_TT_IPV4_TCP,

	MLX5E_TT_IPV6_TCP,

	MLX5E_TT_IPV4_UDP,

	MLX5E_TT_IPV6_UDP,

	MLX5E_TT_IPV4_IPSEC_AH,

	MLX5E_TT_IPV6_IPSEC_AH,

	MLX5E_TT_IPV4_IPSEC_ESP,

	MLX5E_TT_IPV6_IPSEC_ESP,

	MLX5E_TT_IPV4,

	MLX5E_TT_IPV6,

	MLX5E_TT_ANY,

	MLX5E_NUM_TT,

	MLX5E_NUM_INDIR_TIRS = MLX5E_TT_ANY,

};



enum mlx5e_tunnel_types {

	MLX5E_TT_IPV4_GRE,

	MLX5E_TT_IPV6_GRE,

	MLX5E_NUM_TUNNEL_TT,

};



/* L3/L4 traffic type classifier */

struct mlx5e_ttc_table {

	struct mlx5e_flow_table  ft;

	struct mlx5_flow_handle	 *rules[MLX5E_NUM_TT];

	struct mlx5_flow_handle  *tunnel_rules[MLX5E_NUM_TUNNEL_TT];

};



/* NIC prio FTS */

enum {

	MLX5E_VLAN_FT_LEVEL = 0,

	MLX5E_L2_FT_LEVEL,

	MLX5E_TTC_FT_LEVEL,

	MLX5E_INNER_TTC_FT_LEVEL,

#ifdef CONFIG_MLX5_EN_ARFS

	MLX5E_ARFS_FT_LEVEL

#endif

};



#ifdef CONFIG_MLX5_EN_RXNFC



struct mlx5e_ethtool_table {

	struct mlx5_flow_table *ft;

	int                    num_rules;

};



#define ETHTOOL_NUM_L3_L4_FTS 7

#define ETHTOOL_NUM_L2_FTS 4



struct mlx5e_ethtool_steering {

	struct mlx5e_ethtool_table      l3_l4_ft[ETHTOOL_NUM_L3_L4_FTS];

	struct mlx5e_ethtool_table      l2_ft[ETHTOOL_NUM_L2_FTS];

	struct list_head                rules;

	int                             tot_num_rules;

};



void mlx5e_ethtool_init_steering(struct mlx5e_priv *priv);

void mlx5e_ethtool_cleanup_steering(struct mlx5e_priv *priv);

int mlx5e_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *cmd);

int mlx5e_get_rxnfc(struct net_device *dev,

		    struct ethtool_rxnfc *info, u32 *rule_locs);

#else

static inline void mlx5e_ethtool_init_steering(struct mlx5e_priv *priv)    { }

static inline void mlx5e_ethtool_cleanup_steering(struct mlx5e_priv *priv) { }

#endif /* CONFIG_MLX5_EN_RXNFC */



#ifdef CONFIG_MLX5_EN_ARFS

#define ARFS_HASH_SHIFT BITS_PER_BYTE

#define ARFS_HASH_SIZE BIT(BITS_PER_BYTE)



struct arfs_table {

	struct mlx5e_flow_table  ft;

	struct mlx5_flow_handle	 *default_rule;

	struct hlist_head	 rules_hash[ARFS_HASH_SIZE];

};



enum  arfs_type {

	ARFS_IPV4_TCP,

	ARFS_IPV6_TCP,

	ARFS_IPV4_UDP,

	ARFS_IPV6_UDP,

	ARFS_NUM_TYPES,

};



struct mlx5e_arfs_tables {

	struct arfs_table arfs_tables[ARFS_NUM_TYPES];

	/* Protect aRFS rules list */

	spinlock_t                     arfs_lock;

	struct list_head               rules;

	int                            last_filter_id;

	struct workqueue_struct        *wq;

};



int mlx5e_arfs_create_tables(struct mlx5e_priv *priv);

void mlx5e_arfs_destroy_tables(struct mlx5e_priv *priv);

int mlx5e_arfs_enable(struct mlx5e_priv *priv);

int mlx5e_arfs_disable(struct mlx5e_priv *priv);

int mlx5e_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb,

			u16 rxq_index, u32 flow_id);

#else

static inline int mlx5e_arfs_create_tables(struct mlx5e_priv *priv) { return 0; }

static inline void mlx5e_arfs_destroy_tables(struct mlx5e_priv *priv) {}

static inline int mlx5e_arfs_enable(struct mlx5e_priv *priv) { return -EOPNOTSUPP; }

static inline int mlx5e_arfs_disable(struct mlx5e_priv *priv) {	return -EOPNOTSUPP; }

#endif



struct mlx5e_flow_steering {

	struct mlx5_flow_namespace      *ns;

#ifdef CONFIG_MLX5_EN_RXNFC

	struct mlx5e_ethtool_steering   ethtool;

#endif

	struct mlx5e_tc_table           tc;

	struct mlx5e_vlan_table         vlan;

	struct mlx5e_l2_table           l2;

	struct mlx5e_ttc_table          ttc;

	struct mlx5e_ttc_table          inner_ttc;

#ifdef CONFIG_MLX5_EN_ARFS

	struct mlx5e_arfs_tables        arfs;

#endif

};



struct ttc_params {

	struct mlx5_flow_table_attr ft_attr;

	u32 any_tt_tirn;

	u32 indir_tirn[MLX5E_NUM_INDIR_TIRS];

	struct mlx5e_ttc_table *inner_ttc;

};



void mlx5e_set_ttc_basic_params(struct mlx5e_priv *priv, struct ttc_params *ttc_params);

void mlx5e_set_ttc_ft_params(struct ttc_params *ttc_params);

void mlx5e_set_inner_ttc_ft_params(struct ttc_params *ttc_params);



int mlx5e_create_ttc_table(struct mlx5e_priv *priv, struct ttc_params *params,

			   struct mlx5e_ttc_table *ttc);

void mlx5e_destroy_ttc_table(struct mlx5e_priv *priv,

			     struct mlx5e_ttc_table *ttc);



int mlx5e_create_inner_ttc_table(struct mlx5e_priv *priv, struct ttc_params *params,

				 struct mlx5e_ttc_table *ttc);

void mlx5e_destroy_inner_ttc_table(struct mlx5e_priv *priv,

				   struct mlx5e_ttc_table *ttc);



void mlx5e_destroy_flow_table(struct mlx5e_flow_table *ft);



void mlx5e_enable_cvlan_filter(struct mlx5e_priv *priv);

void mlx5e_disable_cvlan_filter(struct mlx5e_priv *priv);



int mlx5e_create_flow_steering(struct mlx5e_priv *priv);

void mlx5e_destroy_flow_steering(struct mlx5e_priv *priv);



#endif /* __MLX5E_FLOW_STEER_H__ */

drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c

+1 −3
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
 * SOFTWARE.

 */



#ifdef CONFIG_RFS_ACCEL



#include <linux/hash.h>

#include <linux/mlx5/fs.h>

#include <linux/ip.h>
@@ -738,4 +736,4 @@ int mlx5e_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb, 
	spin_unlock_bh(&arfs->arfs_lock);

	return arfs_rule->filter_id;

}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE