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

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



Jeff Kirsher says:

====================
100GbE Intel Wired LAN Driver Updates 2020-01-25

This series contains updates to the ice driver to add support for RSS.

Henry and Tony enable the driver to write the filtering hardware tables
to allow for changing of RSS rules, also introduced and initialized the
structures for storing the configuration.  Then followed it up by
creating an extraction sequence based on the packet header protocols to
be programmed.  Next was storing the TCAM entry with the profile data
and VSI group in the respective software structures.

Md Fahad sets up the configuration to support RSS tables for the virtual
function (VF) driver (iavf).  Add support for flow types TCP4, TCP6,
UDP4, UDP6, SCTP4 and SCTP6 for RSS via ethtool.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4d8773b6 18a8d358

drivers/net/ethernet/intel/ice/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ ice-y := ice_main.o \ 
	 ice_txrx_lib.o	\

	 ice_txrx.o	\

	 ice_flex_pipe.o \

	 ice_flow.o	\

	 ice_ethtool.o

ice-$(CONFIG_PCI_IOV) += ice_virtchnl_pf.o ice_sriov.o

ice-$(CONFIG_DCB) += ice_dcb.o ice_dcb_nl.o ice_dcb_lib.o

drivers/net/ethernet/intel/ice/ice_adminq_cmd.h

+8 −0
Original line number Diff line number Diff line
@@ -232,6 +232,13 @@ struct ice_aqc_get_sw_cfg_resp { 
 */

#define ICE_AQC_RES_TYPE_VSI_LIST_REP			0x03

#define ICE_AQC_RES_TYPE_VSI_LIST_PRUNE			0x04

#define ICE_AQC_RES_TYPE_HASH_PROF_BLDR_PROFID		0x60

#define ICE_AQC_RES_TYPE_HASH_PROF_BLDR_TCAM		0x61



#define ICE_AQC_RES_TYPE_FLAG_SCAN_BOTTOM		BIT(12)

#define ICE_AQC_RES_TYPE_FLAG_IGNORE_INDEX		BIT(13)



#define ICE_AQC_RES_TYPE_FLAG_DEDICATED			0x00



/* Allocate Resources command (indirect 0x0208)

 * Free Resources command (indirect 0x0209)
@@ -1849,6 +1856,7 @@ enum ice_adminq_opc { 


	/* package commands */

	ice_aqc_opc_download_pkg			= 0x0C40,

	ice_aqc_opc_update_pkg				= 0x0C42,

	ice_aqc_opc_get_pkg_info_list			= 0x0C43,



	/* debug commands */

drivers/net/ethernet/intel/ice/ice_common.c

+113 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include "ice_common.h"

#include "ice_sched.h"

#include "ice_adminq_cmd.h"

#include "ice_flow.h"



#define ICE_PF_RESET_WAIT_COUNT	200
@@ -1496,6 +1497,114 @@ void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res) 
	}

}



/**

 * ice_aq_alloc_free_res - command to allocate/free resources

 * @hw: pointer to the HW struct

 * @num_entries: number of resource entries in buffer

 * @buf: Indirect buffer to hold data parameters and response

 * @buf_size: size of buffer for indirect commands

 * @opc: pass in the command opcode

 * @cd: pointer to command details structure or NULL

 *

 * Helper function to allocate/free resources using the admin queue commands

 */

enum ice_status

ice_aq_alloc_free_res(struct ice_hw *hw, u16 num_entries,

		      struct ice_aqc_alloc_free_res_elem *buf, u16 buf_size,

		      enum ice_adminq_opc opc, struct ice_sq_cd *cd)

{

	struct ice_aqc_alloc_free_res_cmd *cmd;

	struct ice_aq_desc desc;



	cmd = &desc.params.sw_res_ctrl;



	if (!buf)

		return ICE_ERR_PARAM;



	if (buf_size < (num_entries * sizeof(buf->elem[0])))

