Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/133264/?format=api
{ "id": 133264, "url": "http://patchwork.dpdk.org/api/patches/133264/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20231024102128.16832-5-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": "<20231024102128.16832-5-shaibran@amazon.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231024102128.16832-5-shaibran@amazon.com", "date": "2023-10-24T10:21:27", "name": "[4/5] net/ena: add support for ena-express metrics", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "f1a8e6ab8b933b16569443d19123ff4431539358", "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/20231024102128.16832-5-shaibran@amazon.com/mbox/", "series": [ { "id": 29965, "url": "http://patchwork.dpdk.org/api/series/29965/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29965", "date": "2023-10-24T10:21:23", "name": "net/ena: v2.8.0 driver release", "version": 1, "mbox": "http://patchwork.dpdk.org/series/29965/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/133264/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/133264/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 34D05431EF;\n\tTue, 24 Oct 2023 12:22:17 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 23BF240EE2;\n\tTue, 24 Oct 2023 12:22:17 +0200 (CEST)", "from smtp-fw-9105.amazon.com (smtp-fw-9105.amazon.com\n [207.171.188.204])\n by mails.dpdk.org (Postfix) with ESMTP id 46AF740EE2\n for <dev@dpdk.org>; Tue, 24 Oct 2023 12:22:15 +0200 (CEST)", "from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO\n email-inbound-relay-iad-1d-m6i4x-f05d30a1.us-east-1.amazon.com)\n ([10.25.36.210]) by smtp-border-fw-9105.sea19.amazon.com with\n ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Oct 2023 10:22:09 +0000", "from smtpout.prod.us-east-1.prod.farcaster.email.amazon.dev\n (iad7-ws-svc-p70-lb3-vlan3.iad.amazon.com [10.32.235.38])\n by email-inbound-relay-iad-1d-m6i4x-f05d30a1.us-east-1.amazon.com (Postfix)\n with ESMTPS id E8D1180671; Tue, 24 Oct 2023 10:22:06 +0000 (UTC)", "from EX19MTAEUB001.ant.amazon.com [10.0.17.79:56166]\n by smtpin.naws.eu-west-1.prod.farcaster.email.amazon.dev [10.0.0.200:2525]\n with esmtp (Farcaster)\n id 669cd2a9-6597-4045-ad91-da0cf9205b28;\n Tue, 24 Oct 2023 10:22:05 +0000 (UTC)", "from EX19D007EUA001.ant.amazon.com (10.252.50.133) by\n EX19MTAEUB001.ant.amazon.com (10.252.51.26) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.2.1118.39; Tue, 24 Oct 2023 10:22:05 +0000", "from EX19MTAUWB001.ant.amazon.com (10.250.64.248) by\n EX19D007EUA001.ant.amazon.com (10.252.50.133) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.2.1118.39; Tue, 24 Oct 2023 10:22:04 +0000", "from HFA15-CG15235BS.amazon.com (10.85.143.172) by\n mail-relay.amazon.com (10.250.64.254) with Microsoft SMTP Server id\n 15.2.1118.39 via Frontend Transport; Tue, 24 Oct 2023 10:22:02 +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=1698142936; x=1729678936;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=tl+/0DNZGsSQd/CLMj7PzEoEqomRKYN/280fvIGocqU=;\n b=f9PaqSWiB0Zy2HQuspYVUpAXTmrJT9cenvOc+FIbWayLdWdnX0Etw5sJ\n CVgEtBqc46vb9VW++u64vRR3HuVKbspkLGOQ0dsVlK85CfRwmNu1J5hpm\n kkNz+osmUuy6gS2uRocd+LQz5bEDTr5dZacyIzVLni+9GHryI1wqBzy+v c=;", "X-IronPort-AV": "E=Sophos;i=\"6.03,247,1694736000\"; d=\"scan'208\";a=\"680416287\"", "X-Farcaster-Flow-ID": "669cd2a9-6597-4045-ad91-da0cf9205b28", "From": "<shaibran@amazon.com>", "To": "<ferruh.yigit@amd.com>", "CC": "<dev@dpdk.org>, Shai Brandes <shaibran@amazon.com>, Michal Krawczyk\n <mk@semihalf.com>, Evgeny Schemeilin <evgenys@amazon.com>, Igor Chauskin\n <igorch@amazon.com>, Ron Beider <rbeider@amazon.com>", "Subject": "[PATCH 4/5] net/ena: add support for ena-express metrics", "Date": "Tue, 24 Oct 2023 13:21:27 +0300", "Message-ID": "<20231024102128.16832-5-shaibran@amazon.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20231024102128.16832-1-shaibran@amazon.com>", "References": "<20231024102128.16832-1-shaibran@amazon.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"UTF-8\"", "Content-Transfer-Encoding": "8bit", "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\nENA-express is powered by AWS scalable reliable datagram (SRD)\ntechnology. SRD is a high performance network transport protocol\nthat uses dynamic routing to increase throughput and minimize\ntail latency.\n\nThe driver expose the following ENA-express metrics via xstats:\n* ena_srd_mode – Describes which ENA-express features are enabled\n* ena_srd_eligible_tx_pkts – The number of network packets sent\n within a given time period that meet SRD requirements for\n eligibility\n* ena_srd_tx_pkts – The number of SRD packets transmitted within\n a given time period.\n* ena_srd_rx_pkts – The number of SRD packets received within\n a given time period.\n* ena_srd_resource_utilization – The percentage of the maximum\n allowed memory utilization for concurrent SRD connections\n that the instance has consumed.\n\nProbing the ENA Express metrics is performed via an admin command.\nThus, a multi-process proxy handler was added.\n\nSigned-off-by: Shai Brandes <shaibran@amazon.com>\nReviewed-by: Amit Bernstein <amitbern@amazon.com>\n---\n doc/guides/rel_notes/release_23_11.rst | 1 +\n drivers/net/ena/ena_ethdev.c | 105 ++++++++++++++++++++++++-\n drivers/net/ena/ena_ethdev.h | 18 +++++\n 3 files changed, 123 insertions(+), 1 deletion(-)", "diff": "diff --git a/doc/guides/rel_notes/release_23_11.rst b/doc/guides/rel_notes/release_23_11.rst\nindex f622d93384..7aaa78e6c9 100644\n--- a/doc/guides/rel_notes/release_23_11.rst\n+++ b/doc/guides/rel_notes/release_23_11.rst\n@@ -149,6 +149,7 @@ New Features\n * Upgraded ENA HAL to latest version.\n * Added support for connection tracking allowance utilization metric.\n * Added support for reporting rx overrun errors in xstats.\n+ * Added support for ENA-express metrics.\n \n * **Updated Solarflare net driver.**\n \ndiff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c\nindex b3ebda6049..59cb2792d4 100644\n--- a/drivers/net/ena/ena_ethdev.c\n+++ b/drivers/net/ena/ena_ethdev.c\n@@ -66,6 +66,9 @@ struct ena_stats {\n #define ENA_STAT_GLOBAL_ENTRY(stat) \\\n \tENA_STAT_ENTRY(stat, dev)\n \n+#define ENA_STAT_ENA_SRD_ENTRY(stat) \\\n+\tENA_STAT_ENTRY(stat, srd)\n+\n /* Device arguments */\n #define ENA_DEVARG_LARGE_LLQ_HDR \"large_llq_hdr\"\n /* Timeout in seconds after which a single uncompleted Tx packet should be\n@@ -106,6 +109,14 @@ static struct ena_stats ena_stats_metrics_strings[] = {\n \tENA_STAT_METRICS_ENTRY(conntrack_allowance_available),\n };\n \n+static const struct ena_stats ena_stats_srd_strings[] = {\n+\tENA_STAT_ENA_SRD_ENTRY(ena_srd_mode),\n+\tENA_STAT_ENA_SRD_ENTRY(ena_srd_tx_pkts),\n+\tENA_STAT_ENA_SRD_ENTRY(ena_srd_eligible_tx_pkts),\n+\tENA_STAT_ENA_SRD_ENTRY(ena_srd_rx_pkts),\n+\tENA_STAT_ENA_SRD_ENTRY(ena_srd_resource_utilization),\n+};\n+\n static const struct ena_stats ena_stats_tx_strings[] = {\n \tENA_STAT_TX_ENTRY(cnt),\n \tENA_STAT_TX_ENTRY(bytes),\n@@ -132,9 +143,11 @@ static const struct ena_stats ena_stats_rx_strings[] = {\n #define ENA_STATS_ARRAY_GLOBAL\tARRAY_SIZE(ena_stats_global_strings)\n #define ENA_STATS_ARRAY_METRICS\tARRAY_SIZE(ena_stats_metrics_strings)\n #define ENA_STATS_ARRAY_METRICS_LEGACY\t(ENA_STATS_ARRAY_METRICS - 1)\n+#define ENA_STATS_ARRAY_ENA_SRD\tARRAY_SIZE(ena_stats_srd_strings)\n #define ENA_STATS_ARRAY_TX\tARRAY_SIZE(ena_stats_tx_strings)\n #define ENA_STATS_ARRAY_RX\tARRAY_SIZE(ena_stats_rx_strings)\n \n+\n #define QUEUE_OFFLOADS (RTE_ETH_TX_OFFLOAD_TCP_CKSUM |\\\n \t\t\tRTE_ETH_TX_OFFLOAD_UDP_CKSUM |\\\n \t\t\tRTE_ETH_TX_OFFLOAD_IPV4_CKSUM |\\\n@@ -272,6 +285,8 @@ static int ena_parse_devargs(struct ena_adapter *adapter,\n static void ena_copy_customer_metrics(struct ena_adapter *adapter,\n \t\t\t\t\tuint64_t *buf,\n \t\t\t\t\tsize_t buf_size);\n+static void ena_copy_ena_srd_info(struct ena_adapter *adapter,\n+\t\t\t\t struct ena_stats_srd *srd_info);\n static int ena_setup_rx_intr(struct rte_eth_dev *dev);\n static int ena_rx_queue_intr_enable(struct rte_eth_dev *dev,\n \t\t\t\t uint16_t queue_id);\n@@ -324,6 +339,7 @@ enum ena_mp_req {\n \tENA_MP_IND_TBL_GET,\n \tENA_MP_IND_TBL_SET,\n \tENA_MP_CUSTOMER_METRICS_GET,\n+\tENA_MP_SRD_STATS_GET,\n };\n \n /** Proxy message body. Shared between requests and responses. */\n@@ -581,6 +597,22 @@ ENA_PROXY_DESC(ena_com_get_customer_metrics, ENA_MP_CUSTOMER_METRICS_GET,\n }),\n \tstruct ena_com_dev *ena_dev, char *buf, size_t buf_size);\n \n+ENA_PROXY_DESC(ena_com_get_ena_srd_info, ENA_MP_SRD_STATS_GET,\n+({\n+\tENA_TOUCH(adapter);\n+\tENA_TOUCH(req);\n+\tENA_TOUCH(ena_dev);\n+\tENA_TOUCH(info);\n+}),\n+({\n+\tENA_TOUCH(rsp);\n+\tENA_TOUCH(ena_dev);\n+\tif ((struct ena_stats_srd *)info != &adapter->srd_stats)\n+\t\trte_memcpy((struct ena_stats_srd *)info,\n+\t\t\t\t&adapter->srd_stats,\n+\t\t\t\tsizeof(struct ena_stats_srd));\n+}),\n+\tstruct ena_com_dev *ena_dev, struct ena_admin_ena_srd_info *info);\n \n static inline void ena_trigger_reset(struct ena_adapter *adapter,\n \t\t\t\t enum ena_regs_reset_reason_types reason)\n@@ -787,6 +819,7 @@ static unsigned int ena_xstats_calc_num(struct rte_eth_dev_data *data)\n \n \treturn ENA_STATS_ARRAY_GLOBAL +\n \t\tadapter->metrics_num +\n+\t\tENA_STATS_ARRAY_ENA_SRD +\n \t\t(data->nb_tx_queues * ENA_STATS_ARRAY_TX) +\n \t\t(data->nb_rx_queues * ENA_STATS_ARRAY_RX);\n }\n@@ -3238,6 +3271,27 @@ static void ena_copy_customer_metrics(struct ena_adapter *adapter, uint64_t *buf\n \t}\n }\n \n+static void ena_copy_ena_srd_info(struct ena_adapter *adapter,\n+\t\tstruct ena_stats_srd *srd_info)\n+{\n+\tint rc;\n+\n+\tif (!ena_com_get_cap(&adapter->ena_dev, ENA_ADMIN_ENA_SRD_INFO))\n+\t\treturn;\n+\n+\trte_spinlock_lock(&adapter->admin_lock);\n+\trc = ENA_PROXY(adapter,\n+\t\t ena_com_get_ena_srd_info,\n+\t\t &adapter->ena_dev,\n+\t\t (struct ena_admin_ena_srd_info *)srd_info);\n+\trte_spinlock_unlock(&adapter->admin_lock);\n+\tif (rc != ENA_COM_OK && rc != ENA_COM_UNSUPPORTED) {\n+\t\tPMD_DRV_LOG(WARNING,\n+\t\t\t\t\"Failed to get ENA express srd info, rc: %d\\n\", rc);\n+\t\treturn;\n+\t}\n+}\n+\n /**\n * DPDK callback to retrieve names of extended device statistics\n *\n@@ -3271,6 +3325,11 @@ static int ena_xstats_get_names(struct rte_eth_dev *dev,\n \t\t\t ena_stats_metrics_strings[stat].name,\n \t\t\t RTE_ETH_XSTATS_NAME_SIZE);\n \n+\tfor (stat = 0; stat < ENA_STATS_ARRAY_ENA_SRD; stat++, count++)\n+\t\trte_strscpy(xstats_names[count].name,\n+\t\t\t ena_stats_srd_strings[stat].name,\n+\t\t\t RTE_ETH_XSTATS_NAME_SIZE);\n+\n \tfor (stat = 0; stat < ENA_STATS_ARRAY_RX; stat++)\n \t\tfor (i = 0; i < dev->data->nb_rx_queues; i++, count++)\n \t\t\tsnprintf(xstats_names[count].name,\n@@ -3341,6 +3400,15 @@ static int ena_xstats_get_names_by_id(struct rte_eth_dev *dev,\n \t\t}\n \n \t\tid -= adapter->metrics_num;\n+\n+\t\tif (id < ENA_STATS_ARRAY_ENA_SRD) {\n+\t\t\trte_strscpy(xstats_names[i].name,\n+\t\t\t\t ena_stats_srd_strings[id].name,\n+\t\t\t\t RTE_ETH_XSTATS_NAME_SIZE);\n+\t\t\tcontinue;\n+\t\t}\n+\t\tid -= ENA_STATS_ARRAY_ENA_SRD;\n+\n \t\tif (id < ENA_STATS_ARRAY_RX) {\n \t\t\tqid = id / dev->data->nb_rx_queues;\n \t\t\tid %= dev->data->nb_rx_queues;\n@@ -3392,6 +3460,7 @@ static int ena_xstats_get(struct rte_eth_dev *dev,\n \tint stat_offset;\n \tvoid *stats_begin;\n \tuint64_t metrics_stats[ENA_MAX_CUSTOMER_METRICS];\n+\tstruct ena_stats_srd srd_info = {0};\n \n \tif (n < xstats_count)\n \t\treturn xstats_count;\n@@ -3418,6 +3487,15 @@ static int ena_xstats_get(struct rte_eth_dev *dev,\n \t\t ((char *)stats_begin + stat_offset));\n \t}\n \n+\tena_copy_ena_srd_info(adapter, &srd_info);\n+\tstats_begin = &srd_info;\n+\tfor (stat = 0; stat < ENA_STATS_ARRAY_ENA_SRD; stat++, count++) {\n+\t\tstat_offset = ena_stats_srd_strings[stat].stat_offset;\n+\t\txstats[count].id = count;\n+\t\txstats[count].value = *((uint64_t *)\n+\t\t ((char *)stats_begin + stat_offset));\n+\t}\n+\n \tfor (stat = 0; stat < ENA_STATS_ARRAY_RX; stat++) {\n \t\tfor (i = 0; i < dev->data->nb_rx_queues; i++, count++) {\n \t\t\tstat_offset = ena_stats_rx_strings[stat].stat_offset;\n@@ -3455,7 +3533,9 @@ static int ena_xstats_get_by_id(struct rte_eth_dev *dev,\n \tint qid;\n \tint valid = 0;\n \tbool were_metrics_copied = false;\n+\tbool was_srd_info_copied = false;\n \tuint64_t metrics_stats[ENA_MAX_CUSTOMER_METRICS];\n+\tstruct ena_stats_srd srd_info = {0};\n \n \tfor (i = 0; i < n; ++i) {\n \t\tid = ids[i];\n@@ -3485,8 +3565,27 @@ static int ena_xstats_get_by_id(struct rte_eth_dev *dev,\n \t\t\tcontinue;\n \t\t}\n \n-\t\t/* Check if id belongs to rx queue statistics */\n+\t\t/* Check if id belongs to SRD info statistics */\n \t\tid -= adapter->metrics_num;\n+\n+\t\tif (id < ENA_STATS_ARRAY_ENA_SRD) {\n+\t\t\t/*\n+\t\t\t * Avoid reading srd info multiple times in a single\n+\t\t\t * function call, as it requires communication with the\n+\t\t\t * admin queue.\n+\t\t\t */\n+\t\t\tif (!was_srd_info_copied) {\n+\t\t\t\twas_srd_info_copied = true;\n+\t\t\t\tena_copy_ena_srd_info(adapter, &srd_info);\n+\t\t\t}\n+\t\t\tvalues[i] = *((uint64_t *)&adapter->srd_stats + id);\n+\t\t\t++valid;\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\t/* Check if id belongs to rx queue statistics */\n+\t\tid -= ENA_STATS_ARRAY_ENA_SRD;\n+\n \t\trx_entries = ENA_STATS_ARRAY_RX * dev->data->nb_rx_queues;\n \t\tif (id < rx_entries) {\n \t\t\tqid = id % dev->data->nb_rx_queues;\n@@ -3981,6 +4080,10 @@ ena_mp_primary_handle(const struct rte_mp_msg *mp_msg, const void *peer)\n \t\t\t\t(char *)adapter->metrics_stats,\n \t\t\t\tsizeof(uint64_t) * adapter->metrics_num);\n \t\tbreak;\n+\tcase ENA_MP_SRD_STATS_GET:\n+\t\tres = ena_com_get_ena_srd_info(ena_dev,\n+\t\t\t\t(struct ena_admin_ena_srd_info *)&adapter->srd_stats);\n+\t\tbreak;\n \tdefault:\n \t\tPMD_DRV_LOG(ERR, \"Unknown request type %d\\n\", req->type);\n \t\tres = -EINVAL;\ndiff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h\nindex 3f29764ca6..4988fbffb5 100644\n--- a/drivers/net/ena/ena_ethdev.h\n+++ b/drivers/net/ena/ena_ethdev.h\n@@ -252,6 +252,23 @@ struct ena_stats_metrics {\n \tuint64_t conntrack_allowance_available;\n };\n \n+struct ena_stats_srd {\n+\t/* Describes which ENA Express features are enabled */\n+\tuint64_t ena_srd_mode;\n+\n+\t/* Number of packets transmitted over ENA SRD */\n+\tuint64_t ena_srd_tx_pkts;\n+\n+\t/* Number of packets transmitted or could have been transmitted over ENA SRD */\n+\tuint64_t ena_srd_eligible_tx_pkts;\n+\n+\t/* Number of packets received over ENA SRD */\n+\tuint64_t ena_srd_rx_pkts;\n+\n+\t/* Percentage of the ENA SRD resources that is in use */\n+\tuint64_t ena_srd_resource_utilization;\n+};\n+\n struct ena_offloads {\n \tuint32_t tx_offloads;\n \tuint32_t rx_offloads;\n@@ -329,6 +346,7 @@ struct ena_adapter {\n \t */\n \tuint64_t metrics_stats[ENA_MAX_CUSTOMER_METRICS] __rte_cache_aligned;\n \tuint16_t metrics_num;\n+\tstruct ena_stats_srd srd_stats __rte_cache_aligned;\n };\n \n int ena_mp_indirect_table_set(struct ena_adapter *adapter);\n", "prefixes": [ "4/5" ] }