Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/105677/?format=api
{ "id": 105677, "url": "http://patchwork.dpdk.org/api/patches/105677/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20220107101558.39219-4-humin29@huawei.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": "<20220107101558.39219-4-humin29@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220107101558.39219-4-humin29@huawei.com", "date": "2022-01-07T10:15:46", "name": "[03/15] net/hns3: extract a common API to initialize MAC addrs", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "3a998296954e9d5192d323e35fb2543dd79b2da4", "submitter": { "id": 1944, "url": "http://patchwork.dpdk.org/api/people/1944/?format=api", "name": "humin (Q)", "email": "humin29@huawei.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20220107101558.39219-4-humin29@huawei.com/mbox/", "series": [ { "id": 21092, "url": "http://patchwork.dpdk.org/api/series/21092/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=21092", "date": "2022-01-07T10:15:45", "name": "fix and feature for hns3 PMD", "version": 1, "mbox": "http://patchwork.dpdk.org/series/21092/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/105677/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/105677/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 6F8A1A04A6;\n\tFri, 7 Jan 2022 11:16:07 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id A506541160;\n\tFri, 7 Jan 2022 11:15:41 +0100 (CET)", "from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188])\n by mails.dpdk.org (Postfix) with ESMTP id 512F84014F\n for <dev@dpdk.org>; Fri, 7 Jan 2022 11:15:34 +0100 (CET)", "from dggeme756-chm.china.huawei.com (unknown [172.30.72.57])\n by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4JVfGD652Fz9s2M;\n Fri, 7 Jan 2022 18:14:28 +0800 (CST)", "from localhost.localdomain (10.69.192.56) by\n dggeme756-chm.china.huawei.com (10.3.19.102) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id\n 15.1.2308.20; Fri, 7 Jan 2022 18:15:32 +0800" ], "From": "\"Min Hu (Connor)\" <humin29@huawei.com>", "To": "<dev@dpdk.org>", "CC": "<ferruh.yigit@intel.com>, <thomas@monjalon.net>", "Subject": "[PATCH 03/15] net/hns3: extract a common API to initialize MAC addrs", "Date": "Fri, 7 Jan 2022 18:15:46 +0800", "Message-ID": "<20220107101558.39219-4-humin29@huawei.com>", "X-Mailer": "git-send-email 2.33.0", "In-Reply-To": "<20220107101558.39219-1-humin29@huawei.com>", "References": "<20220107101558.39219-1-humin29@huawei.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[10.69.192.56]", "X-ClientProxiedBy": "dggems706-chm.china.huawei.com (10.3.19.183) To\n dggeme756-chm.china.huawei.com (10.3.19.102)", "X-CFilter-Loop": "Reflected", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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" }, "content": "From: Huisong Li <lihuisong@huawei.com>\n\nThe code logic to initialize \"data->mac_addrs\" for PF and VF is similar.\nThis patch extracts a common API to initialize it to improve code\nmaintainabiliy.\n\nSigned-off-by: Huisong Li <lihuisong@huawei.com>\n---\n drivers/net/hns3/hns3_common.c | 54 +++++++++++++++++++++++++++++++\n drivers/net/hns3/hns3_common.h | 1 +\n drivers/net/hns3/hns3_ethdev.c | 31 +++---------------\n drivers/net/hns3/hns3_ethdev_vf.c | 33 +++----------------\n 4 files changed, 63 insertions(+), 56 deletions(-)", "diff": "diff --git a/drivers/net/hns3/hns3_common.c b/drivers/net/hns3/hns3_common.c\nindex eac2aa1040..cb581bb25a 100644\n--- a/drivers/net/hns3/hns3_common.c\n+++ b/drivers/net/hns3/hns3_common.c\n@@ -581,6 +581,60 @@ hns3_remove_mac_addr(struct rte_eth_dev *dev, uint32_t idx)\n \t}\n }\n \n+int\n+hns3_init_mac_addrs(struct rte_eth_dev *dev)\n+{\n+\tstruct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);\n+\tstruct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);\n+\tconst char *memory_name = hns->is_vf ? \"hns3vf-mac\" : \"hns3-mac\";\n+\tuint16_t mac_addrs_capa = hns->is_vf ? HNS3_VF_UC_MACADDR_NUM :\n+\t\t\t\t\t\tHNS3_UC_MACADDR_NUM;\n+\tchar mac_str[RTE_ETHER_ADDR_FMT_SIZE];\n+\tstruct rte_ether_addr *eth_addr;\n+\n+\t/* Allocate memory for storing MAC addresses */\n+\tdev->data->mac_addrs = rte_zmalloc(memory_name,\n+\t\t\t\tsizeof(struct rte_ether_addr) * mac_addrs_capa,\n+\t\t\t\t0);\n+\tif (dev->data->mac_addrs == NULL) {\n+\t\thns3_err(hw, \"failed to allocate %zx bytes needed to store MAC addresses\",\n+\t\t\t sizeof(struct rte_ether_addr) * mac_addrs_capa);\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\teth_addr = (struct rte_ether_addr *)hw->mac.mac_addr;\n+\tif (!hns->is_vf) {\n+\t\tif (!rte_is_valid_assigned_ether_addr(eth_addr)) {\n+\t\t\trte_eth_random_addr(hw->mac.mac_addr);\n+\t\t\thns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,\n+\t\t\t\t(struct rte_ether_addr *)hw->mac.mac_addr);\n+\t\t\thns3_warn(hw, \"default mac_addr from firmware is an invalid \"\n+\t\t\t\t \"unicast address, using random MAC address %s\",\n+\t\t\t\t mac_str);\n+\t\t}\n+\t} else {\n+\t\t/*\n+\t\t * The hns3 PF ethdev driver in kernel support setting VF MAC\n+\t\t * address on the host by \"ip link set ...\" command. To avoid\n+\t\t * some incorrect scenes, for example, hns3 VF PMD driver fails\n+\t\t * to receive and send packets after user configure the MAC\n+\t\t * address by using the \"ip link set ...\" command, hns3 VF PMD\n+\t\t * driver keep the same MAC address strategy as the hns3 kernel\n+\t\t * ethdev driver in the initialization. If user configure a MAC\n+\t\t * address by the ip command for VF device, then hns3 VF PMD\n+\t\t * driver will start with it, otherwise start with a random MAC\n+\t\t * address in the initialization.\n+\t\t */\n+\t\tif (rte_is_zero_ether_addr(eth_addr))\n+\t\t\trte_eth_random_addr(hw->mac.mac_addr);\n+\t}\n+\n+\trte_ether_addr_copy((struct rte_ether_addr *)hw->mac.mac_addr,\n+\t\t\t &dev->data->mac_addrs[0]);\n+\n+\treturn 0;\n+}\n+\n int\n hns3_init_ring_with_vector(struct hns3_hw *hw)\n {\ndiff --git a/drivers/net/hns3/hns3_common.h b/drivers/net/hns3/hns3_common.h\nindex 0dbb1c0413..a9e8a9cccf 100644\n--- a/drivers/net/hns3/hns3_common.h\n+++ b/drivers/net/hns3/hns3_common.h\n@@ -52,6 +52,7 @@ int hns3_set_mc_mac_addr_list(struct rte_eth_dev *dev,\n \t\t\t uint32_t nb_mc_addr);\n void hns3_ether_format_addr(char *buf, uint16_t size,\n \t\t\t const struct rte_ether_addr *ether_addr);\n+int hns3_init_mac_addrs(struct rte_eth_dev *dev);\n \n int hns3_init_ring_with_vector(struct hns3_hw *hw);\n int hns3_map_rx_interrupt(struct rte_eth_dev *dev);\ndiff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c\nindex 0bd12907d8..44bd7e8b22 100644\n--- a/drivers/net/hns3/hns3_ethdev.c\n+++ b/drivers/net/hns3/hns3_ethdev.c\n@@ -6623,8 +6623,6 @@ static int\n hns3_dev_init(struct rte_eth_dev *eth_dev)\n {\n \tstruct hns3_adapter *hns = eth_dev->data->dev_private;\n-\tchar mac_str[RTE_ETHER_ADDR_FMT_SIZE];\n-\tstruct rte_ether_addr *eth_addr;\n \tstruct hns3_hw *hw = &hns->hw;\n \tint ret;\n \n@@ -6667,30 +6665,9 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)\n \t\tgoto err_init_pf;\n \t}\n \n-\t/* Allocate memory for storing MAC addresses */\n-\teth_dev->data->mac_addrs = rte_zmalloc(\"hns3-mac\",\n-\t\t\t\t\t sizeof(struct rte_ether_addr) *\n-\t\t\t\t\t HNS3_UC_MACADDR_NUM, 0);\n-\tif (eth_dev->data->mac_addrs == NULL) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to allocate %zx bytes needed \"\n-\t\t\t \"to store MAC addresses\",\n-\t\t\t sizeof(struct rte_ether_addr) *\n-\t\t\t HNS3_UC_MACADDR_NUM);\n-\t\tret = -ENOMEM;\n-\t\tgoto err_rte_zmalloc;\n-\t}\n-\n-\teth_addr = (struct rte_ether_addr *)hw->mac.mac_addr;\n-\tif (!rte_is_valid_assigned_ether_addr(eth_addr)) {\n-\t\trte_eth_random_addr(hw->mac.mac_addr);\n-\t\thns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,\n-\t\t\t\t(struct rte_ether_addr *)hw->mac.mac_addr);\n-\t\thns3_warn(hw, \"default mac_addr from firmware is an invalid \"\n-\t\t\t \"unicast address, using random MAC address %s\",\n-\t\t\t mac_str);\n-\t}\n-\trte_ether_addr_copy((struct rte_ether_addr *)hw->mac.mac_addr,\n-\t\t\t ð_dev->data->mac_addrs[0]);\n+\tret = hns3_init_mac_addrs(eth_dev);\n+\tif (ret != 0)\n+\t\tgoto err_init_mac_addrs;\n \n \thw->adapter_state = HNS3_NIC_INITIALIZED;\n \n@@ -6706,7 +6683,7 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)\n \thns3_info(hw, \"hns3 dev initialization successful!\");\n \treturn 0;\n \n-err_rte_zmalloc:\n+err_init_mac_addrs:\n \thns3_uninit_pf(eth_dev);\n \n err_init_pf:\ndiff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c\nindex 805abd4543..58b4a107d3 100644\n--- a/drivers/net/hns3/hns3_ethdev_vf.c\n+++ b/drivers/net/hns3/hns3_ethdev_vf.c\n@@ -2400,34 +2400,9 @@ hns3vf_dev_init(struct rte_eth_dev *eth_dev)\n \t\tgoto err_init_vf;\n \t}\n \n-\t/* Allocate memory for storing MAC addresses */\n-\teth_dev->data->mac_addrs = rte_zmalloc(\"hns3vf-mac\",\n-\t\t\t\t\t sizeof(struct rte_ether_addr) *\n-\t\t\t\t\t HNS3_VF_UC_MACADDR_NUM, 0);\n-\tif (eth_dev->data->mac_addrs == NULL) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to allocate %zx bytes needed \"\n-\t\t\t \"to store MAC addresses\",\n-\t\t\t sizeof(struct rte_ether_addr) *\n-\t\t\t HNS3_VF_UC_MACADDR_NUM);\n-\t\tret = -ENOMEM;\n-\t\tgoto err_rte_zmalloc;\n-\t}\n-\n-\t/*\n-\t * The hns3 PF ethdev driver in kernel support setting VF MAC address\n-\t * on the host by \"ip link set ...\" command. To avoid some incorrect\n-\t * scenes, for example, hns3 VF PMD fails to receive and send\n-\t * packets after user configure the MAC address by using the\n-\t * \"ip link set ...\" command, hns3 VF PMD keep the same MAC\n-\t * address strategy as the hns3 kernel ethdev driver in the\n-\t * initialization. If user configure a MAC address by the ip command\n-\t * for VF device, then hns3 VF PMD will start with it, otherwise\n-\t * start with a random MAC address in the initialization.\n-\t */\n-\tif (rte_is_zero_ether_addr((struct rte_ether_addr *)hw->mac.mac_addr))\n-\t\trte_eth_random_addr(hw->mac.mac_addr);\n-\trte_ether_addr_copy((struct rte_ether_addr *)hw->mac.mac_addr,\n-\t\t\t ð_dev->data->mac_addrs[0]);\n+\tret = hns3_init_mac_addrs(eth_dev);\n+\tif (ret != 0)\n+\t\tgoto err_init_mac_addrs;\n \n \thw->adapter_state = HNS3_NIC_INITIALIZED;\n \n@@ -2443,7 +2418,7 @@ hns3vf_dev_init(struct rte_eth_dev *eth_dev)\n \t\t\t eth_dev);\n \treturn 0;\n \n-err_rte_zmalloc:\n+err_init_mac_addrs:\n \thns3vf_uninit_vf(eth_dev);\n \n err_init_vf:\n", "prefixes": [ "03/15" ] }