Commit f3fbda33 authored by Jacob Keller's avatar Jacob Keller Committed by Tony Nguyen
Browse files

ice: Correctly initialize queue context values 



The ice_alloc_lan_q_ctx function allocates the queue context array for a
given traffic class. This function uses devm_kcalloc which will
zero-allocate the structure. Thus, prior to any queue being setup by
ice_ena_vsi_txq, the q_ctx structure will have a q_handle of 0 and a q_teid
of 0. These are potentially valid values.

Modify the ice_alloc_lan_q_ctx function to initialize every member of the
q_ctx array to have invalid values. Modify ice_dis_vsi_txq to ensure that
it assigns q_teid to an invalid value when it assigns q_handle to the
invalid value as well.

This will allow other code to check whether the queue context is currently
valid before operating on it.

Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Reviewed-by: default avatarDaniel Machon <daniel.machon@microchip.com>
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarDave Ertman <david.m.ertman@intel.com>
Tested-by: default avatarSujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 9d0cd5d2

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

+1 −0
Original line number Diff line number Diff line
@@ -4700,6 +4700,7 @@ ice_dis_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_queues, 
			break;

		ice_free_sched_node(pi, node);

		q_ctx->q_handle = ICE_INVAL_Q_HANDLE;

		q_ctx->q_teid = ICE_INVAL_TEID;

	}

	mutex_unlock(&pi->sched_lock);

	kfree(qg_list);

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

+18 −5
Original line number Diff line number Diff line
@@ -569,18 +569,24 @@ 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;

	u16 idx;



	vsi_ctx = ice_get_vsi_ctx(hw, vsi_handle);

	if (!vsi_ctx)

		return -EINVAL;

	/* 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])

		q_ctx = devm_kcalloc(ice_hw_to_dev(hw), new_numqs,

				     sizeof(*q_ctx), GFP_KERNEL);

		if (!q_ctx)

			return -ENOMEM;



		for (idx = 0; idx < new_numqs; idx++) {

			q_ctx[idx].q_handle = ICE_INVAL_Q_HANDLE;

			q_ctx[idx].q_teid = ICE_INVAL_TEID;

		}



		vsi_ctx->lan_q_ctx[tc] = q_ctx;

		vsi_ctx->num_lan_q_entries[tc] = new_numqs;

		return 0;

	}
@@ -592,9 +598,16 @@ ice_alloc_lan_q_ctx(struct ice_hw *hw, u16 vsi_handle, u8 tc, u16 new_numqs) 
				     sizeof(*q_ctx), GFP_KERNEL);

		if (!q_ctx)

			return -ENOMEM;



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



		for (idx = prev_num; idx < new_numqs; idx++) {

			q_ctx[idx].q_handle = ICE_INVAL_Q_HANDLE;

			q_ctx[idx].q_teid = ICE_INVAL_TEID;

		}



		vsi_ctx->lan_q_ctx[tc] = q_ctx;

		vsi_ctx->num_lan_q_entries[tc] = new_numqs;

	}