Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/59061/?format=api
{ "id": 59061, "url": "https://patches.dpdk.org/api/patches/59061/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1568103959-25572-5-git-send-email-arybchenko@solarflare.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": "<1568103959-25572-5-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1568103959-25572-5-git-send-email-arybchenko@solarflare.com", "date": "2019-09-10T08:25:44", "name": "[04/18] net/bonding: check status of getting link info", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "6c422653576042647f811a9eb1b5084c3a54609b", "submitter": { "id": 607, "url": "https://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.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/1568103959-25572-5-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 6350, "url": "https://patches.dpdk.org/api/series/6350/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=6350", "date": "2019-09-10T08:25:41", "name": "ethdev: change link status get functions return value to int", "version": 1, "mbox": "https://patches.dpdk.org/series/6350/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/59061/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/59061/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 531EE1ED6B;\n\tTue, 10 Sep 2019 10:26:30 +0200 (CEST)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n\t[148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 010E71EC22\n\tfor <dev@dpdk.org>; Tue, 10 Sep 2019 10:26:20 +0200 (CEST)", "from webmail.solarflare.com (webmail.solarflare.com\n\t[12.187.104.26])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby mx1-us2.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n\tC5CB51C0068; Tue, 10 Sep 2019 08:26:19 +0000 (UTC)", "from ocex03.SolarFlarecom.com (10.20.40.36) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id 15.0.1395.4; Tue, 10 Sep 2019 01:26:16 -0700", "from opal.uk.solarflarecom.com (10.17.10.1) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id\n\t15.0.1395.4 via Frontend Transport; Tue, 10 Sep 2019 01:26:16 -0700", "from ukv-loginhost.uk.solarflarecom.com\n\t(ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tx8A8QFU6002226; Tue, 10 Sep 2019 09:26:15 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n\tby ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id\n\t0B1CD1613D2; Tue, 10 Sep 2019 09:26:15 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "Chas Williams <chas3@att.com>", "CC": "<dev@dpdk.org>, Igor Romanov <igor.romanov@oktetlabs.ru>", "Date": "Tue, 10 Sep 2019 09:25:44 +0100", "Message-ID": "<1568103959-25572-5-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1568103959-25572-1-git-send-email-arybchenko@solarflare.com>", "References": "<1568103959-25572-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-TM-AS-Product-Ver": "SMEX-12.5.0.1300-8.5.1010-24898.005", "X-TM-AS-Result": "No-3.263600-4.000000-10", "X-TMASE-MatchedRID": "1e4GURu5ZSnDOgXZFRFV83CO70QAsBdCWw/S0HB7eoNjLp8Cm8vwF2dC\n\tuMvHMJPkGWRGldniBlVw5T4Iaj538mJZXQNDzktSDDB/0m4/XMTqobkz1A0A7VeIuu+Gkot8auP\n\tBry+3W1EzlETC5jrcQoL7JbSyOvcew+noLBygYTgFxov+3JYvY6izFDHVmY+juqWf6Nh7tmEYAR\n\tBTx8mGnXA1rXsS2KwWpM0DuMZdHThqpXWtxrBsQSQ7ls378/zHA76tPJIOKsWnMb4m7aAqt/N+o\n\tA4oIb1dGayYH7HN0cQGQylveAJ0foF4KlUH7HJ6ngIgpj8eDcAZ1CdBJOsoY8RB0bsfrpPIcSqb\n\txBgG0w4dp3EGyknOe4fo+FzzAvMHGz0UHwxBT90jb4ddzb6Mmck+pYzE0OROtMSv1prjUULbZG6\n\tBvIk2Wl8/9cUrr/tcPgbCb+jU1TuTdSRXlCnjBIjjlF305EnAWUm8SESyzd/NBqGt1DPvvA==", "X-TM-AS-User-Approved-Sender": "No", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--3.263600-4.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1010-24898.005", "X-MDID": "1568103980-otnQuYoFf4yY", "Subject": "[dpdk-dev] [PATCH 04/18] net/bonding: check status of getting link\n\tinfo", "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": "From: Igor Romanov <igor.romanov@oktetlabs.ru>\n\nThe return value of rte_eth_link_get() and rte_eth_link_get_nowait()\nwas changed from void to int. Update the usage of the functions\naccording to the new return type.\n\nSigned-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/bonding/rte_eth_bond_8023ad.c | 24 +++++++---\n drivers/net/bonding/rte_eth_bond_api.c | 19 ++++++--\n drivers/net/bonding/rte_eth_bond_pmd.c | 55 ++++++++++++++++++++---\n 3 files changed, 83 insertions(+), 15 deletions(-)", "diff": "diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c\nindex e64fb6e41..e50d946eb 100644\n--- a/drivers/net/bonding/rte_eth_bond_8023ad.c\n+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c\n@@ -675,6 +675,7 @@ selection_logic(struct bond_dev_private *internals, uint16_t slave_id)\n \tuint16_t default_slave = 0;\n \tuint8_t mode_count_id, mode_band_id;\n \tstruct rte_eth_link link_info;\n+\tint ret;\n \n \tslaves = internals->active_slaves;\n \tslaves_count = internals->active_slave_count;\n@@ -687,8 +688,14 @@ selection_logic(struct bond_dev_private *internals, uint16_t slave_id)\n \t\tif (agg->aggregator_port_id != slaves[i])\n \t\t\tcontinue;\n \n+\t\tret = rte_eth_link_get_nowait(slaves[i], &link_info);\n+\t\tif (ret < 0) {\n+\t\t\tRTE_BOND_LOG(ERR,\n+\t\t\t\t\"Slave (port %u) link get failed: %s\\n\",\n+\t\t\t\tslaves[i], rte_strerror(-ret));\n+\t\t\tcontinue;\n+\t\t}\n \t\tagg_count[agg->aggregator_port_id] += 1;\n-\t\trte_eth_link_get_nowait(slaves[i], &link_info);\n \t\tagg_bandwidth[agg->aggregator_port_id] += link_info.link_speed;\n \n \t\t/* Actors system ID is not checked since all slave device have the same\n@@ -821,18 +828,25 @@ bond_mode_8023ad_periodic_cb(void *arg)\n \t/* Update link status on each port */\n \tfor (i = 0; i < internals->active_slave_count; i++) {\n \t\tuint16_t key;\n+\t\tint ret;\n \n \t\tslave_id = internals->active_slaves[i];\n-\t\trte_eth_link_get_nowait(slave_id, &link_info);\n-\t\trte_eth_macaddr_get(slave_id, &slave_addr);\n+\t\tret = rte_eth_link_get_nowait(slave_id, &link_info);\n+\t\tif (ret < 0) {\n+\t\t\tRTE_BOND_LOG(ERR,\n+\t\t\t\t\"Slave (port %u) link get failed: %s\\n\",\n+\t\t\t\tslave_id, rte_strerror(-ret));\n+\t\t}\n \n-\t\tif (link_info.link_status != 0) {\n+\t\tif (ret >= 0 && link_info.link_status != 0) {\n \t\t\tkey = link_speed_key(link_info.link_speed) << 1;\n \t\t\tif (link_info.link_duplex == ETH_LINK_FULL_DUPLEX)\n \t\t\t\tkey |= BOND_LINK_FULL_DUPLEX_KEY;\n-\t\t} else\n+\t\t} else {\n \t\t\tkey = 0;\n+\t\t}\n \n+\t\trte_eth_macaddr_get(slave_id, &slave_addr);\n \t\tport = &bond_mode_8023ad_ports[slave_id];\n \n \t\tkey = rte_cpu_to_be_16(key);\ndiff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c\nindex e2e27e9f2..2cef88720 100644\n--- a/drivers/net/bonding/rte_eth_bond_api.c\n+++ b/drivers/net/bonding/rte_eth_bond_api.c\n@@ -557,9 +557,6 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id)\n \t\t}\n \t}\n \n-\t/* Add slave details to bonded device */\n-\tslave_eth_dev->data->dev_flags |= RTE_ETH_DEV_BONDED_SLAVE;\n-\n \t/* Update all slave devices MACs */\n \tmac_address_slaves_update(bonded_eth_dev);\n \n@@ -571,7 +568,18 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id)\n \t/* If bonded device is started then we can add the slave to our active\n \t * slave array */\n \tif (bonded_eth_dev->data->dev_started) {\n-\t\trte_eth_link_get_nowait(slave_port_id, &link_props);\n+\t\tret = rte_eth_link_get_nowait(slave_port_id, &link_props);\n+\t\tif (ret < 0) {\n+\t\t\trte_eth_dev_callback_unregister(slave_port_id,\n+\t\t\t\t\tRTE_ETH_EVENT_INTR_LSC,\n+\t\t\t\t\tbond_ethdev_lsc_event_callback,\n+\t\t\t\t\t&bonded_eth_dev->data->port_id);\n+\t\t\tinternals->slave_count--;\n+\t\t\tRTE_BOND_LOG(ERR,\n+\t\t\t\t\"Slave (port %u) link get failed: %s\\n\",\n+\t\t\t\tslave_port_id, rte_strerror(-ret));\n+\t\t\treturn -1;\n+\t\t}\n \n \t\t if (link_props.link_status == ETH_LINK_UP) {\n \t\t\tif (internals->active_slave_count == 0 &&\n@@ -581,6 +589,9 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id)\n \t\t}\n \t}\n \n+\t/* Add slave details to bonded device */\n+\tslave_eth_dev->data->dev_flags |= RTE_ETH_DEV_BONDED_SLAVE;\n+\n \tslave_vlan_filter_set(bonded_port_id, slave_port_id);\n \n \treturn 0;\ndiff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c\nindex 9316f93f7..a2d13d95c 100644\n--- a/drivers/net/bonding/rte_eth_bond_pmd.c\n+++ b/drivers/net/bonding/rte_eth_bond_pmd.c\n@@ -846,8 +846,14 @@ bandwidth_left(uint16_t port_id, uint64_t load, uint8_t update_idx,\n \t\tstruct bwg_slave *bwg_slave)\n {\n \tstruct rte_eth_link link_status;\n+\tint ret;\n \n-\trte_eth_link_get_nowait(port_id, &link_status);\n+\tret = rte_eth_link_get_nowait(port_id, &link_status);\n+\tif (ret < 0) {\n+\t\tRTE_BOND_LOG(ERR, \"Slave (port %u) link get failed: %s\",\n+\t\t\t port_id, rte_strerror(-ret));\n+\t\treturn;\n+\t}\n \tuint64_t link_bwg = link_status.link_speed * 1000000ULL / 8;\n \tif (link_bwg == 0)\n \t\treturn;\n@@ -2363,7 +2369,9 @@ bond_ethdev_link_update(struct rte_eth_dev *ethdev, int wait_to_complete)\n \tstruct bond_dev_private *bond_ctx;\n \tstruct rte_eth_link slave_link;\n \n+\tbool one_link_update_succeeded;\n \tuint32_t idx;\n+\tint ret;\n \n \tbond_ctx = ethdev->data->dev_private;\n \n@@ -2396,7 +2404,17 @@ bond_ethdev_link_update(struct rte_eth_dev *ethdev, int wait_to_complete)\n \t\t * greater than this are attempted\n \t\t */\n \t\tfor (idx = 0; idx < bond_ctx->active_slave_count; idx++) {\n-\t\t\tlink_update(bond_ctx->active_slaves[idx], &slave_link);\n+\t\t\tret = link_update(bond_ctx->active_slaves[idx],\n+\t\t\t\t\t &slave_link);\n+\t\t\tif (ret < 0) {\n+\t\t\t\tethdev->data->dev_link.link_speed =\n+\t\t\t\t\tETH_SPEED_NUM_NONE;\n+\t\t\t\tRTE_BOND_LOG(ERR,\n+\t\t\t\t\t\"Slave (port %u) link get failed: %s\",\n+\t\t\t\t\tbond_ctx->active_slaves[idx],\n+\t\t\t\t\trte_strerror(-ret));\n+\t\t\t\treturn 0;\n+\t\t\t}\n \n \t\t\tif (slave_link.link_speed <\n \t\t\t\t\tethdev->data->dev_link.link_speed)\n@@ -2406,7 +2424,13 @@ bond_ethdev_link_update(struct rte_eth_dev *ethdev, int wait_to_complete)\n \t\tbreak;\n \tcase BONDING_MODE_ACTIVE_BACKUP:\n \t\t/* Current primary slave */\n-\t\tlink_update(bond_ctx->current_primary_port, &slave_link);\n+\t\tret = link_update(bond_ctx->current_primary_port, &slave_link);\n+\t\tif (ret < 0) {\n+\t\t\tRTE_BOND_LOG(ERR, \"Slave (port %u) link get failed: %s\",\n+\t\t\t\tbond_ctx->current_primary_port,\n+\t\t\t\trte_strerror(-ret));\n+\t\t\treturn 0;\n+\t\t}\n \n \t\tethdev->data->dev_link.link_speed = slave_link.link_speed;\n \t\tbreak;\n@@ -2426,13 +2450,28 @@ bond_ethdev_link_update(struct rte_eth_dev *ethdev, int wait_to_complete)\n \t\t * of all the slaves\n \t\t */\n \t\tethdev->data->dev_link.link_speed = ETH_SPEED_NUM_NONE;\n+\t\tone_link_update_succeeded = false;\n \n \t\tfor (idx = 0; idx < bond_ctx->active_slave_count; idx++) {\n-\t\t\tlink_update(bond_ctx->active_slaves[idx], &slave_link);\n+\t\t\tret = link_update(bond_ctx->active_slaves[idx],\n+\t\t\t\t\t&slave_link);\n+\t\t\tif (ret < 0) {\n+\t\t\t\tRTE_BOND_LOG(ERR,\n+\t\t\t\t\t\"Slave (port %u) link get failed: %s\",\n+\t\t\t\t\tbond_ctx->active_slaves[idx],\n+\t\t\t\t\trte_strerror(-ret));\n+\t\t\t\tcontinue;\n+\t\t\t}\n \n+\t\t\tone_link_update_succeeded = true;\n \t\t\tethdev->data->dev_link.link_speed +=\n \t\t\t\t\tslave_link.link_speed;\n \t\t}\n+\n+\t\tif (!one_link_update_succeeded) {\n+\t\t\tRTE_BOND_LOG(ERR, \"All slaves link get failed\");\n+\t\t\treturn 0;\n+\t\t}\n \t}\n \n \n@@ -2734,6 +2773,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,\n \tstruct bond_dev_private *internals;\n \tstruct rte_eth_link link;\n \tint rc = -1;\n+\tint ret;\n \n \tuint8_t lsc_flag = 0;\n \tint valid_slave = 0;\n@@ -2774,8 +2814,11 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,\n \tactive_pos = find_slave_by_id(internals->active_slaves,\n \t\t\tinternals->active_slave_count, port_id);\n \n-\trte_eth_link_get_nowait(port_id, &link);\n-\tif (link.link_status) {\n+\tret = rte_eth_link_get_nowait(port_id, &link);\n+\tif (ret < 0)\n+\t\tRTE_BOND_LOG(ERR, \"Slave (port %u) link get failed\", port_id);\n+\n+\tif (ret == 0 && link.link_status) {\n \t\tif (active_pos < internals->active_slave_count)\n \t\t\tgoto link_update;\n \n", "prefixes": [ "04/18" ] }