[dpdk-stable] patch 'net/ena/base: use min/max macros with type conversion' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/20. 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.

Thanks.

Luca Boccassi

---
>From cd266c8c5572699f8496bd05b3b142ef6f0ddce8 Mon Sep 17 00:00:00 2001
From: Michal Krawczyk <mk at semihalf.com>
Date: Thu, 17 Sep 2020 07:30:16 +0200
Subject: [PATCH] net/ena/base: use min/max macros with type conversion

[ upstream commit 8478f502f844ca0055a313609a58d80d30a0bdfd ]

Usage of RTE_MIN(MAX) in ENA_MIN32, ENA_MIN16, ENA_MIN8 (and same for
the MAX), was not enough, as the HAL code is assuming that those macros
will convert both arguments to the specified uintX_t type.

As RTE_MIN(MAX) is using 'typeof' operator, the behavior won't be the
same, especially if arguments has different types (and it could cause
compilation warnings).

To satisfy that, the ENA_MIN_T and ENA_MAX_T macros were added, which
are converting both arguments to the type which is being passed as an
argument.

Fixes: 9ba7981ec992 ("ena: add communication layer for DPDK")

Signed-off-by: Michal Krawczyk <mk at semihalf.com>
Reviewed-by: Igor Chauskin <igorch at amazon.com>
Reviewed-by: Guy Tzalik <gtzalik at amazon.com>
Reviewed-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/net/ena/base/ena_plat_dpdk.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
index da97efca46..2090e34adf 100644
--- a/drivers/net/ena/base/ena_plat_dpdk.h
+++ b/drivers/net/ena/base/ena_plat_dpdk.h
@@ -85,12 +85,14 @@ extern int ena_logtype_com;
 #define ENA_ASSERT(cond, format, arg...) do {} while (0)
 #endif
 
-#define ENA_MAX32(x, y) RTE_MAX((x), (y))
-#define ENA_MAX16(x, y) RTE_MAX((x), (y))
-#define ENA_MAX8(x, y) RTE_MAX((x), (y))
-#define ENA_MIN32(x, y) RTE_MIN((x), (y))
-#define ENA_MIN16(x, y) RTE_MIN((x), (y))
-#define ENA_MIN8(x, y) RTE_MIN((x), (y))
+#define ENA_MAX_T(type, x, y) RTE_MAX((type)(x), (type)(y))
+#define ENA_MAX32(x, y) ENA_MAX_T(uint32_t, (x), (y))
+#define ENA_MAX16(x, y) ENA_MAX_T(uint16_t, (x), (y))
+#define ENA_MAX8(x, y) ENA_MAX_T(uint8_t, (x), (y))
+#define ENA_MIN_T(type, x, y) RTE_MIN((type)(x), (type)(y))
+#define ENA_MIN32(x, y) ENA_MIN_T(uint32_t, (x), (y))
+#define ENA_MIN16(x, y) ENA_MIN_T(uint16_t, (x), (y))
+#define ENA_MIN8(x, y) ENA_MIN_T(uint8_t, (x), (y))
 
 #define BITS_PER_LONG_LONG (__SIZEOF_LONG_LONG__ * 8)
 #define U64_C(x) x ## ULL
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:13.788652801 +0000
+++ 0065-net-ena-base-use-min-max-macros-with-type-conversion.patch	2020-10-28 10:35:11.536830495 +0000
@@ -1,8 +1,10 @@
-From 8478f502f844ca0055a313609a58d80d30a0bdfd Mon Sep 17 00:00:00 2001
+From cd266c8c5572699f8496bd05b3b142ef6f0ddce8 Mon Sep 17 00:00:00 2001
 From: Michal Krawczyk <mk at semihalf.com>
 Date: Thu, 17 Sep 2020 07:30:16 +0200
 Subject: [PATCH] net/ena/base: use min/max macros with type conversion
 
+[ upstream commit 8478f502f844ca0055a313609a58d80d30a0bdfd ]
+
 Usage of RTE_MIN(MAX) in ENA_MIN32, ENA_MIN16, ENA_MIN8 (and same for
 the MAX), was not enough, as the HAL code is assuming that those macros
 will convert both arguments to the specified uintX_t type.
@@ -16,7 +18,6 @@
 argument.
 
 Fixes: 9ba7981ec992 ("ena: add communication layer for DPDK")
-Cc: stable at dpdk.org
 
 Signed-off-by: Michal Krawczyk <mk at semihalf.com>
 Reviewed-by: Igor Chauskin <igorch at amazon.com>
@@ -27,10 +28,10 @@
  1 file changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
-index 595967e6e3..ba7a098f59 100644
+index da97efca46..2090e34adf 100644
 --- a/drivers/net/ena/base/ena_plat_dpdk.h
 +++ b/drivers/net/ena/base/ena_plat_dpdk.h
-@@ -86,12 +86,14 @@ extern int ena_logtype_com;
+@@ -85,12 +85,14 @@ extern int ena_logtype_com;
  #define ENA_ASSERT(cond, format, arg...) do {} while (0)
  #endif