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

Commit bb87ee0e authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Jeff Kirsher
Browse files

ice: Create framework for VSI queue context 



This patch introduces a framework to store queue specific information
in VSI queue contexts. Currently VSI queue context (represented by
struct ice_q_ctx) only has q_handle as a member. In future patches,
this structure will be updated to hold queue specific information.

Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f76c4b57

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

+57 −5
Original line number Diff line number Diff line
@@ -2790,11 +2790,36 @@ ice_set_ctx(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info) 
	return 0;

}



/**

 * ice_get_lan_q_ctx - get the LAN queue context for the given VSI and TC

 * @hw: pointer to the HW struct

 * @vsi_handle: software VSI handle

 * @tc: TC number

 * @q_handle: software queue handle

 */

static struct ice_q_ctx *

ice_get_lan_q_ctx(struct ice_hw *hw, u16 vsi_handle, u8 tc, u16 q_handle)

{

	struct ice_vsi_ctx *vsi;

	struct ice_q_ctx *q_ctx;



	vsi = ice_get_vsi_ctx(hw, vsi_handle);

	if (!vsi)

		return NULL;

	if (q_handle >= vsi->num_lan_q_entries[tc])

		return NULL;

	if (!vsi->lan_q_ctx[tc])

		return NULL;

	q_ctx = vsi->lan_q_ctx[tc];

	return &q_ctx[q_handle];

}



/**

 * ice_ena_vsi_txq

 * @pi: port information structure

 * @vsi_handle: software VSI handle

 * @tc: TC number

 * @q_handle: software queue handle

 * @num_qgrps: Number of added queue groups

 * @buf: list of queue groups to be added

 * @buf_size: size of buffer for indirect command
@@ -2803,12 +2828,13 @@ ice_set_ctx(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info) 
 * This function adds one LAN queue

 */

enum ice_status

ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,

		struct ice_aqc_add_tx_qgrp *buf, u16 buf_size,

ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 q_handle,

		u8 num_qgrps, struct ice_aqc_add_tx_qgrp *buf, u16 buf_size,

		struct ice_sq_cd *cd)

{

	struct ice_aqc_txsched_elem_data node = { 0 };

	struct ice_sched_node *parent;

	struct ice_q_ctx *q_ctx;

	enum ice_status status;

	struct ice_hw *hw;
@@ -2825,6 +2851,14 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, 


	mutex_lock(&pi->sched_lock);



	q_ctx = ice_get_lan_q_ctx(hw, vsi_handle, tc, q_handle);

	if (!q_ctx) {

		ice_debug(hw, ICE_DBG_SCHED, "Enaq: invalid queue handle %d\n",

			  q_handle);

		status = ICE_ERR_PARAM;

		goto ena_txq_exit;

	}



	/* find a parent node */

	parent = ice_sched_get_free_qparent(pi, vsi_handle, tc,

					    ICE_SCHED_NODE_OWNER_LAN);
@@ -2851,7 +2885,7 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, 
	/* add the LAN queue */

	status = ice_aq_add_lan_txq(hw, num_qgrps, buf, buf_size, cd);

