Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/44572/?format=api
{ "id": 44572, "url": "http://patchwork.dpdk.org/api/patches/44572/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1536675645-10105-5-git-send-email-reshma.pattan@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": "<1536675645-10105-5-git-send-email-reshma.pattan@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1536675645-10105-5-git-send-email-reshma.pattan@intel.com", "date": "2018-09-11T14:20:34", "name": "[v2,04/15] net/softnic: replace some pointers with arrays", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "bcda1564230f186c7ef55eccff429a1766fdaeab", "submitter": { "id": 70, "url": "http://patchwork.dpdk.org/api/people/70/?format=api", "name": "Pattan, Reshma", "email": "reshma.pattan@intel.com" }, "delegate": { "id": 10018, "url": "http://patchwork.dpdk.org/api/users/10018/?format=api", "username": "cristian_dumitrescu", "first_name": "Cristian", "last_name": "Dumitrescu", "email": "cristian.dumitrescu@intel.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1536675645-10105-5-git-send-email-reshma.pattan@intel.com/mbox/", "series": [ { "id": 1270, "url": "http://patchwork.dpdk.org/api/series/1270/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=1270", "date": "2018-09-11T14:20:34", "name": null, "version": 2, "mbox": "http://patchwork.dpdk.org/series/1270/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/44572/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/44572/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 D4E575688;\n\tTue, 11 Sep 2018 16:20:57 +0200 (CEST)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby dpdk.org (Postfix) with ESMTP id 307204F94\n\tfor <dev@dpdk.org>; Tue, 11 Sep 2018 16:20:53 +0200 (CEST)", "from fmsmga007.fm.intel.com ([10.253.24.52])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t11 Sep 2018 07:20:52 -0700", "from sivswdev02.ir.intel.com (HELO localhost.localdomain)\n\t([10.237.217.46])\n\tby fmsmga007.fm.intel.com with ESMTP; 11 Sep 2018 07:20:51 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.53,360,1531810800\"; d=\"scan'208\";a=\"69156864\"", "From": "Reshma Pattan <reshma.pattan@intel.com>", "To": "dev@dpdk.org", "Cc": "Cristian Dumitrescu <cristian.dumitrescu@intel.com>,\n\tReshma Pattan <reshma.pattan@intel.com>", "Date": "Tue, 11 Sep 2018 15:20:34 +0100", "Message-Id": "<1536675645-10105-5-git-send-email-reshma.pattan@intel.com>", "X-Mailer": "git-send-email 1.7.0.7", "In-Reply-To": "<1536251222-17275-1-git-send-email-reshma.pattan@intel.com>", "References": "<1536251222-17275-1-git-send-email-reshma.pattan@intel.com>", "Subject": "[dpdk-dev] [PATCH v2 04/15] net/softnic: replace some pointers with\n\tarrays", "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": "Change dev_name, action_profile_name and key_mask\nfrom char* type to arary type of structures\nsoftnic_port_in_params, softnic_port_out_params\nand softnic_table_hash_params.\n\nSigned-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>\nSigned-off-by: Reshma Pattan <reshma.pattan@intel.com>\n---\n drivers/net/softnic/rte_eth_softnic_cli.c | 34 +++++++++++--------------\n drivers/net/softnic/rte_eth_softnic_internals.h | 18 ++++++-------\n drivers/net/softnic/rte_eth_softnic_pipeline.c | 4 +--\n 3 files changed, 26 insertions(+), 30 deletions(-)", "diff": "diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c b/drivers/net/softnic/rte_eth_softnic_cli.c\nindex 8f5f82555..dc8ccdc73 100644\n--- a/drivers/net/softnic/rte_eth_softnic_cli.c\n+++ b/drivers/net/softnic/rte_eth_softnic_cli.c\n@@ -1697,6 +1697,8 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,\n \tuint32_t t0;\n \tint enabled, status;\n \n+\tmemset(&p, 0, sizeof(p));\n+\n \tif (n_tokens < 7) {\n \t\tsnprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);\n \t\treturn;\n@@ -1735,7 +1737,7 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,\n \n \t\tp.type = PORT_IN_RXQ;\n \n-\t\tp.dev_name = tokens[t0 + 1];\n+\t\tstrcpy(p.dev_name, tokens[t0 + 1]);\n \n \t\tif (strcmp(tokens[t0 + 2], \"rxq\") != 0) {\n \t\t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"rxq\");\n@@ -1758,7 +1760,7 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,\n \n \t\tp.type = PORT_IN_SWQ;\n \n-\t\tp.dev_name = tokens[t0 + 1];\n+\t\tstrcpy(p.dev_name, tokens[t0 + 1]);\n \n \t\tt0 += 2;\n \t} else if (strcmp(tokens[t0], \"tmgr\") == 0) {\n@@ -1770,7 +1772,7 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,\n \n \t\tp.type = PORT_IN_TMGR;\n \n-\t\tp.dev_name = tokens[t0 + 1];\n+\t\tstrcpy(p.dev_name, tokens[t0 + 1]);\n \n \t\tt0 += 2;\n \t} else if (strcmp(tokens[t0], \"tap\") == 0) {\n@@ -1782,7 +1784,7 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,\n \n \t\tp.type = PORT_IN_TAP;\n \n-\t\tp.dev_name = tokens[t0 + 1];\n+\t\tstrcpy(p.dev_name, tokens[t0 + 1]);\n \n \t\tif (strcmp(tokens[t0 + 2], \"mempool\") != 0) {\n \t\t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND,\n@@ -1814,8 +1816,6 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,\n \n \t\tp.type = PORT_IN_SOURCE;\n \n-\t\tp.dev_name = NULL;\n-\n \t\tif (strcmp(tokens[t0 + 1], \"mempool\") != 0) {\n \t\t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND,\n \t\t\t\t\"mempool\");\n@@ -1851,7 +1851,6 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,\n \t\treturn;\n \t}\n \n-\tp.action_profile_name = NULL;\n \tif (n_tokens > t0 &&\n \t\t(strcmp(tokens[t0], \"action\") == 0)) {\n \t\tif (n_tokens < t0 + 2) {\n@@ -1859,7 +1858,7 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,\n \t\t\treturn;\n \t\t}\n \n-\t\tp.action_profile_name = tokens[t0 + 1];\n+\t\tstrcpy(p.action_profile_name, tokens[t0 + 1]);\n \n \t\tt0 += 2;\n \t}\n@@ -1945,7 +1944,7 @@ cmd_pipeline_port_out(struct pmd_internals *softnic,\n \n \t\tp.type = PORT_OUT_TXQ;\n \n-\t\tp.dev_name = tokens[7];\n+\t\tstrcpy(p.dev_name, tokens[7]);\n \n \t\tif (strcmp(tokens[8], \"txq\") != 0) {\n \t\t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"txq\");\n@@ -1966,7 +1965,7 @@ cmd_pipeline_port_out(struct pmd_internals *softnic,\n \n \t\tp.type = PORT_OUT_SWQ;\n \n-\t\tp.dev_name = tokens[7];\n+\t\tstrcpy(p.dev_name, tokens[7]);\n \t} else if (strcmp(tokens[6], \"tmgr\") == 0) {\n \t\tif (n_tokens != 8) {\n \t\t\tsnprintf(out, out_size, MSG_ARG_MISMATCH,\n@@ -1976,7 +1975,7 @@ cmd_pipeline_port_out(struct pmd_internals *softnic,\n \n \t\tp.type = PORT_OUT_TMGR;\n \n-\t\tp.dev_name = tokens[7];\n+\t\tstrcpy(p.dev_name, tokens[7]);\n \t} else if (strcmp(tokens[6], \"tap\") == 0) {\n \t\tif (n_tokens != 8) {\n \t\t\tsnprintf(out, out_size, MSG_ARG_MISMATCH,\n@@ -1986,7 +1985,7 @@ cmd_pipeline_port_out(struct pmd_internals *softnic,\n \n \t\tp.type = PORT_OUT_TAP;\n \n-\t\tp.dev_name = tokens[7];\n+\t\tstrcpy(p.dev_name, tokens[7]);\n \t} else if (strcmp(tokens[6], \"sink\") == 0) {\n \t\tif ((n_tokens != 7) && (n_tokens != 11)) {\n \t\t\tsnprintf(out, out_size, MSG_ARG_MISMATCH,\n@@ -1996,8 +1995,6 @@ cmd_pipeline_port_out(struct pmd_internals *softnic,\n \n \t\tp.type = PORT_OUT_SINK;\n \n-\t\tp.dev_name = NULL;\n-\n \t\tif (n_tokens == 7) {\n \t\t\tp.sink.file_name = NULL;\n \t\t\tp.sink.max_n_pkts = 0;\n@@ -2064,12 +2061,13 @@ cmd_pipeline_table(struct pmd_internals *softnic,\n \tchar *out,\n \tsize_t out_size)\n {\n-\tuint8_t key_mask[TABLE_RULE_MATCH_SIZE_MAX];\n \tstruct softnic_table_params p;\n \tchar *pipeline_name;\n \tuint32_t t0;\n \tint status;\n \n+\tmemset(&p, 0, sizeof(p));\n+\n \tif (n_tokens < 5) {\n \t\tsnprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);\n \t\treturn;\n@@ -2203,12 +2201,11 @@ cmd_pipeline_table(struct pmd_internals *softnic,\n \t\t}\n \n \t\tif ((softnic_parse_hex_string(tokens[t0 + 5],\n-\t\t\tkey_mask, &key_mask_size) != 0) ||\n+\t\t\tp.match.hash.key_mask, &key_mask_size) != 0) ||\n \t\t\tkey_mask_size != p.match.hash.key_size) {\n \t\t\tsnprintf(out, out_size, MSG_ARG_INVALID, \"key_mask\");\n \t\t\treturn;\n \t\t}\n-\t\tp.match.hash.key_mask = key_mask;\n \n \t\tif (strcmp(tokens[t0 + 6], \"offset\") != 0) {\n \t\t\tsnprintf(out, out_size, MSG_ARG_NOT_FOUND, \"offset\");\n@@ -2295,7 +2292,6 @@ cmd_pipeline_table(struct pmd_internals *softnic,\n \t\treturn;\n \t}\n \n-\tp.action_profile_name = NULL;\n \tif (n_tokens > t0 &&\n \t\t(strcmp(tokens[t0], \"action\") == 0)) {\n \t\tif (n_tokens < t0 + 2) {\n@@ -2303,7 +2299,7 @@ cmd_pipeline_table(struct pmd_internals *softnic,\n \t\t\treturn;\n \t\t}\n \n-\t\tp.action_profile_name = tokens[t0 + 1];\n+\t\tstrcpy(p.action_profile_name, tokens[t0 + 1]);\n \n \t\tt0 += 2;\n \t}\ndiff --git a/drivers/net/softnic/rte_eth_softnic_internals.h b/drivers/net/softnic/rte_eth_softnic_internals.h\nindex d1996c469..f40215dfe 100644\n--- a/drivers/net/softnic/rte_eth_softnic_internals.h\n+++ b/drivers/net/softnic/rte_eth_softnic_internals.h\n@@ -308,7 +308,7 @@ enum softnic_port_in_type {\n struct softnic_port_in_params {\n \t/* Read */\n \tenum softnic_port_in_type type;\n-\tconst char *dev_name;\n+\tchar dev_name[NAME_SIZE];\n \tunion {\n \t\tstruct {\n \t\t\tuint16_t queue_id;\n@@ -328,7 +328,7 @@ struct softnic_port_in_params {\n \tuint32_t burst_size;\n \n \t/* Action */\n-\tconst char *action_profile_name;\n+\tchar action_profile_name[NAME_SIZE];\n };\n \n enum softnic_port_out_type {\n@@ -341,7 +341,7 @@ enum softnic_port_out_type {\n \n struct softnic_port_out_params {\n \tenum softnic_port_out_type type;\n-\tconst char *dev_name;\n+\tchar dev_name[NAME_SIZE];\n \tunion {\n \t\tstruct {\n \t\t\tuint16_t queue_id;\n@@ -376,11 +376,15 @@ struct softnic_table_array_params {\n \tuint32_t key_offset;\n };\n \n+#ifndef TABLE_RULE_MATCH_SIZE_MAX\n+#define TABLE_RULE_MATCH_SIZE_MAX 256\n+#endif\n+\n struct softnic_table_hash_params {\n \tuint32_t n_keys;\n \tuint32_t key_offset;\n \tuint32_t key_size;\n-\tuint8_t *key_mask;\n+\tuint8_t key_mask[TABLE_RULE_MATCH_SIZE_MAX];\n \tuint32_t n_buckets;\n \tint extendable_bucket;\n };\n@@ -402,7 +406,7 @@ struct softnic_table_params {\n \t} match;\n \n \t/* Action */\n-\tconst char *action_profile_name;\n+\tchar action_profile_name[NAME_SIZE];\n };\n \n struct softnic_port_in {\n@@ -757,10 +761,6 @@ struct softnic_table_rule_match_array {\n \tuint32_t pos;\n };\n \n-#ifndef TABLE_RULE_MATCH_SIZE_MAX\n-#define TABLE_RULE_MATCH_SIZE_MAX 256\n-#endif\n-\n struct softnic_table_rule_match_hash {\n \tuint8_t key[TABLE_RULE_MATCH_SIZE_MAX];\n };\ndiff --git a/drivers/net/softnic/rte_eth_softnic_pipeline.c b/drivers/net/softnic/rte_eth_softnic_pipeline.c\nindex 45136a4a2..dacf7bc9a 100644\n--- a/drivers/net/softnic/rte_eth_softnic_pipeline.c\n+++ b/drivers/net/softnic/rte_eth_softnic_pipeline.c\n@@ -213,7 +213,7 @@ softnic_pipeline_port_in_create(struct pmd_internals *softnic,\n \t\treturn -1;\n \n \tap = NULL;\n-\tif (params->action_profile_name) {\n+\tif (strlen(params->action_profile_name)) {\n \t\tap = softnic_port_in_action_profile_find(softnic,\n \t\t\tparams->action_profile_name);\n \t\tif (ap == NULL)\n@@ -730,7 +730,7 @@ softnic_pipeline_table_create(struct pmd_internals *softnic,\n \t\treturn -1;\n \n \tap = NULL;\n-\tif (params->action_profile_name) {\n+\tif (strlen(params->action_profile_name)) {\n \t\tap = softnic_table_action_profile_find(softnic,\n \t\t\tparams->action_profile_name);\n \t\tif (ap == NULL)\n", "prefixes": [ "v2", "04/15" ] }