Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/86618/?format=api
{ "id": 86618, "url": "https://patches.dpdk.org/api/patches/86618/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1610631217-14216-2-git-send-email-oulijun@huawei.com/", "project": { "id": 1, "url": "https://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": "<1610631217-14216-2-git-send-email-oulijun@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1610631217-14216-2-git-send-email-oulijun@huawei.com", "date": "2021-01-14T13:33:30", "name": "[1/8] net/hns3: use C11 atomics builtins for resetting", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "252964ac46af4d86ef1db3c2827f24baf47b6495", "submitter": { "id": 1675, "url": "https://patches.dpdk.org/api/people/1675/?format=api", "name": "Lijun Ou", "email": "oulijun@huawei.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1610631217-14216-2-git-send-email-oulijun@huawei.com/mbox/", "series": [ { "id": 14755, "url": "https://patches.dpdk.org/api/series/14755/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=14755", "date": "2021-01-14T13:33:37", "name": "TM and some bugfixes for hns3", "version": 1, "mbox": "https://patches.dpdk.org/series/14755/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/86618/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/86618/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 6F94FA0A02;\n\tThu, 14 Jan 2021 14:34:25 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id D03C214127D;\n\tThu, 14 Jan 2021 14:34:03 +0100 (CET)", "from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190])\n by mails.dpdk.org (Postfix) with ESMTP id 82890141250\n for <dev@dpdk.org>; Thu, 14 Jan 2021 14:33:58 +0100 (CET)", "from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.59])\n by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4DGlcR14d7z15t1D\n for <dev@dpdk.org>; Thu, 14 Jan 2021 21:32:55 +0800 (CST)", "from localhost.localdomain (10.69.192.56) by\n DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id\n 14.3.498.0; Thu, 14 Jan 2021 21:33:53 +0800" ], "From": "Lijun Ou <oulijun@huawei.com>", "To": "<ferruh.yigit@intel.com>", "CC": "<dev@dpdk.org>", "Date": "Thu, 14 Jan 2021 21:33:30 +0800", "Message-ID": "<1610631217-14216-2-git-send-email-oulijun@huawei.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1610631217-14216-1-git-send-email-oulijun@huawei.com>", "References": "<1610631217-14216-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 1/8] net/hns3: use C11 atomics builtins for\n resetting", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Use C11 atomic builtins with explicit ordering instead of\nrte_atomic ops with the resetting member of hns3_reset_data\nstructure.\n\nSigned-off-by: Lijun Ou <oulijun@huawei.com>\n---\n drivers/net/hns3/hns3_dcb.c | 5 +++--\n drivers/net/hns3/hns3_ethdev.c | 8 ++++----\n drivers/net/hns3/hns3_ethdev.h | 2 +-\n drivers/net/hns3/hns3_ethdev_vf.c | 12 ++++++------\n drivers/net/hns3/hns3_intr.c | 8 ++++----\n drivers/net/hns3/hns3_rxtx.c | 2 +-\n 6 files changed, 19 insertions(+), 18 deletions(-)", "diff": "diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c\nindex fb50179..b32d5af 100644\n--- a/drivers/net/hns3/hns3_dcb.c\n+++ b/drivers/net/hns3/hns3_dcb.c\n@@ -633,7 +633,7 @@ hns3_set_rss_size(struct hns3_hw *hw, uint16_t nb_rx_q)\n \t * and configured directly to the hardware in the RESET_STAGE_RESTORE\n \t * stage of the reset process.\n \t */\n-\tif (rte_atomic16_read(&hw->reset.resetting) == 0) {\n+\tif (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED) == 0) {\n \t\tfor (i = 0; i < HNS3_RSS_IND_TBL_SIZE; i++)\n \t\t\trss_cfg->rss_indirection_tbl[i] =\n \t\t\t\t\t\t\ti % hw->alloc_rss_size;\n@@ -1562,7 +1562,8 @@ hns3_dcb_configure(struct hns3_adapter *hns)\n \tint ret;\n \n \thns3_dcb_cfg_validate(hns, &num_tc, &map_changed);\n-\tif (map_changed || rte_atomic16_read(&hw->reset.resetting)) {\n+\tif (map_changed ||\n+\t __atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED)) {\n \t\tret = hns3_dcb_info_update(hns, num_tc);\n \t\tif (ret) {\n \t\t\thns3_err(hw, \"dcb info update failed: %d\", ret);\ndiff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c\nindex 90544fe..888338a 100644\n--- a/drivers/net/hns3/hns3_ethdev.c\n+++ b/drivers/net/hns3/hns3_ethdev.c\n@@ -1017,7 +1017,7 @@ hns3_init_vlan_config(struct hns3_adapter *hns)\n \t * ensure that the hardware configuration remains unchanged before and\n \t * after reset.\n \t */\n-\tif (rte_atomic16_read(&hw->reset.resetting) == 0) {\n+\tif (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED) == 0) {\n \t\thw->port_base_vlan_cfg.state = HNS3_PORT_BASE_VLAN_DISABLE;\n \t\thw->port_base_vlan_cfg.pvid = HNS3_INVALID_PVID;\n \t}\n@@ -1041,7 +1041,7 @@ hns3_init_vlan_config(struct hns3_adapter *hns)\n \t * we will restore configurations to hardware in hns3_restore_vlan_table\n \t * and hns3_restore_vlan_conf later.\n \t */\n-\tif (rte_atomic16_read(&hw->reset.resetting) == 0) {\n+\tif (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED) == 0) {\n \t\tret = hns3_vlan_pvid_configure(hns, HNS3_INVALID_PVID, 0);\n \t\tif (ret) {\n \t\t\thns3_err(hw, \"pvid set fail in pf, ret =%d\", ret);\n@@ -4872,7 +4872,7 @@ hns3_dev_start(struct rte_eth_dev *dev)\n \tint ret;\n \n \tPMD_INIT_FUNC_TRACE();\n-\tif (rte_atomic16_read(&hw->reset.resetting))\n+\tif (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED))\n \t\treturn -EBUSY;\n \n \trte_spinlock_lock(&hw->lock);\n@@ -5018,7 +5018,7 @@ hns3_dev_stop(struct rte_eth_dev *dev)\n \trte_delay_ms(hw->tqps_num);\n \n \trte_spinlock_lock(&hw->lock);\n-\tif (rte_atomic16_read(&hw->reset.resetting) == 0) {\n+\tif (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED) == 0) {\n \t\thns3_stop_tqps(hw);\n \t\thns3_do_stop(hns);\n \t\thns3_unmap_rx_interrupt(dev);\ndiff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h\nindex 31f78a1..0d86683 100644\n--- a/drivers/net/hns3/hns3_ethdev.h\n+++ b/drivers/net/hns3/hns3_ethdev.h\n@@ -350,7 +350,7 @@ struct hns3_reset_data {\n \tenum hns3_reset_stage stage;\n \trte_atomic16_t schedule;\n \t/* Reset flag, covering the entire reset process */\n-\trte_atomic16_t resetting;\n+\tuint16_t resetting;\n \t/* Used to disable sending cmds during reset */\n \trte_atomic16_t disable_cmd;\n \t/* The reset level being processed */\ndiff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c\nindex f09cabc..3809824 100644\n--- a/drivers/net/hns3/hns3_ethdev_vf.c\n+++ b/drivers/net/hns3/hns3_ethdev_vf.c\n@@ -898,7 +898,7 @@ hns3vf_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)\n \t * MTU value issued by hns3 VF PMD driver must be less than or equal to\n \t * PF's MTU.\n \t */\n-\tif (rte_atomic16_read(&hw->reset.resetting)) {\n+\tif (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED)) {\n \t\thns3_err(hw, \"Failed to set mtu during resetting\");\n \t\treturn -EIO;\n \t}\n@@ -1438,7 +1438,7 @@ hns3vf_request_link_info(struct hns3_hw *hw)\n \tuint8_t resp_msg;\n \tint ret;\n \n-\tif (rte_atomic16_read(&hw->reset.resetting))\n+\tif (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED))\n \t\treturn;\n \tret = hns3_send_mbx_msg(hw, HNS3_MBX_GET_LINK_STATUS, 0, NULL, 0, false,\n \t\t\t\t&resp_msg, sizeof(resp_msg));\n@@ -1471,7 +1471,7 @@ hns3vf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)\n \tstruct hns3_hw *hw = &hns->hw;\n \tint ret;\n \n-\tif (rte_atomic16_read(&hw->reset.resetting)) {\n+\tif (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED)) {\n \t\thns3_err(hw,\n \t\t\t \"vf set vlan id failed during resetting, vlan_id =%u\",\n \t\t\t vlan_id);\n@@ -1510,7 +1510,7 @@ hns3vf_vlan_offload_set(struct rte_eth_dev *dev, int mask)\n \tunsigned int tmp_mask;\n \tint ret = 0;\n \n-\tif (rte_atomic16_read(&hw->reset.resetting)) {\n+\tif (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED)) {\n \t\thns3_err(hw, \"vf set vlan offload failed during resetting, \"\n \t\t\t \"mask = 0x%x\", mask);\n \t\treturn -EIO;\n@@ -1957,7 +1957,7 @@ hns3vf_dev_stop(struct rte_eth_dev *dev)\n \trte_delay_ms(hw->tqps_num);\n \n \trte_spinlock_lock(&hw->lock);\n-\tif (rte_atomic16_read(&hw->reset.resetting) == 0) {\n+\tif (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED) == 0) {\n \t\thns3_stop_tqps(hw);\n \t\thns3vf_do_stop(hns);\n \t\thns3vf_unmap_rx_interrupt(dev);\n@@ -2188,7 +2188,7 @@ hns3vf_dev_start(struct rte_eth_dev *dev)\n \tint ret;\n \n \tPMD_INIT_FUNC_TRACE();\n-\tif (rte_atomic16_read(&hw->reset.resetting))\n+\tif (__atomic_load_n(&hw->reset.resetting, __ATOMIC_RELAXED))\n \t\treturn -EBUSY;\n \n \trte_spinlock_lock(&hw->lock);\ndiff --git a/drivers/net/hns3/hns3_intr.c b/drivers/net/hns3/hns3_intr.c\nindex 99c500d..51f19b4 100644\n--- a/drivers/net/hns3/hns3_intr.c\n+++ b/drivers/net/hns3/hns3_intr.c\n@@ -1761,7 +1761,7 @@ hns3_reset_init(struct hns3_hw *hw)\n \thw->reset.stage = RESET_STAGE_NONE;\n \thw->reset.request = 0;\n \thw->reset.pending = 0;\n-\trte_atomic16_init(&hw->reset.resetting);\n+\thw->reset.resetting = 0;\n \trte_atomic16_init(&hw->reset.disable_cmd);\n \thw->reset.wait_data = rte_zmalloc(\"wait_data\",\n \t\t\t\t\t sizeof(struct hns3_wait_data), 0);\n@@ -2011,7 +2011,7 @@ hns3_reset_pre(struct hns3_adapter *hns)\n \tint ret;\n \n \tif (hw->reset.stage == RESET_STAGE_NONE) {\n-\t\trte_atomic16_set(&hns->hw.reset.resetting, 1);\n+\t\t__atomic_store_n(&hns->hw.reset.resetting, 1, __ATOMIC_RELAXED);\n \t\thw->reset.stage = RESET_STAGE_DOWN;\n \t\tret = hw->reset.ops->stop_service(hns);\n \t\tgettimeofday(&tv, NULL);\n@@ -2098,7 +2098,7 @@ hns3_reset_post(struct hns3_adapter *hns)\n \t\t/* IMP will wait ready flag before reset */\n \t\thns3_notify_reset_ready(hw, false);\n \t\thns3_clear_reset_level(hw, &hw->reset.pending);\n-\t\trte_atomic16_clear(&hns->hw.reset.resetting);\n+\t\t__atomic_store_n(&hns->hw.reset.resetting, 0, __ATOMIC_RELAXED);\n \t\thw->reset.attempts = 0;\n \t\thw->reset.stats.success_cnt++;\n \t\thw->reset.stage = RESET_STAGE_NONE;\n@@ -2223,7 +2223,7 @@ hns3_reset_process(struct hns3_adapter *hns, enum hns3_reset_level new_level)\n \t\t\thw->reset.mbuf_deferred_free = false;\n \t\t}\n \t\trte_spinlock_unlock(&hw->lock);\n-\t\trte_atomic16_clear(&hns->hw.reset.resetting);\n+\t\t__atomic_store_n(&hns->hw.reset.resetting, 0, __ATOMIC_RELAXED);\n \t\thw->reset.stage = RESET_STAGE_NONE;\n \t\tgettimeofday(&tv, NULL);\n \t\ttimersub(&tv, &hw->reset.start_time, &tv_delta);\ndiff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c\nindex 88d3bab..d4608ac 100644\n--- a/drivers/net/hns3/hns3_rxtx.c\n+++ b/drivers/net/hns3/hns3_rxtx.c\n@@ -3744,7 +3744,7 @@ void hns3_set_rxtx_function(struct rte_eth_dev *eth_dev)\n \teth_tx_prep_t prep = NULL;\n \n \tif (hns->hw.adapter_state == HNS3_NIC_STARTED &&\n-\t rte_atomic16_read(&hns->hw.reset.resetting) == 0) {\n+\t __atomic_load_n(&hns->hw.reset.resetting, __ATOMIC_RELAXED) == 0) {\n \t\teth_dev->rx_pkt_burst = hns3_get_rx_function(eth_dev);\n \t\teth_dev->tx_pkt_burst = hns3_get_tx_function(eth_dev, &prep);\n \t\teth_dev->tx_pkt_prepare = prep;\n", "prefixes": [ "1/8" ] }