	if (status) {

		ice_debug(hw, ICE_DBG_SCHED, "enable Q %d failed %d\n",

		ice_debug(hw, ICE_DBG_SCHED, "enable queue %d failed %d\n",

			  le16_to_cpu(buf->txqs[0].txq_id),

			  hw->adminq.sq_last_status);

		goto ena_txq_exit;
@@ -2859,6 +2893,7 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, 


	node.node_teid = buf->txqs[0].q_teid;

	node.data.elem_type = ICE_AQC_ELEM_TYPE_LEAF;

	q_ctx->q_handle = q_handle;



	/* add a leaf node into schduler tree queue layer */

	status = ice_sched_add_node(pi, hw->num_tx_sched_layers - 1, &node);
@@ -2871,7 +2906,10 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, 
/**

 * ice_dis_vsi_txq

 * @pi: port information structure

 * @vsi_handle: software VSI handle

 * @tc: TC number

 * @num_queues: number of queues

 * @q_handles: pointer to software queue handle array

 * @q_ids: pointer to the q_id array

 * @q_teids: pointer to queue node teids

 * @rst_src: if called due to reset, specifies the reset source
@@ -2881,12 +2919,14 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps, 
 * This function removes queues and their corresponding nodes in SW DB

 */

enum ice_status

ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids,

		u32 *q_teids, enum ice_disq_rst_src rst_src, u16 vmvf_num,

ice_dis_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_queues,

		u16 *q_handles, u16 *q_ids, u32 *q_teids,

		enum ice_disq_rst_src rst_src, u16 vmvf_num,

		struct ice_sq_cd *cd)

{

	enum ice_status status = ICE_ERR_DOES_NOT_EXIST;

	struct ice_aqc_dis_txq_item qg_list;

	struct ice_q_ctx *q_ctx;

	u16 i;



	if (!pi || pi->port_state != ICE_SCHED_PORT_STATE_READY)
@@ -2909,6 +2949,17 @@ ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids, 
		node = ice_sched_find_node_by_teid(pi->root, q_teids[i]);

		if (!node)

			continue;

		q_ctx = ice_get_lan_q_ctx(pi->hw, vsi_handle, tc, q_handles[i]);

		if (!q_ctx) {

			ice_debug(pi->hw, ICE_DBG_SCHED, "invalid queue handle%d\n",

				  q_handles[i]);

			continue;

		}

		if (q_ctx->q_handle != q_handles[i]) {

			ice_debug(pi->hw, ICE_DBG_SCHED, "Err:handles %d %d\n",

				  q_ctx->q_handle, q_handles[i]);

			continue;

		}

		qg_list.parent_teid = node->info.parent_teid;

		qg_list.num_qs = 1;

		qg_list.q_id[0] = cpu_to_le16(q_ids[i]);
@@ -2919,6 +2970,7 @@ ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids, 
		if (status)

			break;

		ice_free_sched_node(pi, node);

		q_ctx->q_handle = ICE_INVAL_Q_HANDLE;

	}

	mutex_unlock(&pi->sched_lock);

	return status;

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

+6 −5
Original line number Diff line number Diff line
@@ -99,15 +99,16 @@ ice_aq_set_port_id_led(struct ice_port_info *pi, bool is_orig_mode, 
		       struct ice_sq_cd *cd);



enum ice_status

ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids,

		u32 *q_teids, enum ice_disq_rst_src rst_src, u16 vmvf_num,

		struct ice_sq_cd *cmd_details);

ice_dis_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_queues,

		u16 *q_handle, u16 *q_ids, u32 *q_teids,

		enum ice_disq_rst_src rst_src, u16 vmvf_num,

		struct ice_sq_cd *cd);

enum ice_status

ice_cfg_vsi_lan(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap,

		u16 *max_lanqs);

enum ice_status

ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,

		struct ice_aqc_add_tx_qgrp *buf, u16 buf_size,

ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 q_handle,

		u8 num_qgrps, struct ice_aqc_add_tx_qgrp *buf, u16 buf_size,

		struct ice_sq_cd *cd);

enum ice_status ice_replay_vsi(struct ice_hw *hw, u16 vsi_handle);

void ice_replay_post(struct ice_hw *hw);

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

