patch 'net/ena/base: fix metrics excessive memory consumption' has been queued to stable release 23.11.1

Xueming Li xuemingl at nvidia.com
Sat Apr 13 14:50:05 CEST 2024
Previous message (by thread): patch 'dts: strip whitespaces from stdout and stderr' has been queued to stable release 23.11.1
Next message (by thread): please help backporting some patches to stable release 23.11.1
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Hi,

FYI, your patch has been queued to stable release 23.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/15/24. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=cfa8a4cb909e07cbb34941358f4d912c879dca34

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From cfa8a4cb909e07cbb34941358f4d912c879dca34 Mon Sep 17 00:00:00 2001
From: Shai Brandes <shaibran at amazon.com>
Date: Mon, 8 Apr 2024 15:15:25 +0300
Subject: [PATCH] net/ena/base: fix metrics excessive memory consumption
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit c8a1898f82f8c04cbe1d3e2d0eec0705386c23f7 ]

The driver accidentally allocates a huge memory
buffer for the customer metrics because it uses
an uninitialized variable for the buffer length.
This can lead to excessive memory footprint for
the driver which can even fail to initialize in
case of insufficient memory.

Bugzilla ID: 1400
Fixes: f73f53f7dc7a ("net/ena: upgrade HAL")
Cc: stable at dpdk.org

Signed-off-by: Shai Brandes <shaibran at amazon.com>
Reviewed-by: Amit Bernstein <amitbern at amazon.com>
---
 drivers/net/ena/base/ena_com.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c
