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

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

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
40GbE Intel Wired LAN Driver Updates 2018-02-14

This patch series enables the new mqprio hardware offload mechanism
creating traffic classes on VFs for XL710 devices. The parameters
needed to configure these traffic classes/queue channels are provides
by the user via the tc tool. A maximum of four traffic classes can be
created on each VF. This patch series also enables application of cloud
filters to each of these traffic classes. The cloud filters are applied
using the tc-flower classifier.

Example:
    1. tc qdisc add dev vf0 root mqprio num_tc 4 map 0 0 0 0 1 2 2 3\
        queues 2@0 2@2 1@4 1@5 hw 1 mode channel
    2. tc qdisc add dev vf0 ingress
    3. ethtool -K vf0 hw-tc-offload on
    4. ip link set eth0 vf 0 spoofchk off
    5. tc filter add dev vf0 protocol ip parent ffff: prio 1 flower dst_ip\
        192.168.3.5/32 ip_proto udp dst_port 25 skip_sw hw_tc 2
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dff8baa2 e284fc28

drivers/net/ethernet/intel/i40e/i40e.h

+6 −0
Original line number Diff line number Diff line
@@ -1109,4 +1109,10 @@ static inline bool i40e_enabled_xdp_vsi(struct i40e_vsi *vsi) 


int i40e_create_queue_channel(struct i40e_vsi *vsi, struct i40e_channel *ch);

int i40e_set_bw_limit(struct i40e_vsi *vsi, u16 seid, u64 max_tx_rate);

int i40e_add_del_cloud_filter(struct i40e_vsi *vsi,

			      struct i40e_cloud_filter *filter,

			      bool add);

int i40e_add_del_cloud_filter_big_buf(struct i40e_vsi *vsi,

				      struct i40e_cloud_filter *filter,

				      bool add);

#endif /* _I40E_H_ */

drivers/net/ethernet/intel/i40e/i40e_main.c

+5 −11
Original line number Diff line number Diff line
@@ -69,12 +69,6 @@ static int i40e_reset(struct i40e_pf *pf); 
static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired);

static void i40e_fdir_sb_setup(struct i40e_pf *pf);

static int i40e_veb_get_bw_info(struct i40e_veb *veb);

static int i40e_add_del_cloud_filter(struct i40e_vsi *vsi,

				     struct i40e_cloud_filter *filter,

				     bool add);

static int i40e_add_del_cloud_filter_big_buf(struct i40e_vsi *vsi,

					     struct i40e_cloud_filter *filter,

					     bool add);

static int i40e_get_capabilities(struct i40e_pf *pf,

				 enum i40e_admin_queue_opc list_type);
@@ -6841,7 +6835,7 @@ i40e_set_cld_element(struct i40e_cloud_filter *filter, 
 * Add or delete a cloud filter for a specific flow spec.

 * Returns 0 if the filter were successfully added.

 **/

static int i40e_add_del_cloud_filter(struct i40e_vsi *vsi,

int i40e_add_del_cloud_filter(struct i40e_vsi *vsi,

			      struct i40e_cloud_filter *filter, bool add)

{

	struct i40e_aqc_cloud_filters_element_data cld_filter;
@@ -6908,7 +6902,7 @@ static int i40e_add_del_cloud_filter(struct i40e_vsi *vsi, 
 * Add or delete a cloud filter for a specific flow spec using big buffer.

 * Returns 0 if the filter were successfully added.

 **/

static int i40e_add_del_cloud_filter_big_buf(struct i40e_vsi *vsi,

int i40e_add_del_cloud_filter_big_buf(struct i40e_vsi *vsi,

				      struct i40e_cloud_filter *filter,

				      bool add)

{

drivers/net/ethernet/intel/i40e/i40e_type.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#define I40E_MASK(mask, shift) ((u32)(mask) << (shift))



#define I40E_MAX_VSI_QP			16

#define I40E_MAX_VF_VSI			3

#define I40E_MAX_VF_VSI			4

#define I40E_MAX_CHAINED_RX_BUFFERS	5

#define I40E_MAX_PF_UDP_OFFLOAD_PORTS	16

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

+931 −69

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h

+20 −0
Original line number Diff line number Diff line
@@ -69,6 +69,19 @@ enum i40e_vf_capabilities { 
	I40E_VIRTCHNL_VF_CAP_IWARP,

};



/* In ADq, max 4 VSI's can be allocated per VF including primary VF VSI.

 * These variables are used to store indices, id's and number of queues

 * for each VSI including that of primary VF VSI. Each Traffic class is

 * termed as channel and each channel can in-turn have 4 queues which

 * means max 16 queues overall per VF.

 */

struct i40evf_channel {

	u16 vsi_idx; /* index in PF struct for all channel VSIs */

	u16 vsi_id; /* VSI ID used by firmware */

	u16 num_qps; /* number of queue pairs requested by user */

	u64 max_tx_rate; /* bandwidth rate allocation for VSIs */

};



/* VF information structure */

struct i40e_vf {

	struct i40e_pf *pf;
@@ -111,6 +124,13 @@ struct i40e_vf { 
	u16 num_mac;

	u16 num_vlan;



	/* ADq related variables */

	bool adq_enabled; /* flag to enable adq */

	u8 num_tc;

	struct i40evf_channel ch[I40E_MAX_VF_VSI];

	struct hlist_head cloud_filter_list;

	u16 num_cloud_filters;



	/* RDMA Client */

	struct virtchnl_iwarp_qvlist_info *qvlist_info;

};