Commit 597b8af5 authored by Piotr Raczynski's avatar Piotr Raczynski Committed by Tony Nguyen
Browse files

ice: add new VSI type for subfunctions 



Add required plumbing for new VSI type dedicated to devlink subfunctions.
Make sure that the vsi is properly configured and destroyed. Also allow
loading XDP and AF_XDP sockets.

The first implementation of devlink subfunctions supports only one Tx/Rx
queue pair per given subfunction.

Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: default avatarWojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: default avatarPiotr Raczynski <piotr.raczynski@intel.com>
Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: default avatarRafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 52fc70a3

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

+4 −1
Original line number Diff line number Diff line
@@ -325,6 +325,9 @@ ice_setup_tx_ctx(struct ice_tx_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf 
		tlan_ctx->vmvf_num = hw->func_caps.vf_base_id + vsi->vf->vf_id;

		tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_VF;

		break;

	case ICE_VSI_SF:

		tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_VMQ;

		break;

	default:

		return;

	}
@@ -540,7 +543,7 @@ static int ice_vsi_cfg_rxq(struct ice_rx_ring *ring) 


	ring->rx_buf_len = ring->vsi->rx_buf_len;



	if (ring->vsi->type == ICE_VSI_PF) {

	if (ring->vsi->type == ICE_VSI_PF || ring->vsi->type == ICE_VSI_SF) {

		if (!xdp_rxq_info_is_reg(&ring->xdp_rxq)) {

			err = __xdp_rxq_info_reg(&ring->xdp_rxq, ring->netdev,

						 ring->q_index,

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

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ void ice_vsi_set_dcb_tc_cfg(struct ice_vsi *vsi) 
		vsi->tc_cfg.numtc = ice_dcb_get_num_tc(cfg);

		break;

	case ICE_VSI_CHNL:

	case ICE_VSI_SF:

		vsi->tc_cfg.ena_tc = BIT(ice_get_first_droptc(vsi));

		vsi->tc_cfg.numtc = 1;

		break;

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

+23 −2
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ const char *ice_vsi_type_str(enum ice_vsi_type vsi_type) 
		return "ICE_VSI_PF";

	case ICE_VSI_VF:

		return "ICE_VSI_VF";

	case ICE_VSI_SF:

		return "ICE_VSI_SF";

	case ICE_VSI_CTRL:

		return "ICE_VSI_CTRL";

	case ICE_VSI_CHNL:
@@ -135,6 +137,7 @@ static void ice_vsi_set_num_desc(struct ice_vsi *vsi) 
{

	switch (vsi->type) {

	case ICE_VSI_PF:

	case ICE_VSI_SF:

	case ICE_VSI_CTRL:

	case ICE_VSI_LB:

		/* a user could change the values of num_[tr]x_desc using
@@ -201,6 +204,12 @@ static void ice_vsi_set_num_qs(struct ice_vsi *vsi) 
					   max_t(int, vsi->alloc_rxq,

						 vsi->alloc_txq));

		break;

	case ICE_VSI_SF:

		vsi->alloc_txq = 1;

		vsi->alloc_rxq = 1;

		vsi->num_q_vectors = 1;

		vsi->irq_dyn_alloc = true;

		break;

	case ICE_VSI_VF:

		if (vf->num_req_qs)

			vf->num_vf_qs = vf->num_req_qs;
@@ -559,6 +568,7 @@ ice_vsi_alloc_def(struct ice_vsi *vsi, struct ice_channel *ch) 


	switch (vsi->type) {

	case ICE_VSI_PF:

	case ICE_VSI_SF:

		/* Setup default MSIX irq handler for VSI */

		vsi->irq_handler = ice_msix_clean_rings;

		break;
@@ -889,6 +899,11 @@ static void ice_vsi_set_rss_params(struct ice_vsi *vsi) 
					      max_rss_size);

		vsi->rss_lut_type = ICE_LUT_PF;

		break;

	case ICE_VSI_SF:

		vsi->rss_table_size = ICE_LUT_VSI_SIZE;

		vsi->rss_size = min_t(u16, num_online_cpus(), max_rss_size);

		vsi->rss_lut_type = ICE_LUT_VSI;

		break;

	case ICE_VSI_VF:

		/* VF VSI will get a small RSS table.

		 * For VSI_LUT, LUT size should be set to 64 bytes.
@@ -1136,6 +1151,7 @@ static void ice_set_rss_vsi_ctx(struct ice_vsi_ctx *ctxt, struct ice_vsi *vsi) 
		lut_type = ICE_AQ_VSI_Q_OPT_RSS_LUT_PF;

		break;

	case ICE_VSI_VF:

	case ICE_VSI_SF:

		/* VF VSI will gets a small RSS table which is a VSI LUT type */

		lut_type = ICE_AQ_VSI_Q_OPT_RSS_LUT_VSI;

		break;
@@ -1214,6 +1230,7 @@ static int ice_vsi_init(struct ice_vsi *vsi, u32 vsi_flags) 
	case ICE_VSI_PF:

		ctxt->flags = ICE_AQ_VSI_TYPE_PF;

		break;

	case ICE_VSI_SF:

	case ICE_VSI_CHNL:

		ctxt->flags = ICE_AQ_VSI_TYPE_VMDQ2;

		break;
@@ -2095,6 +2112,7 @@ static void ice_set_agg_vsi(struct ice_vsi *vsi) 
	case ICE_VSI_CHNL:

	case ICE_VSI_LB:

	case ICE_VSI_PF:

	case ICE_VSI_SF:

		max_agg_nodes = ICE_MAX_PF_AGG_NODES;

		agg_node_id_start = ICE_PF_AGG_NODE_ID_START;

		agg_node_iter = &pf->pf_agg_node[0];
@@ -2264,6 +2282,7 @@ static int ice_vsi_cfg_def(struct ice_vsi *vsi) 


	switch (vsi->type) {

	case ICE_VSI_CTRL:

	case ICE_VSI_SF:

	case ICE_VSI_PF:

		ret = ice_vsi_alloc_q_vectors(vsi);

		if (ret)
@@ -2648,7 +2667,8 @@ int ice_ena_vsi(struct ice_vsi *vsi, bool locked) 


	clear_bit(ICE_VSI_NEEDS_RESTART, vsi->state);



	if (vsi->netdev && vsi->type == ICE_VSI_PF) {

	if (vsi->netdev && (vsi->type == ICE_VSI_PF ||

			    vsi->type == ICE_VSI_SF)) {

		if (netif_running(vsi->netdev)) {

			if (!locked)

				rtnl_lock();
@@ -2676,7 +2696,8 @@ void ice_dis_vsi(struct ice_vsi *vsi, bool locked) 


	set_bit(ICE_VSI_NEEDS_RESTART, vsi->state);



	if (vsi->type == ICE_VSI_PF && vsi->netdev) {

	if (vsi->netdev && (vsi->type == ICE_VSI_PF ||

			    vsi->type == ICE_VSI_SF)) {

		if (netif_running(vsi->netdev)) {

			if (!locked)

				rtnl_lock();

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

+5 −2
Original line number Diff line number Diff line
@@ -2974,6 +2974,9 @@ int ice_vsi_determine_xdp_res(struct ice_vsi *vsi) 
	if (avail < cpus / 2)

		return -ENOMEM;



	if (vsi->type == ICE_VSI_SF)

		avail = vsi->alloc_txq;



	vsi->num_xdp_txq = min_t(u16, avail, cpus);



	if (vsi->num_xdp_txq < cpus)
@@ -3095,8 +3098,8 @@ static int ice_xdp(struct net_device *dev, struct netdev_bpf *xdp) 
	struct ice_vsi *vsi = np->vsi;

	int ret;



	if (vsi->type != ICE_VSI_PF) {

		NL_SET_ERR_MSG_MOD(xdp->extack, "XDP can be loaded only on PF VSI");

	if (vsi->type != ICE_VSI_PF && vsi->type != ICE_VSI_SF) {

		NL_SET_ERR_MSG_MOD(xdp->extack, "XDP can be loaded only on PF or SF VSI");

		return -EINVAL;

	}

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

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ enum ice_vsi_type { 
	ICE_VSI_CTRL = 3,	/* equates to ICE_VSI_PF with 1 queue pair */

	ICE_VSI_CHNL = 4,

	ICE_VSI_LB = 6,

	ICE_VSI_SF = 9,

};



struct ice_link_status {