Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/57237/?format=api
{ "id": 57237, "url": "http://patchwork.dpdk.org/api/patches/57237/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1564401209-18752-2-git-send-email-matan@mellanox.com/", "project": { "id": 1, "url": "http://patchwork.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": "<1564401209-18752-2-git-send-email-matan@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1564401209-18752-2-git-send-email-matan@mellanox.com", "date": "2019-07-29T11:53:19", "name": "[01/11] net/mlx5: fix Rx scatter mode validation", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "e1ab9202366d710e97e1050c07e630b4fcbb3810", "submitter": { "id": 796, "url": "http://patchwork.dpdk.org/api/people/796/?format=api", "name": "Matan Azrad", "email": "matan@mellanox.com" }, "delegate": { "id": 3268, "url": "http://patchwork.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1564401209-18752-2-git-send-email-matan@mellanox.com/mbox/", "series": [ { "id": 5809, "url": "http://patchwork.dpdk.org/api/series/5809/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=5809", "date": "2019-07-29T11:53:21", "name": "net/mlx5: LRO fixes and enhancements", "version": 1, "mbox": "http://patchwork.dpdk.org/series/5809/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/57237/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/57237/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 3DF411BF9E;\n\tMon, 29 Jul 2019 14:16:58 +0200 (CEST)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n\tby dpdk.org (Postfix) with ESMTP id 26F5A1BF59\n\tfor <dev@dpdk.org>; Mon, 29 Jul 2019 14:16:36 +0200 (CEST)", "from Internal Mail-Server by MTLPINE2 (envelope-from\n\tmatan@mellanox.com)\n\twith ESMTPS (AES256-SHA encrypted); 29 Jul 2019 15:16:29 +0300", "from pegasus07.mtr.labs.mlnx (pegasus07.mtr.labs.mlnx\n\t[10.210.16.112])\n\tby labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6TCGS4F021429;\n\tMon, 29 Jul 2019 15:16:29 +0300" ], "From": "Matan Azrad <matan@mellanox.com>", "To": "Shahaf Shuler <shahafs@mellanox.com>, Yongseok Koh <yskoh@mellanox.com>, \n\tViacheslav Ovsiienko <viacheslavo@mellanox.com>", "Cc": "dev@dpdk.org, Dekel Peled <dekelp@mellanox.com>, stable@dpdk.org", "Date": "Mon, 29 Jul 2019 11:53:19 +0000", "Message-Id": "<1564401209-18752-2-git-send-email-matan@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1564401209-18752-1-git-send-email-matan@mellanox.com>", "References": "<1564401209-18752-1-git-send-email-matan@mellanox.com>", "Subject": "[dpdk-dev] [PATCH 01/11] net/mlx5: fix Rx scatter mode validation", "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": "If the mbuf size of the Rx mempool supplied by the user in the Rx setup\nis unable to contain the maximum Rx packet length in addition to the\nmbuf head-room, the Rx scatter offload must be configured. Otherwise,\nthere is not enough space in single mbuf to contain a packet with size of\nthe maximum Rx packet length.\n\nThe PMD did not return an error in the abovementioned case.\n\nReturn an error in the above case.\n\nFixes: 7d6bf6b866b8 (\"net/mlx5: add Multi-Packet Rx support\")\nFixes: edad38fcd00e (\"net/mlx: enhance Rx scatter mode detection\")\nCc: stable@dpdk.org\n\nSigned-off-by: Matan Azrad <matan@mellanox.com>\nAcked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>\n---\n drivers/net/mlx5/mlx5_rxq.c | 39 ++++++++++++++++++++-------------------\n 1 file changed, 20 insertions(+), 19 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex 441f158..dc878f2 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -1616,7 +1616,20 @@ struct mlx5_rxq_ctrl *\n \tuint64_t offloads = conf->offloads |\n \t\t\t dev->data->dev_conf.rxmode.offloads;\n \tconst int mprq_en = mlx5_check_mprq_support(dev) > 0;\n-\n+\tunsigned int max_rx_pkt_len = dev->data->dev_conf.rxmode.max_rx_pkt_len;\n+\tunsigned int non_scatter_min_mbuf_size = max_rx_pkt_len +\n+\t\t\t\t\t\t\tRTE_PKTMBUF_HEADROOM;\n+\n+\tif (non_scatter_min_mbuf_size > mb_len && !(offloads &\n+\t\t\t\t\t\t DEV_RX_OFFLOAD_SCATTER)) {\n+\t\tDRV_LOG(ERR, \"port %u Rx queue %u: Scatter offload is not\"\n+\t\t\t\" configured and no enough mbuf space(%u) to contain \"\n+\t\t\t\"the maximum RX packet length(%u) with head-room(%u)\",\n+\t\t\tdev->data->port_id, idx, mb_len, max_rx_pkt_len,\n+\t\t\tRTE_PKTMBUF_HEADROOM);\n+\t\trte_errno = ENOSPC;\n+\t\treturn NULL;\n+\t}\n \ttmpl = rte_calloc_socket(\"RXQ\", 1,\n \t\t\t\t sizeof(*tmpl) +\n \t\t\t\t desc_n * sizeof(struct rte_mbuf *),\n@@ -1642,9 +1655,8 @@ struct mlx5_rxq_ctrl *\n \t * stride.\n \t * Otherwise, enable Rx scatter if necessary.\n \t */\n-\tassert(mb_len >= RTE_PKTMBUF_HEADROOM * strd_headroom_en);\n-\tmprq_stride_size = dev->data->dev_conf.rxmode.max_rx_pkt_len +\n-\t\t\t\tRTE_PKTMBUF_HEADROOM * strd_headroom_en;\n+\tmprq_stride_size = max_rx_pkt_len + RTE_PKTMBUF_HEADROOM *\n+\t\t\t\tstrd_headroom_en;\n \tif (mprq_en &&\n \t desc > (1U << config->mprq.stride_num_n) &&\n \t mprq_stride_size <= (1U << config->mprq.max_stride_size_n)) {\n@@ -1666,13 +1678,10 @@ struct mlx5_rxq_ctrl *\n \t\t\t\" strd_num_n = %u, strd_sz_n = %u\",\n \t\t\tdev->data->port_id, idx,\n \t\t\ttmpl->rxq.strd_num_n, tmpl->rxq.strd_sz_n);\n-\t} else if (dev->data->dev_conf.rxmode.max_rx_pkt_len <=\n-\t\t (mb_len - RTE_PKTMBUF_HEADROOM)) {\n+\t} else if (max_rx_pkt_len <= (mb_len - RTE_PKTMBUF_HEADROOM)) {\n \t\ttmpl->rxq.sges_n = 0;\n \t} else if (offloads & DEV_RX_OFFLOAD_SCATTER) {\n-\t\tunsigned int size =\n-\t\t\tRTE_PKTMBUF_HEADROOM +\n-\t\t\tdev->data->dev_conf.rxmode.max_rx_pkt_len;\n+\t\tunsigned int size = non_scatter_min_mbuf_size;\n \t\tunsigned int sges_n;\n \n \t\t/*\n@@ -1684,24 +1693,16 @@ struct mlx5_rxq_ctrl *\n \t\t/* Make sure rxq.sges_n did not overflow. */\n \t\tsize = mb_len * (1 << tmpl->rxq.sges_n);\n \t\tsize -= RTE_PKTMBUF_HEADROOM;\n-\t\tif (size < dev->data->dev_conf.rxmode.max_rx_pkt_len) {\n+\t\tif (size < max_rx_pkt_len) {\n \t\t\tDRV_LOG(ERR,\n \t\t\t\t\"port %u too many SGEs (%u) needed to handle\"\n \t\t\t\t\" requested maximum packet size %u\",\n \t\t\t\tdev->data->port_id,\n \t\t\t\t1 << sges_n,\n-\t\t\t\tdev->data->dev_conf.rxmode.max_rx_pkt_len);\n+\t\t\t\tmax_rx_pkt_len);\n \t\t\trte_errno = EOVERFLOW;\n \t\t\tgoto error;\n \t\t}\n-\t} else {\n-\t\tDRV_LOG(WARNING,\n-\t\t\t\"port %u the requested maximum Rx packet size (%u) is\"\n-\t\t\t\" larger than a single mbuf (%u) and scattered mode has\"\n-\t\t\t\" not been requested\",\n-\t\t\tdev->data->port_id,\n-\t\t\tdev->data->dev_conf.rxmode.max_rx_pkt_len,\n-\t\t\tmb_len - RTE_PKTMBUF_HEADROOM);\n \t}\n \tif (mprq_en && !mlx5_rxq_mprq_enabled(&tmpl->rxq))\n \t\tDRV_LOG(WARNING,\n", "prefixes": [ "01/11" ] }