Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/68084/?format=api
{ "id": 68084, "url": "http://patchwork.dpdk.org/api/patches/68084/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1586467444-15197-2-git-send-email-akozyrev@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": "<1586467444-15197-2-git-send-email-akozyrev@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1586467444-15197-2-git-send-email-akozyrev@mellanox.com", "date": "2020-04-09T21:24:02", "name": "[v3,1/3] net/mlx5: add a devarg to specify MPRQ stride size", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "abc6c08dbeabc397144fd2104a12dee2bbc1c084", "submitter": { "id": 1573, "url": "http://patchwork.dpdk.org/api/people/1573/?format=api", "name": "Alexander Kozyrev", "email": "akozyrev@mellanox.com" }, "delegate": null, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1586467444-15197-2-git-send-email-akozyrev@mellanox.com/mbox/", "series": [ { "id": 9278, "url": "http://patchwork.dpdk.org/api/series/9278/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=9278", "date": "2020-04-09T21:24:01", "name": "net/mlx5: add large packet size support to MPRQ", "version": 3, "mbox": "http://patchwork.dpdk.org/series/9278/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/68084/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/68084/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 97528A0597;\n\tThu, 9 Apr 2020 23:24:45 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id E7B671D151;\n\tThu, 9 Apr 2020 23:24:27 +0200 (CEST)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by dpdk.org (Postfix) with ESMTP id E134A1C434\n for <dev@dpdk.org>; Thu, 9 Apr 2020 23:24:24 +0200 (CEST)", "from Internal Mail-Server by MTLPINE2 (envelope-from\n akozyrev@mellanox.com)\n with ESMTPS (AES256-SHA encrypted); 10 Apr 2020 00:24:21 +0300", "from pegasus02.mtr.labs.mlnx. (pegasus02.mtr.labs.mlnx\n [10.210.16.122])\n by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 039LOItm026643;\n Fri, 10 Apr 2020 00:24:20 +0300" ], "From": "Alexander Kozyrev <akozyrev@mellanox.com>", "To": "dev@dpdk.org", "Cc": "rasland@mellanox.com, matan@mellanox.com, viacheslavo@mellanox.com,\n stable@dpdk.org", "Date": "Thu, 9 Apr 2020 21:24:02 +0000", "Message-Id": "<1586467444-15197-2-git-send-email-akozyrev@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1586467444-15197-1-git-send-email-akozyrev@mellanox.com>", "References": "<1585691559-17409-1-git-send-email-akozyrev@mellanox.com>\n <1586467444-15197-1-git-send-email-akozyrev@mellanox.com>", "Subject": "[dpdk-dev] [PATCH v3 1/3] net/mlx5: add a devarg to specify MPRQ\n\tstride 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 <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": "Define a device parameter to configure log 2 of a stride size for MPRQ\n- mprq_log_stride_size. User is able to specify a stride size in a range\nallowed by an underlying hardware. The default stride size is defined as\n2048 bytes to encompass most commonly used packet sizes in the Internet\n(MTU 1518 and less) and will be used in case a maximum configured packet\nsize cannot fit into the largest possible stride size. Otherwise a\nstride size is set to a large enough value to encompass a whole packet.\n\nCc: stable@dpdk.org\n\nSigned-off-by: Alexander Kozyrev <akozyrev@mellanox.com>\nAcked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>\n---\n doc/guides/nics/mlx5.rst | 17 +++++++++--\n doc/guides/rel_notes/release_20_05.rst | 1 +\n drivers/net/mlx5/mlx5.c | 34 +++++++++++++++++-----\n drivers/net/mlx5/mlx5.h | 1 +\n drivers/net/mlx5/mlx5_defs.h | 3 ++\n drivers/net/mlx5/mlx5_rxq.c | 52 +++++++++++++++++++++++++---------\n 6 files changed, 85 insertions(+), 23 deletions(-)", "diff": "diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst\nindex e13c07d..759d0ac 100644\n--- a/doc/guides/nics/mlx5.rst\n+++ b/doc/guides/nics/mlx5.rst\n@@ -408,8 +408,7 @@ Run-time configuration\n \n A nonzero value enables configuring Multi-Packet Rx queues. Rx queue is\n configured as Multi-Packet RQ if the total number of Rx queues is\n- ``rxqs_min_mprq`` or more and Rx scatter isn't configured. Disabled by\n- default.\n+ ``rxqs_min_mprq`` or more. Disabled by default.\n \n Multi-Packet Rx Queue (MPRQ a.k.a Striding RQ) can further save PCIe bandwidth\n by posting a single large buffer for multiple packets. Instead of posting a\n@@ -434,6 +433,20 @@ Run-time configuration\n \n The size of Rx queue should be bigger than the number of strides.\n \n+- ``mprq_log_stride_size`` parameter [int]\n+\n+ Log 2 of the size of a stride for Multi-Packet Rx queue. Configuring a smaller\n+ stride size can save some memory and reduce probability of a depletion of all\n+ available strides due to unreleased packets by an application. If configured\n+ value is not in the range of device capability, the default value will be set\n+ with a warning message. The default value is 11 which is 2048 bytes per a\n+ stride, valid only if ``mprq_en`` is set. With ``mprq_log_stride_size`` set\n+ it is possible for a pcaket to span across multiple strides. This mode allows\n+ support of jumbo frames (9K) with MPRQ. The memcopy of some packets (or part\n+ of a packet if Rx scatter is configured) may be required in case there is no\n+ space left for a head room at the end of a stride which incurs some\n+ performance penalty.\n+\n - ``mprq_max_memcpy_len`` parameter [int]\n \n The maximum length of packet to memcpy in case of Multi-Packet Rx queue. Rx\ndiff --git a/doc/guides/rel_notes/release_20_05.rst b/doc/guides/rel_notes/release_20_05.rst\nindex 2596269..586a442 100644\n--- a/doc/guides/rel_notes/release_20_05.rst\n+++ b/doc/guides/rel_notes/release_20_05.rst\n@@ -62,6 +62,7 @@ New Features\n \n * Added support for matching on IPv4 Time To Live and IPv6 Hop Limit.\n * Added support for creating Relaxed Ordering Memory Regions.\n+ * Added support for jumbo frame size (9K MTU) in Multi-Packet RQ mode.\n \n * **Updated the Intel ice driver.**\n \ndiff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex efdd53c..293d316 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -63,6 +63,9 @@\n /* Device parameter to configure log 2 of the number of strides for MPRQ. */\n #define MLX5_RX_MPRQ_LOG_STRIDE_NUM \"mprq_log_stride_num\"\n \n+/* Device parameter to configure log 2 of the stride size for MPRQ. */\n+#define MLX5_RX_MPRQ_LOG_STRIDE_SIZE \"mprq_log_stride_size\"\n+\n /* Device parameter to limit the size of memcpy'd packet for MPRQ. */\n #define MLX5_RX_MPRQ_MAX_MEMCPY_LEN \"mprq_max_memcpy_len\"\n \n@@ -1533,6 +1536,8 @@ struct mlx5_flow_id_pool *\n \t\tconfig->mprq.enabled = !!tmp;\n \t} else if (strcmp(MLX5_RX_MPRQ_LOG_STRIDE_NUM, key) == 0) {\n \t\tconfig->mprq.stride_num_n = tmp;\n+\t} else if (strcmp(MLX5_RX_MPRQ_LOG_STRIDE_SIZE, key) == 0) {\n+\t\tconfig->mprq.stride_size_n = tmp;\n \t} else if (strcmp(MLX5_RX_MPRQ_MAX_MEMCPY_LEN, key) == 0) {\n \t\tconfig->mprq.max_memcpy_len = tmp;\n \t} else if (strcmp(MLX5_RXQS_MIN_MPRQ, key) == 0) {\n@@ -1629,6 +1634,7 @@ struct mlx5_flow_id_pool *\n \t\tMLX5_RXQ_PKT_PAD_EN,\n \t\tMLX5_RX_MPRQ_EN,\n \t\tMLX5_RX_MPRQ_LOG_STRIDE_NUM,\n+\t\tMLX5_RX_MPRQ_LOG_STRIDE_SIZE,\n \t\tMLX5_RX_MPRQ_MAX_MEMCPY_LEN,\n \t\tMLX5_RXQS_MIN_MPRQ,\n \t\tMLX5_TXQ_INLINE,\n@@ -2304,8 +2310,6 @@ struct mlx5_flow_id_pool *\n \t\t\tmprq_caps.min_single_wqe_log_num_of_strides;\n \t\tmprq_max_stride_num_n =\n \t\t\tmprq_caps.max_single_wqe_log_num_of_strides;\n-\t\tconfig.mprq.stride_num_n = RTE_MAX(MLX5_MPRQ_STRIDE_NUM_N,\n-\t\t\t\t\t\t mprq_min_stride_num_n);\n \t}\n #endif\n \tif (RTE_CACHE_LINE_SIZE == 128 &&\n@@ -2619,17 +2623,32 @@ struct mlx5_flow_id_pool *\n #endif\n \t}\n \tif (config.mprq.enabled && mprq) {\n-\t\tif (config.mprq.stride_num_n > mprq_max_stride_num_n ||\n-\t\t config.mprq.stride_num_n < mprq_min_stride_num_n) {\n+\t\tif (config.mprq.stride_num_n &&\n+\t\t (config.mprq.stride_num_n > mprq_max_stride_num_n ||\n+\t\t config.mprq.stride_num_n < mprq_min_stride_num_n)) {\n \t\t\tconfig.mprq.stride_num_n =\n-\t\t\t\tRTE_MAX(MLX5_MPRQ_STRIDE_NUM_N,\n-\t\t\t\t\tmprq_min_stride_num_n);\n+\t\t\t\tRTE_MIN(RTE_MAX(MLX5_MPRQ_STRIDE_NUM_N,\n+\t\t\t\t\t\tmprq_min_stride_num_n),\n+\t\t\t\t\tmprq_max_stride_num_n);\n \t\t\tDRV_LOG(WARNING,\n \t\t\t\t\"the number of strides\"\n \t\t\t\t\" for Multi-Packet RQ is out of range,\"\n \t\t\t\t\" setting default value (%u)\",\n \t\t\t\t1 << config.mprq.stride_num_n);\n \t\t}\n+\t\tif (config.mprq.stride_size_n &&\n+\t\t (config.mprq.stride_size_n > mprq_max_stride_size_n ||\n+\t\t config.mprq.stride_size_n < mprq_min_stride_size_n)) {\n+\t\t\tconfig.mprq.stride_size_n =\n+\t\t\t\tRTE_MIN(RTE_MAX(MLX5_MPRQ_STRIDE_SIZE_N,\n+\t\t\t\t\t\tmprq_min_stride_size_n),\n+\t\t\t\t\tmprq_max_stride_size_n);\n+\t\t\tDRV_LOG(WARNING,\n+\t\t\t\t\"the size of a stride\"\n+\t\t\t\t\" for Multi-Packet RQ is out of range,\"\n+\t\t\t\t\" setting default value (%u)\",\n+\t\t\t\t1 << config.mprq.stride_size_n);\n+\t\t}\n \t\tconfig.mprq.min_stride_size_n = mprq_min_stride_size_n;\n \t\tconfig.mprq.max_stride_size_n = mprq_max_stride_size_n;\n \t} else if (config.mprq.enabled && !mprq) {\n@@ -3363,7 +3382,8 @@ struct mlx5_flow_id_pool *\n \t\t.mr_ext_memseg_en = 1,\n \t\t.mprq = {\n \t\t\t.enabled = 0, /* Disabled by default. */\n-\t\t\t.stride_num_n = MLX5_MPRQ_STRIDE_NUM_N,\n+\t\t\t.stride_num_n = 0,\n+\t\t\t.stride_size_n = 0,\n \t\t\t.max_memcpy_len = MLX5_MPRQ_MEMCPY_DEFAULT_LEN,\n \t\t\t.min_rxqs_num = MLX5_MPRQ_MIN_RXQS,\n \t\t},\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex 396dba7..39af7ab 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -179,6 +179,7 @@ struct mlx5_dev_config {\n \tstruct {\n \t\tunsigned int enabled:1; /* Whether MPRQ is enabled. */\n \t\tunsigned int stride_num_n; /* Number of strides. */\n+\t\tunsigned int stride_size_n; /* Size of a stride. */\n \t\tunsigned int min_stride_size_n; /* Min size of a stride. */\n \t\tunsigned int max_stride_size_n; /* Max size of a stride. */\n \t\tunsigned int max_memcpy_len;\ndiff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h\nindex 19e8253..260f584 100644\n--- a/drivers/net/mlx5/mlx5_defs.h\n+++ b/drivers/net/mlx5/mlx5_defs.h\n@@ -143,6 +143,9 @@\n /* Log 2 of the default number of strides per WQE for Multi-Packet RQ. */\n #define MLX5_MPRQ_STRIDE_NUM_N 6U\n \n+/* Log 2 of the default size of a stride per WQE for Multi-Packet RQ. */\n+#define MLX5_MPRQ_STRIDE_SIZE_N 11U\n+\n /* Two-byte shift is disabled for Multi-Packet RQ. */\n #define MLX5_MPRQ_TWO_BYTE_SHIFT 0\n \ndiff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex 0a95e3c..7adeabc 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -1793,7 +1793,9 @@ struct mlx5_rxq_ctrl *\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_rxq_ctrl *tmpl;\n \tunsigned int mb_len = rte_pktmbuf_data_room_size(mp);\n+\tunsigned int mprq_stride_nums;\n \tunsigned int mprq_stride_size;\n+\tunsigned int mprq_stride_cap;\n \tstruct mlx5_dev_config *config = &priv->config;\n \tunsigned int strd_headroom_en;\n \t/*\n@@ -1856,25 +1858,40 @@ struct mlx5_rxq_ctrl *\n \t\tstrd_headroom_en = 1;\n \t\tmprq_stride_size = non_scatter_min_mbuf_size;\n \t}\n+\tmprq_stride_nums = config->mprq.stride_num_n ?\n+\t\tconfig->mprq.stride_num_n : MLX5_MPRQ_STRIDE_NUM_N;\n+\tmprq_stride_size = (mprq_stride_size <=\n+\t\t\t(1U << config->mprq.max_stride_size_n)) ?\n+\t\tlog2above(mprq_stride_size) : MLX5_MPRQ_STRIDE_SIZE_N;\n+\tmprq_stride_cap = (config->mprq.stride_num_n ?\n+\t\t(1U << config->mprq.stride_num_n) : (1U << mprq_stride_nums)) *\n+\t\t\t(config->mprq.stride_size_n ?\n+\t\t(1U << config->mprq.stride_size_n) : (1U << mprq_stride_size));\n \t/*\n \t * This Rx queue can be configured as a Multi-Packet RQ if all of the\n \t * following conditions are met:\n \t * - MPRQ is enabled.\n \t * - The number of descs is more than the number of strides.\n-\t * - max_rx_pkt_len plus overhead is less than the max size of a\n-\t * stride.\n+\t * - max_rx_pkt_len plus overhead is less than the max size\n+\t * of a stride or mprq_stride_size is specified by an user.\n+\t * Need to nake sure that there are enough stides to encap\n+\t * the maximum packet size in case mprq_stride_size is set.\n \t * Otherwise, enable Rx scatter if necessary.\n \t */\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+\tif (mprq_en && desc > (1U << mprq_stride_nums) &&\n+\t (non_scatter_min_mbuf_size -\n+\t (lro_on_queue ? RTE_PKTMBUF_HEADROOM : 0) <=\n+\t (1U << config->mprq.max_stride_size_n) ||\n+\t (config->mprq.stride_size_n &&\n+\t non_scatter_min_mbuf_size <= mprq_stride_cap))) {\n \t\t/* TODO: Rx scatter isn't supported yet. */\n \t\ttmpl->rxq.sges_n = 0;\n \t\t/* Trim the number of descs needed. */\n-\t\tdesc >>= config->mprq.stride_num_n;\n-\t\ttmpl->rxq.strd_num_n = config->mprq.stride_num_n;\n-\t\ttmpl->rxq.strd_sz_n = RTE_MAX(log2above(mprq_stride_size),\n-\t\t\t\t\t config->mprq.min_stride_size_n);\n+\t\tdesc >>= mprq_stride_nums;\n+\t\ttmpl->rxq.strd_num_n = config->mprq.stride_num_n ?\n+\t\t\tconfig->mprq.stride_num_n : mprq_stride_nums;\n+\t\ttmpl->rxq.strd_sz_n = config->mprq.stride_size_n ?\n+\t\t\tconfig->mprq.stride_size_n : mprq_stride_size;\n \t\ttmpl->rxq.strd_shift_en = MLX5_MPRQ_TWO_BYTE_SHIFT;\n \t\ttmpl->rxq.strd_headroom_en = strd_headroom_en;\n \t\ttmpl->rxq.mprq_max_memcpy_len = RTE_MIN(first_mb_free_size,\n@@ -1923,11 +1940,18 @@ struct mlx5_rxq_ctrl *\n \tif (mprq_en && !mlx5_rxq_mprq_enabled(&tmpl->rxq))\n \t\tDRV_LOG(WARNING,\n \t\t\t\"port %u MPRQ is requested but cannot be enabled\"\n-\t\t\t\" (requested: desc = %u, stride_sz = %u,\"\n-\t\t\t\" supported: min_stride_num = %u, max_stride_sz = %u).\",\n-\t\t\tdev->data->port_id, desc, mprq_stride_size,\n-\t\t\t(1 << config->mprq.stride_num_n),\n-\t\t\t(1 << config->mprq.max_stride_size_n));\n+\t\t\t\" (requested: packet size = %u, desc = %u,\"\n+\t\t\t\" stride_sz = %u, stride_num = %u,\"\n+\t\t\t\" supported: min_stride_sz = %u, max_stride_sz = %u).\",\n+\t\t\tdev->data->port_id, non_scatter_min_mbuf_size, desc,\n+\t\t\tconfig->mprq.stride_size_n ?\n+\t\t\t\t(1U << config->mprq.stride_size_n) :\n+\t\t\t\t(1U << mprq_stride_size),\n+\t\t\tconfig->mprq.stride_num_n ?\n+\t\t\t\t(1U << config->mprq.stride_num_n) :\n+\t\t\t\t(1U << mprq_stride_nums),\n+\t\t\t(1U << config->mprq.min_stride_size_n),\n+\t\t\t(1U << config->mprq.max_stride_size_n));\n \tDRV_LOG(DEBUG, \"port %u maximum number of segments per packet: %u\",\n \t\tdev->data->port_id, 1 << tmpl->rxq.sges_n);\n \tif (desc % (1 << tmpl->rxq.sges_n)) {\n", "prefixes": [ "v3", "1/3" ] }