index 57ccde9545..2f438597e6 100644
--- a/drivers/net/ena/base/ena_com.c
+++ b/drivers/net/ena/base/ena_com.c
@@ -3141,16 +3141,18 @@ int ena_com_allocate_debug_area(struct ena_com_dev *ena_dev,
 int ena_com_allocate_customer_metrics_buffer(struct ena_com_dev *ena_dev)
 {
 	struct ena_customer_metrics *customer_metrics = &ena_dev->customer_metrics;
+	customer_metrics->buffer_len = ENA_CUSTOMER_METRICS_BUFFER_SIZE;
+	customer_metrics->buffer_virt_addr = NULL;
 
 	ENA_MEM_ALLOC_COHERENT(ena_dev->dmadev,
 			       customer_metrics->buffer_len,
 			       customer_metrics->buffer_virt_addr,
 			       customer_metrics->buffer_dma_addr,
 			       customer_metrics->buffer_dma_handle);
-	if (unlikely(customer_metrics->buffer_virt_addr == NULL))
+	if (unlikely(customer_metrics->buffer_virt_addr == NULL)) {
+		customer_metrics->buffer_len = 0;
 		return ENA_COM_NO_MEM;
-
-	customer_metrics->buffer_len = ENA_CUSTOMER_METRICS_BUFFER_SIZE;
+	}
 
 	return 0;
 }
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-13 20:43:08.830253026 +0800
+++ 0125-net-ena-base-fix-metrics-excessive-memory-consumptio.patch	2024-04-13 20:43:05.157753723 +0800
@@ -1 +1 @@
-From c8a1898f82f8c04cbe1d3e2d0eec0705386c23f7 Mon Sep 17 00:00:00 2001
+From cfa8a4cb909e07cbb34941358f4d912c879dca34 Mon Sep 17 00:00:00 2001
@@ -3,2 +3,3 @@
-Date: Tue, 12 Mar 2024 20:07:09 +0200
-Subject: [PATCH] net/ena: improve style and readability
+Date: Mon, 8 Apr 2024 15:15:25 +0300
+Subject: [PATCH] net/ena/base: fix metrics excessive memory consumption
+Cc: Xueming Li <xuemingl at nvidia.com>
@@ -6,2 +7,12 @@
-This patch makes several changes to improve
-the style and readability of the code.
+[ upstream commit c8a1898f82f8c04cbe1d3e2d0eec0705386c23f7 ]
+
+The driver accidentally allocates a huge memory
+buffer for the customer metrics because it uses
+an uninitialized variable for the buffer length.
+This can lead to excessive memory footprint for
+the driver which can even fail to initialize in
+case of insufficient memory.
+
+Bugzilla ID: 1400
+Fixes: f73f53f7dc7a ("net/ena: upgrade HAL")
+Cc: stable at dpdk.org
@@ -12,3 +23,2 @@
- drivers/net/ena/base/ena_com.c       | 13 +++++--------
- drivers/net/ena/base/ena_plat_dpdk.h |  2 +-
- 2 files changed, 6 insertions(+), 9 deletions(-)
+ drivers/net/ena/base/ena_com.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
@@ -17 +27 @@
-index b98540ba63..2db21e7895 100644
+index 57ccde9545..2f438597e6 100644
@@ -20,28 +30,2 @@
-@@ -1914,15 +1914,14 @@ int ena_com_phc_get_timestamp(struct ena_com_dev *ena_dev, u64 *timestamp)
- 
- 		/* PHC is in active state, update statistics according to req_id and error_flags */
- 		if ((READ_ONCE16(read_resp->req_id) != phc->req_id) ||
--		    (read_resp->error_flags & ENA_PHC_ERROR_FLAGS)) {
-+		    (read_resp->error_flags & ENA_PHC_ERROR_FLAGS))
- 			/* Device didn't update req_id during blocking time or timestamp is invalid,
- 			 * this indicates on a device error
- 			 */
- 			phc->stats.phc_err++;
--		} else {
-+		else
- 			/* Device updated req_id during blocking time with valid timestamp */
- 			phc->stats.phc_exp++;
--		}
- 	}
- 
- 	/* Setting relative timeouts */
-@@ -2431,7 +2430,7 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *ena_dev, void *data)
- 		timestamp = (u64)aenq_common->timestamp_low |
- 			((u64)aenq_common->timestamp_high << 32);
- 
--		ena_trc_dbg(ena_dev, "AENQ! Group[%x] Syndrome[%x] timestamp: [%" ENA_PRIU64 "s]\n",
-+		ena_trc_dbg(ena_dev, "AENQ! Group[%x] Syndrome[%x] timestamp: [%" ENA_PRIu64 "s]\n",
- 			    aenq_common->group,
- 			    aenq_common->syndrome,
- 			    timestamp);
-@@ -3233,16 +3232,15 @@ int ena_com_allocate_customer_metrics_buffer(struct ena_com_dev *ena_dev)
+@@ -3141,16 +3141,18 @@ int ena_com_allocate_debug_area(struct ena_com_dev *ena_dev,
+ int ena_com_allocate_customer_metrics_buffer(struct ena_com_dev *ena_dev)
@@ -50 +33,0 @@
- 
@@ -51,0 +35,2 @@
++	customer_metrics->buffer_virt_addr = NULL;
+ 
@@ -58 +43,2 @@
-+	if (unlikely(!customer_metrics->buffer_virt_addr))
++	if (unlikely(customer_metrics->buffer_virt_addr == NULL)) {
++		customer_metrics->buffer_len = 0;
@@ -60,2 +45,0 @@
- 
--	customer_metrics->buffer_len = ENA_CUSTOMER_METRICS_BUFFER_SIZE;
@@ -63,2 +47,2 @@
- 	return 0;
- }
+-	customer_metrics->buffer_len = ENA_CUSTOMER_METRICS_BUFFER_SIZE;
++	}
@@ -66,6 +50 @@
-@@ -3285,7 +3283,6 @@ void ena_com_delete_customer_metrics_buffer(struct ena_com_dev *ena_dev)
- 				      customer_metrics->buffer_dma_addr,
- 				      customer_metrics->buffer_dma_handle);
- 		customer_metrics->buffer_virt_addr = NULL;
--		customer_metrics->buffer_len = 0;
- 	}
+ 	return 0;
@@ -73,14 +51,0 @@
- 
-diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
-index bb21e1bf01..9e365b0f3b 100644
---- a/drivers/net/ena/base/ena_plat_dpdk.h
-+++ b/drivers/net/ena/base/ena_plat_dpdk.h
-@@ -40,7 +40,7 @@ typedef uint64_t dma_addr_t;
- #define ETIME ETIMEDOUT
- #endif
- 
--#define ENA_PRIU64 PRIu64
-+#define ENA_PRIu64 PRIu64
- #define ena_atomic32_t rte_atomic32_t
- #define ena_mem_handle_t const struct rte_memzone *
-
Previous message (by thread): patch 'dts: strip whitespaces from stdout and stderr' has been queued to stable release 23.11.1
Next message (by thread): please help backporting some patches to stable release 23.11.1
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the stable mailing list