Commit 8f88b303 authored by Amritha Nambiar's avatar Amritha Nambiar Committed by Jeff Kirsher
Browse files

i40e: Add infrastructure for queue channel support 



This patch sets up the infrastructure for offloading TCs and
queue configurations to the hardware by creating HW channels(VSI).
A new channel is created for each of the traffic class
configuration offloaded via mqprio framework except for the first TC
(TC0). TC0 for the main VSI is also reconfigured as per user provided
queue parameters. Queue counts that are not power-of-2 are handled by
reconfiguring RSS by reprogramming LUTs using the queue count value.
This patch also handles configuring the TX rings for the channels,
setting up the RX queue map for channel.

Also, the channels so created are removed and all the queue
configuration is set to default when the qdisc is detached from the
root of the device.

Signed-off-by: default avatarAmritha Nambiar <amritha.nambiar@intel.com>
Signed-off-by: default avatarKiran Patil <kiran.patil@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ff424188

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

+32 −0
Original line number Original line Diff line number Diff line
@@ -87,6 +87,7 @@ 
#define I40E_AQ_LEN			256

#define I40E_AQ_LEN			256

#define I40E_AQ_WORK_LIMIT		66 /* max number of VFs + a little */

#define I40E_AQ_WORK_LIMIT		66 /* max number of VFs + a little */

#define I40E_MAX_USER_PRIORITY		8

#define I40E_MAX_USER_PRIORITY		8

#define I40E_MAX_QUEUES_PER_CH		64

#define I40E_DEFAULT_TRAFFIC_CLASS	BIT(0)

#define I40E_DEFAULT_TRAFFIC_CLASS	BIT(0)

#define I40E_DEFAULT_MSG_ENABLE		4

#define I40E_DEFAULT_MSG_ENABLE		4

#define I40E_QUEUE_WAIT_RETRY_LIMIT	10

#define I40E_QUEUE_WAIT_RETRY_LIMIT	10
@@ -340,6 +341,23 @@ struct i40e_flex_pit { 
	u8 pit_index;

	u8 pit_index;

};

};





struct i40e_channel {

	struct list_head list;

	bool initialized;

	u8 type;

	u16 vsi_number; /* Assigned VSI number from AQ 'Add VSI' response */

	u16 stat_counter_idx;

	u16 base_queue;

	u16 num_queue_pairs; /* Requested by user */

	u16 seid;



	u8 enabled_tc;

	struct i40e_aqc_vsi_properties_data info;



	/* track this channel belongs to which VSI */

	struct i40e_vsi *parent_vsi;

};



/* struct that defines the Ethernet device */

/* struct that defines the Ethernet device */

struct i40e_pf {

struct i40e_pf {

	struct pci_dev *pdev;

	struct pci_dev *pdev;
@@ -456,6 +474,7 @@ struct i40e_pf { 
#define I40E_FLAG_CLIENT_RESET			BIT(26)

#define I40E_FLAG_CLIENT_RESET			BIT(26)

#define I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED	BIT(27)

#define I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED	BIT(27)

#define I40E_FLAG_SOURCE_PRUNING_DISABLED	BIT(28)

#define I40E_FLAG_SOURCE_PRUNING_DISABLED	BIT(28)

#define I40E_FLAG_TC_MQPRIO			BIT(29)





	struct i40e_client_instance *cinst;

	struct i40e_client_instance *cinst;

	bool stat_offsets_loaded;

	bool stat_offsets_loaded;
@@ -536,6 +555,8 @@ struct i40e_pf { 
	u32 ioremap_len;

	u32 ioremap_len;

	u32 fd_inv;

	u32 fd_inv;

	u16 phy_led_val;

	u16 phy_led_val;



	u16 override_q_count;

};

};





/**

/**
@@ -700,6 +721,15 @@ struct i40e_vsi { 
	bool current_isup;	/* Sync 'link up' logging */

	bool current_isup;	/* Sync 'link up' logging */

	enum i40e_aq_link_speed current_speed;	/* Sync link speed logging */

	enum i40e_aq_link_speed current_speed;	/* Sync link speed logging */





	/* channel specific fields */

	u16 cnt_q_avail;	/* num of queues available for channel usage */

	u16 orig_rss_size;

	u16 current_rss_size;



	u16 next_base_queue;	/* next queue to be used for channel setup */



	struct list_head ch_list;



	void *priv;	/* client driver data reference. */

	void *priv;	/* client driver data reference. */





	/* VSI specific handlers */

	/* VSI specific handlers */
@@ -1004,4 +1034,6 @@ static inline bool i40e_enabled_xdp_vsi(struct i40e_vsi *vsi) 
{

{

	return !!vsi->xdp_prog;

	return !!vsi->xdp_prog;

}

}



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

#endif /* _I40E_H_ */
 
#endif /* _I40E_H_ */

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

+709 −9

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -426,6 +426,8 @@ struct i40e_ring { 
					 * i40e_clean_rx_ring_irq() is called

					 * i40e_clean_rx_ring_irq() is called

					 * for this ring.

					 * for this ring.

					 */

					 */



	struct i40e_channel *ch;

} ____cacheline_internodealigned_in_smp;

} ____cacheline_internodealigned_in_smp;





static inline bool ring_uses_build_skb(struct i40e_ring *ring)

static inline bool ring_uses_build_skb(struct i40e_ring *ring)

CRA Git | Maintained and supported by SUSTech CRA and CCSE