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

Commit e4655e4a 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 2017-10-13

This series contains updates to mqprio and i40e.

Amritha introduces a new hardware offload mode in tc/mqprio where the TCs,
the queue configurations and bandwidth rate limits are offloaded to the
hardware. The existing mqprio framework is extended to configure the queue
counts and layout and also added support for rate limiting. This is
achieved through new netlink attributes for the 'mode' option which takes
values such as 'dcb' (default) and 'channel' and a 'shaper' option for
QoS attributes such as bandwidth rate limits in hw mode 1.  Legacy devices
can fall back to the existing setup supporting hw mode 1 without these
additional options where only the TCs are offloaded and then the 'mode'
and 'shaper' options defaults to DCB support.  The i40e driver enables the
new mqprio hardware offload mechanism factoring the TCs, queue
configuration and bandwidth rates by creating HW channel VSIs.
In this new mode, the priority to traffic class mapping and the user
specified queue ranges are used to configure the traffic class when the
'mode' option is set to 'channel'. This is achieved 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)
which is for the main VSI. TC0 for the main VSI is also reconfigured as
per user provided queue parameters. Finally, bandwidth rate limits are set
on these traffic classes through the shaper attribute by sending these
rates in addition to the number of TCs and the queue configurations.

Colin Ian King makes an array of constant values "constant".

Alan fixes and issue where on some firmware versions, we were failing to
actually fill out the phy_types which caused ethtool to not report any
link types.  Also hardened against a potentially malicious VF by not
letting the VF to reset itself after requesting to change the number of
queues (via ethtool), let the PF reset the VF to institute the requested
changes.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ae0783b1 17a9422d

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

+44 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#include <linux/clocksource.h>

#include <linux/net_tstamp.h>

#include <linux/ptp_clock_kernel.h>

#include <net/pkt_cls.h>

#include "i40e_type.h"

#include "i40e_prototype.h"

#include "i40e_client.h"
@@ -87,6 +88,7 @@ 
#define I40E_AQ_LEN			256

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

#define I40E_MAX_USER_PRIORITY		8

#define I40E_MAX_QUEUES_PER_CH		64

#define I40E_DEFAULT_TRAFFIC_CLASS	BIT(0)

#define I40E_DEFAULT_MSG_ENABLE		4

#define I40E_QUEUE_WAIT_RETRY_LIMIT	10
@@ -126,6 +128,10 @@ 
/* default to trying for four seconds */

#define I40E_TRY_LINK_TIMEOUT	(4 * HZ)



/* BW rate limiting */

#define I40E_BW_CREDIT_DIVISOR		50 /* 50Mbps per BW credit */

#define I40E_MAX_BW_INACTIVE_ACCUM	4  /* accumulate 4 credits max */



/* driver state flags */

enum i40e_state_t {

	__I40E_TESTING,
@@ -157,6 +163,8 @@ enum i40e_state_t { 
	__I40E_STATE_SIZE__,

};



#define I40E_PF_RESET_FLAG	BIT_ULL(__I40E_PF_RESET_REQUESTED)



/* VSI state flags */

enum i40e_vsi_state_t {

	__I40E_VSI_DOWN,
@@ -338,6 +346,25 @@ struct i40e_flex_pit { 
	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;



	u64 max_tx_rate;



	/* track this channel belongs to which VSI */

	struct i40e_vsi *parent_vsi;

};



/* struct that defines the Ethernet device */

struct i40e_pf {

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

#define I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED	BIT(27)

#define I40E_FLAG_SOURCE_PRUNING_DISABLED	BIT(28)

#define I40E_FLAG_TC_MQPRIO			BIT(29)



	struct i40e_client_instance *cinst;

	bool stat_offsets_loaded;
@@ -534,6 +562,8 @@ struct i40e_pf { 
	u32 ioremap_len;

	u32 fd_inv;

	u16 phy_led_val;



	u16 override_q_count;

};



/**
@@ -677,6 +707,7 @@ struct i40e_vsi { 
	enum i40e_vsi_type type;  /* VSI type, e.g., LAN, FCoE, etc */

	s16 vf_id;		/* Virtual function ID for SRIOV VSIs */



	struct tc_mqprio_qopt_offload mqprio_qopt; /* queue parameters */

	struct i40e_tc_configuration tc_config;

	struct i40e_aqc_vsi_properties_data info;
@@ -698,6 +729,16 @@ struct i40e_vsi { 
	bool current_isup;	/* Sync 'link up' 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;

	bool reconfig_rss;



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



	struct list_head ch_list;



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



	/* VSI specific handlers */
@@ -1002,4 +1043,7 @@ static inline bool i40e_enabled_xdp_vsi(struct i40e_vsi *vsi) 
{

	return !!vsi->xdp_prog;

}



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);

#endif /* _I40E_H_ */

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

+6 −1
Original line number Diff line number Diff line
@@ -1611,8 +1611,13 @@ i40e_status i40e_aq_get_phy_capabilities(struct i40e_hw *hw, 
	if (report_init) {

		if (hw->mac.type ==  I40E_MAC_XL710 &&

		    hw->aq.api_maj_ver == I40E_FW_API_VERSION_MAJOR &&

		    hw->aq.api_min_ver >= I40E_MINOR_VER_GET_LINK_INFO_XL710)

		    hw->aq.api_min_ver >= I40E_MINOR_VER_GET_LINK_INFO_XL710) {

			status = i40e_aq_get_link_info(hw, true, NULL, NULL);

		} else {

			hw->phy.phy_types = le32_to_cpu(abilities->phy_type);

			hw->phy.phy_types |=

					((u64)abilities->phy_type_ext << 32);

		}

	}



	return status;

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

+1 −2
Original line number Diff line number Diff line
@@ -798,8 +798,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp, 
		 */

		if (!(pf->flags & I40E_FLAG_VEB_MODE_ENABLED)) {

			pf->flags |= I40E_FLAG_VEB_MODE_ENABLED;

			i40e_do_reset_safe(pf,

					   BIT_ULL(__I40E_PF_RESET_REQUESTED));

			i40e_do_reset_safe(pf, I40E_PF_RESET_FLAG);

		}



		vsi = i40e_vsi_setup(pf, I40E_VSI_VMDQ2, vsi_seid, 0);

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

+3 −1
Original line number Diff line number Diff line
@@ -36,7 +36,9 @@ 
static i40e_status i40e_diag_reg_pattern_test(struct i40e_hw *hw,

							u32 reg, u32 mask)

{

	const u32 patterns[] = {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};

	static const u32 patterns[] = {

		0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF

	};

	u32 pat, val, orig_val;

	int i;

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

+7 −1
Original line number Diff line number Diff line
@@ -2652,7 +2652,7 @@ static int i40e_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, 


	switch (cmd->cmd) {

	case ETHTOOL_GRXRINGS:

		cmd->data = vsi->num_queue_pairs;

		cmd->data = vsi->rss_size;

		ret = 0;

		break;

	case ETHTOOL_GRXFH:
@@ -3897,6 +3897,12 @@ static int i40e_set_channels(struct net_device *dev, 
	if (vsi->type != I40E_VSI_MAIN)

		return -EINVAL;



	/* We do not support setting channels via ethtool when TCs are

	 * configured through mqprio

	 */

	if (pf->flags & I40E_FLAG_TC_MQPRIO)

		return -EINVAL;



	/* verify they are not requesting separate vectors */

	if (!count || ch->rx_count || ch->tx_count)

		return -EINVAL;