Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/79151/?format=api
{ "id": 79151, "url": "https://patches.dpdk.org/api/patches/79151/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200929075330.40201-1-chenxux.di@intel.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": "<20200929075330.40201-1-chenxux.di@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200929075330.40201-1-chenxux.di@intel.com", "date": "2020-09-29T07:53:30", "name": "[RFC,5/5] app/testpmd: add support for ixgbe FDIR configuration", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "7f3b34ace18f5c7c567dd3285aa3e03d55dab044", "submitter": { "id": 1409, "url": "https://patches.dpdk.org/api/people/1409/?format=api", "name": "Chenxu Di", "email": "chenxux.di@intel.com" }, "delegate": { "id": 1540, "url": "https://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20200929075330.40201-1-chenxux.di@intel.com/mbox/", "series": [ { "id": 12581, "url": "https://patches.dpdk.org/api/series/12581/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=12581", "date": "2020-09-29T07:48:33", "name": "[RFC,1/5] net/i40e: decouple dependency from superseded structures", "version": 1, "mbox": "https://patches.dpdk.org/series/12581/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/79151/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/79151/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id ECD69A04C0;\n\tTue, 29 Sep 2020 10:11:19 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id CCC5D1D945;\n\tTue, 29 Sep 2020 10:10:30 +0200 (CEST)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n by dpdk.org (Postfix) with ESMTP id 1C4011D938\n for <dev@dpdk.org>; Tue, 29 Sep 2020 10:10:26 +0200 (CEST)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 29 Sep 2020 01:10:23 -0700", "from unknown (HELO localhost.localdomain) ([10.239.255.61])\n by fmsmga002.fm.intel.com with ESMTP; 29 Sep 2020 01:10:20 -0700" ], "IronPort-SDR": [ "\n YjtQHu5NfaxPPTYFqVn+acCFSqargwmJZoWna4iy+k0OwEoV9Dj3tbrQ3npdnUpxLQKyCNsyRO\n MMecj5DTMqfA==", "\n NsU0IVqiPyvg2IceZ9MvH5UVCpqyGYKbIvNnh3yf+FmY/v0QTkfs0MLA1If+2Mc1iBg00xMAZz\n /4rmuT8zaBhQ==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9758\"; a=\"159516221\"", "E=Sophos;i=\"5.77,317,1596524400\"; d=\"scan'208\";a=\"159516221\"", "E=Sophos;i=\"5.77,317,1596524400\"; d=\"scan'208\";a=\"345186740\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Chenxu Di <chenxux.di@intel.com>", "To": "dev@dpdk.org", "Cc": "junyux.jiang@intel.com, shougangx.wang@intel.com,\n Wenzhuo Lu <wenzhuo.lu@intel.com>, Beilei Xing <beilei.xing@intel.com>,\n Chenxu Di <chenxux.di@intel.com>", "Date": "Tue, 29 Sep 2020 07:53:30 +0000", "Message-Id": "<20200929075330.40201-1-chenxux.di@intel.com>", "X-Mailer": "git-send-email 2.17.1", "Subject": "[dpdk-dev] [RFC 5/5] app/testpmd: add support for ixgbe FDIR\n\tconfiguration", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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": "As annouced in deprecation.rst, the \"rte_eth_conf.fdir_conf\" field\nwill be removed, but IXGBE generic flow still needs to depend on these\nconfigurations. This patch adds setting FDIR configuration for IXGBE PMD\nby calling private API.\n\nSigned-off-by: Chenxu Di <chenxux.di@intel.com>\n---\n app/test-pmd/parameters.c | 63 ++++++++++++++++++++++++++++++++++++++-\n app/test-pmd/testpmd.c | 28 +++++++++++++++++\n app/test-pmd/testpmd.h | 3 ++\n 3 files changed, 93 insertions(+), 1 deletion(-)", "diff": "diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c\nindex 8c2aa13dd..f9547a4d2 100644\n--- a/app/test-pmd/parameters.c\n+++ b/app/test-pmd/parameters.c\n@@ -42,6 +42,9 @@\n #ifdef RTE_LIBRTE_PMD_BOND\n #include <rte_eth_bond.h>\n #endif\n+#ifdef RTE_LIBRTE_IXGBE_PMD\n+#include <rte_pmd_ixgbe.h>\n+#endif\n #include <rte_flow.h>\n \n #include \"testpmd.h\"\n@@ -935,6 +938,29 @@ launch_args_parse(int argc, char** argv)\n \t\t\t\t\t\t \"none, signature, perfect, perfect-mac-vlan\"\n \t\t\t\t\t\t \" or perfect-tunnel\\n\",\n \t\t\t\t\t\t optarg);\n+#ifdef RTE_LIBRTE_IXGBE_PMD\n+\t\t\t\tif (!strcmp(optarg, \"signature\"))\n+\t\t\t\t\tixgbe_fdir_conf.mode =\n+\t\t\t\t\t\tRTE_PMD_IXGBE_FDIR_MODE_SIGNATURE;\n+\t\t\t\telse if (!strcmp(optarg, \"perfect\"))\n+\t\t\t\t\tixgbe_fdir_conf.mode =\n+\t\t\t\t\t\tRTE_PMD_IXGBE_FDIR_MODE_PERFECT;\n+\t\t\t\telse if (!strcmp(optarg, \"perfect-mac-vlan\"))\n+\t\t\t\t\tixgbe_fdir_conf.mode =\n+\t\t\t\t\t\tRTE_PMD_IXGBE_FDIR_MODE_PERFECT_MAC_VLAN;\n+\t\t\t\telse if (!strcmp(optarg, \"perfect-tunnel\"))\n+\t\t\t\t\tixgbe_fdir_conf.mode =\n+\t\t\t\t\t\tRTE_PMD_IXGBE_FDIR_MODE_PERFECT_TUNNEL;\n+\t\t\t\telse if (!strcmp(optarg, \"none\"))\n+\t\t\t\t\tixgbe_fdir_conf.mode =\n+\t\t\t\t\t\tRTE_PMD_IXGBE_FDIR_MODE_NONE;\n+\t\t\t\telse\n+\t\t\t\t\trte_exit(EXIT_FAILURE,\n+\t\t\t\t\t\t \"pkt-mode-invalid %s invalid - must be: \"\n+\t\t\t\t\t\t \"none, signature, perfect, perfect-mac-vlan\"\n+\t\t\t\t\t\t \" or perfect-tunnel\\n\",\n+\t\t\t\t\t\t optarg);\n+#endif\n \t\t\t}\n \t\t\tif (!strcmp(lgopts[opt_idx].name,\n \t\t\t\t \"pkt-filter-report-hash\")) {\n@@ -952,6 +978,22 @@ launch_args_parse(int argc, char** argv)\n \t\t\t\t\t\t \"pkt-filter-report-hash %s invalid \"\n \t\t\t\t\t\t \"- must be: none or match or always\\n\",\n \t\t\t\t\t\t optarg);\n+#ifdef RTE_LIBRTE_IXGBE_PMD\n+\t\t\t\tif (!strcmp(optarg, \"none\"))\n+\t\t\t\t\tixgbe_fdir_conf.status =\n+\t\t\t\t\t\tRTE_PMD_IXGBE_FDIR_NO_REPORT_STATUS;\n+\t\t\t\telse if (!strcmp(optarg, \"match\"))\n+\t\t\t\t\tixgbe_fdir_conf.status =\n+\t\t\t\t\t\tRTE_PMD_IXGBE_FDIR_REPORT_STATUS;\n+\t\t\t\telse if (!strcmp(optarg, \"always\"))\n+\t\t\t\t\tixgbe_fdir_conf.status =\n+\t\t\t\t\t\tRTE_PMD_IXGBE_FDIR_REPORT_STATUS_ALWAYS;\n+\t\t\t\telse\n+\t\t\t\t\trte_exit(EXIT_FAILURE,\n+\t\t\t\t\t\t \"pkt-filter-report-hash %s invalid \"\n+\t\t\t\t\t\t \"- must be: none or match or always\\n\",\n+\t\t\t\t\t\t optarg);\n+#endif\n \t\t\t}\n \t\t\tif (!strcmp(lgopts[opt_idx].name, \"pkt-filter-size\")) {\n \t\t\t\tif (!strcmp(optarg, \"64K\"))\n@@ -967,12 +1009,31 @@ launch_args_parse(int argc, char** argv)\n \t\t\t\t\trte_exit(EXIT_FAILURE, \"pkt-filter-size %s invalid -\"\n \t\t\t\t\t\t \" must be: 64K or 128K or 256K\\n\",\n \t\t\t\t\t\t optarg);\n+#ifdef RTE_LIBRTE_IXGBE_PMD\n+\t\t\t\tif (!strcmp(optarg, \"64K\"))\n+\t\t\t\t\tixgbe_fdir_conf.pballoc =\n+\t\t\t\t\t\tRTE_PMD_IXGBE_FDIR_PBALLOC_64K;\n+\t\t\t\telse if (!strcmp(optarg, \"128K\"))\n+\t\t\t\t\tixgbe_fdir_conf.pballoc =\n+\t\t\t\t\t\tRTE_PMD_IXGBE_FDIR_PBALLOC_128K;\n+\t\t\t\telse if (!strcmp(optarg, \"256K\"))\n+\t\t\t\t\tixgbe_fdir_conf.pballoc =\n+\t\t\t\t\t\tRTE_PMD_IXGBE_FDIR_PBALLOC_256K;\n+\t\t\t\telse\n+\t\t\t\t\trte_exit(EXIT_FAILURE, \"pkt-filter-size %s invalid -\"\n+\t\t\t\t\t\t \" must be: 64K or 128K or 256K\\n\",\n+\t\t\t\t\t\t optarg);\n+#endif\n \t\t\t}\n \t\t\tif (!strcmp(lgopts[opt_idx].name,\n \t\t\t\t \"pkt-filter-drop-queue\")) {\n \t\t\t\tn = atoi(optarg);\n-\t\t\t\tif (n >= 0)\n+\t\t\t\tif (n >= 0) {\n \t\t\t\t\tfdir_conf.drop_queue = (uint8_t) n;\n+#ifdef RTE_LIBRTE_IXGBE_PMD\n+\t\t\t\t\tixgbe_fdir_conf.drop_queue = (uint8_t) n;\n+#endif\n+\t\t\t\t}\n \t\t\t\telse\n \t\t\t\t\trte_exit(EXIT_FAILURE,\n \t\t\t\t\t\t \"drop queue %d invalid - must\"\ndiff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c\nindex ee3dd27d8..155063dbc 100644\n--- a/app/test-pmd/testpmd.c\n+++ b/app/test-pmd/testpmd.c\n@@ -459,6 +459,31 @@ struct rte_fdir_conf fdir_conf = {\n \t.drop_queue = 127,\n };\n \n+#ifdef RTE_LIBRTE_IXGBE_PMD\n+struct rte_pmd_ixgbe_fdir_conf ixgbe_fdir_conf = {\n+\t.mode = RTE_PMD_IXGBE_FDIR_MODE_NONE,\n+\t.pballoc = RTE_PMD_IXGBE_FDIR_PBALLOC_64K,\n+\t.status = RTE_PMD_IXGBE_FDIR_REPORT_STATUS,\n+\t.mask = {\n+\t\t.vlan_tci_mask = 0xFFEF,\n+\t\t.ipv4_mask = {\n+\t\t\t.src_ip = 0xFFFFFFFF,\n+\t\t\t.dst_ip = 0xFFFFFFFF,\n+\t\t},\n+\t\t.ipv6_mask = {\n+\t\t\t.src_ip = {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},\n+\t\t\t.dst_ip = {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF},\n+\t\t},\n+\t\t.src_port_mask = 0xFFFF,\n+\t\t.dst_port_mask = 0xFFFF,\n+\t\t.mac_addr_byte_mask = 0xFF,\n+\t\t.tunnel_type_mask = 1,\n+\t\t.tunnel_id_mask = 0xFFFFFFFF,\n+\t},\n+\t.drop_queue = 127,\n+};\n+#endif\n+\n volatile int test_done = 1; /* stop packet forwarding when set to 1. */\n \n struct queue_stats_mappings tx_queue_stats_mappings_array[MAX_TX_QUEUE_STATS_MAPPINGS];\n@@ -3342,6 +3367,9 @@ init_port_config(void)\n \tRTE_ETH_FOREACH_DEV(pid) {\n \t\tport = &ports[pid];\n \t\tport->dev_conf.fdir_conf = fdir_conf;\n+#ifdef RTE_LIBRTE_IXGBE_PMD\n+\t\trte_pmd_ixgbe_update_fdir_conf(pid, ixgbe_fdir_conf);\n+#endif\n \n \t\tret = eth_dev_info_get_print_err(pid, &port->dev_info);\n \t\tif (ret != 0)\ndiff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h\nindex f139fe7a0..8adb31b4f 100644\n--- a/app/test-pmd/testpmd.h\n+++ b/app/test-pmd/testpmd.h\n@@ -409,6 +409,9 @@ extern uint8_t bitrate_enabled;\n #endif\n \n extern struct rte_fdir_conf fdir_conf;\n+#ifdef RTE_LIBRTE_IXGBE_PMD\n+extern struct rte_pmd_ixgbe_fdir_conf ixgbe_fdir_conf;\n+#endif\n \n /*\n * Configuration of packet segments used by the \"txonly\" processing engine.\n", "prefixes": [ "RFC", "5/5" ] }