Commit d94dbdc4 authored by Brett Creeley's avatar Brett Creeley Committed by Tony Nguyen
Browse files

ice: Fix ice_cfg_rdma_fltr() to only update relevant fields 



The current implementation causes ice_vsi_update() to update all VSI
fields based on the cached VSI context. This also assumes that the
ICE_AQ_VSI_PROP_Q_OPT_VALID bit is set. This can cause problems if the
VSI context is not correctly synced by the driver. Fix this by only
updating the fields that correspond to ICE_AQ_VSI_PROP_Q_OPT_VALID.
Also, make sure to save the updated result in the cached VSI context
on success.

Fixes: 348048e7 ("ice: Implement iidc operations")
Co-developed-by: default avatarRobert Malz <robertx.malz@intel.com>
Signed-off-by: default avatarRobert Malz <robertx.malz@intel.com>
Signed-off-by: default avatarBrett Creeley <brett.creeley@intel.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Reviewed-by: default avatarPiotr Raczynski <piotr.raczynski@intel.com>
Tested-by: default avatarJakub Andrysiak <jakub.andrysiak@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 66ceaa4c

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

+22 −4
Original line number Diff line number Diff line
@@ -1780,18 +1780,36 @@ ice_update_vsi(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi_ctx, 
int

ice_cfg_rdma_fltr(struct ice_hw *hw, u16 vsi_handle, bool enable)

{

	struct ice_vsi_ctx *ctx;

	struct ice_vsi_ctx *ctx, *cached_ctx;

	int status;



	cached_ctx = ice_get_vsi_ctx(hw, vsi_handle);

	if (!cached_ctx)

		return -ENOENT;



	ctx = ice_get_vsi_ctx(hw, vsi_handle);

	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);

	if (!ctx)

		return -EIO;

		return -ENOMEM;



	ctx->info.q_opt_rss = cached_ctx->info.q_opt_rss;

	ctx->info.q_opt_tc = cached_ctx->info.q_opt_tc;

	ctx->info.q_opt_flags = cached_ctx->info.q_opt_flags;



	ctx->info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_Q_OPT_VALID);



	if (enable)

		ctx->info.q_opt_flags |= ICE_AQ_VSI_Q_OPT_PE_FLTR_EN;

	else

		ctx->info.q_opt_flags &= ~ICE_AQ_VSI_Q_OPT_PE_FLTR_EN;



	return ice_update_vsi(hw, vsi_handle, ctx, NULL);

	status = ice_update_vsi(hw, vsi_handle, ctx, NULL);

	if (!status) {

		cached_ctx->info.q_opt_flags = ctx->info.q_opt_flags;

		cached_ctx->info.valid_sections |= ctx->info.valid_sections;

	}



	kfree(ctx);

	return status;

}



/**