Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/58663/?format=api
{ "id": 58663, "url": "http://patchwork.dpdk.org/api/patches/58663/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20190905145315.19395-9-ferruh.yigit@intel.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20190905145315.19395-9-ferruh.yigit@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190905145315.19395-9-ferruh.yigit@intel.com", "date": "2019-09-05T14:53:13", "name": "[08/10] app/testpmd: fix global variable multiple definitions", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "e26634a7307266790f1c3d728adbf51b3b7a2cf9", "submitter": { "id": 324, "url": "http://patchwork.dpdk.org/api/people/324/?format=api", "name": "Ferruh Yigit", "email": "ferruh.yigit@intel.com" }, "delegate": { "id": 24651, "url": "http://patchwork.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20190905145315.19395-9-ferruh.yigit@intel.com/mbox/", "series": [ { "id": 6259, "url": "http://patchwork.dpdk.org/api/series/6259/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=6259", "date": "2019-09-05T14:53:05", "name": "fix global variable multiple definitions", "version": 1, "mbox": "http://patchwork.dpdk.org/series/6259/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/58663/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/58663/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 9ADA81F033;\n\tThu, 5 Sep 2019 16:53:42 +0200 (CEST)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n\tby dpdk.org (Postfix) with ESMTP id DF3771EFC4;\n\tThu, 5 Sep 2019 16:53:31 +0200 (CEST)", "from fmsmga008.fm.intel.com ([10.253.24.58])\n\tby fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t05 Sep 2019 07:53:31 -0700", "from silpixa00399752.ir.intel.com (HELO\n\tsilpixa00399752.ger.corp.intel.com) ([10.237.223.78])\n\tby fmsmga008.fm.intel.com with ESMTP; 05 Sep 2019 07:53:30 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.64,470,1559545200\"; d=\"scan'208\";a=\"182846386\"", "From": "Ferruh Yigit <ferruh.yigit@intel.com>", "To": "Adrien Mazarguil <adrien.mazarguil@6wind.com>,\n\tWenzhuo Lu <wenzhuo.lu@intel.com>, Jingjing Wu <jingjing.wu@intel.com>,\n\tBernard Iremonger <bernard.iremonger@intel.com>", "Cc": "dev@dpdk.org,\n\tstable@dpdk.org", "Date": "Thu, 5 Sep 2019 15:53:13 +0100", "Message-Id": "<20190905145315.19395-9-ferruh.yigit@intel.com>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190905145315.19395-1-ferruh.yigit@intel.com>", "References": "<20190905145315.19395-1-ferruh.yigit@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 08/10] app/testpmd: fix global variable multiple\n\tdefinitions", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Some flow config related global variables are defined in a header file\nwhich was causing multiple definitions of the variables, fixed it by\nmoving them to the .c file.\n\nIssue has been detected by '-fno-common' gcc flag.\n\nAlso while being there,\nremoved duplicated 'ACTION_RAW_ENCAP_MAX_DAT definition,\nmoved 'vxlan_encap_conf' & 'nvgre_encap_conf' initialization to\n 'cmdline_flow.c' which is better location than 'testpmd.c'\nrelocated 'action_raw_encap_data' & 'action_raw_decap_data' struct\n definitions slightly within the file\n\nFixes: 1960be7d32f8 (\"app/testpmd: add VXLAN encap/decap\")\nFixes: dcd962fc6b4e (\"app/testpmd: add NVGRE encap/decap\")\nFixes: a1191d39cb57 (\"app/testpmd: add MPLSoUDP encapsulation\")\nFixes: 3e77031be855 (\"app/testpmd: add MPLSoGRE encapsulation\")\nCc: stable@dpdk.org\n\nSigned-off-by: Ferruh Yigit <ferruh.yigit@intel.com>\n---\n app/test-pmd/cmdline_flow.c | 77 +++++++++++++++++++++++++++++--------\n app/test-pmd/testpmd.c | 35 -----------------\n app/test-pmd/testpmd.h | 18 +++++----\n 3 files changed, 71 insertions(+), 59 deletions(-)", "diff": "diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex 369426cbd..bc2ba7987 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -316,9 +316,7 @@ struct action_rss_data {\n \tuint16_t queue[ACTION_RSS_QUEUE_NUM];\n };\n \n-/** Maximum number of items in struct rte_flow_action_vxlan_encap. */\n-#define ACTION_VXLAN_ENCAP_ITEMS_NUM 6\n-\n+/** Maximum data size in struct rte_flow_action_raw_encap. */\n #define ACTION_RAW_ENCAP_MAX_DATA 128\n \n /** Storage for struct rte_flow_action_raw_encap. */\n@@ -330,6 +328,13 @@ struct raw_encap_conf {\n \n struct raw_encap_conf raw_encap_conf = {.size = 0};\n \n+/** Storage for struct rte_flow_action_raw_encap including external data. */\n+struct action_raw_encap_data {\n+\tstruct rte_flow_action_raw_encap conf;\n+\tuint8_t data[ACTION_RAW_ENCAP_MAX_DATA];\n+\tuint8_t preserve[ACTION_RAW_ENCAP_MAX_DATA];\n+};\n+\n /** Storage for struct rte_flow_action_raw_decap. */\n struct raw_decap_conf {\n \tuint8_t data[ACTION_RAW_ENCAP_MAX_DATA];\n@@ -338,6 +343,35 @@ struct raw_decap_conf {\n \n struct raw_decap_conf raw_decap_conf = {.size = 0};\n \n+/** Storage for struct rte_flow_action_raw_decap including external data. */\n+struct action_raw_decap_data {\n+\tstruct rte_flow_action_raw_decap conf;\n+\tuint8_t data[ACTION_RAW_ENCAP_MAX_DATA];\n+};\n+\n+struct vxlan_encap_conf vxlan_encap_conf = {\n+\t.select_ipv4 = 1,\n+\t.select_vlan = 0,\n+\t.select_tos_ttl = 0,\n+\t.vni = \"\\x00\\x00\\x00\",\n+\t.udp_src = 0,\n+\t.udp_dst = RTE_BE16(4789),\n+\t.ipv4_src = RTE_IPV4(127, 0, 0, 1),\n+\t.ipv4_dst = RTE_IPV4(255, 255, 255, 255),\n+\t.ipv6_src = \"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\"\n+\t\t\"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x01\",\n+\t.ipv6_dst = \"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\"\n+\t\t\"\\x00\\x00\\x00\\x00\\x00\\x00\\x11\\x11\",\n+\t.vlan_tci = 0,\n+\t.ip_tos = 0,\n+\t.ip_ttl = 255,\n+\t.eth_src = \"\\x00\\x00\\x00\\x00\\x00\\x00\",\n+\t.eth_dst = \"\\xff\\xff\\xff\\xff\\xff\\xff\",\n+};\n+\n+/** Maximum number of items in struct rte_flow_action_vxlan_encap. */\n+#define ACTION_VXLAN_ENCAP_ITEMS_NUM 6\n+\n /** Storage for struct rte_flow_action_vxlan_encap including external data. */\n struct action_vxlan_encap_data {\n \tstruct rte_flow_action_vxlan_encap conf;\n@@ -352,6 +386,21 @@ struct action_vxlan_encap_data {\n \tstruct rte_flow_item_vxlan item_vxlan;\n };\n \n+struct nvgre_encap_conf nvgre_encap_conf = {\n+\t.select_ipv4 = 1,\n+\t.select_vlan = 0,\n+\t.tni = \"\\x00\\x00\\x00\",\n+\t.ipv4_src = RTE_IPV4(127, 0, 0, 1),\n+\t.ipv4_dst = RTE_IPV4(255, 255, 255, 255),\n+\t.ipv6_src = \"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\"\n+\t\t\"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x01\",\n+\t.ipv6_dst = \"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\"\n+\t\t\"\\x00\\x00\\x00\\x00\\x00\\x00\\x11\\x11\",\n+\t.vlan_tci = 0,\n+\t.eth_src = \"\\x00\\x00\\x00\\x00\\x00\\x00\",\n+\t.eth_dst = \"\\xff\\xff\\xff\\xff\\xff\\xff\",\n+};\n+\n /** Maximum number of items in struct rte_flow_action_nvgre_encap. */\n #define ACTION_NVGRE_ENCAP_ITEMS_NUM 5\n \n@@ -368,21 +417,17 @@ struct action_nvgre_encap_data {\n \tstruct rte_flow_item_nvgre item_nvgre;\n };\n \n-/** Maximum data size in struct rte_flow_action_raw_encap. */\n-#define ACTION_RAW_ENCAP_MAX_DATA 128\n+struct l2_encap_conf l2_encap_conf;\n \n-/** Storage for struct rte_flow_action_raw_encap including external data. */\n-struct action_raw_encap_data {\n-\tstruct rte_flow_action_raw_encap conf;\n-\tuint8_t data[ACTION_RAW_ENCAP_MAX_DATA];\n-\tuint8_t preserve[ACTION_RAW_ENCAP_MAX_DATA];\n-};\n+struct l2_decap_conf l2_decap_conf;\n \n-/** Storage for struct rte_flow_action_raw_decap including external data. */\n-struct action_raw_decap_data {\n-\tstruct rte_flow_action_raw_decap conf;\n-\tuint8_t data[ACTION_RAW_ENCAP_MAX_DATA];\n-};\n+struct mplsogre_encap_conf mplsogre_encap_conf;\n+\n+struct mplsogre_decap_conf mplsogre_decap_conf;\n+\n+struct mplsoudp_encap_conf mplsoudp_encap_conf;\n+\n+struct mplsoudp_decap_conf mplsoudp_decap_conf;\n \n /** Maximum number of subsequent tokens and arguments on the stack. */\n #define CTX_STACK_SIZE 16\ndiff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c\nindex cbf73e685..e301563d6 100644\n--- a/app/test-pmd/testpmd.c\n+++ b/app/test-pmd/testpmd.c\n@@ -478,41 +478,6 @@ uint8_t bitrate_enabled;\n struct gro_status gro_ports[RTE_MAX_ETHPORTS];\n uint8_t gro_flush_cycles = GRO_DEFAULT_FLUSH_CYCLES;\n \n-struct vxlan_encap_conf vxlan_encap_conf = {\n-\t.select_ipv4 = 1,\n-\t.select_vlan = 0,\n-\t.select_tos_ttl = 0,\n-\t.vni = \"\\x00\\x00\\x00\",\n-\t.udp_src = 0,\n-\t.udp_dst = RTE_BE16(4789),\n-\t.ipv4_src = RTE_IPV4(127, 0, 0, 1),\n-\t.ipv4_dst = RTE_IPV4(255, 255, 255, 255),\n-\t.ipv6_src = \"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\"\n-\t\t\"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x01\",\n-\t.ipv6_dst = \"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\"\n-\t\t\"\\x00\\x00\\x00\\x00\\x00\\x00\\x11\\x11\",\n-\t.vlan_tci = 0,\n-\t.ip_tos = 0,\n-\t.ip_ttl = 255,\n-\t.eth_src = \"\\x00\\x00\\x00\\x00\\x00\\x00\",\n-\t.eth_dst = \"\\xff\\xff\\xff\\xff\\xff\\xff\",\n-};\n-\n-struct nvgre_encap_conf nvgre_encap_conf = {\n-\t.select_ipv4 = 1,\n-\t.select_vlan = 0,\n-\t.tni = \"\\x00\\x00\\x00\",\n-\t.ipv4_src = RTE_IPV4(127, 0, 0, 1),\n-\t.ipv4_dst = RTE_IPV4(255, 255, 255, 255),\n-\t.ipv6_src = \"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\"\n-\t\t\"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x01\",\n-\t.ipv6_dst = \"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\"\n-\t\t\"\\x00\\x00\\x00\\x00\\x00\\x00\\x11\\x11\",\n-\t.vlan_tci = 0,\n-\t.eth_src = \"\\x00\\x00\\x00\\x00\\x00\\x00\",\n-\t.eth_dst = \"\\xff\\xff\\xff\\xff\\xff\\xff\",\n-};\n-\n /* Forward function declarations */\n static void setup_attached_port(portid_t pi);\n static void map_port_queue_stats_mapping_registers(portid_t pi,\ndiff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h\nindex d73955da1..79adebaeb 100644\n--- a/app/test-pmd/testpmd.h\n+++ b/app/test-pmd/testpmd.h\n@@ -507,7 +507,8 @@ struct vxlan_encap_conf {\n \tuint8_t eth_src[RTE_ETHER_ADDR_LEN];\n \tuint8_t eth_dst[RTE_ETHER_ADDR_LEN];\n };\n-struct vxlan_encap_conf vxlan_encap_conf;\n+\n+extern struct vxlan_encap_conf vxlan_encap_conf;\n \n /* NVGRE encap/decap parameters. */\n struct nvgre_encap_conf {\n@@ -522,7 +523,8 @@ struct nvgre_encap_conf {\n \tuint8_t eth_src[RTE_ETHER_ADDR_LEN];\n \tuint8_t eth_dst[RTE_ETHER_ADDR_LEN];\n };\n-struct nvgre_encap_conf nvgre_encap_conf;\n+\n+extern struct nvgre_encap_conf nvgre_encap_conf;\n \n /* L2 encap parameters. */\n struct l2_encap_conf {\n@@ -532,13 +534,13 @@ struct l2_encap_conf {\n \tuint8_t eth_src[RTE_ETHER_ADDR_LEN];\n \tuint8_t eth_dst[RTE_ETHER_ADDR_LEN];\n };\n-struct l2_encap_conf l2_encap_conf;\n+extern struct l2_encap_conf l2_encap_conf;\n \n /* L2 decap parameters. */\n struct l2_decap_conf {\n \tuint32_t select_vlan:1;\n };\n-struct l2_decap_conf l2_decap_conf;\n+extern struct l2_decap_conf l2_decap_conf;\n \n /* MPLSoGRE encap parameters. */\n struct mplsogre_encap_conf {\n@@ -553,14 +555,14 @@ struct mplsogre_encap_conf {\n \tuint8_t eth_src[RTE_ETHER_ADDR_LEN];\n \tuint8_t eth_dst[RTE_ETHER_ADDR_LEN];\n };\n-struct mplsogre_encap_conf mplsogre_encap_conf;\n+extern struct mplsogre_encap_conf mplsogre_encap_conf;\n \n /* MPLSoGRE decap parameters. */\n struct mplsogre_decap_conf {\n \tuint32_t select_ipv4:1;\n \tuint32_t select_vlan:1;\n };\n-struct mplsogre_decap_conf mplsogre_decap_conf;\n+extern struct mplsogre_decap_conf mplsogre_decap_conf;\n \n /* MPLSoUDP encap parameters. */\n struct mplsoudp_encap_conf {\n@@ -577,14 +579,14 @@ struct mplsoudp_encap_conf {\n \tuint8_t eth_src[RTE_ETHER_ADDR_LEN];\n \tuint8_t eth_dst[RTE_ETHER_ADDR_LEN];\n };\n-struct mplsoudp_encap_conf mplsoudp_encap_conf;\n+extern struct mplsoudp_encap_conf mplsoudp_encap_conf;\n \n /* MPLSoUDP decap parameters. */\n struct mplsoudp_decap_conf {\n \tuint32_t select_ipv4:1;\n \tuint32_t select_vlan:1;\n };\n-struct mplsoudp_decap_conf mplsoudp_decap_conf;\n+extern struct mplsoudp_decap_conf mplsoudp_decap_conf;\n \n static inline unsigned int\n lcore_num(void)\n", "prefixes": [ "08/10" ] }