Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/51387/?format=api
{ "id": 51387, "url": "http://patches.dpdk.org/api/patches/51387/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1553082442-18850-4-git-send-email-david.marchand@redhat.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": "<1553082442-18850-4-git-send-email-david.marchand@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1553082442-18850-4-git-send-email-david.marchand@redhat.com", "date": "2019-03-20T11:47:20", "name": "[3/5] net/bonding: fix incorrect slave id types", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "35312c385624c3aa1213ec5e2633bda18081cb72", "submitter": { "id": 1173, "url": "http://patches.dpdk.org/api/people/1173/?format=api", "name": "David Marchand", "email": "david.marchand@redhat.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/1553082442-18850-4-git-send-email-david.marchand@redhat.com/mbox/", "series": [ { "id": 3816, "url": "http://patches.dpdk.org/api/series/3816/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=3816", "date": "2019-03-20T11:47:17", "name": "bonding fixes", "version": 1, "mbox": "http://patches.dpdk.org/series/3816/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/51387/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/51387/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 972865B3E;\n\tWed, 20 Mar 2019 12:47:47 +0100 (CET)", "from mx1.redhat.com (mx1.redhat.com [209.132.183.28])\n\tby dpdk.org (Postfix) with ESMTP id 1F8064C91;\n\tWed, 20 Mar 2019 12:47:45 +0100 (CET)", "from smtp.corp.redhat.com\n\t(int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 81FC23084028;\n\tWed, 20 Mar 2019 11:47:44 +0000 (UTC)", "from dmarchan.remote.csb (ovpn-204-129.brq.redhat.com\n\t[10.40.204.129])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 380B81001E71;\n\tWed, 20 Mar 2019 11:47:42 +0000 (UTC)" ], "From": "David Marchand <david.marchand@redhat.com>", "To": "dev@dpdk.org", "Cc": "chas3@att.com,\n\tstable@dpdk.org", "Date": "Wed, 20 Mar 2019 12:47:20 +0100", "Message-Id": "<1553082442-18850-4-git-send-email-david.marchand@redhat.com>", "In-Reply-To": "<1553082442-18850-1-git-send-email-david.marchand@redhat.com>", "References": "<1553082442-18850-1-git-send-email-david.marchand@redhat.com>", "X-Scanned-By": "MIMEDefang 2.84 on 10.5.11.22", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.40]); Wed, 20 Mar 2019 11:47:44 +0000 (UTC)", "Subject": "[dpdk-dev] [PATCH 3/5] net/bonding: fix incorrect slave id types", "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": "Caught by code review, with port id conversion to 16bits, the slave id\nhave been extended to 16bits as well (both slave index and count).\n\nFixes: f8244c6399d9 (\"ethdev: increase port id range\")\nCc: stable@dpdk.org\n\nSigned-off-by: David Marchand <david.marchand@redhat.com>\n---\n drivers/net/bonding/rte_eth_bond_8023ad.c | 10 ++++-----\n drivers/net/bonding/rte_eth_bond_alb.c | 4 ++--\n drivers/net/bonding/rte_eth_bond_api.c | 4 ++--\n drivers/net/bonding/rte_eth_bond_pmd.c | 36 +++++++++++++++++-------------\n drivers/net/bonding/rte_eth_bond_private.h | 8 +++----\n 5 files changed, 33 insertions(+), 29 deletions(-)", "diff": "diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c\nindex dd847c6..ba44660 100644\n--- a/drivers/net/bonding/rte_eth_bond_8023ad.c\n+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c\n@@ -664,7 +664,7 @@\n * @param port_pos\t\t\tPort to assign.\n */\n static void\n-selection_logic(struct bond_dev_private *internals, uint8_t slave_id)\n+selection_logic(struct bond_dev_private *internals, uint16_t slave_id)\n {\n \tstruct port *agg, *port;\n \tuint16_t slaves_count, new_agg_id, i, j = 0;\n@@ -781,7 +781,7 @@\n }\n \n static void\n-rx_machine_update(struct bond_dev_private *internals, uint8_t slave_id,\n+rx_machine_update(struct bond_dev_private *internals, uint16_t slave_id,\n \t\tstruct rte_mbuf *lacp_pkt) {\n \tstruct lacpdu_header *lacp;\n \n@@ -805,8 +805,8 @@\n \tstruct rte_eth_link link_info;\n \tstruct ether_addr slave_addr;\n \tstruct rte_mbuf *lacp_pkt = NULL;\n-\n-\tuint8_t i, slave_id;\n+\tuint16_t slave_id;\n+\tuint16_t i;\n \n \n \t/* Update link status on each port */\n@@ -1149,7 +1149,7 @@\n bond_mode_8023ad_enable(struct rte_eth_dev *bond_dev)\n {\n \tstruct bond_dev_private *internals = bond_dev->data->dev_private;\n-\tuint8_t i;\n+\tuint16_t i;\n \n \tfor (i = 0; i < internals->active_slave_count; i++)\n \t\tbond_mode_8023ad_activate_slave(bond_dev,\ndiff --git a/drivers/net/bonding/rte_eth_bond_alb.c b/drivers/net/bonding/rte_eth_bond_alb.c\nindex c3891c7..d3e16d4 100644\n--- a/drivers/net/bonding/rte_eth_bond_alb.c\n+++ b/drivers/net/bonding/rte_eth_bond_alb.c\n@@ -18,10 +18,10 @@\n \treturn hash;\n }\n \n-static uint8_t\n+static uint16_t\n calculate_slave(struct bond_dev_private *internals)\n {\n-\tuint8_t idx;\n+\tuint16_t idx;\n \n \tidx = (internals->mode6.last_slave + 1) % internals->active_slave_count;\n \tinternals->mode6.last_slave = idx;\ndiff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c\nindex b55752e..a23988d 100644\n--- a/drivers/net/bonding/rte_eth_bond_api.c\n+++ b/drivers/net/bonding/rte_eth_bond_api.c\n@@ -76,7 +76,7 @@\n activate_slave(struct rte_eth_dev *eth_dev, uint16_t port_id)\n {\n \tstruct bond_dev_private *internals = eth_dev->data->dev_private;\n-\tuint8_t active_count = internals->active_slave_count;\n+\tuint16_t active_count = internals->active_slave_count;\n \n \tif (internals->mode == BONDING_MODE_8023AD)\n \t\tbond_mode_8023ad_activate_slave(eth_dev, port_id);\n@@ -796,7 +796,7 @@\n \t\t\tuint16_t len)\n {\n \tstruct bond_dev_private *internals;\n-\tuint8_t i;\n+\tuint16_t i;\n \n \tif (valid_bonded_port_id(bonded_port_id) != 0)\n \t\treturn -1;\ndiff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c\nindex df0a3b4..bbe2568 100644\n--- a/drivers/net/bonding/rte_eth_bond_pmd.c\n+++ b/drivers/net/bonding/rte_eth_bond_pmd.c\n@@ -353,7 +353,7 @@\n \n \tfor (i = 0; i < nb_bufs; i++) {\n \t\t/* Populate slave mbuf arrays with mbufs for that slave. */\n-\t\tuint8_t slave_idx = bufs_slave_port_idxs[i];\n+\t\tuint16_t slave_idx = bufs_slave_port_idxs[i];\n \n \t\tslave_bufs[slave_idx][slave_nb_bufs[slave_idx]++] = bufs[i];\n \t}\n@@ -404,8 +404,9 @@\n \n \tuint8_t collecting; /* current slave collecting status */\n \tconst uint8_t promisc = internals->promiscuous_en;\n-\tuint8_t i, j, k;\n \tuint8_t subtype;\n+\tuint8_t j, k;\n+\tuint16_t i;\n \n \t/* Copy slave list to protect against slave up/down changes during tx\n \t * bursting */\n@@ -774,7 +775,7 @@ struct client_stats_t {\n \n void\n burst_xmit_l2_hash(struct rte_mbuf **buf, uint16_t nb_pkts,\n-\t\tuint8_t slave_count, uint16_t *slaves)\n+\t\tuint16_t slave_count, uint16_t *slaves)\n {\n \tstruct ether_hdr *eth_hdr;\n \tuint32_t hash;\n@@ -791,7 +792,7 @@ struct client_stats_t {\n \n void\n burst_xmit_l23_hash(struct rte_mbuf **buf, uint16_t nb_pkts,\n-\t\tuint8_t slave_count, uint16_t *slaves)\n+\t\tuint16_t slave_count, uint16_t *slaves)\n {\n \tuint16_t i;\n \tstruct ether_hdr *eth_hdr;\n@@ -829,7 +830,7 @@ struct client_stats_t {\n \n void\n burst_xmit_l34_hash(struct rte_mbuf **buf, uint16_t nb_pkts,\n-\t\tuint8_t slave_count, uint16_t *slaves)\n+\t\tuint16_t slave_count, uint16_t *slaves)\n {\n \tstruct ether_hdr *eth_hdr;\n \tuint16_t proto;\n@@ -899,7 +900,7 @@ struct client_stats_t {\n struct bwg_slave {\n \tuint64_t bwg_left_int;\n \tuint64_t bwg_left_remainder;\n-\tuint8_t slave;\n+\tuint16_t slave;\n };\n \n void\n@@ -952,11 +953,12 @@ struct bwg_slave {\n \tstruct bond_dev_private *internals = arg;\n \tstruct rte_eth_stats slave_stats;\n \tstruct bwg_slave bwg_array[RTE_MAX_ETHPORTS];\n-\tuint8_t slave_count;\n+\tuint16_t slave_count;\n \tuint64_t tx_bytes;\n \n \tuint8_t update_stats = 0;\n-\tuint8_t i, slave_id;\n+\tuint16_t slave_id;\n+\tuint16_t i;\n \n \tinternals->slave_update_idx++;\n \n@@ -1243,7 +1245,7 @@ struct bwg_slave {\n \n \tfor (i = 0; i < nb_bufs; i++) {\n \t\t/* Populate slave mbuf arrays with mbufs for that slave. */\n-\t\tuint8_t slave_idx = bufs_slave_port_idxs[i];\n+\t\tuint16_t slave_idx = bufs_slave_port_idxs[i];\n \n \t\tslave_bufs[slave_idx][slave_nb_bufs[slave_idx]++] = bufs[i];\n \t}\n@@ -1354,7 +1356,7 @@ struct bwg_slave {\n \t\t\t * Populate slave mbuf arrays with mbufs for that\n \t\t\t * slave\n \t\t\t */\n-\t\t\tuint8_t slave_idx = bufs_slave_port_idxs[i];\n+\t\t\tuint16_t slave_idx = bufs_slave_port_idxs[i];\n \n \t\t\tslave_bufs[slave_idx][slave_nb_bufs[slave_idx]++] =\n \t\t\t\t\tbufs[i];\n@@ -1396,8 +1398,9 @@ struct bwg_slave {\n \tstruct bond_dev_private *internals;\n \tstruct bond_tx_queue *bd_tx_q;\n \n-\tuint8_t tx_failed_flag = 0, num_of_slaves;\n \tuint16_t slaves[RTE_MAX_ETHPORTS];\n+\tuint8_t tx_failed_flag = 0;\n+\tuint16_t num_of_slaves;\n \n \tuint16_t max_nb_of_tx_pkts = 0;\n \n@@ -1948,7 +1951,7 @@ struct bwg_slave {\n slave_remove(struct bond_dev_private *internals,\n \t\tstruct rte_eth_dev *slave_eth_dev)\n {\n-\tuint8_t i;\n+\tuint16_t i;\n \n \tfor (i = 0; i < internals->slave_count; i++)\n \t\tif (internals->slaves[i].port_id ==\n@@ -2147,7 +2150,7 @@ struct bwg_slave {\n bond_ethdev_stop(struct rte_eth_dev *eth_dev)\n {\n \tstruct bond_dev_private *internals = eth_dev->data->dev_private;\n-\tuint8_t i;\n+\tuint16_t i;\n \n \tif (internals->mode == BONDING_MODE_8023AD) {\n \t\tstruct port *port;\n@@ -2243,7 +2246,7 @@ struct bwg_slave {\n \t */\n \tif (internals->slave_count > 0) {\n \t\tstruct rte_eth_dev_info slave_info;\n-\t\tuint8_t idx;\n+\t\tuint16_t idx;\n \n \t\tfor (idx = 0; idx < internals->slave_count; idx++) {\n \t\t\trte_eth_dev_info_get(internals->slaves[idx].port_id,\n@@ -2656,9 +2659,10 @@ struct bwg_slave {\n \tstruct rte_eth_link link;\n \tint rc = -1;\n \n-\tint i, valid_slave = 0;\n-\tuint8_t active_pos;\n \tuint8_t lsc_flag = 0;\n+\tint valid_slave = 0;\n+\tuint16_t active_pos;\n+\tuint16_t i;\n \n \tif (type != RTE_ETH_EVENT_INTR_LSC || param == NULL)\n \t\treturn rc;\ndiff --git a/drivers/net/bonding/rte_eth_bond_private.h b/drivers/net/bonding/rte_eth_bond_private.h\nindex 032ffed..8afef39 100644\n--- a/drivers/net/bonding/rte_eth_bond_private.h\n+++ b/drivers/net/bonding/rte_eth_bond_private.h\n@@ -100,7 +100,7 @@ struct rte_flow {\n };\n \n typedef void (*burst_xmit_hash_t)(struct rte_mbuf **buf, uint16_t nb_pkts,\n-\t\tuint8_t slave_count, uint16_t *slaves);\n+\t\tuint16_t slave_count, uint16_t *slaves);\n \n /** Link Bonding PMD device private configuration Structure */\n struct bond_dev_private {\n@@ -256,15 +256,15 @@ struct bond_dev_private {\n \n void\n burst_xmit_l2_hash(struct rte_mbuf **buf, uint16_t nb_pkts,\n-\t\tuint8_t slave_count, uint16_t *slaves);\n+\t\tuint16_t slave_count, uint16_t *slaves);\n \n void\n burst_xmit_l23_hash(struct rte_mbuf **buf, uint16_t nb_pkts,\n-\t\tuint8_t slave_count, uint16_t *slaves);\n+\t\tuint16_t slave_count, uint16_t *slaves);\n \n void\n burst_xmit_l34_hash(struct rte_mbuf **buf, uint16_t nb_pkts,\n-\t\tuint8_t slave_count, uint16_t *slaves);\n+\t\tuint16_t slave_count, uint16_t *slaves);\n \n \n void\n", "prefixes": [ "3/5" ] }