Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/99931/?format=api
{ "id": 99931, "url": "http://patches.dpdk.org/api/patches/99931/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210928152300.989961-1-andrew.rybchenko@oktetlabs.ru/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20210928152300.989961-1-andrew.rybchenko@oktetlabs.ru>", "list_archive_url": "https://inbox.dpdk.org/dev/20210928152300.989961-1-andrew.rybchenko@oktetlabs.ru", "date": "2021-09-28T15:23:00", "name": "ethdev: remove deprecated shared counter attribute", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "6a9cabfd6d41ae12035f2b3c4aaeecbc80a256e2", "submitter": { "id": 2013, "url": "http://patches.dpdk.org/api/people/2013/?format=api", "name": "Andrew Rybchenko", "email": "Andrew.Rybchenko@oktetlabs.ru" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210928152300.989961-1-andrew.rybchenko@oktetlabs.ru/mbox/", "series": [ { "id": 19234, "url": "http://patches.dpdk.org/api/series/19234/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=19234", "date": "2021-09-28T15:23:00", "name": "ethdev: remove deprecated shared counter attribute", "version": 1, "mbox": "http://patches.dpdk.org/series/19234/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/99931/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/99931/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 5820DA0C43;\n\tTue, 28 Sep 2021 17:23:17 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id DD44E410D7;\n\tTue, 28 Sep 2021 17:23:16 +0200 (CEST)", "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id 1ADF140E3C\n for <dev@dpdk.org>; Tue, 28 Sep 2021 17:23:16 +0200 (CEST)", "by shelob.oktetlabs.ru (Postfix, from userid 122)\n id ADAD97F690; Tue, 28 Sep 2021 18:23:15 +0300 (MSK)", "from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17])\n by shelob.oktetlabs.ru (Postfix) with ESMTP id 8F71B7F52A;\n Tue, 28 Sep 2021 18:23:05 +0300 (MSK)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on shelob.oktetlabs.ru", "X-Spam-Level": "", "X-Spam-Status": "No, score=0.8 required=5.0 tests=ALL_TRUSTED,\n DKIM_ADSP_DISCARD,\n URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2", "DKIM-Filter": "OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 8F71B7F52A", "Authentication-Results": "shelob.oktetlabs.ru/8F71B7F52A; dkim=none;\n dkim-atps=neutral", "From": "Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "To": "Ori Kam <orika@nvidia.com>, Xiaoyun Li <xiaoyun.li@intel.com>,\n Ray Kinsella <mdr@ashroe.eu>, Ajit Khaparde <ajit.khaparde@broadcom.com>,\n Somnath Kotur <somnath.kotur@broadcom.com>,\n Nithin Dabilpuram <ndabilpuram@marvell.com>,\n Kiran Kumar K <kirankumark@marvell.com>,\n Sunil Kumar Kori <skori@marvell.com>, Satha Rao <skoteshwar@marvell.com>,\n \"Min Hu (Connor)\" <humin29@huawei.com>,\n Yisen Zhuang <yisen.zhuang@huawei.com>, Lijun Ou <oulijun@huawei.com>,\n Qiming Yang <qiming.yang@intel.com>, Qi Zhang <qi.z.zhang@intel.com>,\n Matan Azrad <matan@nvidia.com>,\n Viacheslav Ovsiienko <viacheslavo@nvidia.com>,\n Jerin Jacob <jerinj@marvell.com>,\n Jasvinder Singh <jasvinder.singh@intel.com>,\n Cristian Dumitrescu <cristian.dumitrescu@intel.com>,\n Thomas Monjalon <thomas@monjalon.net>,\n Ferruh Yigit <ferruh.yigit@intel.com>", "Cc": "dev@dpdk.org", "Date": "Tue, 28 Sep 2021 18:23:00 +0300", "Message-Id": "<20210928152300.989961-1-andrew.rybchenko@oktetlabs.ru>", "X-Mailer": "git-send-email 2.30.2", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH] ethdev: remove deprecated shared counter\n attribute", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Indirect actions should be used to do shared counters.\n\nSigned-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>\n---\n app/test-pmd/cmdline_flow.c | 10 --\n doc/guides/prog_guide/rte_flow.rst | 19 +--\n doc/guides/rel_notes/deprecation.rst | 4 -\n doc/guides/rel_notes/release_21_11.rst | 4 +\n drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 5 -\n drivers/net/cnxk/cnxk_rte_flow.c | 8 --\n drivers/net/hns3/hns3_flow.c | 3 +-\n drivers/net/ice/ice_fdir_filter.c | 4 +-\n drivers/net/mlx5/mlx5.h | 7 --\n drivers/net/mlx5/mlx5_flow_dv.c | 135 ++-------------------\n drivers/net/mlx5/mlx5_flow_verbs.c | 22 +---\n drivers/net/octeontx2/otx2_flow_parse.c | 10 --\n drivers/net/sfc/sfc_mae.c | 9 +-\n drivers/net/softnic/rte_eth_softnic_flow.c | 7 --\n lib/ethdev/rte_flow.h | 17 +--\n 15 files changed, 23 insertions(+), 241 deletions(-)", "diff": "diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex bb22294dd3..0b5856c7d5 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -322,7 +322,6 @@ enum index {\n \tACTION_QUEUE_INDEX,\n \tACTION_DROP,\n \tACTION_COUNT,\n-\tACTION_COUNT_SHARED,\n \tACTION_COUNT_ID,\n \tACTION_RSS,\n \tACTION_RSS_FUNC,\n@@ -1451,7 +1450,6 @@ static const enum index action_queue[] = {\n \n static const enum index action_count[] = {\n \tACTION_COUNT_ID,\n-\tACTION_COUNT_SHARED,\n \tACTION_NEXT,\n \tZERO,\n };\n@@ -3712,14 +3710,6 @@ static const struct token token_list[] = {\n \t\t.args = ARGS(ARGS_ENTRY(struct rte_flow_action_count, id)),\n \t\t.call = parse_vc_conf,\n \t},\n-\t[ACTION_COUNT_SHARED] = {\n-\t\t.name = \"shared\",\n-\t\t.help = \"shared counter\",\n-\t\t.next = NEXT(action_count, NEXT_ENTRY(COMMON_BOOLEAN)),\n-\t\t.args = ARGS(ARGS_ENTRY_BF(struct rte_flow_action_count,\n-\t\t\t\t\t shared, 1)),\n-\t\t.call = parse_vc_conf,\n-\t},\n \t[ACTION_RSS] = {\n \t\t.name = \"rss\",\n \t\t.help = \"spread packets among several queues\",\ndiff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst\nindex 2b42d5ec8c..3cb014c1fa 100644\n--- a/doc/guides/prog_guide/rte_flow.rst\n+++ b/doc/guides/prog_guide/rte_flow.rst\n@@ -158,7 +158,7 @@ Several pattern items and actions are valid and can be used in both\n directions. At least one direction must be specified.\n \n Specifying both directions at once for a given rule is not recommended but\n-may be valid in a few cases (e.g. shared counters).\n+may be valid in a few cases.\n \n Attribute: Transfer\n ^^^^^^^^^^^^^^^^^^^\n@@ -1491,9 +1491,7 @@ Actions are performed in list order:\n +=======+========+============+=======+\n | 0 | MARK | ``mark`` | 0x2a |\n +-------+--------+------------+-------+\n- | 1 | COUNT | ``shared`` | 0 |\n- | | +------------+-------+\n- | | | ``id`` | 0 |\n+ | 1 | COUNT | ``id`` | 0 |\n +-------+--------+------------+-------+\n | 2 | QUEUE | ``queue`` | 10 |\n +-------+--------+------------+-------+\n@@ -1734,20 +1732,9 @@ action must specify a unique id.\n Counters can be retrieved and reset through ``rte_flow_query()``, see\n ``struct rte_flow_query_count``.\n \n-The shared flag indicates whether the counter is unique to the flow rule the\n-action is specified with, or whether it is a shared counter.\n-\n-For a count action with the shared flag set, then a global device\n-namespace is assumed for the counter id, so that any matched flow rules using\n-a count action with the same counter id on the same port will contribute to\n-that counter.\n-\n For ports within the same switch domain then the counter id namespace extends\n to all ports within that switch domain.\n \n-The shared flag is DEPRECATED and ``INDIRECT`` ``COUNT`` action should be used\n-to make shared counters.\n-\n .. _table_rte_flow_action_count:\n \n .. table:: COUNT\n@@ -1755,8 +1742,6 @@ to make shared counters.\n +------------+---------------------------------+\n | Field | Value |\n +============+=================================+\n- | ``shared`` | DEPRECATED, shared counter flag |\n- +------------+---------------------------------+\n | ``id`` | counter id |\n +------------+---------------------------------+\n \ndiff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst\nindex 59445a6f42..21ef39841f 100644\n--- a/doc/guides/rel_notes/deprecation.rst\n+++ b/doc/guides/rel_notes/deprecation.rst\n@@ -124,10 +124,6 @@ Deprecation Notices\n to support modifying fields larger than 64 bits.\n In addition, documentation will be updated to clarify byte order.\n \n-* ethdev: Attribute ``shared`` of the ``struct rte_flow_action_count``\n- is deprecated and will be removed in DPDK 21.11. Shared counters should\n- be managed using shared actions API (``rte_flow_shared_action_create`` etc).\n-\n * ethdev: Definition of the flow API action ``RTE_FLOW_ACTION_TYPE_PORT_ID``\n is ambiguous and needs clarification.\n Structure ``rte_flow_action_port_id`` will be extended to specify\ndiff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst\nindex a84c912f20..0d91ad5d7b 100644\n--- a/doc/guides/rel_notes/release_21_11.rst\n+++ b/doc/guides/rel_notes/release_21_11.rst\n@@ -126,6 +126,10 @@ Removed Items\n blacklist/whitelist are removed. Users must use the new\n block/allow list arguments.\n \n+* ethdev: Removed deprecated ``shared`` attribute of the\n+ ``struct rte_flow_action_count``. Shared counters should be managed\n+ using indirect actions API (``rte_flow_action_handle_create`` etc).\n+\n \n API Changes\n -----------\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\nindex 3a9c9bba27..f1e270af8b 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\n@@ -2111,11 +2111,6 @@ ulp_rte_count_act_handler(const struct rte_flow_action *action_item,\n \n \tact_count = action_item->conf;\n \tif (act_count) {\n-\t\tif (act_count->shared) {\n-\t\t\tBNXT_TF_DBG(ERR,\n-\t\t\t\t \"Parse Error:Shared count not supported\\n\");\n-\t\t\treturn BNXT_TF_RC_PARSE_ERR;\n-\t\t}\n \t\tmemcpy(&act_prop->act_details[BNXT_ULP_ACT_PROP_IDX_COUNT],\n \t\t &act_count->id,\n \t\t BNXT_ULP_ACT_PROP_SZ_COUNT);\ndiff --git a/drivers/net/cnxk/cnxk_rte_flow.c b/drivers/net/cnxk/cnxk_rte_flow.c\nindex 32c1b5dee5..27defd2fa9 100644\n--- a/drivers/net/cnxk/cnxk_rte_flow.c\n+++ b/drivers/net/cnxk/cnxk_rte_flow.c\n@@ -110,7 +110,6 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,\n \t\t struct roc_npc_action in_actions[], uint32_t *flowkey_cfg)\n {\n \tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n-\tconst struct rte_flow_action_count *act_count;\n \tconst struct rte_flow_action_queue *act_q;\n \tint i = 0, rc = 0;\n \tint rq;\n@@ -131,13 +130,6 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,\n \t\t\tbreak;\n \n \t\tcase RTE_FLOW_ACTION_TYPE_COUNT:\n-\t\t\tact_count = (const struct rte_flow_action_count *)\n-\t\t\t\t\t actions->conf;\n-\n-\t\t\tif (act_count->shared == 1) {\n-\t\t\t\tplt_npc_dbg(\"Shared counter is not supported\");\n-\t\t\t\tgoto err_exit;\n-\t\t\t}\n \t\t\tin_actions[i].type = ROC_NPC_ACTION_TYPE_COUNT;\n \t\t\tbreak;\n \ndiff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c\nindex 841e0b9da3..fe1a387526 100644\n--- a/drivers/net/hns3/hns3_flow.c\n+++ b/drivers/net/hns3/hns3_flow.c\n@@ -1782,8 +1782,7 @@ hns3_flow_create(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,\n \t\tgoto out;\n \n \tif (fdir_rule.flags & HNS3_RULE_FLAG_COUNTER) {\n-\t\tret = hns3_counter_new(dev, fdir_rule.act_cnt.shared,\n-\t\t\t\t fdir_rule.act_cnt.id, error);\n+\t\tret = hns3_counter_new(dev, 0, fdir_rule.act_cnt.id, error);\n \t\tif (ret)\n \t\t\tgoto out;\n \ndiff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c\nindex e0cca7cb3c..14e4e069c4 100644\n--- a/drivers/net/ice/ice_fdir_filter.c\n+++ b/drivers/net/ice/ice_fdir_filter.c\n@@ -1339,9 +1339,7 @@ ice_fdir_create_filter(struct ice_adapter *ad,\n \tif (filter->input.cnt_ena) {\n \t\tstruct rte_flow_action_count *act_count = &filter->act_count;\n \n-\t\tfilter->counter = ice_fdir_counter_alloc(pf,\n-\t\t\t\t\t\t\t act_count->shared,\n-\t\t\t\t\t\t\t act_count->id);\n+\t\tfilter->counter = ice_fdir_counter_alloc(pf, 0, act_count->id);\n \t\tif (!filter->counter) {\n \t\t\trte_flow_error_set(error, EINVAL,\n \t\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION, NULL,\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex 3581414b78..ba48a0fee2 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -324,7 +324,6 @@ struct mlx5_lb_ctx {\n #define MLX5_MAX_PENDING_QUERIES 4\n #define MLX5_CNT_CONTAINER_RESIZE 64\n #define MLX5_CNT_SHARED_OFFSET 0x80000000\n-#define IS_LEGACY_SHARED_CNT(cnt) (!!((cnt) & MLX5_CNT_SHARED_OFFSET))\n #define IS_BATCH_CNT(cnt) (((cnt) & (MLX5_CNT_SHARED_OFFSET - 1)) >= \\\n \t\t\t MLX5_CNT_BATCH_OFFSET)\n #define MLX5_CNT_SIZE (sizeof(struct mlx5_flow_counter))\n@@ -392,12 +391,6 @@ struct mlx5_flow_counter_shared {\n \t};\n };\n \n-/* Shared counter configuration. */\n-struct mlx5_shared_counter_conf {\n-\tstruct rte_eth_dev *dev; /* The device shared counter belongs to. */\n-\tuint32_t id; /* The shared counter ID. */\n-};\n-\n struct mlx5_flow_counter_pool;\n /* Generic counters information. */\n struct mlx5_flow_counter {\ndiff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex b610ad3ef4..91314d5ea5 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -3308,33 +3308,11 @@ flow_dv_validate_action_set_tag(struct rte_eth_dev *dev,\n \treturn 0;\n }\n \n-/**\n- * Check if action counter is shared by either old or new mechanism.\n- *\n- * @param[in] action\n- * Pointer to the action structure.\n- *\n- * @return\n- * True when counter is shared, false otherwise.\n- */\n-static inline bool\n-is_shared_action_count(const struct rte_flow_action *action)\n-{\n-\tconst struct rte_flow_action_count *count =\n-\t\t\t(const struct rte_flow_action_count *)action->conf;\n-\n-\tif ((int)action->type == MLX5_RTE_FLOW_ACTION_TYPE_COUNT)\n-\t\treturn true;\n-\treturn !!(count && count->shared);\n-}\n-\n /**\n * Validate count action.\n *\n * @param[in] dev\n * Pointer to rte_eth_dev structure.\n- * @param[in] shared\n- * Indicator if action is shared.\n * @param[in] action_flags\n * Holds the actions detected until now.\n * @param[out] error\n@@ -3344,7 +3322,7 @@ is_shared_action_count(const struct rte_flow_action *action)\n * 0 on success, a negative errno value otherwise and rte_errno is set.\n */\n static int\n-flow_dv_validate_action_count(struct rte_eth_dev *dev, bool shared,\n+flow_dv_validate_action_count(struct rte_eth_dev *dev,\n \t\t\t uint64_t action_flags,\n \t\t\t struct rte_flow_error *error)\n {\n@@ -3356,11 +3334,6 @@ flow_dv_validate_action_count(struct rte_eth_dev *dev, bool shared,\n \t\treturn rte_flow_error_set(error, EINVAL,\n \t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n \t\t\t\t\t \"duplicate count actions set\");\n-\tif (shared && (action_flags & MLX5_FLOW_ACTION_AGE) &&\n-\t !priv->sh->flow_hit_aso_en)\n-\t\treturn rte_flow_error_set(error, EINVAL,\n-\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n-\t\t\t\t\t \"old age and shared count combination is not supported\");\n #ifdef HAVE_IBV_FLOW_DEVX_COUNTERS\n \treturn 0;\n #endif\n@@ -5658,9 +5631,7 @@ flow_dv_validate_action_sample(uint64_t *action_flags,\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ACTION_TYPE_COUNT:\n \t\t\tret = flow_dv_validate_action_count\n-\t\t\t\t(dev, is_shared_action_count(act),\n-\t\t\t\t *action_flags | sub_action_flags,\n-\t\t\t\t error);\n+\t\t\t\t(dev, *action_flags | sub_action_flags, error);\n \t\t\tif (ret < 0)\n \t\t\t\treturn ret;\n \t\t\t*count = act->conf;\n@@ -6230,60 +6201,6 @@ flow_dv_counter_alloc(struct rte_eth_dev *dev, uint32_t age)\n \treturn 0;\n }\n \n-/**\n- * Allocate a shared flow counter.\n- *\n- * @param[in] ctx\n- * Pointer to the shared counter configuration.\n- * @param[in] data\n- * Pointer to save the allocated counter index.\n- *\n- * @return\n- * Index to flow counter on success, 0 otherwise and rte_errno is set.\n- */\n-\n-static int32_t\n-flow_dv_counter_alloc_shared_cb(void *ctx, union mlx5_l3t_data *data)\n-{\n-\tstruct mlx5_shared_counter_conf *conf = ctx;\n-\tstruct rte_eth_dev *dev = conf->dev;\n-\tstruct mlx5_flow_counter *cnt;\n-\n-\tdata->dword = flow_dv_counter_alloc(dev, 0);\n-\tdata->dword |= MLX5_CNT_SHARED_OFFSET;\n-\tcnt = flow_dv_counter_get_by_idx(dev, data->dword, NULL);\n-\tcnt->shared_info.id = conf->id;\n-\treturn 0;\n-}\n-\n-/**\n- * Get a shared flow counter.\n- *\n- * @param[in] dev\n- * Pointer to the Ethernet device structure.\n- * @param[in] id\n- * Counter identifier.\n- *\n- * @return\n- * Index to flow counter on success, 0 otherwise and rte_errno is set.\n- */\n-static uint32_t\n-flow_dv_counter_get_shared(struct rte_eth_dev *dev, uint32_t id)\n-{\n-\tstruct mlx5_priv *priv = dev->data->dev_private;\n-\tstruct mlx5_shared_counter_conf conf = {\n-\t\t.dev = dev,\n-\t\t.id = id,\n-\t};\n-\tunion mlx5_l3t_data data = {\n-\t\t.dword = 0,\n-\t};\n-\n-\tmlx5_l3t_prepare_entry(priv->sh->cnt_id_tbl, id, &data,\n-\t\t\t flow_dv_counter_alloc_shared_cb, &conf);\n-\treturn data.dword;\n-}\n-\n /**\n * Get age param from counter index.\n *\n@@ -6366,16 +6283,6 @@ flow_dv_counter_free(struct rte_eth_dev *dev, uint32_t counter)\n \tif (pool->is_aged) {\n \t\tflow_dv_counter_remove_from_age(dev, counter, cnt);\n \t} else {\n-\t\t/*\n-\t\t * If the counter action is shared by ID, the l3t_clear_entry\n-\t\t * function reduces its references counter. If after the\n-\t\t * reduction the action is still referenced, the function\n-\t\t * returns here and does not release it.\n-\t\t */\n-\t\tif (IS_LEGACY_SHARED_CNT(counter) &&\n-\t\t mlx5_l3t_clear_entry(priv->sh->cnt_id_tbl,\n-\t\t\t\t\t cnt->shared_info.id))\n-\t\t\treturn;\n \t\t/*\n \t\t * If the counter action is shared by indirect action API,\n \t\t * the atomic function reduces its references counter.\n@@ -6385,8 +6292,7 @@ flow_dv_counter_free(struct rte_eth_dev *dev, uint32_t counter)\n \t\t * indirect action API, shared info is 1 before the reduction,\n \t\t * so this condition is failed and function doesn't return here.\n \t\t */\n-\t\tif (!IS_LEGACY_SHARED_CNT(counter) &&\n-\t\t __atomic_sub_fetch(&cnt->shared_info.refcnt, 1,\n+\t\tif (__atomic_sub_fetch(&cnt->shared_info.refcnt, 1,\n \t\t\t\t __ATOMIC_RELAXED))\n \t\t\treturn;\n \t}\n@@ -7275,7 +7181,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,\n \t}\n \tfor (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {\n \t\tint type = actions->type;\n-\t\tbool shared_count = false;\n \n \t\tif (!mlx5_flow_os_action_supported(type))\n \t\t\treturn rte_flow_error_set(error, ENOTSUP,\n@@ -7427,8 +7332,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,\n \t\t\tbreak;\n \t\tcase MLX5_RTE_FLOW_ACTION_TYPE_COUNT:\n \t\tcase RTE_FLOW_ACTION_TYPE_COUNT:\n-\t\t\tshared_count = is_shared_action_count(actions);\n-\t\t\tret = flow_dv_validate_action_count(dev, shared_count,\n+\t\t\tret = flow_dv_validate_action_count(dev,\n \t\t\t\t\t\t\t action_flags,\n \t\t\t\t\t\t\t error);\n \t\t\tif (ret < 0)\n@@ -7747,12 +7651,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,\n \t\t\t * mutual exclusion with share counter actions.\n \t\t\t */\n \t\t\tif (!priv->sh->flow_hit_aso_en) {\n-\t\t\t\tif (shared_count)\n-\t\t\t\t\treturn rte_flow_error_set\n-\t\t\t\t\t\t(error, EINVAL,\n-\t\t\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION,\n-\t\t\t\t\t\tNULL,\n-\t\t\t\t\t\t\"old age and shared count combination is not supported\");\n \t\t\t\tif (sample_count)\n \t\t\t\t\treturn rte_flow_error_set\n \t\t\t\t\t\t(error, EINVAL,\n@@ -10837,16 +10735,14 @@ flow_dv_translate_action_port_id(struct rte_eth_dev *dev,\n static uint32_t\n flow_dv_translate_create_counter(struct rte_eth_dev *dev,\n \t\t\t\tstruct mlx5_flow *dev_flow,\n-\t\t\t\tconst struct rte_flow_action_count *count,\n+\t\t\t\tconst struct rte_flow_action_count *count\n+\t\t\t\t\t__rte_unused,\n \t\t\t\tconst struct rte_flow_action_age *age)\n {\n \tuint32_t counter;\n \tstruct mlx5_age_param *age_param;\n \n-\tif (count && count->shared)\n-\t\tcounter = flow_dv_counter_get_shared(dev, count->id);\n-\telse\n-\t\tcounter = flow_dv_counter_alloc(dev, !!age);\n+\tcounter = flow_dv_counter_alloc(dev, !!age);\n \tif (!counter || age == NULL)\n \t\treturn counter;\n \tage_param = flow_dv_counter_idx_get_age(dev, counter);\n@@ -13216,8 +13112,7 @@ flow_dv_translate(struct rte_eth_dev *dev,\n \t\t\t * when they are not shared.\n \t\t\t */\n \t\t\tif (action_flags & MLX5_FLOW_ACTION_AGE) {\n-\t\t\t\tif ((non_shared_age &&\n-\t\t\t\t count && !count->shared) ||\n+\t\t\t\tif ((non_shared_age && count) ||\n \t\t\t\t !(priv->sh->flow_hit_aso_en &&\n \t\t\t\t (attr->group || attr->transfer))) {\n \t\t\t\t\t/* Creates age by counters. */\n@@ -17469,19 +17364,7 @@ flow_dv_action_validate(struct rte_eth_dev *dev,\n \t\t\t\t\t\t\"Indirect age action not supported\");\n \t\treturn flow_dv_validate_action_age(0, action, dev, err);\n \tcase RTE_FLOW_ACTION_TYPE_COUNT:\n-\t\t/*\n-\t\t * There are two mechanisms to share the action count.\n-\t\t * The old mechanism uses the shared field to share, while the\n-\t\t * new mechanism uses the indirect action API.\n-\t\t * This validation comes to make sure that the two mechanisms\n-\t\t * are not combined.\n-\t\t */\n-\t\tif (is_shared_action_count(action))\n-\t\t\treturn rte_flow_error_set(err, ENOTSUP,\n-\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n-\t\t\t\t\t\t NULL,\n-\t\t\t\t\t\t \"Mix shared and indirect counter is not supported\");\n-\t\treturn flow_dv_validate_action_count(dev, true, 0, err);\n+\t\treturn flow_dv_validate_action_count(dev, 0, err);\n \tcase RTE_FLOW_ACTION_TYPE_CONNTRACK:\n \t\tif (!priv->sh->ct_aso_en)\n \t\t\treturn rte_flow_error_set(err, ENOTSUP,\ndiff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c\nindex b93fd4d2c9..1627c3905f 100644\n--- a/drivers/net/mlx5/mlx5_flow_verbs.c\n+++ b/drivers/net/mlx5/mlx5_flow_verbs.c\n@@ -250,8 +250,6 @@ flow_verbs_counter_create(struct rte_eth_dev *dev,\n *\n * @param[in] dev\n * Pointer to the Ethernet device structure.\n- * @param[in] shared\n- * Indicate if this counter is shared with other flows.\n * @param[in] id\n * Counter identifier.\n *\n@@ -259,21 +257,17 @@ flow_verbs_counter_create(struct rte_eth_dev *dev,\n * Index to the counter, 0 otherwise and rte_errno is set.\n */\n static uint32_t\n-flow_verbs_counter_new(struct rte_eth_dev *dev, uint32_t shared, uint32_t id)\n+flow_verbs_counter_new(struct rte_eth_dev *dev, uint32_t id __rte_unused)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_flow_counter_mng *cmng = &priv->sh->cmng;\n \tstruct mlx5_flow_counter_pool *pool = NULL;\n \tstruct mlx5_flow_counter *cnt = NULL;\n-\tunion mlx5_l3t_data data;\n \tuint32_t n_valid = cmng->n_valid;\n \tuint32_t pool_idx, cnt_idx;\n \tuint32_t i;\n \tint ret;\n \n-\tif (shared && !mlx5_l3t_get_entry(priv->sh->cnt_id_tbl, id, &data) &&\n-\t data.dword)\n-\t\treturn data.dword;\n \tfor (pool_idx = 0; pool_idx < n_valid; ++pool_idx) {\n \t\tpool = cmng->pools[pool_idx];\n \t\tif (!pool)\n@@ -320,13 +314,6 @@ flow_verbs_counter_new(struct rte_eth_dev *dev, uint32_t shared, uint32_t id)\n \tTAILQ_REMOVE(&pool->counters[0], cnt, next);\n \ti = MLX5_CNT_ARRAY_IDX(pool, cnt);\n \tcnt_idx = MLX5_MAKE_CNT_IDX(pool_idx, i);\n-\tif (shared) {\n-\t\tdata.dword = cnt_idx;\n-\t\tif (mlx5_l3t_set_entry(priv->sh->cnt_id_tbl, id, &data))\n-\t\t\treturn 0;\n-\t\tcnt->shared_info.id = id;\n-\t\tcnt_idx |= MLX5_CNT_SHARED_OFFSET;\n-\t}\n \t/* Create counter with Verbs. */\n \tret = flow_verbs_counter_create(dev, cnt);\n \tif (!ret) {\n@@ -352,14 +339,10 @@ flow_verbs_counter_new(struct rte_eth_dev *dev, uint32_t shared, uint32_t id)\n static void\n flow_verbs_counter_release(struct rte_eth_dev *dev, uint32_t counter)\n {\n-\tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_flow_counter_pool *pool;\n \tstruct mlx5_flow_counter *cnt;\n \n \tcnt = flow_verbs_counter_get_by_idx(dev, counter, &pool);\n-\tif (IS_LEGACY_SHARED_CNT(counter) &&\n-\t mlx5_l3t_clear_entry(priv->sh->cnt_id_tbl, cnt->shared_info.id))\n-\t\treturn;\n #if defined(HAVE_IBV_DEVICE_COUNTERS_SET_V42)\n \tclaim_zero(mlx5_glue->destroy_counter_set\n \t\t\t((struct ibv_counter_set *)cnt->dcs_when_active));\n@@ -1198,8 +1181,7 @@ flow_verbs_translate_action_count(struct mlx5_flow *dev_flow,\n #endif\n \n \tif (!flow->counter) {\n-\t\tflow->counter = flow_verbs_counter_new(dev, count->shared,\n-\t\t\t\t\t\t count->id);\n+\t\tflow->counter = flow_verbs_counter_new(dev, count->id);\n \t\tif (!flow->counter)\n \t\t\treturn rte_flow_error_set(error, rte_errno,\n \t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\ndiff --git a/drivers/net/octeontx2/otx2_flow_parse.c b/drivers/net/octeontx2/otx2_flow_parse.c\nindex 63a33142a5..30a232f033 100644\n--- a/drivers/net/octeontx2/otx2_flow_parse.c\n+++ b/drivers/net/octeontx2/otx2_flow_parse.c\n@@ -901,7 +901,6 @@ otx2_flow_parse_actions(struct rte_eth_dev *dev,\n \tstruct otx2_eth_dev *hw = dev->data->dev_private;\n \tstruct otx2_npc_flow_info *npc = &hw->npc_flow;\n \tconst struct rte_flow_action_port_id *port_act;\n-\tconst struct rte_flow_action_count *act_count;\n \tconst struct rte_flow_action_mark *act_mark;\n \tconst struct rte_flow_action_queue *act_q;\n \tconst struct rte_flow_action_vf *vf_act;\n@@ -947,15 +946,6 @@ otx2_flow_parse_actions(struct rte_eth_dev *dev,\n \t\t\tbreak;\n \n \t\tcase RTE_FLOW_ACTION_TYPE_COUNT:\n-\t\t\tact_count =\n-\t\t\t\t(const struct rte_flow_action_count *)\n-\t\t\t\tactions->conf;\n-\n-\t\t\tif (act_count->shared == 1) {\n-\t\t\t\terrmsg = \"Shared Counters not supported\";\n-\t\t\t\terrcode = ENOTSUP;\n-\t\t\t\tgoto err_exit;\n-\t\t\t}\n \t\t\t/* Indicates, need a counter */\n \t\t\tflow->ctr_id = 1;\n \t\t\treq_act |= OTX2_FLOW_ACT_COUNT;\ndiff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c\nindex 4b520bc619..5fcdf9c2f5 100644\n--- a/drivers/net/sfc/sfc_mae.c\n+++ b/drivers/net/sfc/sfc_mae.c\n@@ -2802,16 +2802,12 @@ sfc_mae_rule_parse_action_mark(struct sfc_adapter *sa,\n \n static int\n sfc_mae_rule_parse_action_count(struct sfc_adapter *sa,\n-\t\t\t\tconst struct rte_flow_action_count *conf,\n+\t\t\t\tconst struct rte_flow_action_count *conf\n+\t\t\t\t\t__rte_unused,\n \t\t\t\tefx_mae_actions_t *spec)\n {\n \tint rc;\n \n-\tif (conf->shared) {\n-\t\trc = ENOTSUP;\n-\t\tgoto fail_counter_shared;\n-\t}\n-\n \tif ((sa->counter_rxq.state & SFC_COUNTER_RXQ_INITIALIZED) == 0) {\n \t\tsfc_err(sa,\n \t\t\t\"counter queue is not configured for COUNT action\");\n@@ -2837,7 +2833,6 @@ sfc_mae_rule_parse_action_count(struct sfc_adapter *sa,\n fail_populate_count:\n fail_no_service_core:\n fail_counter_queue_uninit:\n-fail_counter_shared:\n \n \treturn rc;\n }\ndiff --git a/drivers/net/softnic/rte_eth_softnic_flow.c b/drivers/net/softnic/rte_eth_softnic_flow.c\nindex 27eaf380cd..39038d26d8 100644\n--- a/drivers/net/softnic/rte_eth_softnic_flow.c\n+++ b/drivers/net/softnic/rte_eth_softnic_flow.c\n@@ -1448,13 +1448,6 @@ flow_rule_action_get(struct pmd_internals *softnic,\n \t\t\t\t\taction,\n \t\t\t\t\t\"COUNT: Null configuration\");\n \n-\t\t\tif (conf->shared)\n-\t\t\t\treturn rte_flow_error_set(error,\n-\t\t\t\t\tENOTSUP,\n-\t\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION_CONF,\n-\t\t\t\t\tconf,\n-\t\t\t\t\t\"COUNT: Shared counters not supported\");\n-\n \t\t\tif (n_count)\n \t\t\t\treturn rte_flow_error_set(error,\n \t\t\t\t\tENOTSUP,\ndiff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h\nindex 7b1ed7f110..5306e8ca4b 100644\n--- a/lib/ethdev/rte_flow.h\n+++ b/lib/ethdev/rte_flow.h\n@@ -75,7 +75,7 @@ extern \"C\" {\n * At least one direction must be specified.\n *\n * Specifying both directions at once for a given rule is not recommended\n- * but may be valid in a few cases (e.g. shared counter).\n+ * but may be valid in a few cases.\n */\n struct rte_flow_attr {\n \tuint32_t group; /**< Priority group. */\n@@ -2498,24 +2498,11 @@ struct rte_flow_query_age {\n * Counters can be retrieved and reset through ``rte_flow_query()``, see\n * ``struct rte_flow_query_count``.\n *\n- * @deprecated Shared attribute is deprecated, use generic\n- * RTE_FLOW_ACTION_TYPE_INDIRECT action.\n- *\n- * The shared flag indicates whether the counter is unique to the flow rule the\n- * action is specified with, or whether it is a shared counter.\n- *\n- * For a count action with the shared flag set, then then a global device\n- * namespace is assumed for the counter id, so that any matched flow rules using\n- * a count action with the same counter id on the same port will contribute to\n- * that counter.\n- *\n * For ports within the same switch domain then the counter id namespace extends\n * to all ports within that switch domain.\n */\n struct rte_flow_action_count {\n-\t/** @deprecated Share counter ID with other flow rules. */\n-\tuint32_t shared:1;\n-\tuint32_t reserved:31; /**< Reserved, must be zero. */\n+\tuint32_t reserved; /**< Reserved, must be zero. */\n \tuint32_t id; /**< Counter ID. */\n };\n \n", "prefixes": [] }