+60 −39
Original line number Diff line number Diff line
@@ -1715,8 +1715,8 @@ ice_vsi_cfg_txqs(struct ice_vsi *vsi, struct ice_ring **rings, int offset) 
			rings[q_idx]->tail =

				pf->hw.hw_addr + QTX_COMM_DBELL(pf_q);

			status = ice_ena_vsi_txq(vsi->port_info, vsi->idx, tc,

						 num_q_grps, qg_buf, buf_len,

						 NULL);

						 i, num_q_grps, qg_buf,

						 buf_len, NULL);

			if (status) {

				dev_err(&vsi->back->pdev->dev,

					"Failed to set LAN Tx queue context, error: %d\n",
@@ -2033,10 +2033,10 @@ ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src, 
{

	struct ice_pf *pf = vsi->back;

	struct ice_hw *hw = &pf->hw;

	int tc, q_idx = 0, err = 0;

	u16 *q_ids, *q_handles, i;

	enum ice_status status;

	u32 *q_teids, val;

	u16 *q_ids, i;

	int err = 0;



	if (vsi->num_txq > ICE_LAN_TXQ_MAX_QDIS)

		return -EINVAL;
@@ -2053,8 +2053,19 @@ ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src, 
		goto err_alloc_q_ids;

	}



	/* set up the Tx queue list to be disabled */

	ice_for_each_txq(vsi, i) {

	q_handles = devm_kcalloc(&pf->pdev->dev, vsi->num_txq,

				 sizeof(*q_handles), GFP_KERNEL);

	if (!q_handles) {

		err = -ENOMEM;

		goto err_alloc_q_handles;

	}



	/* set up the Tx queue list to be disabled for each enabled TC */

	ice_for_each_traffic_class(tc) {

		if (!(vsi->tc_cfg.ena_tc & BIT(tc)))

			break;



		for (i = 0; i < vsi->tc_cfg.tc_info[tc].qcount_tx; i++) {

			u16 v_idx;



			if (!rings || !rings[i] || !rings[i]->q_vector) {
@@ -2062,8 +2073,9 @@ ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src, 
				goto err_out;

			}



		q_ids[i] = vsi->txq_map[i + offset];

		q_teids[i] = rings[i]->txq_teid;

			q_ids[i] = vsi->txq_map[q_idx + offset];

			q_teids[i] = rings[q_idx]->txq_teid;

			q_handles[i] = i;



			/* clear cause_ena bit for disabled queues */

			val = rd32(hw, QINT_TQCTL(rings[i]->reg_idx));
@@ -2073,21 +2085,26 @@ ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src, 
			/* software is expected to wait for 100 ns */

			ndelay(100);



		/* trigger a software interrupt for the vector associated to

		 * the queue to schedule NAPI handler

			/* trigger a software interrupt for the vector

			 * associated to the queue to schedule NAPI handler

			 */

			v_idx = rings[i]->q_vector->v_idx;

			wr32(hw, GLINT_DYN_CTL(vsi->hw_base_vector + v_idx),

		     GLINT_DYN_CTL_SWINT_TRIG_M | GLINT_DYN_CTL_INTENA_MSK_M);

			     GLINT_DYN_CTL_SWINT_TRIG_M |

			     GLINT_DYN_CTL_INTENA_MSK_M);

			q_idx++;

		}

	status = ice_dis_vsi_txq(vsi->port_info, vsi->num_txq, q_ids, q_teids,

				 rst_src, rel_vmvf_num, NULL);

	/* if the disable queue command was exercised during an active reset

	 * flow, ICE_ERR_RESET_ONGOING is returned. This is not an error as

	 * the reset operation disables queues at the hardware level anyway.

		status = ice_dis_vsi_txq(vsi->port_info, vsi->idx, tc,

					 vsi->num_txq, q_handles, q_ids,

					 q_teids, rst_src, rel_vmvf_num, NULL);



		/* if the disable queue command was exercised during an active

		 * reset flow, ICE_ERR_RESET_ONGOING is returned. This is not

		 * an error as the reset operation disables queues at the

		 * hardware level anyway.

		 */

		if (status == ICE_ERR_RESET_ONGOING) {

		dev_info(&pf->pdev->dev,

			dev_dbg(&pf->pdev->dev,

				"Reset in progress. LAN Tx queues already disabled\n");

		} else if (status) {

			dev_err(&pf->pdev->dev,
@@ -2095,8 +2112,12 @@ ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src, 
				status);

			err = -ENODEV;

		}

	}



err_out:

	devm_kfree(&pf->pdev->dev, q_handles);



err_alloc_q_handles:

	devm_kfree(&pf->pdev->dev, q_ids);



err_alloc_q_ids:

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

+49 −5
Original line number Diff line number Diff line
@@ -532,6 +532,50 @@ ice_sched_suspend_resume_elems(struct ice_hw *hw, u8 num_nodes, u32 *node_teids, 
	return status;

}



/**

 * ice_alloc_lan_q_ctx - allocate LAN queue contexts for the given VSI and TC

 * @hw: pointer to the HW struct

 * @vsi_handle: VSI handle

 * @tc: TC number

 * @new_numqs: number of queues

 */

static enum ice_status

ice_alloc_lan_q_ctx(struct ice_hw *hw, u16 vsi_handle, u8 tc, u16 new_numqs)

{

	struct ice_vsi_ctx *vsi_ctx;

	struct ice_q_ctx *q_ctx;



	vsi_ctx = ice_get_vsi_ctx(hw, vsi_handle);

	if (!vsi_ctx)

		return ICE_ERR_PARAM;

	/* allocate LAN queue contexts */

	if (!vsi_ctx->lan_q_ctx[tc]) {

		vsi_ctx->lan_q_ctx[tc] = devm_kcalloc(ice_hw_to_dev(hw),

						      new_numqs,

						      sizeof(*q_ctx),

						      GFP_KERNEL);

		if (!vsi_ctx->lan_q_ctx[tc])

			return ICE_ERR_NO_MEMORY;

		vsi_ctx->num_lan_q_entries[tc] = new_numqs;

		return 0;

	}

	/* num queues are increased, update the queue contexts */

	if (new_numqs > vsi_ctx->num_lan_q_entries[tc]) {

		u16 prev_num = vsi_ctx->num_lan_q_entries[tc];



		q_ctx = devm_kcalloc(ice_hw_to_dev(hw), new_numqs,

				     sizeof(*q_ctx), GFP_KERNEL);

		if (!q_ctx)

			return ICE_ERR_NO_MEMORY;

		memcpy(q_ctx, vsi_ctx->lan_q_ctx[tc],

		       prev_num * sizeof(*q_ctx));

		devm_kfree(ice_hw_to_dev(hw), vsi_ctx->lan_q_ctx[tc]);

		vsi_ctx->lan_q_ctx[tc] = q_ctx;

		vsi_ctx->num_lan_q_entries[tc] = new_numqs;

	}

	return 0;

}



/**

 * ice_sched_clear_agg - clears the aggregator related information

 * @hw: pointer to the hardware structure
@@ -1403,14 +1447,14 @@ ice_sched_update_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle, 
	if (!vsi_ctx)

		return ICE_ERR_PARAM;



	if (owner == ICE_SCHED_NODE_OWNER_LAN)

	prev_numqs = vsi_ctx->sched.max_lanq[tc];

	else

		return ICE_ERR_PARAM;



	/* num queues are not changed or less than the previous number */

	if (new_numqs <= prev_numqs)

		return status;

	status = ice_alloc_lan_q_ctx(hw, vsi_handle, tc, new_numqs);

	if (status)

		return status;



	if (new_numqs)

		ice_sched_calc_vsi_child_nodes(hw, new_numqs, new_num_nodes);

	/* Keep the max number of queue configuration all the time. Update the

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

+22 −0
Original line number Diff line number Diff line
@@ -328,6 +328,27 @@ ice_save_vsi_ctx(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi) 
	hw->vsi_ctx[vsi_handle] = vsi;

}



/**

 * ice_clear_vsi_q_ctx - clear VSI queue contexts for all TCs

 * @hw: pointer to the HW struct

 * @vsi_handle: VSI handle

 */

static void ice_clear_vsi_q_ctx(struct ice_hw *hw, u16 vsi_handle)

{

	struct ice_vsi_ctx *vsi;

	u8 i;



	vsi = ice_get_vsi_ctx(hw, vsi_handle);

	if (!vsi)

		return;

	ice_for_each_traffic_class(i) {

		if (vsi->lan_q_ctx[i]) {

			devm_kfree(ice_hw_to_dev(hw), vsi->lan_q_ctx[i]);

			vsi->lan_q_ctx[i] = NULL;

		}

	}

}



/**

 * ice_clear_vsi_ctx - clear the VSI context entry

 * @hw: pointer to the HW struct
@@ -341,6 +362,7 @@ static void ice_clear_vsi_ctx(struct ice_hw *hw, u16 vsi_handle) 


	vsi = ice_get_vsi_ctx(hw, vsi_handle);

	if (vsi) {

		ice_clear_vsi_q_ctx(hw, vsi_handle);

		devm_kfree(ice_hw_to_dev(hw), vsi);

		hw->vsi_ctx[vsi_handle] = NULL;

	}