		return ICE_ERR_PARAM;



	ice_fill_dflt_direct_cmd_desc(&desc, opc);



	desc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD);



	cmd->num_entries = cpu_to_le16(num_entries);



	return ice_aq_send_cmd(hw, &desc, buf, buf_size, cd);

}



/**

 * ice_alloc_hw_res - allocate resource

 * @hw: pointer to the HW struct

 * @type: type of resource

 * @num: number of resources to allocate

 * @btm: allocate from bottom

 * @res: pointer to array that will receive the resources

 */

enum ice_status

ice_alloc_hw_res(struct ice_hw *hw, u16 type, u16 num, bool btm, u16 *res)

{

	struct ice_aqc_alloc_free_res_elem *buf;

	enum ice_status status;

	u16 buf_len;



	buf_len = struct_size(buf, elem, num - 1);

	buf = kzalloc(buf_len, GFP_KERNEL);

	if (!buf)

		return ICE_ERR_NO_MEMORY;



	/* Prepare buffer to allocate resource. */

	buf->num_elems = cpu_to_le16(num);

	buf->res_type = cpu_to_le16(type | ICE_AQC_RES_TYPE_FLAG_DEDICATED |

				    ICE_AQC_RES_TYPE_FLAG_IGNORE_INDEX);

	if (btm)

		buf->res_type |= cpu_to_le16(ICE_AQC_RES_TYPE_FLAG_SCAN_BOTTOM);



	status = ice_aq_alloc_free_res(hw, 1, buf, buf_len,

				       ice_aqc_opc_alloc_res, NULL);

	if (status)

		goto ice_alloc_res_exit;



	memcpy(res, buf->elem, sizeof(buf->elem) * num);



ice_alloc_res_exit:

	kfree(buf);

	return status;

}



/**

 * ice_free_hw_res - free allocated HW resource

 * @hw: pointer to the HW struct

 * @type: type of resource to free

 * @num: number of resources

 * @res: pointer to array that contains the resources to free

 */

enum ice_status

ice_free_hw_res(struct ice_hw *hw, u16 type, u16 num, u16 *res)

{

	struct ice_aqc_alloc_free_res_elem *buf;

	enum ice_status status;

	u16 buf_len;



	buf_len = struct_size(buf, elem, num - 1);

	buf = kzalloc(buf_len, GFP_KERNEL);

	if (!buf)

		return ICE_ERR_NO_MEMORY;



	/* Prepare buffer to free resource. */

	buf->num_elems = cpu_to_le16(num);

	buf->res_type = cpu_to_le16(type);

	memcpy(buf->elem, res, sizeof(buf->elem) * num);



	status = ice_aq_alloc_free_res(hw, num, buf, buf_len,

				       ice_aqc_opc_free_res, NULL);

	if (status)

		ice_debug(hw, ICE_DBG_SW, "CQ CMD Buffer:\n");



	kfree(buf);

	return status;

}



/**

 * ice_get_num_per_func - determine number of resources per PF

 * @hw: pointer to the HW structure
@@ -3406,7 +3515,10 @@ enum ice_status ice_replay_vsi(struct ice_hw *hw, u16 vsi_handle) 
		if (status)

			return status;

	}



	/* Replay per VSI all RSS configurations */

	status = ice_replay_rss_cfg(hw, vsi_handle);

	if (status)

		return status;

	/* Replay per VSI all filters */

	status = ice_replay_vsi_all_fltr(hw, vsi_handle);

	return status;

drivers/net/ethernet/intel/ice/ice_common.h

+8 −0
Original line number Diff line number Diff line
@@ -34,10 +34,18 @@ enum ice_status 
ice_acquire_res(struct ice_hw *hw, enum ice_aq_res_ids res,

		enum ice_aq_res_access_type access, u32 timeout);

void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res);

enum ice_status

ice_alloc_hw_res(struct ice_hw *hw, u16 type, u16 num, bool btm, u16 *res);

