Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/82499/?format=api
{ "id": 82499, "url": "http://patches.dpdk.org/api/patches/82499/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20201028022957.722253-1-jiawenwu@trustnetic.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": "<20201028022957.722253-1-jiawenwu@trustnetic.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201028022957.722253-1-jiawenwu@trustnetic.com", "date": "2020-10-28T02:29:57", "name": "[v2] net/txgbe: fix driver exit", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "d6a48b275e3ce340a6b188a6ae8817294381ce26", "submitter": { "id": 1932, "url": "http://patches.dpdk.org/api/people/1932/?format=api", "name": "Jiawen Wu", "email": "jiawenwu@trustnetic.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20201028022957.722253-1-jiawenwu@trustnetic.com/mbox/", "series": [ { "id": 13398, "url": "http://patches.dpdk.org/api/series/13398/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=13398", "date": "2020-10-28T02:29:57", "name": "[v2] net/txgbe: fix driver exit", "version": 2, "mbox": "http://patches.dpdk.org/series/13398/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/82499/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/82499/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 B3F35A04DD;\n\tWed, 28 Oct 2020 03:28:28 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 00F965916;\n\tWed, 28 Oct 2020 03:28:27 +0100 (CET)", "from smtpproxy21.qq.com (smtpbg704.qq.com [203.205.195.105])\n by dpdk.org (Postfix) with ESMTP id 2276D558E\n for <dev@dpdk.org>; Wed, 28 Oct 2020 03:28:23 +0100 (CET)", "from localhost.localdomain.com (unknown [183.129.236.74])\n by esmtp6.qq.com (ESMTP) with\n id ; Wed, 28 Oct 2020 10:28:08 +0800 (CST)" ], "X-QQ-mid": "bizesmtp11t1603852097t8qyuppa", "X-QQ-SSF": "01400000000000C0C000B00A0000000", "X-QQ-FEAT": "l6IKqkG+NbkhBreuXUE9fNq49PE/g/xMs9+f1hSmR5KutGClU13roKy87XkJ8\n ErN0B8GsuqkIhSf7XKTqsGbvtPasf9dX9q63NGup/7e4iZ/UqQjGp5XyebjErN1taMcl7+D\n v47l4qWFJ+1bQk3q/PqNOZy3qbdxcdgyRvPlLhwnhgQKwCeNw/hY2r7k4sNDCzmdbXKsYwx\n usnF0TEdUlbISaDS2HhSHgVzCtFYiYBX4dxfB5kFn+2H+I+yymKpxnhCh5WHPO8WuyxdPgL\n k2Iws2xJG3DBVaI8jsINvCDWlbK34JQso2QiLnagnvwYWv86fmN6w9rQPc341/C0/fSkEtl\n RImn6E1", "X-QQ-GoodBg": "2", "From": "Jiawen Wu <jiawenwu@trustnetic.com>", "To": "dev@dpdk.org", "Cc": "Jiawen Wu <jiawenwu@trustnetic.com>", "Date": "Wed, 28 Oct 2020 10:29:57 +0800", "Message-Id": "<20201028022957.722253-1-jiawenwu@trustnetic.com>", "X-Mailer": "git-send-email 2.18.4", "X-QQ-SENDSIZE": "520", "Feedback-ID": "bizesmtp:trustnetic.com:qybgforeign:qybgforeign6", "X-QQ-Bgrelay": "1", "Subject": "[dpdk-dev] [PATCH v2] net/txgbe: fix driver exit", "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": "Replace the 'rte_panic()' with an error return.\nAlso change the type of the calling function.\n\nSigned-off-by: Jiawen Wu <jiawenwu@trustnetic.com>\n---\n drivers/net/txgbe/txgbe_ethdev.c | 11 +++++++++--\n drivers/net/txgbe/txgbe_ethdev.h | 2 +-\n drivers/net/txgbe/txgbe_pf.c | 23 ++++++++++++++++++-----\n 3 files changed, 28 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c\nindex aeefb1ed1..189caf2e9 100644\n--- a/drivers/net/txgbe/txgbe_ethdev.c\n+++ b/drivers/net/txgbe/txgbe_ethdev.c\n@@ -475,7 +475,7 @@ eth_txgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)\n \tconst struct rte_memzone *mz;\n \tuint32_t ctrl_ext;\n \tuint16_t csum;\n-\tint err, i;\n+\tint err, i, ret;\n \n \tPMD_INIT_FUNC_TRACE();\n \n@@ -639,7 +639,14 @@ eth_txgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)\n \tmemset(hwstrip, 0, sizeof(*hwstrip));\n \n \t/* initialize PF if max_vfs not zero */\n-\ttxgbe_pf_host_init(eth_dev);\n+\tret = txgbe_pf_host_init(eth_dev);\n+\tif (ret) {\n+\t\trte_free(eth_dev->data->mac_addrs);\n+\t\teth_dev->data->mac_addrs = NULL;\n+\t\trte_free(eth_dev->data->hash_mac_addrs);\n+\t\teth_dev->data->hash_mac_addrs = NULL;\n+\t\treturn ret;\n+\t}\n \n \tctrl_ext = rd32(hw, TXGBE_PORTCTL);\n \t/* let hardware know driver is loaded */\ndiff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h\nindex 331be9244..2c3680218 100644\n--- a/drivers/net/txgbe/txgbe_ethdev.h\n+++ b/drivers/net/txgbe/txgbe_ethdev.h\n@@ -288,7 +288,7 @@ void txgbe_configure_dcb(struct rte_eth_dev *dev);\n int\n txgbe_dev_link_update_share(struct rte_eth_dev *dev,\n \t\tint wait_to_complete);\n-void txgbe_pf_host_init(struct rte_eth_dev *eth_dev);\n+int txgbe_pf_host_init(struct rte_eth_dev *eth_dev);\n \n void txgbe_pf_host_uninit(struct rte_eth_dev *eth_dev);\n \ndiff --git a/drivers/net/txgbe/txgbe_pf.c b/drivers/net/txgbe/txgbe_pf.c\nindex 67045fb01..151f2c7a4 100644\n--- a/drivers/net/txgbe/txgbe_pf.c\n+++ b/drivers/net/txgbe/txgbe_pf.c\n@@ -64,7 +64,7 @@ txgbe_mb_intr_setup(struct rte_eth_dev *dev)\n \treturn 0;\n }\n \n-void txgbe_pf_host_init(struct rte_eth_dev *eth_dev)\n+int txgbe_pf_host_init(struct rte_eth_dev *eth_dev)\n {\n \tstruct txgbe_vf_info **vfinfo = TXGBE_DEV_VFDATA(eth_dev);\n \tstruct txgbe_mirror_info *mirror_info = TXGBE_DEV_MR_INFO(eth_dev);\n@@ -72,20 +72,31 @@ void txgbe_pf_host_init(struct rte_eth_dev *eth_dev)\n \tstruct txgbe_hw *hw = TXGBE_DEV_HW(eth_dev);\n \tuint16_t vf_num;\n \tuint8_t nb_queue;\n+\tint ret = 0;\n \n \tPMD_INIT_FUNC_TRACE();\n \n \tRTE_ETH_DEV_SRIOV(eth_dev).active = 0;\n \tvf_num = dev_num_vf(eth_dev);\n \tif (vf_num == 0)\n-\t\treturn;\n+\t\treturn ret;\n \n \t*vfinfo = rte_zmalloc(\"vf_info\",\n \t\t\tsizeof(struct txgbe_vf_info) * vf_num, 0);\n-\tif (*vfinfo == NULL)\n-\t\trte_panic(\"Cannot allocate memory for private VF data\\n\");\n+\tif (*vfinfo == NULL) {\n+\t\tPMD_INIT_LOG(ERR,\n+\t\t\t\"Cannot allocate memory for private VF data\\n\");\n+\t\treturn -ENOMEM;\n+\t}\n \n-\trte_eth_switch_domain_alloc(&(*vfinfo)->switch_domain_id);\n+\tret = rte_eth_switch_domain_alloc(&(*vfinfo)->switch_domain_id);\n+\tif (ret) {\n+\t\tPMD_INIT_LOG(ERR,\n+\t\t\t\"failed to allocate switch domain for device %d\", ret);\n+\t\trte_free(*vfinfo);\n+\t\t*vfinfo = NULL;\n+\t\treturn ret;\n+\t}\n \n \tmemset(mirror_info, 0, sizeof(struct txgbe_mirror_info));\n \tmemset(uta_info, 0, sizeof(struct txgbe_uta_info));\n@@ -114,6 +125,8 @@ void txgbe_pf_host_init(struct rte_eth_dev *eth_dev)\n \n \t/* set mb interrupt mask */\n \ttxgbe_mb_intr_setup(eth_dev);\n+\n+\treturn ret;\n }\n \n void txgbe_pf_host_uninit(struct rte_eth_dev *eth_dev)\n", "prefixes": [ "v2" ] }