[PATCH v2] net/ice: fix DCF state checking mechanism

[Connolly, Padraig J]

> -----Original Message-----
> From: peng1x.zhang at intel.com <peng1x.zhang at intel.com>
> Sent: Wednesday, May 11, 2022 4:50 PM
> To: Yang, Qiming <qiming.yang at intel.com>; Zhang, Qi Z
> <qi.z.zhang at intel.com>; dev at dpdk.org
> Cc: Zhang, Peng1X <peng1x.zhang at intel.com>; stable at dpdk.org
> Subject: [PATCH v2] net/ice: fix DCF state checking mechanism
> 
> From: Peng Zhang <peng1x.zhang at intel.com>
> 
> DCF state previous checking mechanism can not fully detect DCF state
> whether is on or not,so PMD will report uncorrect error code in some cases
> and mislead user.Fix DCF state checking mechanism which will mention user
> resource temporarily unavailable when DCF state is not on.
> 
> Fixes: 285f63fc6bb7 ("net/ice: track DCF state of PF")
> Cc: stable at dpdk.org
> 
> Signed-off-by: Peng Zhang <peng1x.zhang at intel.com>
> ---
>  drivers/net/ice/ice_dcf_parent.c    |  3 ---
>  drivers/net/ice/ice_switch_filter.c | 20 ++++++--------------
>  2 files changed, 6 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/net/ice/ice_dcf_parent.c
> b/drivers/net/ice/ice_dcf_parent.c
> index 2f96dedcce..5b02e0197f 100644
> --- a/drivers/net/ice/ice_dcf_parent.c
> +++ b/drivers/net/ice/ice_dcf_parent.c
> @@ -121,7 +121,6 @@ ice_dcf_vsi_update_service_handler(void *param)
>  	struct ice_dcf_hw *hw = reset_param->dcf_hw;
>  	struct ice_dcf_adapter *adapter =
>  		container_of(hw, struct ice_dcf_adapter, real_hw);
> -	struct ice_adapter *parent_adapter = &adapter->parent;
> 
>  	pthread_detach(pthread_self());
> 
> @@ -130,8 +129,6 @@ ice_dcf_vsi_update_service_handler(void *param)
>  	rte_spinlock_lock(&vsi_update_lock);
> 
>  	if (!ice_dcf_handle_vsi_update_event(hw)) {
> -		__atomic_store_n(&parent_adapter->dcf_state_on, true,
> -				 __ATOMIC_RELAXED);
>  		ice_dcf_update_vf_vsi_map(&adapter->parent.hw,
>  					  hw->num_vfs, hw->vf_vsi_map);
>  	}
> diff --git a/drivers/net/ice/ice_switch_filter.c
> b/drivers/net/ice/ice_switch_filter.c
> index 36c9bffb73..3d36c63e97 100644
> --- a/drivers/net/ice/ice_switch_filter.c
> +++ b/drivers/net/ice/ice_switch_filter.c
> @@ -403,13 +403,6 @@ ice_switch_create(struct ice_adapter *ad,
>  		goto error;
>  	}
> 
> -	if (ice_dcf_adminq_need_retry(ad)) {
> -		rte_flow_error_set(error, EAGAIN,
> -			RTE_FLOW_ERROR_TYPE_ITEM, NULL,
> -			"DCF is not on");
> -		goto error;
> -	}
> -
>  	ret = ice_add_adv_rule(hw, list, lkups_cnt, rule_info, &rule_added);
>  	if (!ret) {
>  		filter_conf_ptr = rte_zmalloc("ice_switch_filter", @@ -432,6
> +425,9 @@ ice_switch_create(struct ice_adapter *ad,
>  		filter_conf_ptr->fltr_status = ICE_SW_FLTR_ADDED;
> 
>  		flow->rule = filter_conf_ptr;
> +
> +		if (ad->hw.dcf_enabled)
> +			__atomic_store_n(&ad->dcf_state_on, true,
> __ATOMIC_RELAXED);
>  	} else {
>  		if (ice_dcf_adminq_need_retry(ad))
>  			ret = -EAGAIN;
> @@ -490,13 +486,6 @@ ice_switch_destroy(struct ice_adapter *ad,
>  		return -rte_errno;
>  	}
> 
> -	if (ice_dcf_adminq_need_retry(ad)) {
> -		rte_flow_error_set(error, EAGAIN,
> -			RTE_FLOW_ERROR_TYPE_ITEM, NULL,
> -			"DCF is not on");
> -		return -rte_errno;
> -	}
> -
>  	ret = ice_rem_adv_rule_by_id(hw, &filter_conf_ptr-
> >sw_query_data);
>  	if (ret) {
>  		if (ice_dcf_adminq_need_retry(ad))
> @@ -508,6 +497,9 @@ ice_switch_destroy(struct ice_adapter *ad,
>  			RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
>  			"fail to destroy switch filter rule");
>  		return -rte_errno;
> +	} else {
> +		if (ad->hw.dcf_enabled)
> +			__atomic_store_n(&ad->dcf_state_on, true,
> __ATOMIC_RELAXED);
>  	}
> 
>  	ice_switch_filter_rule_free(flow);
> --
> 2.25.1

Tested-by: Padraig Connolly <padraig.j.connolly at intel.com>