enum ice_status

ice_free_hw_res(struct ice_hw *hw, u16 type, u16 num, u16 *res);

enum ice_status ice_init_nvm(struct ice_hw *hw);

enum ice_status

ice_read_sr_buf(struct ice_hw *hw, u16 offset, u16 *words, u16 *data);

enum ice_status

ice_aq_alloc_free_res(struct ice_hw *hw, u16 num_entries,

		      struct ice_aqc_alloc_free_res_elem *buf, u16 buf_size,

		      enum ice_adminq_opc opc, struct ice_sq_cd *cd);

enum ice_status

ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq,

		struct ice_aq_desc *desc, void *buf, u16 buf_size,

		struct ice_sq_cd *cd);

drivers/net/ethernet/intel/ice/ice_ethtool.c

+243 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
/* ethtool support for ice */



#include "ice.h"

#include "ice_flow.h"

#include "ice_lib.h"

#include "ice_dcb_lib.h"
@@ -2533,6 +2534,243 @@ done: 
	return err;

}



/**

 * ice_parse_hdrs - parses headers from RSS hash input

 * @nfc: ethtool rxnfc command

 *

 * This function parses the rxnfc command and returns intended

 * header types for RSS configuration

 */

static u32 ice_parse_hdrs(struct ethtool_rxnfc *nfc)

{

	u32 hdrs = ICE_FLOW_SEG_HDR_NONE;



	switch (nfc->flow_type) {

	case TCP_V4_FLOW:

		hdrs |= ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_IPV4;

		break;

	case UDP_V4_FLOW:

		hdrs |= ICE_FLOW_SEG_HDR_UDP | ICE_FLOW_SEG_HDR_IPV4;

		break;

	case SCTP_V4_FLOW:

		hdrs |= ICE_FLOW_SEG_HDR_SCTP | ICE_FLOW_SEG_HDR_IPV4;

		break;

	case TCP_V6_FLOW:

		hdrs |= ICE_FLOW_SEG_HDR_TCP | ICE_FLOW_SEG_HDR_IPV6;

		break;

	case UDP_V6_FLOW:

		hdrs |= ICE_FLOW_SEG_HDR_UDP | ICE_FLOW_SEG_HDR_IPV6;

		break;

	case SCTP_V6_FLOW:

		hdrs |= ICE_FLOW_SEG_HDR_SCTP | ICE_FLOW_SEG_HDR_IPV6;

		break;

	default:

		break;

	}

	return hdrs;

}



#define ICE_FLOW_HASH_FLD_IPV4_SA	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)

#define ICE_FLOW_HASH_FLD_IPV6_SA	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)

#define ICE_FLOW_HASH_FLD_IPV4_DA	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)

#define ICE_FLOW_HASH_FLD_IPV6_DA	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)

#define ICE_FLOW_HASH_FLD_TCP_SRC_PORT	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)

#define ICE_FLOW_HASH_FLD_TCP_DST_PORT	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)

#define ICE_FLOW_HASH_FLD_UDP_SRC_PORT	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)

#define ICE_FLOW_HASH_FLD_UDP_DST_PORT	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)

#define ICE_FLOW_HASH_FLD_SCTP_SRC_PORT	\

	BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)

#define ICE_FLOW_HASH_FLD_SCTP_DST_PORT	\

	BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)



/**

 * ice_parse_hash_flds - parses hash fields from RSS hash input

 * @nfc: ethtool rxnfc command

 *

 * This function parses the rxnfc command and returns intended

 * hash fields for RSS configuration

 */

static u64 ice_parse_hash_flds(struct ethtool_rxnfc *nfc)

