Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/91442/?format=api
{ "id": 91442, "url": "https://patches.dpdk.org/api/patches/91442/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1618395600-215396-2-git-send-email-haifeil@nvidia.com/", "project": { "id": 1, "url": "https://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": "<1618395600-215396-2-git-send-email-haifeil@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1618395600-215396-2-git-send-email-haifeil@nvidia.com", "date": "2021-04-14T10:19:59", "name": "[v6,1/2] ethdev: dump single flow rule", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "14b5555e7b6d2e620564bfe465d5ee30967398ff", "submitter": { "id": 2131, "url": "https://patches.dpdk.org/api/people/2131/?format=api", "name": "Haifei Luo", "email": "haifeil@nvidia.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1618395600-215396-2-git-send-email-haifeil@nvidia.com/mbox/", "series": [ { "id": 16367, "url": "https://patches.dpdk.org/api/series/16367/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=16367", "date": "2021-04-14T10:19:58", "name": "single flow dump", "version": 6, "mbox": "https://patches.dpdk.org/series/16367/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/91442/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/91442/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 BAA1CA0562;\n\tWed, 14 Apr 2021 12:20:10 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 39286161961;\n\tWed, 14 Apr 2021 12:20:07 +0200 (CEST)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by mails.dpdk.org (Postfix) with ESMTP id E35B5161959\n for <dev@dpdk.org>; Wed, 14 Apr 2021 12:20:04 +0200 (CEST)", "from Internal Mail-Server by MTLPINE1 (envelope-from\n haifeil@nvidia.com) with SMTP; 14 Apr 2021 13:20:03 +0300", "from nvidia.com (gen-l-vrt-173.mtl.labs.mlnx [10.234.173.1])\n by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 13EAK2aF029750;\n Wed, 14 Apr 2021 13:20:02 +0300" ], "From": "Haifei Luo <haifeil@nvidia.com>", "To": "dev@dpdk.org", "Cc": "orika@nvidia.com, viacheslavo@nvidia.com, rasland@nvidia.com,\n xuemingl@nvidia.com, haifeil@nvidia.com, ajit.khaparde@broadcom.com,\n Xiaoyun Li <xiaoyun.li@intel.com>, Matan Azrad <matan@nvidia.com>,\n Shahaf Shuler <shahafs@nvidia.com>, Jerin Jacob <jerinj@marvell.com>,\n Nithin Dabilpuram <ndabilpuram@marvell.com>,\n Kiran Kumar K <kirankumark@marvell.com>,\n Thomas Monjalon <thomas@monjalon.net>,\n Ferruh Yigit <ferruh.yigit@intel.com>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "Date": "Wed, 14 Apr 2021 13:19:59 +0300", "Message-Id": "<1618395600-215396-2-git-send-email-haifeil@nvidia.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1618395600-215396-1-git-send-email-haifeil@nvidia.com>", "References": "<1615277716-64404-1-git-send-email-haifeil@nvidia.com>\n <1618395600-215396-1-git-send-email-haifeil@nvidia.com>", "Subject": "[dpdk-dev] [PATCH v6 1/2] ethdev: dump single flow rule", "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": "Previous implementations support dump all the flows. Add new arg\nrte_flow in rte_flow_dev_dump to dump one flow.\n\nSigned-off-by: Haifei Luo <haifeil@nvidia.com>\nAcked-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\nAcked-by: Ori Kam <orika@nvidia.com>\n---\n app/test-pmd/config.c | 2 +-\n doc/guides/nics/mlx5.rst | 9 ++++++---\n doc/guides/rel_notes/release_21_05.rst | 3 +++\n drivers/net/mlx5/linux/mlx5_socket.c | 2 +-\n drivers/net/mlx5/mlx5.h | 4 ++--\n drivers/net/mlx5/mlx5_flow.c | 9 ++++++---\n drivers/net/octeontx2/otx2_flow.c | 9 ++++++++-\n lib/librte_ethdev/rte_flow.c | 5 +++--\n lib/librte_ethdev/rte_flow.h | 5 ++++-\n lib/librte_ethdev/rte_flow_driver.h | 1 +\n 10 files changed, 35 insertions(+), 14 deletions(-)", "diff": "diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c\nindex a5e82b7..ca34a63 100644\n--- a/app/test-pmd/config.c\n+++ b/app/test-pmd/config.c\n@@ -1932,7 +1932,7 @@ struct rte_flow_shared_action *\n \t\t\treturn -errno;\n \t\t}\n \t}\n-\tret = rte_flow_dev_dump(port_id, file, &error);\n+\tret = rte_flow_dev_dump(port_id, NULL, file, &error);\n \tif (ret) {\n \t\tport_flow_complain(&error);\n \t\tprintf(\"Failed to dump flow: %s\\n\", strerror(-ret));\ndiff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst\nindex 490329a..7ff92b0 100644\n--- a/doc/guides/nics/mlx5.rst\n+++ b/doc/guides/nics/mlx5.rst\n@@ -1837,13 +1837,16 @@ all flows with assistance of external tools.\n \n .. code-block:: console\n \n- testpmd> flow dump <port> <output_file>\n+ To dump all flows:\n+ testpmd> flow dump <port> all <output_file>\n+ and dump one flow:\n+ testpmd> flow dump <port> rule <rule_id> <output_file>\n \n - call rte_flow_dev_dump api:\n \n .. code-block:: console\n \n- rte_flow_dev_dump(port, file, NULL);\n+ rte_flow_dev_dump(port, flow, file, NULL);\n \n #. Dump human-readable flows from raw file:\n \n@@ -1851,4 +1854,4 @@ all flows with assistance of external tools.\n \n .. code-block:: console\n \n- mlx_steering_dump.py -f <output_file>\n+ mlx_steering_dump.py -f <output_file> -flowptr <flow_ptr>\ndiff --git a/doc/guides/rel_notes/release_21_05.rst b/doc/guides/rel_notes/release_21_05.rst\nindex a0b9079..6d209a2 100644\n--- a/doc/guides/rel_notes/release_21_05.rst\n+++ b/doc/guides/rel_notes/release_21_05.rst\n@@ -207,6 +207,9 @@ API Changes\n Also, make sure to start the actual text at the margin.\n =======================================================\n \n+* ethdev: Added a rte_flow pointer parameter to the function\n+ ``rte_flow_dev_dump()`` allowing dump for single flow.\n+\n * eal: The experimental TLS API added in ``rte_thread.h`` has been renamed\n from ``rte_thread_tls_*`` to ``rte_thread_*`` to avoid naming redundancy\n and confusion with the transport layer security term.\ndiff --git a/drivers/net/mlx5/linux/mlx5_socket.c b/drivers/net/mlx5/linux/mlx5_socket.c\nindex b1f41bc..6e354f4 100644\n--- a/drivers/net/mlx5/linux/mlx5_socket.c\n+++ b/drivers/net/mlx5/linux/mlx5_socket.c\n@@ -84,7 +84,7 @@\n \t}\n \t/* Dump flow. */\n \tdev = &rte_eth_devices[port_id];\n-\tret = mlx5_flow_dev_dump(dev, file, NULL);\n+\tret = mlx5_flow_dev_dump(dev, NULL, file, NULL);\n \t/* Set-up the ancillary data and reply. */\n \tmsg.msg_controllen = 0;\n \tmsg.msg_control = NULL;\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex 0f69f9d..e0f7101 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -1245,8 +1245,8 @@ void mlx5_flow_async_pool_query_handle(struct mlx5_dev_ctx_shared *sh,\n void mlx5_counter_free(struct rte_eth_dev *dev, uint32_t cnt);\n int mlx5_counter_query(struct rte_eth_dev *dev, uint32_t cnt,\n \t\t bool clear, uint64_t *pkts, uint64_t *bytes);\n-int mlx5_flow_dev_dump(struct rte_eth_dev *dev, FILE *file,\n-\t\t struct rte_flow_error *error);\n+int mlx5_flow_dev_dump(struct rte_eth_dev *dev, struct rte_flow *flow,\n+\t\t\tFILE *file, struct rte_flow_error *error);\n void mlx5_flow_rxq_dynf_metadata_set(struct rte_eth_dev *dev);\n int mlx5_flow_get_aged_flows(struct rte_eth_dev *dev, void **contexts,\n \t\t\tuint32_t nb_contexts, struct rte_flow_error *error);\ndiff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c\nindex 668c32c..a8cf674 100644\n--- a/drivers/net/mlx5/mlx5_flow.c\n+++ b/drivers/net/mlx5/mlx5_flow.c\n@@ -7154,7 +7154,7 @@ struct mlx5_meter_domains_infos *\n * 0 on success, a nagative value otherwise.\n */\n int\n-mlx5_flow_dev_dump(struct rte_eth_dev *dev,\n+mlx5_flow_dev_dump(struct rte_eth_dev *dev, struct rte_flow *flow_idx,\n \t\t FILE *file,\n \t\t struct rte_flow_error *error __rte_unused)\n {\n@@ -7166,8 +7166,11 @@ struct mlx5_meter_domains_infos *\n \t\t\treturn -errno;\n \t\treturn -ENOTSUP;\n \t}\n-\treturn mlx5_devx_cmd_flow_dump(sh->fdb_domain, sh->rx_domain,\n-\t\t\t\t sh->tx_domain, file);\n+\n+\tif (!flow_idx)\n+\t\treturn mlx5_devx_cmd_flow_dump(sh->fdb_domain,\n+\t\t\t\tsh->rx_domain, sh->tx_domain, file);\n+\treturn -ENOTSUP;\n }\n \n /**\ndiff --git a/drivers/net/octeontx2/otx2_flow.c b/drivers/net/octeontx2/otx2_flow.c\nindex 14ac9bc..1c90d75 100644\n--- a/drivers/net/octeontx2/otx2_flow.c\n+++ b/drivers/net/octeontx2/otx2_flow.c\n@@ -807,7 +807,7 @@\n \n static int\n otx2_flow_dev_dump(struct rte_eth_dev *dev,\n-\t\t FILE *file,\n+\t\t struct rte_flow *flow, FILE *file,\n \t\t struct rte_flow_error *error)\n {\n \tstruct otx2_eth_dev *hw = dev->data->dev_private;\n@@ -822,6 +822,13 @@\n \t\t\t\t \"Invalid file\");\n \t\treturn -EINVAL;\n \t}\n+\tif (flow != NULL) {\n+\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_HANDLE,\n+\t\t\t\t NULL,\n+\t\t\t\t \"Invalid argument\");\n+\t\treturn -EINVAL;\n+\t}\n \n \tmax_prio = hw->npc_flow.flow_max_priority;\n \ndiff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c\nindex e07e617..7241f00 100644\n--- a/lib/librte_ethdev/rte_flow.c\n+++ b/lib/librte_ethdev/rte_flow.c\n@@ -1027,7 +1027,8 @@ enum rte_flow_conv_item_spec_type {\n }\n \n int\n-rte_flow_dev_dump(uint16_t port_id, FILE *file, struct rte_flow_error *error)\n+rte_flow_dev_dump(uint16_t port_id, struct rte_flow *flow,\n+\t\t\tFILE *file, struct rte_flow_error *error)\n {\n \tstruct rte_eth_dev *dev = &rte_eth_devices[port_id];\n \tconst struct rte_flow_ops *ops = rte_flow_ops_get(port_id, error);\n@@ -1037,7 +1038,7 @@ enum rte_flow_conv_item_spec_type {\n \t\treturn -rte_errno;\n \tif (likely(!!ops->dev_dump)) {\n \t\tfts_enter(dev);\n-\t\tret = ops->dev_dump(dev, file, error);\n+\t\tret = ops->dev_dump(dev, flow, file, error);\n \t\tfts_exit(dev);\n \t\treturn flow_err(port_id, ret, error);\n \t}\ndiff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h\nindex c476a0f..5eba79d 100644\n--- a/lib/librte_ethdev/rte_flow.h\n+++ b/lib/librte_ethdev/rte_flow.h\n@@ -3232,6 +3232,8 @@ enum rte_flow_conv_op {\n *\n * @param[in] port_id\n * The port identifier of the Ethernet device.\n+ * @param[in] flow\n+ * The pointer of flow rule to dump. Dump all rules if NULL.\n * @param[in] file\n * A pointer to a file for output.\n * @param[out] error\n@@ -3242,7 +3244,8 @@ enum rte_flow_conv_op {\n */\n __rte_experimental\n int\n-rte_flow_dev_dump(uint16_t port_id, FILE *file, struct rte_flow_error *error);\n+rte_flow_dev_dump(uint16_t port_id, struct rte_flow *flow,\n+\t\tFILE *file, struct rte_flow_error *error);\n \n /**\n * Check if mbuf dynamic field for metadata is registered.\ndiff --git a/lib/librte_ethdev/rte_flow_driver.h b/lib/librte_ethdev/rte_flow_driver.h\nindex da594d9..6ae1f8c 100644\n--- a/lib/librte_ethdev/rte_flow_driver.h\n+++ b/lib/librte_ethdev/rte_flow_driver.h\n@@ -75,6 +75,7 @@ struct rte_flow_ops {\n \t/** See rte_flow_dev_dump(). */\n \tint (*dev_dump)\n \t\t(struct rte_eth_dev *dev,\n+\t\t struct rte_flow *flow,\n \t\t FILE *file,\n \t\t struct rte_flow_error *error);\n \t/** See rte_flow_get_aged_flows() */\n", "prefixes": [ "v6", "1/2" ] }