From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EA20DA0C41; Fri, 5 Nov 2021 22:54:43 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6E5034111E; Fri, 5 Nov 2021 22:54:34 +0100 (CET) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 69E9440689; Fri, 5 Nov 2021 22:54:31 +0100 (CET) Received: from bree.oktetlabs.ru (bree.oktetlabs.ru [192.168.34.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by shelob.oktetlabs.ru (Postfix) with ESMTPS id 05AD17F6F3; Sat, 6 Nov 2021 00:54:31 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 05AD17F6F3 Authentication-Results: shelob.oktetlabs.ru/05AD17F6F3; dkim=none; dkim-atps=neutral From: Ivan Malov To: dev@dpdk.org Cc: stable@dpdk.org, Andrew Rybchenko , Andy Moreton , Igor Romanov Date: Sat, 6 Nov 2021 00:54:06 +0300 Message-Id: <20211105215409.5706-3-ivan.malov@oktetlabs.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211105215409.5706-1-ivan.malov@oktetlabs.ru> References: <20211105215409.5706-1-ivan.malov@oktetlabs.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 2/5] common/sfc_efx/base: refine adding count action to a set X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 1) Invalid counter ID is always set by default. Do not set it again when adding the action. 2) Counter ID validity check is missing in the action set allocation helper. Introduce it. Fixes: 238306cf9aff ("common/sfc_efx/base: support counter in action set") Cc: stable@dpdk.org Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/common/sfc_efx/base/efx_mae.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/drivers/common/sfc_efx/base/efx_mae.c b/drivers/common/sfc_efx/base/efx_mae.c index 542c345b76..c93fe9bdfc 100644 --- a/drivers/common/sfc_efx/base/efx_mae.c +++ b/drivers/common/sfc_efx/base/efx_mae.c @@ -1567,13 +1567,14 @@ efx_mae_action_set_add_count( * two steps: first add this action to the action spec, and then * add the counter ID to the spec. This allows validity checking * and resource allocation to be done separately. - * Mark the counter ID as invalid in the spec to ensure that the - * caller must also invoke efx_mae_action_set_fill_in_counter_id() - * before action set allocation. + * + * In order to fill in the counter ID, the caller is supposed to invoke + * efx_mae_action_set_fill_in_counter_id(). If they do not do that, + * efx_mae_action_set_alloc() invocation will throw an error. + * + * For now, no arguments are supposed to be handled. */ - spec->ema_rsrc.emar_counter_id.id = EFX_MAE_RSRC_ID_INVALID; - /* Nothing else is supposed to take place over here. */ if (arg_size != 0) { rc = EINVAL; goto fail1; @@ -2585,6 +2586,12 @@ efx_mae_action_set_alloc( goto fail2; } + if (spec->ema_n_count_actions == 1 && + spec->ema_rsrc.emar_counter_id.id == EFX_MAE_RSRC_ID_INVALID) { + rc = EINVAL; + goto fail3; + } + req.emr_cmd = MC_CMD_MAE_ACTION_SET_ALLOC; req.emr_in_buf = payload; req.emr_in_length = MC_CMD_MAE_ACTION_SET_ALLOC_IN_LEN; @@ -2662,24 +2669,26 @@ efx_mae_action_set_alloc( if (req.emr_rc != 0) { rc = req.emr_rc; - goto fail3; + goto fail4; } if (req.emr_out_length_used < MC_CMD_MAE_ACTION_SET_ALLOC_OUT_LEN) { rc = EMSGSIZE; - goto fail4; + goto fail5; } aset_id.id = MCDI_OUT_DWORD(req, MAE_ACTION_SET_ALLOC_OUT_AS_ID); if (aset_id.id == EFX_MAE_RSRC_ID_INVALID) { rc = ENOENT; - goto fail5; + goto fail6; } aset_idp->id = aset_id.id; return (0); +fail6: + EFSYS_PROBE(fail6); fail5: EFSYS_PROBE(fail5); fail4: -- 2.30.2