Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/138255/?format=api
{ "id": 138255, "url": "http://patchwork.dpdk.org/api/patches/138255/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20240312180716.8515-7-shaibran@amazon.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": "<20240312180716.8515-7-shaibran@amazon.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20240312180716.8515-7-shaibran@amazon.com", "date": "2024-03-12T18:06:51", "name": "[v4,06/31] net/ena: restructure the llq policy setting process", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "221544ed2500eef2f5b1e841cbf37cdd2936b3a4", "submitter": { "id": 2930, "url": "http://patchwork.dpdk.org/api/people/2930/?format=api", "name": "Brandes, Shai", "email": "shaibran@amazon.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20240312180716.8515-7-shaibran@amazon.com/mbox/", "series": [ { "id": 31487, "url": "http://patchwork.dpdk.org/api/series/31487/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=31487", "date": "2024-03-12T18:06:45", "name": "net/ena: v2.9.0 driver release", "version": 4, "mbox": "http://patchwork.dpdk.org/series/31487/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/138255/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/138255/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 5D75843C94;\n\tTue, 12 Mar 2024 19:07:59 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 1319342E08;\n\tTue, 12 Mar 2024 19:07:42 +0100 (CET)", "from smtp-fw-80007.amazon.com (smtp-fw-80007.amazon.com\n [99.78.197.218]) by mails.dpdk.org (Postfix) with ESMTP id 1C8F042E05\n for <dev@dpdk.org>; Tue, 12 Mar 2024 19:07:39 +0100 (CET)", "from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO\n smtpout.prod.us-east-1.prod.farcaster.email.amazon.dev) ([10.25.36.210])\n by smtp-border-fw-80007.pdx80.corp.amazon.com with\n ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2024 18:07:40 +0000", "from EX19MTAEUC001.ant.amazon.com [10.0.10.100:15920]\n by smtpin.naws.eu-west-1.prod.farcaster.email.amazon.dev [10.0.21.118:2525]\n with esmtp (Farcaster)\n id 18af2330-8e3e-4913-84e9-b32ffd6a21d0;\n Tue, 12 Mar 2024 18:07:38 +0000 (UTC)", "from EX19D007EUB002.ant.amazon.com (10.252.51.117) by\n EX19MTAEUC001.ant.amazon.com (10.252.51.193) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.2.1258.28; Tue, 12 Mar 2024 18:07:38 +0000", "from EX19MTAUWA001.ant.amazon.com (10.250.64.204) by\n EX19D007EUB002.ant.amazon.com (10.252.51.117) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.2.1258.28; Tue, 12 Mar 2024 18:07:37 +0000", "from HFA15-CG15235BS.amazon.com (10.85.143.174) by\n mail-relay.amazon.com (10.250.64.204) with Microsoft SMTP Server id\n 15.2.1258.28 via Frontend Transport; Tue, 12 Mar 2024 18:07:36 +0000" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209;\n t=1710266860; x=1741802860;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version;\n bh=LzWNkwlGckcegYfNXpaO9H15LjzfgcHcKoeXFoB5oUA=;\n b=ADybGF8YCjE0ydQAx/MypuBzF7P50XG50jcCg7GcP9lfF9p9VFbZ7jR6\n LASclBvXTDscHreFshrEsuq+T5pr5xa/9q+a9cf7708KlLLrrccqn+YWC\n PmlI+afdrqehQBz+nXa+wZD4cI0uOkWzvqR/O7tReIJB5aqRY1EiAhc7P U=;", "X-IronPort-AV": "E=Sophos;i=\"6.07,119,1708387200\"; d=\"scan'208\";a=\"280481504\"", "X-Farcaster-Flow-ID": "18af2330-8e3e-4913-84e9-b32ffd6a21d0", "From": "<shaibran@amazon.com>", "To": "<ferruh.yigit@amd.com>", "CC": "<dev@dpdk.org>, Shai Brandes <shaibran@amazon.com>", "Subject": "[PATCH v4 06/31] net/ena: restructure the llq policy setting process", "Date": "Tue, 12 Mar 2024 20:06:51 +0200", "Message-ID": "<20240312180716.8515-7-shaibran@amazon.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20240312180716.8515-1-shaibran@amazon.com>", "References": "<20240312180716.8515-1-shaibran@amazon.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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" }, "content": "From: Shai Brandes <shaibran@amazon.com>\n\nThe driver will set the size of the LLQ header size\naccording to the recommendation from the device.\nThe user can bypass the recommendation via devargs:\n- The existing devarg 'large_llq_hdr' (default 0)\n allows user to enforce large llq header policy.\n- The existing devarg 'enable_llq' (default 1)\n allows user to disable llq usage.\n- A new devarg 'normal_llq_hdr' (default 0)\n allows user to enforce normal llq header policy.\n\nSigned-off-by: Shai Brandes <shaibran@amazon.com>\nReviewed-by: Amit Bernstein <amitbern@amazon.com>\n---\n doc/guides/nics/ena.rst | 4 ++\n doc/guides/rel_notes/release_24_03.rst | 1 +\n drivers/net/ena/ena_ethdev.c | 60 ++++++++++++++++++++++----\n drivers/net/ena/ena_ethdev.h | 11 ++++-\n 4 files changed, 67 insertions(+), 9 deletions(-)", "diff": "diff --git a/doc/guides/nics/ena.rst b/doc/guides/nics/ena.rst\nindex b039e75ead..725215b36d 100644\n--- a/doc/guides/nics/ena.rst\n+++ b/doc/guides/nics/ena.rst\n@@ -113,6 +113,10 @@ Runtime Configuration\n effect only if the device also supports large LLQ headers. Otherwise, the\n default value will be used.\n \n+ * **normal_llq_hdr** (default 0)\n+\n+ Enforce normal LLQ policy.\n+\n * **miss_txc_to** (default 5)\n \n Number of seconds after which the Tx packet will be considered missing.\ndiff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst\nindex cbd4669cbb..58d092194e 100644\n--- a/doc/guides/rel_notes/release_24_03.rst\n+++ b/doc/guides/rel_notes/release_24_03.rst\n@@ -108,6 +108,7 @@ New Features\n * Removed the reporting of `rx_overruns` errors from xstats and instead updated `imissed` stat with its value.\n * Added support for sub-optimal configuration notifications from the device.\n * Restructured fast release of mbufs when RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE optimization is enabled.\n+ * Added `normal_llq_hdr` devarg that enforce normal llq header policy.\n \n * **Updated Atomic Rules' Arkville driver.**\n \ndiff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c\nindex 537ee9f8c3..e23edd4bd2 100644\n--- a/drivers/net/ena/ena_ethdev.c\n+++ b/drivers/net/ena/ena_ethdev.c\n@@ -40,6 +40,8 @@\n \n #define BITS_PER_TYPE(type) (sizeof(type) * BITS_PER_BYTE)\n \n+#define DECIMAL_BASE 10\n+\n /*\n * We should try to keep ENA_CLEANUP_BUF_SIZE lower than\n * RTE_MEMPOOL_CACHE_MAX_SIZE, so we can fit this in mempool local cache.\n@@ -75,6 +77,7 @@ struct ena_stats {\n \n /* Device arguments */\n #define ENA_DEVARG_LARGE_LLQ_HDR \"large_llq_hdr\"\n+#define ENA_DEVARG_NORMAL_LLQ_HDR \"normal_llq_hdr\"\n /* Timeout in seconds after which a single uncompleted Tx packet should be\n * considered as a missing.\n */\n@@ -297,6 +300,8 @@ static int ena_rx_queue_intr_disable(struct rte_eth_dev *dev,\n static int ena_configure_aenq(struct ena_adapter *adapter);\n static int ena_mp_primary_handle(const struct rte_mp_msg *mp_msg,\n \t\t\t\t const void *peer);\n+static ena_llq_policy ena_define_llq_hdr_policy(struct ena_adapter *adapter);\n+static bool ena_use_large_llq_hdr(struct ena_adapter *adapter, uint8_t recommended_entry_size);\n \n static const struct eth_dev_ops ena_dev_ops = {\n \t.dev_configure = ena_dev_configure,\n@@ -1135,6 +1140,7 @@ ena_calc_io_queue_size(struct ena_calc_queue_size_ctx *ctx,\n \tctx->max_tx_queue_size = max_tx_queue_size;\n \tctx->max_rx_queue_size = max_rx_queue_size;\n \n+\tPMD_DRV_LOG(INFO, \"tx queue size %u\\n\", max_tx_queue_size);\n \treturn 0;\n }\n \n@@ -2034,7 +2040,7 @@ ena_set_queues_placement_policy(struct ena_adapter *adapter,\n \tint rc;\n \tu32 llq_feature_mask;\n \n-\tif (!adapter->enable_llq) {\n+\tif (adapter->llq_header_policy == ENA_LLQ_POLICY_DISABLED) {\n \t\tPMD_DRV_LOG(WARNING,\n \t\t\t\"NOTE: LLQ has been disabled as per user's request. \"\n \t\t\t\"This may lead to a huge performance degradation!\\n\");\n@@ -2241,12 +2247,16 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)\n \tadapter->missing_tx_completion_to = ENA_TX_TIMEOUT;\n \tadapter->enable_llq = true;\n \tadapter->use_large_llq_hdr = false;\n+\tadapter->use_normal_llq_hdr = false;\n \n+\t/* Get user bypass */\n \trc = ena_parse_devargs(adapter, pci_dev->device.devargs);\n \tif (rc != 0) {\n \t\tPMD_INIT_LOG(CRIT, \"Failed to parse devargs\\n\");\n \t\tgoto err;\n \t}\n+\tadapter->llq_header_policy = ena_define_llq_hdr_policy(adapter);\n+\n \trc = ena_com_allocate_customer_metrics_buffer(ena_dev);\n \tif (rc != 0) {\n \t\tPMD_INIT_LOG(CRIT, \"Failed to allocate customer metrics buffer\\n\");\n@@ -2264,8 +2274,9 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)\n \tif (!(adapter->all_aenq_groups & BIT(ENA_ADMIN_LINK_CHANGE)))\n \t\tadapter->edev_data->dev_flags &= ~RTE_ETH_DEV_INTR_LSC;\n \n-\tset_default_llq_configurations(&llq_config, &get_feat_ctx.llq,\n-\t\tadapter->use_large_llq_hdr);\n+\tbool use_large_llq_hdr = ena_use_large_llq_hdr(adapter,\n+\t\t\t\t\t\t get_feat_ctx.llq.entry_size_recommended);\n+\tset_default_llq_configurations(&llq_config, &get_feat_ctx.llq, use_large_llq_hdr);\n \trc = ena_set_queues_placement_policy(adapter, ena_dev,\n \t\t\t\t\t &get_feat_ctx.llq, &llq_config);\n \tif (unlikely(rc)) {\n@@ -2273,18 +2284,19 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)\n \t\treturn rc;\n \t}\n \n-\tif (ena_dev->tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_HOST)\n+\tif (ena_dev->tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_HOST) {\n \t\tqueue_type_str = \"Regular\";\n-\telse\n+\t} else {\n \t\tqueue_type_str = \"Low latency\";\n+\t\tPMD_DRV_LOG(INFO, \"LLQ entry size %uB\\n\", llq_config.llq_ring_entry_size_value);\n+\t}\n \tPMD_DRV_LOG(INFO, \"Placement policy: %s\\n\", queue_type_str);\n \n \tcalc_queue_ctx.ena_dev = ena_dev;\n \tcalc_queue_ctx.get_feat_ctx = &get_feat_ctx;\n \n \tmax_num_io_queues = ena_calc_max_io_queue_num(ena_dev, &get_feat_ctx);\n-\trc = ena_calc_io_queue_size(&calc_queue_ctx,\n-\t\tadapter->use_large_llq_hdr);\n+\trc = ena_calc_io_queue_size(&calc_queue_ctx, use_large_llq_hdr);\n \tif (unlikely((rc != 0) || (max_num_io_queues == 0))) {\n \t\trc = -EFAULT;\n \t\tgoto err_device_destroy;\n@@ -3632,7 +3644,7 @@ static int ena_process_uint_devarg(const char *key,\n \tchar *str_end;\n \tuint64_t uint_value;\n \n-\tuint_value = strtoull(value, &str_end, 10);\n+\tuint_value = strtoull(value, &str_end, DECIMAL_BASE);\n \tif (value == str_end) {\n \t\tPMD_INIT_LOG(ERR,\n \t\t\t\"Invalid value for key '%s'. Only uint values are accepted.\\n\",\n@@ -3685,6 +3697,8 @@ static int ena_process_bool_devarg(const char *key,\n \t/* Now, assign it to the proper adapter field. */\n \tif (strcmp(key, ENA_DEVARG_LARGE_LLQ_HDR) == 0)\n \t\tadapter->use_large_llq_hdr = bool_value;\n+\telse if (strcmp(key, ENA_DEVARG_NORMAL_LLQ_HDR) == 0)\n+\t\tadapter->use_normal_llq_hdr = bool_value;\n \telse if (strcmp(key, ENA_DEVARG_ENABLE_LLQ) == 0)\n \t\tadapter->enable_llq = bool_value;\n \n@@ -3696,6 +3710,7 @@ static int ena_parse_devargs(struct ena_adapter *adapter,\n {\n \tstatic const char * const allowed_args[] = {\n \t\tENA_DEVARG_LARGE_LLQ_HDR,\n+\t\tENA_DEVARG_NORMAL_LLQ_HDR,\n \t\tENA_DEVARG_MISS_TXC_TO,\n \t\tENA_DEVARG_ENABLE_LLQ,\n \t\tNULL,\n@@ -3717,6 +3732,10 @@ static int ena_parse_devargs(struct ena_adapter *adapter,\n \t\tena_process_bool_devarg, adapter);\n \tif (rc != 0)\n \t\tgoto exit;\n+\trc = rte_kvargs_process(kvlist, ENA_DEVARG_NORMAL_LLQ_HDR,\n+\t\tena_process_bool_devarg, adapter);\n+\tif (rc != 0)\n+\t\tgoto exit;\n \trc = rte_kvargs_process(kvlist, ENA_DEVARG_MISS_TXC_TO,\n \t\tena_process_uint_devarg, adapter);\n \tif (rc != 0)\n@@ -3943,6 +3962,7 @@ RTE_PMD_REGISTER_PCI_TABLE(net_ena, pci_id_ena_map);\n RTE_PMD_REGISTER_KMOD_DEP(net_ena, \"* igb_uio | uio_pci_generic | vfio-pci\");\n RTE_PMD_REGISTER_PARAM_STRING(net_ena,\n \tENA_DEVARG_LARGE_LLQ_HDR \"=<0|1> \"\n+\tENA_DEVARG_NORMAL_LLQ_HDR \"=<0|1> \"\n \tENA_DEVARG_ENABLE_LLQ \"=<0|1> \"\n \tENA_DEVARG_MISS_TXC_TO \"=<uint>\");\n RTE_LOG_REGISTER_SUFFIX(ena_logtype_init, init, NOTICE);\n@@ -4129,3 +4149,27 @@ ena_mp_primary_handle(const struct rte_mp_msg *mp_msg, const void *peer)\n \t/* Return just IPC processing status */\n \treturn rte_mp_reply(&mp_rsp, peer);\n }\n+\n+static ena_llq_policy ena_define_llq_hdr_policy(struct ena_adapter *adapter)\n+{\n+\tif (!adapter->enable_llq)\n+\t\treturn ENA_LLQ_POLICY_DISABLED;\n+\tif (adapter->use_large_llq_hdr)\n+\t\treturn ENA_LLQ_POLICY_LARGE;\n+\tif (adapter->use_normal_llq_hdr)\n+\t\treturn ENA_LLQ_POLICY_NORMAL;\n+\treturn ENA_LLQ_POLICY_RECOMMENDED;\n+}\n+\n+static bool ena_use_large_llq_hdr(struct ena_adapter *adapter, uint8_t recommended_entry_size)\n+{\n+\tif (adapter->llq_header_policy == ENA_LLQ_POLICY_LARGE) {\n+\t\treturn true;\n+\t} else if (adapter->llq_header_policy == ENA_LLQ_POLICY_RECOMMENDED) {\n+\t\tPMD_DRV_LOG(INFO, \"Recommended device entry size policy %u\\n\",\n+\t\t\trecommended_entry_size);\n+\t\tif (recommended_entry_size == ENA_ADMIN_LIST_ENTRY_SIZE_256B)\n+\t\t\treturn true;\n+\t}\n+\treturn false;\n+}\ndiff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h\nindex 20b8307836..7358f28caf 100644\n--- a/drivers/net/ena/ena_ethdev.h\n+++ b/drivers/net/ena/ena_ethdev.h\n@@ -85,6 +85,14 @@ enum ena_ring_type {\n \tENA_RING_TYPE_TX = 2,\n };\n \n+typedef enum ena_llq_policy_t {\n+\tENA_LLQ_POLICY_DISABLED = 0, /* Host queues */\n+\tENA_LLQ_POLICY_RECOMMENDED = 1, /* Device recommendation */\n+\tENA_LLQ_POLICY_NORMAL = 2, /* 128B long LLQ entry */\n+\tENA_LLQ_POLICY_LARGE = 3, /* 256B long LLQ entry */\n+\tENA_LLQ_POLICY_LAST,\n+} ena_llq_policy;\n+\n struct ena_tx_buffer {\n \tstruct rte_mbuf *mbuf;\n \tunsigned int tx_descs;\n@@ -328,9 +336,10 @@ struct ena_adapter {\n \tuint32_t active_aenq_groups;\n \n \tbool trigger_reset;\n-\n \tbool enable_llq;\n \tbool use_large_llq_hdr;\n+\tbool use_normal_llq_hdr;\n+\tena_llq_policy llq_header_policy;\n \n \tuint32_t last_tx_comp_qid;\n \tuint64_t missing_tx_completion_to;\n", "prefixes": [ "v4", "06/31" ] }