{

	u64 hfld = ICE_HASH_INVALID;



	if (nfc->data & RXH_IP_SRC || nfc->data & RXH_IP_DST) {

		switch (nfc->flow_type) {

		case TCP_V4_FLOW:

		case UDP_V4_FLOW:

		case SCTP_V4_FLOW:

			if (nfc->data & RXH_IP_SRC)

				hfld |= ICE_FLOW_HASH_FLD_IPV4_SA;

			if (nfc->data & RXH_IP_DST)

				hfld |= ICE_FLOW_HASH_FLD_IPV4_DA;

			break;

		case TCP_V6_FLOW:

		case UDP_V6_FLOW:

		case SCTP_V6_FLOW:

			if (nfc->data & RXH_IP_SRC)

				hfld |= ICE_FLOW_HASH_FLD_IPV6_SA;

			if (nfc->data & RXH_IP_DST)

				hfld |= ICE_FLOW_HASH_FLD_IPV6_DA;

			break;

		default:

			break;

		}

	}



	if (nfc->data & RXH_L4_B_0_1 || nfc->data & RXH_L4_B_2_3) {

		switch (nfc->flow_type) {

		case TCP_V4_FLOW:

		case TCP_V6_FLOW:

			if (nfc->data & RXH_L4_B_0_1)

				hfld |= ICE_FLOW_HASH_FLD_TCP_SRC_PORT;

			if (nfc->data & RXH_L4_B_2_3)

				hfld |= ICE_FLOW_HASH_FLD_TCP_DST_PORT;

			break;

		case UDP_V4_FLOW:

		case UDP_V6_FLOW:

			if (nfc->data & RXH_L4_B_0_1)

				hfld |= ICE_FLOW_HASH_FLD_UDP_SRC_PORT;

			if (nfc->data & RXH_L4_B_2_3)

				hfld |= ICE_FLOW_HASH_FLD_UDP_DST_PORT;

			break;

		case SCTP_V4_FLOW:

		case SCTP_V6_FLOW:

			if (nfc->data & RXH_L4_B_0_1)

				hfld |= ICE_FLOW_HASH_FLD_SCTP_SRC_PORT;

			if (nfc->data & RXH_L4_B_2_3)

				hfld |= ICE_FLOW_HASH_FLD_SCTP_DST_PORT;

			break;

		default:

			break;

		}

	}



	return hfld;

}



/**

 * ice_set_rss_hash_opt - Enable/Disable flow types for RSS hash

 * @vsi: the VSI being configured

 * @nfc: ethtool rxnfc command

 *

 * Returns Success if the flow input set is supported.

 */

static int

ice_set_rss_hash_opt(struct ice_vsi *vsi, struct ethtool_rxnfc *nfc)

{

	struct ice_pf *pf = vsi->back;

	enum ice_status status;

	struct device *dev;

	u64 hashed_flds;

	u32 hdrs;



	dev = ice_pf_to_dev(pf);

	if (ice_is_safe_mode(pf)) {

		dev_dbg(dev, "Advanced RSS disabled. Package download failed, vsi num = %d\n",

			vsi->vsi_num);

		return -EINVAL;

	}



	hashed_flds = ice_parse_hash_flds(nfc);

	if (hashed_flds == ICE_HASH_INVALID) {

		dev_dbg(dev, "Invalid hash fields, vsi num = %d\n",

			vsi->vsi_num);

		return -EINVAL;

	}



	hdrs = ice_parse_hdrs(nfc);

	if (hdrs == ICE_FLOW_SEG_HDR_NONE) {

		dev_dbg(dev, "Header type is not valid, vsi num = %d\n",

			vsi->vsi_num);

		return -EINVAL;

	}



	status = ice_add_rss_cfg(&pf->hw, vsi->idx, hashed_flds, hdrs);

	if (status) {

		dev_dbg(dev, "ice_add_rss_cfg failed, vsi num = %d, error = %d\n",

			vsi->vsi_num, status);

		return -EINVAL;

	}



	return 0;

}



/**

 * ice_get_rss_hash_opt - Retrieve hash fields for a given flow-type

 * @vsi: the VSI being configured

 * @nfc: ethtool rxnfc command

 */

