Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/60422/?format=api
{ "id": 60422, "url": "http://patches.dpdk.org/api/patches/60422/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191002171745.4504-3-ajit.khaparde@broadcom.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": "<20191002171745.4504-3-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20191002171745.4504-3-ajit.khaparde@broadcom.com", "date": "2019-10-02T17:17:31", "name": "[v3,02/16] net/bnxt: fix traffic failure with higher mbuf size", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "9264b2ff101f2b558adb21d975e64e0bb2fabe17", "submitter": { "id": 501, "url": "http://patches.dpdk.org/api/people/501/?format=api", "name": "Ajit Khaparde", "email": "ajit.khaparde@broadcom.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/20191002171745.4504-3-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 6669, "url": "http://patches.dpdk.org/api/series/6669/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6669", "date": "2019-10-02T17:17:29", "name": "bnxt patchset", "version": 3, "mbox": "http://patches.dpdk.org/series/6669/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/60422/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/60422/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 8ED8D1BF2E;\n\tWed, 2 Oct 2019 19:17:58 +0200 (CEST)", "from rnd-relay.smtp.broadcom.com (unknown [192.19.229.170])\n\tby dpdk.org (Postfix) with ESMTP id 570BC1BF13;\n\tWed, 2 Oct 2019 19:17:53 +0200 (CEST)", "from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net\n\t[10.75.242.48])\n\tby rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 05D3130D31F;\n\tWed, 2 Oct 2019 10:16:36 -0700 (PDT)", "from C02VPB22HTD6.wifi.broadcom.net (c02vpb22htd6.wifi.broadcom.net\n\t[10.69.74.102])\n\tby mail-irv-17.broadcom.com (Postfix) with ESMTP id CDDB2140069;\n\tWed, 2 Oct 2019 10:17:47 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 05D3130D31F", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n\ts=dkimrelay; t=1570036596;\n\tbh=r77+LPnLPPBmeUhagTMgRimBJPsOFGZvYRw1wXfVsSM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=OYPAiR/yfBgMsAPPgAg1e0jrHjvfcueObjpBoscUlJGUay52gtHhjtgy0ez3MSx8E\n\tT96VsQ2ZRe7eZoyaPdPFmiz2KZjD5Xy1YGb09ZEJ2zEiKNwgvX5NYVhH56l68yXIlM\n\t53iIWh6qm720tt/BZisb3Et98Sb+DPjiSpzjmTeA=", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com,\n\tSantoshkumar Karanappa Rastapur <santosh.rastapur@broadcom.com>,\n\tstable@dpdk.org, Kalesh AP <kalesh-anakkur.purayil@broadcom.com>,\n\tSomnath Kotur <somnath.kotur@broadcom.com>,\n\tLance Richardson <lance.richardson@broadcom.com>", "Date": "Wed, 2 Oct 2019 10:17:31 -0700", "Message-Id": "<20191002171745.4504-3-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.20.1 (Apple Git-117)", "In-Reply-To": "<20191002171745.4504-1-ajit.khaparde@broadcom.com>", "References": "<20191002055423.99659-1-ajit.khaparde@broadcom.com>\n\t<20191002171745.4504-1-ajit.khaparde@broadcom.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v3 02/16] net/bnxt: fix traffic failure with\n\thigher mbuf size", "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: Santoshkumar Karanappa Rastapur <santosh.rastapur@broadcom.com>\n\nMaximum frame length supported by hw is 9600 bytes.\nWhen user launches testpmd with --mbuf-size=9729,\nwe are posting buffer descriptors of size 9601 to the ring.\nThis was causing packets getting discarded.\n\nFixes: daef48efe5e5 (\"net/bnxt: support set MTU\")\nCc: stable@dpdk.org\nSigned-off-by: Santoshkumar Karanappa Rastapur <santosh.rastapur@broadcom.com>\nSigned-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>\nReviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>\nReviewed-by: Lance Richardson <lance.richardson@broadcom.com>\nSigned-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/bnxt.h | 5 ++++-\n drivers/net/bnxt/bnxt_ethdev.c | 29 +++++++++--------------------\n drivers/net/bnxt/bnxt_hwrm.c | 3 +++\n drivers/net/bnxt/bnxt_ring.c | 5 -----\n drivers/net/bnxt/bnxt_rxq.c | 2 +-\n drivers/net/bnxt/bnxt_rxq.h | 1 -\n drivers/net/bnxt/bnxt_rxr.c | 7 ++-----\n 7 files changed, 19 insertions(+), 33 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h\nindex 818a49f461..68ac30bb58 100644\n--- a/drivers/net/bnxt/bnxt.h\n+++ b/drivers/net/bnxt/bnxt.h\n@@ -23,12 +23,15 @@\n \n #define BNXT_MAX_MTU\t\t9574\n #define VLAN_TAG_SIZE\t\t4\n+#define BNXT_NUM_VLANS\t\t2\n+#define BNXT_MAX_PKT_LEN\t(BNXT_MAX_MTU + RTE_ETHER_HDR_LEN +\\\n+\t\t\t\t RTE_ETHER_CRC_LEN +\\\n+\t\t\t\t (BNXT_NUM_VLANS * VLAN_TAG_SIZE))\n #define BNXT_VF_RSV_NUM_RSS_CTX\t1\n #define BNXT_VF_RSV_NUM_L2_CTX\t4\n /* TODO: For now, do not support VMDq/RFS on VFs. */\n #define BNXT_VF_RSV_NUM_VNIC\t1\n #define BNXT_MAX_LED\t\t4\n-#define BNXT_NUM_VLANS\t\t2\n #define BNXT_MIN_RING_DESC\t16\n #define BNXT_MAX_TX_RING_DESC\t4096\n #define BNXT_MAX_RX_RING_DESC\t8192\ndiff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex 0083ba6e83..4095e9c720 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -545,10 +545,13 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,\n \tdev_info->hash_key_size = 40;\n \tmax_vnics = bp->max_vnics;\n \n+\t/* MTU specifics */\n+\tdev_info->min_mtu = RTE_ETHER_MIN_MTU;\n+\tdev_info->max_mtu = BNXT_MAX_MTU;\n+\n \t/* Fast path specifics */\n \tdev_info->min_rx_bufsize = 1;\n-\tdev_info->max_rx_pktlen = BNXT_MAX_MTU + RTE_ETHER_HDR_LEN +\n-\t\tRTE_ETHER_CRC_LEN + VLAN_TAG_SIZE * 2;\n+\tdev_info->max_rx_pktlen = BNXT_MAX_PKT_LEN;\n \n \tdev_info->rx_offload_capa = BNXT_DEV_RX_OFFLOAD_SUPPORT;\n \tif (bp->flags & BNXT_FLAG_PTP_SUPPORTED)\n@@ -1967,7 +1970,6 @@ bnxt_txq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,\n static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)\n {\n \tstruct bnxt *bp = eth_dev->data->dev_private;\n-\tstruct rte_eth_dev_info dev_info;\n \tuint32_t new_pkt_size;\n \tuint32_t rc = 0;\n \tuint32_t i;\n@@ -1979,18 +1981,6 @@ static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)\n \tnew_pkt_size = new_mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN +\n \t\t VLAN_TAG_SIZE * BNXT_NUM_VLANS;\n \n-\trc = bnxt_dev_info_get_op(eth_dev, &dev_info);\n-\tif (rc != 0) {\n-\t\tPMD_DRV_LOG(ERR, \"Error during getting ethernet device info\\n\");\n-\t\treturn rc;\n-\t}\n-\n-\tif (new_mtu < RTE_ETHER_MIN_MTU || new_mtu > BNXT_MAX_MTU) {\n-\t\tPMD_DRV_LOG(ERR, \"MTU requested must be within (%d, %d)\\n\",\n-\t\t\tRTE_ETHER_MIN_MTU, BNXT_MAX_MTU);\n-\t\treturn -EINVAL;\n-\t}\n-\n #ifdef RTE_ARCH_X86\n \t/*\n \t * If vector-mode tx/rx is active, disallow any MTU change that would\n@@ -2020,15 +2010,12 @@ static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)\n \n \teth_dev->data->dev_conf.rxmode.max_rx_pkt_len = new_pkt_size;\n \n-\teth_dev->data->mtu = new_mtu;\n-\tPMD_DRV_LOG(INFO, \"New MTU is %d\\n\", eth_dev->data->mtu);\n-\n \tfor (i = 0; i < bp->nr_vnics; i++) {\n \t\tstruct bnxt_vnic_info *vnic = &bp->vnic_info[i];\n \t\tuint16_t size = 0;\n \n-\t\tvnic->mru = bp->eth_dev->data->mtu + RTE_ETHER_HDR_LEN +\n-\t\t\t\t\tRTE_ETHER_CRC_LEN + VLAN_TAG_SIZE * 2;\n+\t\tvnic->mru = new_mtu + RTE_ETHER_HDR_LEN +\n+\t\t\t\tRTE_ETHER_CRC_LEN + VLAN_TAG_SIZE * 2;\n \t\trc = bnxt_hwrm_vnic_cfg(bp, vnic);\n \t\tif (rc)\n \t\t\tbreak;\n@@ -2043,6 +2030,8 @@ static int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu)\n \t\t}\n \t}\n \n+\tPMD_DRV_LOG(INFO, \"New MTU is %d\\n\", new_mtu);\n+\n \treturn rc;\n }\n \ndiff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c\nindex 174dc75d54..09330e2382 100644\n--- a/drivers/net/bnxt/bnxt_hwrm.c\n+++ b/drivers/net/bnxt/bnxt_hwrm.c\n@@ -1233,6 +1233,7 @@ int bnxt_hwrm_ring_alloc(struct bnxt *bp,\n \t\t\tmb_pool = bp->rx_queues[0]->mb_pool;\n \t\t\trx_buf_size = rte_pktmbuf_data_room_size(mb_pool) -\n \t\t\t\t RTE_PKTMBUF_HEADROOM;\n+\t\t\trx_buf_size = RTE_MIN(BNXT_MAX_PKT_LEN, rx_buf_size);\n \t\t\treq.rx_buf_size = rte_cpu_to_le_16(rx_buf_size);\n \t\t\tenables |=\n \t\t\t\tHWRM_RING_ALLOC_INPUT_ENABLES_RX_BUF_SIZE_VALID;\n@@ -1263,6 +1264,7 @@ int bnxt_hwrm_ring_alloc(struct bnxt *bp,\n \t\tmb_pool = bp->rx_queues[0]->mb_pool;\n \t\trx_buf_size = rte_pktmbuf_data_room_size(mb_pool) -\n \t\t\t RTE_PKTMBUF_HEADROOM;\n+\t\trx_buf_size = RTE_MIN(BNXT_MAX_PKT_LEN, rx_buf_size);\n \t\treq.rx_buf_size = rte_cpu_to_le_16(rx_buf_size);\n \n \t\treq.stat_ctx_id = rte_cpu_to_le_32(stats_ctx_id);\n@@ -1879,6 +1881,7 @@ int bnxt_hwrm_vnic_plcmode_cfg(struct bnxt *bp,\n \n \tsize = rte_pktmbuf_data_room_size(bp->rx_queues[0]->mb_pool);\n \tsize -= RTE_PKTMBUF_HEADROOM;\n+\tsize = RTE_MIN(BNXT_MAX_PKT_LEN, size);\n \n \treq.jumbo_thresh = rte_cpu_to_le_16(size);\n \treq.vnic_id = rte_cpu_to_le_16(vnic->fw_vnic_id);\ndiff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c\nindex ec17783cf8..73eee43148 100644\n--- a/drivers/net/bnxt/bnxt_ring.c\n+++ b/drivers/net/bnxt/bnxt_ring.c\n@@ -561,9 +561,6 @@ int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int queue_index)\n \tif (rc)\n \t\tgoto err_out;\n \n-\trxq->rx_buf_use_size = BNXT_MAX_MTU + RTE_ETHER_HDR_LEN +\n-\t\tRTE_ETHER_CRC_LEN + (2 * VLAN_TAG_SIZE);\n-\n \tif (bp->eth_dev->data->rx_queue_state[queue_index] ==\n \t RTE_ETH_QUEUE_STATE_STARTED) {\n \t\tif (bnxt_init_one_rx_ring(rxq)) {\n@@ -640,8 +637,6 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)\n \t\tif (bnxt_alloc_rx_agg_ring(bp, i))\n \t\t\tgoto err_out;\n \n-\t\trxq->rx_buf_use_size = BNXT_MAX_MTU + RTE_ETHER_HDR_LEN +\n-\t\t\t\t\tRTE_ETHER_CRC_LEN + (2 * VLAN_TAG_SIZE);\n \t\tif (bnxt_init_one_rx_ring(rxq)) {\n \t\t\tPMD_DRV_LOG(ERR, \"bnxt_init_one_rx_ring failed!\\n\");\n \t\t\tbnxt_rx_queue_release_op(rxq);\ndiff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c\nindex d5fc5268db..192ffd8780 100644\n--- a/drivers/net/bnxt/bnxt_rxq.c\n+++ b/drivers/net/bnxt/bnxt_rxq.c\n@@ -331,13 +331,13 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,\n \trxq->nb_rx_desc = nb_desc;\n \trxq->rx_free_thresh = rx_conf->rx_free_thresh;\n \n-\tPMD_DRV_LOG(DEBUG, \"RX Buf size is %d\\n\", rxq->rx_buf_use_size);\n \tPMD_DRV_LOG(DEBUG, \"RX Buf MTU %d\\n\", eth_dev->data->mtu);\n \n \trc = bnxt_init_rx_ring_struct(rxq, socket_id);\n \tif (rc)\n \t\tgoto out;\n \n+\tPMD_DRV_LOG(DEBUG, \"RX Buf size is %d\\n\", rxq->rx_buf_size);\n \trxq->queue_id = queue_idx;\n \trxq->port_id = eth_dev->data->port_id;\n \tif (rx_offloads & DEV_RX_OFFLOAD_KEEP_CRC)\ndiff --git a/drivers/net/bnxt/bnxt_rxq.h b/drivers/net/bnxt/bnxt_rxq.h\nindex b5e42d01c0..c60b04426c 100644\n--- a/drivers/net/bnxt/bnxt_rxq.h\n+++ b/drivers/net/bnxt/bnxt_rxq.h\n@@ -36,7 +36,6 @@ struct bnxt_rx_queue {\n \tstruct bnxt_vnic_info\t*vnic;\n \n \tuint32_t\t\t\trx_buf_size;\n-\tuint32_t\t\t\trx_buf_use_size; /* useable size */\n \tstruct bnxt_rx_ring_info\t*rx_ring;\n \tstruct bnxt_cp_ring_info\t*cp_ring;\n \tstruct bnxt_cp_ring_info\t*nq_ring;\ndiff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c\nindex 28487fb38e..f60880c63e 100644\n--- a/drivers/net/bnxt/bnxt_rxr.c\n+++ b/drivers/net/bnxt/bnxt_rxr.c\n@@ -713,9 +713,7 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id)\n \tstruct bnxt_rx_ring_info *rxr;\n \tstruct bnxt_ring *ring;\n \n-\trxq->rx_buf_use_size = BNXT_MAX_MTU + RTE_ETHER_HDR_LEN +\n-\t\tRTE_ETHER_CRC_LEN + (2 * VLAN_TAG_SIZE);\n-\trxq->rx_buf_size = rxq->rx_buf_use_size + sizeof(struct rte_mbuf);\n+\trxq->rx_buf_size = BNXT_MAX_PKT_LEN + sizeof(struct rte_mbuf);\n \n \trxr = rte_zmalloc_socket(\"bnxt_rx_ring\",\n \t\t\t\t sizeof(struct bnxt_rx_ring_info),\n@@ -826,8 +824,7 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)\n \tuint16_t size;\n \n \tsize = rte_pktmbuf_data_room_size(rxq->mb_pool) - RTE_PKTMBUF_HEADROOM;\n-\tif (rxq->rx_buf_use_size <= size)\n-\t\tsize = rxq->rx_buf_use_size;\n+\tsize = RTE_MIN(BNXT_MAX_PKT_LEN, size);\n \n \ttype = RX_PROD_PKT_BD_TYPE_RX_PROD_PKT | RX_PROD_PKT_BD_FLAGS_EOP_PAD;\n \n", "prefixes": [ "v3", "02/16" ] }