Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/60797/?format=api
{ "id": 60797, "url": "http://patches.dpdk.org/api/patches/60797/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191009130716.80418-1-haiyue.wang@intel.com/", "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": "<20191009130716.80418-1-haiyue.wang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20191009130716.80418-1-haiyue.wang@intel.com", "date": "2019-10-09T13:07:16", "name": "[v1] net/ice: avoid the parsed devargs value being overwritten", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "3908d4f51d4b91ac24ea34710a9972f9fed3ecb2", "submitter": { "id": 1044, "url": "http://patches.dpdk.org/api/people/1044/?format=api", "name": "Wang, Haiyue", "email": "haiyue.wang@intel.com" }, "delegate": { "id": 31221, "url": "http://patches.dpdk.org/api/users/31221/?format=api", "username": "yexl", "first_name": "xiaolong", "last_name": "ye", "email": "xiaolong.ye@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20191009130716.80418-1-haiyue.wang@intel.com/mbox/", "series": [ { "id": 6765, "url": "http://patches.dpdk.org/api/series/6765/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6765", "date": "2019-10-09T13:07:16", "name": "[v1] net/ice: avoid the parsed devargs value being overwritten", "version": 1, "mbox": "http://patches.dpdk.org/series/6765/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/60797/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/60797/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 49E541DFEF;\n\tWed, 9 Oct 2019 15:12:57 +0200 (CEST)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n\tby dpdk.org (Postfix) with ESMTP id 45BB11DF98\n\tfor <dev@dpdk.org>; Wed, 9 Oct 2019 15:12:55 +0200 (CEST)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t09 Oct 2019 06:12:54 -0700", "from npg-dpdk-haiyue-1.sh.intel.com ([10.67.119.153])\n\tby orsmga001.jf.intel.com with ESMTP; 09 Oct 2019 06:12:53 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.67,276,1566889200\"; d=\"scan'208\";a=\"277418605\"", "From": "Haiyue Wang <haiyue.wang@intel.com>", "To": "dev@dpdk.org", "Cc": "Haiyue Wang <haiyue.wang@intel.com>", "Date": "Wed, 9 Oct 2019 21:07:16 +0800", "Message-Id": "<20191009130716.80418-1-haiyue.wang@intel.com>", "X-Mailer": "git-send-email 2.17.1", "Subject": "[dpdk-dev] [PATCH v1] net/ice: avoid the parsed devargs value being\n\toverwritten", "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": "If the default dev args 'proto_xtr' is not in the first position, it\nwill overwrite the parsed queue map value, so use an new variable to\nsave the default.\n\nAnd enhance the error message printing to show the right information.\n\nSigned-off-by: Haiyue Wang <haiyue.wang@intel.com>\n---\n drivers/net/ice/ice_ethdev.c | 44 +++++++++++++++++++++++++-----------\n drivers/net/ice/ice_ethdev.h | 1 +\n 2 files changed, 32 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c\nindex 022b58c01..440203247 100644\n--- a/drivers/net/ice/ice_ethdev.c\n+++ b/drivers/net/ice/ice_ethdev.c\n@@ -428,8 +428,7 @@ parse_queue_proto_xtr(const char *queues, struct ice_devargs *devargs)\n \t\tif (xtr_type < 0)\n \t\t\treturn -1;\n \n-\t\tmemset(devargs->proto_xtr, xtr_type,\n-\t\t sizeof(devargs->proto_xtr));\n+\t\tdevargs->proto_xtr_dflt = xtr_type;\n \n \t\treturn 0;\n \t}\n@@ -1369,12 +1368,36 @@ ice_interrupt_handler(void *param)\n \trte_intr_ack(dev->intr_handle);\n }\n \n+static void\n+ice_init_proto_xtr(struct rte_eth_dev *dev)\n+{\n+\tstruct ice_adapter *ad =\n+\t\t\tICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);\n+\tstruct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n+\tstruct ice_hw *hw = ICE_PF_TO_HW(pf);\n+\tuint16_t i;\n+\n+\tif (!ice_proto_xtr_support(hw)) {\n+\t\tPMD_DRV_LOG(NOTICE, \"Protocol extraction is not supported\");\n+\t\treturn;\n+\t}\n+\n+\tpf->proto_xtr = rte_zmalloc(NULL, pf->lan_nb_qps, 0);\n+\tif (unlikely(pf->proto_xtr == NULL)) {\n+\t\tPMD_DRV_LOG(ERR, \"No memory for setting up protocol extraction table\");\n+\t\treturn;\n+\t}\n+\n+\tfor (i = 0; i < pf->lan_nb_qps; i++)\n+\t\tpf->proto_xtr[i] = ad->devargs.proto_xtr[i] != PROTO_XTR_NONE ?\n+\t\t\t\t ad->devargs.proto_xtr[i] :\n+\t\t\t\t ad->devargs.proto_xtr_dflt;\n+}\n+\n /* Initialize SW parameters of PF */\n static int\n ice_pf_sw_init(struct rte_eth_dev *dev)\n {\n-\tstruct ice_adapter *ad =\n-\t\t\tICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);\n \tstruct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);\n \tstruct ice_hw *hw = ICE_PF_TO_HW(pf);\n \n@@ -1384,15 +1407,7 @@ ice_pf_sw_init(struct rte_eth_dev *dev)\n \n \tpf->lan_nb_qps = pf->lan_nb_qp_max;\n \n-\tif (ice_proto_xtr_support(hw))\n-\t\tpf->proto_xtr = rte_zmalloc(NULL, pf->lan_nb_qps, 0);\n-\n-\tif (pf->proto_xtr != NULL)\n-\t\trte_memcpy(pf->proto_xtr, ad->devargs.proto_xtr,\n-\t\t\t RTE_MIN((size_t)pf->lan_nb_qps,\n-\t\t\t\t sizeof(ad->devargs.proto_xtr)));\n-\telse\n-\t\tPMD_DRV_LOG(NOTICE, \"Protocol extraction is disabled\");\n+\tice_init_proto_xtr(dev);\n \n \treturn 0;\n }\n@@ -1805,6 +1820,7 @@ static int ice_parse_devargs(struct rte_eth_dev *dev)\n \t\treturn -EINVAL;\n \t}\n \n+\tad->devargs.proto_xtr_dflt = PROTO_XTR_NONE;\n \tmemset(ad->devargs.proto_xtr, PROTO_XTR_NONE,\n \t sizeof(ad->devargs.proto_xtr));\n \n@@ -2126,6 +2142,8 @@ ice_dev_close(struct rte_eth_dev *dev)\n \trte_free(hw->port_info);\n \thw->port_info = NULL;\n \tice_shutdown_all_ctrlq(hw);\n+\trte_free(pf->proto_xtr);\n+\tpf->proto_xtr = NULL;\n \n \tdev->dev_ops = NULL;\n \tdev->rx_pkt_burst = NULL;\ndiff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h\nindex 182c6f611..2fd98817b 100644\n--- a/drivers/net/ice/ice_ethdev.h\n+++ b/drivers/net/ice/ice_ethdev.h\n@@ -288,6 +288,7 @@ struct ice_pf {\n */\n struct ice_devargs {\n \tint safe_mode_support;\n+\tuint8_t proto_xtr_dflt;\n \tuint8_t proto_xtr[ICE_MAX_QUEUE_NUM];\n };\n \n", "prefixes": [ "v1" ] }