static void

ice_get_rss_hash_opt(struct ice_vsi *vsi, struct ethtool_rxnfc *nfc)

{

	struct ice_pf *pf = vsi->back;

	struct device *dev;

	u64 hash_flds;

	u32 hdrs;



	dev = ice_pf_to_dev(pf);



	nfc->data = 0;

	if (ice_is_safe_mode(pf)) {

		dev_dbg(dev, "Advanced RSS disabled. Package download failed, vsi num = %d\n",

			vsi->vsi_num);

		return;

	}



	hdrs = ice_parse_hdrs(nfc);

	if (hdrs == ICE_FLOW_SEG_HDR_NONE) {

		dev_dbg(dev, "Header type is not valid, vsi num = %d\n",

			vsi->vsi_num);

		return;

	}



	hash_flds = ice_get_rss_cfg(&pf->hw, vsi->idx, hdrs);

	if (hash_flds == ICE_HASH_INVALID) {

		dev_dbg(dev, "No hash fields found for the given header type, vsi num = %d\n",

			vsi->vsi_num);

		return;

	}



	if (hash_flds & ICE_FLOW_HASH_FLD_IPV4_SA ||

	    hash_flds & ICE_FLOW_HASH_FLD_IPV6_SA)

		nfc->data |= (u64)RXH_IP_SRC;



	if (hash_flds & ICE_FLOW_HASH_FLD_IPV4_DA ||

	    hash_flds & ICE_FLOW_HASH_FLD_IPV6_DA)

		nfc->data |= (u64)RXH_IP_DST;



	if (hash_flds & ICE_FLOW_HASH_FLD_TCP_SRC_PORT ||

	    hash_flds & ICE_FLOW_HASH_FLD_UDP_SRC_PORT ||

	    hash_flds & ICE_FLOW_HASH_FLD_SCTP_SRC_PORT)

		nfc->data |= (u64)RXH_L4_B_0_1;



	if (hash_flds & ICE_FLOW_HASH_FLD_TCP_DST_PORT ||

	    hash_flds & ICE_FLOW_HASH_FLD_UDP_DST_PORT ||

	    hash_flds & ICE_FLOW_HASH_FLD_SCTP_DST_PORT)

		nfc->data |= (u64)RXH_L4_B_2_3;

}



/**

 * ice_set_rxnfc - command to set Rx flow rules.

 * @netdev: network interface device structure

 * @cmd: ethtool rxnfc command

 *

 * Returns 0 for success and negative values for errors

 */

static int ice_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd)

{

	struct ice_netdev_priv *np = netdev_priv(netdev);

	struct ice_vsi *vsi = np->vsi;



	switch (cmd->cmd) {

	case ETHTOOL_SRXFH:

		return ice_set_rss_hash_opt(vsi, cmd);

	default:

		break;

	}

	return -EOPNOTSUPP;

}



/**

 * ice_get_rxnfc - command to get Rx flow classification rules

 * @netdev: network interface device structure
@@ -2554,6 +2792,10 @@ ice_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, 
		cmd->data = vsi->rss_size;

		ret = 0;

		break;

	case ETHTOOL_GRXFH:

		ice_get_rss_hash_opt(vsi, cmd);

		ret = 0;

		break;

	default:

		break;

	}
@@ -3857,6 +4099,7 @@ static const struct ethtool_ops ice_ethtool_ops = { 
	.set_priv_flags		= ice_set_priv_flags,

	.get_sset_count		= ice_get_sset_count,

	.get_rxnfc		= ice_get_rxnfc,

	.set_rxnfc		= ice_set_rxnfc,

	.get_ringparam		= ice_get_ringparam,

	.set_ringparam		= ice_set_ringparam,

	.nway_reset		= ice_nway_reset,

CRA Git | Maintained and supported by SUSTech CRA and CCSE