Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/85046/?format=api
{ "id": 85046, "url": "http://patches.dpdk.org/api/patches/85046/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1607846585-2381-7-git-send-email-oulijun@huawei.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": "<1607846585-2381-7-git-send-email-oulijun@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1607846585-2381-7-git-send-email-oulijun@huawei.com", "date": "2020-12-13T08:03:04", "name": "[6/7] net/hns3: fix directly access with rte device", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ccfcee4f5d3d90448bde0f395ad9e43b5e3776c3", "submitter": { "id": 1675, "url": "http://patches.dpdk.org/api/people/1675/?format=api", "name": "Lijun Ou", "email": "oulijun@huawei.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/1607846585-2381-7-git-send-email-oulijun@huawei.com/mbox/", "series": [ { "id": 14275, "url": "http://patches.dpdk.org/api/series/14275/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=14275", "date": "2020-12-13T08:03:03", "name": "some bugfixes for hns3", "version": 1, "mbox": "http://patches.dpdk.org/series/14275/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/85046/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/85046/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 9C224A04B5;\n\tSun, 13 Dec 2020 09:05:22 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 615BDC872;\n\tSun, 13 Dec 2020 09:03:24 +0100 (CET)", "from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190])\n by dpdk.org (Postfix) with ESMTP id 196B8C9C4\n for <dev@dpdk.org>; Sun, 13 Dec 2020 09:03:22 +0100 (CET)", "from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.60])\n by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4Ctxnz2Sl1z15cD3\n for <dev@dpdk.org>; Sun, 13 Dec 2020 16:02:31 +0800 (CST)", "from localhost.localdomain (10.69.192.56) by\n DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id\n 14.3.498.0; Sun, 13 Dec 2020 16:02:59 +0800" ], "From": "Lijun Ou <oulijun@huawei.com>", "To": "<ferruh.yigit@intel.com>", "CC": "<dev@dpdk.org>, <linuxarm@huawei.com>", "Date": "Sun, 13 Dec 2020 16:03:04 +0800", "Message-ID": "<1607846585-2381-7-git-send-email-oulijun@huawei.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1607846585-2381-1-git-send-email-oulijun@huawei.com>", "References": "<1607846585-2381-1-git-send-email-oulijun@huawei.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[10.69.192.56]", "X-CFilter-Loop": "Reflected", "Subject": "[dpdk-dev] [PATCH 6/7] net/hns3: fix directly access with rte device", "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": "From: \"Min Hu (Connor)\" <humin29@huawei.com>\n\nIn current version, there exists the way of access\nglobal 'rte_eth_devices' array directly, and this\nis not a good way.\nBetter way is to store the 'eth_dev' in the device\nprivate data in the probe(). Then driver could use\nit later.\n\nFixes: ab2e2e344163 (\"net/hns3: get device capability in primary process\")\nFixes: c4ae39b2cfc5 (\"net/hns3: fix Rx interrupt after reset\")\nFixes: 2790c6464725 (\"net/hns3: support device reset\")\nFixes: c203571b3602 (\"net/hns3: register and add log interface\")\nFixes: 1265b5372d9d (\"net/hns3: add some definitions for data structure and macro\")\nFixes: 521ab3e93361 (\"net/hns3: add simple Rx path\")\nFixes: a3d4f4d291d7 (\"net/hns3: support NEON Rx\")\nFixes: 952ebacce4f2 (\"net/hns3: support SVE Rx\")\nCc: stable@dpdk.org\n\nSigned-off-by: Min Hu (Connor) <humin29@huawei.com>\nSigned-off-by: Lijun Ou <oulijun@huawei.com>\n---\n drivers/net/hns3/hns3_ethdev.c | 11 +++++------\n drivers/net/hns3/hns3_ethdev.h | 6 ++++++\n drivers/net/hns3/hns3_ethdev_vf.c | 13 ++++++-------\n drivers/net/hns3/hns3_rxtx.c | 13 ++++++-------\n drivers/net/hns3/hns3_rxtx_vec.c | 4 +++-\n drivers/net/hns3/hns3_rxtx_vec_sve.c | 4 +++-\n 6 files changed, 29 insertions(+), 22 deletions(-)", "diff": "diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c\nindex f49b779..1093be1 100644\n--- a/drivers/net/hns3/hns3_ethdev.c\n+++ b/drivers/net/hns3/hns3_ethdev.c\n@@ -2992,15 +2992,14 @@ hns3_query_dev_specifications(struct hns3_hw *hw)\n static int\n hns3_get_capability(struct hns3_hw *hw)\n {\n+\tstruct rte_eth_dev *eth_dev = HNS3_DEV_HW_TO_ETH_DEV(hw);\n \tstruct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);\n \tstruct rte_pci_device *pci_dev;\n \tstruct hns3_pf *pf = &hns->pf;\n-\tstruct rte_eth_dev *eth_dev;\n \tuint16_t device_id;\n \tuint8_t revision;\n \tint ret;\n \n-\teth_dev = &rte_eth_devices[hw->data->port_id];\n \tpci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n \tdevice_id = pci_dev->id.device_id;\n \n@@ -4836,7 +4835,7 @@ hns3_map_rx_interrupt(struct rte_eth_dev *dev)\n static int\n hns3_restore_rx_interrupt(struct hns3_hw *hw)\n {\n-\tstruct rte_eth_dev *dev = &rte_eth_devices[hw->data->port_id];\n+\tstruct rte_eth_dev *dev = HNS3_DEV_HW_TO_ETH_DEV(hw);\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n \tstruct rte_intr_handle *intr_handle = &pci_dev->intr_handle;\n \tuint16_t q_id;\n@@ -5526,7 +5525,7 @@ hns3_stop_service(struct hns3_adapter *hns)\n \tstruct hns3_hw *hw = &hns->hw;\n \tstruct rte_eth_dev *eth_dev;\n \n-\teth_dev = &rte_eth_devices[hw->data->port_id];\n+\teth_dev = hns->eth_dev;\n \tif (hw->adapter_state == HNS3_NIC_STARTED)\n \t\trte_eal_alarm_cancel(hns3_service_handler, eth_dev);\n \thw->mac.link_status = ETH_LINK_DOWN;\n@@ -5567,7 +5566,7 @@ hns3_start_service(struct hns3_adapter *hns)\n \tif (hw->reset.level == HNS3_IMP_RESET ||\n \t hw->reset.level == HNS3_GLOBAL_RESET)\n \t\thns3_set_rst_done(hw);\n-\teth_dev = &rte_eth_devices[hw->data->port_id];\n+\teth_dev = hns->eth_dev;\n \thns3_set_rxtx_function(eth_dev);\n \thns3_mp_req_start_rxtx(eth_dev);\n \tif (hw->adapter_state == HNS3_NIC_STARTED) {\n@@ -5668,7 +5667,7 @@ hns3_reset_service(void *param)\n \tif (rte_atomic16_read(&hns->hw.reset.schedule) == SCHEDULE_DEFERRED) {\n \t\trte_atomic16_set(&hns->hw.reset.schedule, SCHEDULE_REQUESTED);\n \t\thns3_err(hw, \"Handling interrupts in delayed tasks\");\n-\t\thns3_interrupt_handler(&rte_eth_devices[hw->data->port_id]);\n+\t\thns3_interrupt_handler(hns->eth_dev);\n \t\treset_level = hns3_get_reset_level(hns, &hw->reset.pending);\n \t\tif (reset_level == HNS3_NONE_RESET) {\n \t\t\thns3_err(hw, \"No reset level is set, try IMP reset\");\ndiff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h\nindex 8d6b8cd..51e450a 100644\n--- a/drivers/net/hns3/hns3_ethdev.h\n+++ b/drivers/net/hns3/hns3_ethdev.h\n@@ -798,6 +798,12 @@ struct hns3_adapter {\n #define HNS3_DEV_HW_TO_ADAPTER(hw) \\\n \tcontainer_of(hw, struct hns3_adapter, hw)\n \n+static inline struct rte_eth_dev *HNS3_DEV_HW_TO_ETH_DEV(struct hns3_hw *hw)\n+{\n+\tstruct hns3_adapter *adapter = HNS3_DEV_HW_TO_ADAPTER(hw);\n+\treturn adapter->eth_dev;\n+}\n+\n #define hns3_set_field(origin, mask, shift, val) \\\n \tdo { \\\n \t\t(origin) &= (~(mask)); \\\ndiff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c\nindex 9c382bf..890d33d 100644\n--- a/drivers/net/hns3/hns3_ethdev_vf.c\n+++ b/drivers/net/hns3/hns3_ethdev_vf.c\n@@ -1180,12 +1180,11 @@ hns3vf_query_dev_specifications(struct hns3_hw *hw)\n static int\n hns3vf_get_capability(struct hns3_hw *hw)\n {\n+\tstruct rte_eth_dev *eth_dev = HNS3_DEV_HW_TO_ETH_DEV(hw);\n \tstruct rte_pci_device *pci_dev;\n-\tstruct rte_eth_dev *eth_dev;\n \tuint8_t revision;\n \tint ret;\n \n-\teth_dev = &rte_eth_devices[hw->data->port_id];\n \tpci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n \n \t/* Get PCI revision id */\n@@ -2152,7 +2151,7 @@ hns3vf_map_rx_interrupt(struct rte_eth_dev *dev)\n static int\n hns3vf_restore_rx_interrupt(struct hns3_hw *hw)\n {\n-\tstruct rte_eth_dev *dev = &rte_eth_devices[hw->data->port_id];\n+\tstruct rte_eth_dev *dev = HNS3_DEV_HW_TO_ETH_DEV(hw);\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);\n \tstruct rte_intr_handle *intr_handle = &pci_dev->intr_handle;\n \tuint16_t q_id;\n@@ -2377,7 +2376,7 @@ hns3vf_stop_service(struct hns3_adapter *hns)\n \tstruct hns3_hw *hw = &hns->hw;\n \tstruct rte_eth_dev *eth_dev;\n \n-\teth_dev = &rte_eth_devices[hw->data->port_id];\n+\teth_dev = hns->eth_dev;\n \tif (hw->adapter_state == HNS3_NIC_STARTED)\n \t\trte_eal_alarm_cancel(hns3vf_service_handler, eth_dev);\n \thw->mac.link_status = ETH_LINK_DOWN;\n@@ -2415,7 +2414,7 @@ hns3vf_start_service(struct hns3_adapter *hns)\n \tstruct hns3_hw *hw = &hns->hw;\n \tstruct rte_eth_dev *eth_dev;\n \n-\teth_dev = &rte_eth_devices[hw->data->port_id];\n+\teth_dev = hns->eth_dev;\n \thns3_set_rxtx_function(eth_dev);\n \thns3_mp_req_start_rxtx(eth_dev);\n \tif (hw->adapter_state == HNS3_NIC_STARTED) {\n@@ -2577,7 +2576,7 @@ hns3vf_reset_service(void *param)\n \tif (rte_atomic16_read(&hns->hw.reset.schedule) == SCHEDULE_DEFERRED) {\n \t\trte_atomic16_set(&hns->hw.reset.schedule, SCHEDULE_REQUESTED);\n \t\thns3_err(hw, \"Handling interrupts in delayed tasks\");\n-\t\thns3vf_interrupt_handler(&rte_eth_devices[hw->data->port_id]);\n+\t\thns3vf_interrupt_handler(hns->eth_dev);\n \t\treset_level = hns3vf_get_reset_level(hw, &hw->reset.pending);\n \t\tif (reset_level == HNS3_NONE_RESET) {\n \t\t\thns3_err(hw, \"No reset level is set, try global reset\");\n@@ -2608,7 +2607,7 @@ hns3vf_reset_service(void *param)\n static int\n hns3vf_reinit_dev(struct hns3_adapter *hns)\n {\n-\tstruct rte_eth_dev *eth_dev = &rte_eth_devices[hns->hw.data->port_id];\n+\tstruct rte_eth_dev *eth_dev = hns->eth_dev;\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n \tstruct hns3_hw *hw = &hns->hw;\n \tint ret;\ndiff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c\nindex 88d3bab..b7a28e8 100644\n--- a/drivers/net/hns3/hns3_rxtx.c\n+++ b/drivers/net/hns3/hns3_rxtx.c\n@@ -912,7 +912,7 @@ hns3_queue_intr_enable(struct hns3_hw *hw, uint16_t queue_id, bool en)\n void\n hns3_dev_all_rx_queue_intr_enable(struct hns3_hw *hw, bool en)\n {\n-\tstruct rte_eth_dev *dev = &rte_eth_devices[hw->data->port_id];\n+\tstruct rte_eth_dev *dev = HNS3_DEV_HW_TO_ETH_DEV(hw);\n \tuint16_t nb_rx_q = hw->data->nb_rx_queues;\n \tint i;\n \n@@ -1620,7 +1620,7 @@ static int\n hns3_rxq_conf_runtime_check(struct hns3_hw *hw, uint16_t buf_size,\n \t\t\t\tuint16_t nb_desc)\n {\n-\tstruct rte_eth_dev *dev = &rte_eth_devices[hw->data->port_id];\n+\tstruct rte_eth_dev *dev = HNS3_DEV_HW_TO_ETH_DEV(hw);\n \tstruct rte_eth_rxmode *rxmode = &hw->data->dev_conf.rxmode;\n \teth_rx_burst_t pkt_burst = dev->rx_pkt_burst;\n \tuint16_t min_vec_bds;\n@@ -2078,6 +2078,7 @@ hns3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \tvolatile struct hns3_desc *rxdp; /* pointer of the current desc */\n \tstruct hns3_rx_queue *rxq; /* RX queue */\n \tstruct hns3_entry *sw_ring;\n+\tstruct rte_eth_dev *dev;\n \tstruct hns3_entry *rxe;\n \tstruct hns3_desc rxd;\n \tstruct rte_mbuf *nmb; /* pointer of the new mbuf */\n@@ -2110,10 +2111,8 @@ hns3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \n \t\tnmb = hns3_rx_alloc_buffer(rxq);\n \t\tif (unlikely(nmb == NULL)) {\n-\t\t\tuint16_t port_id;\n-\n-\t\t\tport_id = rxq->port_id;\n-\t\t\trte_eth_devices[port_id].data->rx_mbuf_alloc_failed++;\n+\t\t\tdev = rxq->hns->eth_dev;\n+\t\t\tdev->data->rx_mbuf_alloc_failed++;\n \t\t\tbreak;\n \t\t}\n \n@@ -2289,7 +2288,7 @@ hns3_recv_scattered_pkts(void *rx_queue,\n \n \t\tnmb = hns3_rx_alloc_buffer(rxq);\n \t\tif (unlikely(nmb == NULL)) {\n-\t\t\tdev = &rte_eth_devices[rxq->port_id];\n+\t\t\tdev = rxq->hns->eth_dev;\n \t\t\tdev->data->rx_mbuf_alloc_failed++;\n \t\t\tbreak;\n \t\t}\ndiff --git a/drivers/net/hns3/hns3_rxtx_vec.c b/drivers/net/hns3/hns3_rxtx_vec.c\nindex a26c83d..5d02588 100644\n--- a/drivers/net/hns3/hns3_rxtx_vec.c\n+++ b/drivers/net/hns3/hns3_rxtx_vec.c\n@@ -52,12 +52,14 @@ hns3_rxq_rearm_mbuf(struct hns3_rx_queue *rxq)\n #define REARM_LOOP_STEP_NUM\t4\n \tstruct hns3_entry *rxep = &rxq->sw_ring[rxq->rx_rearm_start];\n \tstruct hns3_desc *rxdp = rxq->rx_ring + rxq->rx_rearm_start;\n+\tstruct rte_eth_dev *dev;\n \tuint64_t dma_addr;\n \tint i;\n \n \tif (unlikely(rte_mempool_get_bulk(rxq->mb_pool, (void *)rxep,\n \t\t\t\t\t HNS3_DEFAULT_RXQ_REARM_THRESH) < 0)) {\n-\t\trte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;\n+\t\tdev = rxq->hns->eth_dev;\n+\t\tdev->data->rx_mbuf_alloc_failed++;\n \t\treturn;\n \t}\n \ndiff --git a/drivers/net/hns3/hns3_rxtx_vec_sve.c b/drivers/net/hns3/hns3_rxtx_vec_sve.c\nindex 8c2c8f6..603d726 100644\n--- a/drivers/net/hns3/hns3_rxtx_vec_sve.c\n+++ b/drivers/net/hns3/hns3_rxtx_vec_sve.c\n@@ -239,11 +239,13 @@ hns3_rxq_rearm_mbuf_sve(struct hns3_rx_queue *rxq)\n \tstruct hns3_entry *rxep = &rxq->sw_ring[rxq->rx_rearm_start];\n \tstruct hns3_desc *rxdp = rxq->rx_ring + rxq->rx_rearm_start;\n \tstruct hns3_entry *rxep_tmp = rxep;\n+\tstruct rte_eth_dev *dev;\n \tint i;\n \n \tif (unlikely(rte_mempool_get_bulk(rxq->mb_pool, (void *)rxep,\n \t\t\t\t\t HNS3_DEFAULT_RXQ_REARM_THRESH) < 0)) {\n-\t\trte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;\n+\t\tdev = rxq->hns->eth_dev;\n+\t\tdev->data->rx_mbuf_alloc_failed++;\n \t\treturn;\n \t}\n \n", "prefixes": [ "6/7" ] }