From patchwork Fri Dec 3 14:31:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Dumitrescu X-Patchwork-Id: 104855 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7DA66A0C45; Fri, 3 Dec 2021 15:31:12 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D272E410DC; Fri, 3 Dec 2021 15:31:11 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 4FC7340041; Fri, 3 Dec 2021 15:31:08 +0100 (CET) X-IronPort-AV: E=McAfee;i="6200,9189,10186"; a="237206332" X-IronPort-AV: E=Sophos;i="5.87,284,1631602800"; d="scan'208";a="237206332" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2021 06:31:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,284,1631602800"; d="scan'208";a="577408554" Received: from silpixa00400573.ir.intel.com (HELO silpixa00400573.ger.corp.intel.com) ([10.237.223.107]) by fmsmga004.fm.intel.com with ESMTP; 03 Dec 2021 06:31:05 -0800 From: Cristian Dumitrescu To: dev@dpdk.org Cc: stable@dpdk.org, Yogesh Jangra Subject: [PATCH] pipeline: fix annotation checks Date: Fri, 3 Dec 2021 14:31:04 +0000 Message-Id: <20211203143104.90385-1-cristian.dumitrescu@intel.com> X-Mailer: git-send-email 2.17.1 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 The checks for the table-only and default-only annotations were incorrect, as they were using the pipeline action ID instead of the table action ID for retrieving the table action info. These checks are now corrected and pushed into the internal table_entry_check() function. Fixes: cd79e0205824 ("pipeline: support action annotations") Cc: stable@dpdk.org Signed-off-by: Cristian Dumitrescu Signed-off-by: Yogesh Jangra --- lib/pipeline/rte_swx_ctl.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/lib/pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c index 1c908e3e3f..8e29d58cec 100644 --- a/lib/pipeline/rte_swx_ctl.c +++ b/lib/pipeline/rte_swx_ctl.c @@ -372,18 +372,34 @@ table_entry_check(struct rte_swx_ctl_pipeline *ctl, if (data_check) { struct action *a; + struct rte_swx_ctl_table_action_info *tai; uint32_t i; /* action_id. */ - for (i = 0; i < table->info.n_actions; i++) - if (entry->action_id == table->actions[i].action_id) + for (i = 0; i < table->info.n_actions; i++) { + tai = &table->actions[i]; + + if (entry->action_id == tai->action_id) break; + } CHECK(i < table->info.n_actions, EINVAL); /* action_data. */ a = &ctl->actions[entry->action_id]; CHECK(!(a->data_size && !entry->action_data), EINVAL); + + /* When both key_check and data_check are true, we are interested in both the entry + * key and data, which means the operation is _regular_ table entry add. + */ + if (key_check && !tai->action_is_for_table_entries) + return -EINVAL; + + /* When key_check is false while data_check is true, we are only interested in the + * entry data, which means the operation is _default_ table entry add. + */ + if (!key_check && !tai->action_is_for_default_entry) + return -EINVAL; } return 0; @@ -1446,8 +1462,6 @@ rte_swx_ctl_pipeline_table_entry_add(struct rte_swx_ctl_pipeline *ctl, CHECK(entry, EINVAL); CHECK(!table_entry_check(ctl, table_id, entry, 1, 1), EINVAL); - CHECK(table->actions[entry->action_id].action_is_for_table_entries, EINVAL); - new_entry = table_entry_duplicate(ctl, table_id, entry, 1, 1); CHECK(new_entry, ENOMEM); @@ -1653,8 +1667,6 @@ rte_swx_ctl_pipeline_table_default_entry_add(struct rte_swx_ctl_pipeline *ctl, CHECK(entry, EINVAL); CHECK(!table_entry_check(ctl, table_id, entry, 0, 1), EINVAL); - CHECK(table->actions[entry->action_id].action_is_for_default_entry, EINVAL); - new_entry = table_entry_duplicate(ctl, table_id, entry, 0, 1); CHECK(new_entry, ENOMEM);