[dpdk-stable] patch 'net/mlx5: fix 32-bit build' has been queued to LTS release 18.11.3

Kevin Traynor ktraynor at redhat.com
Fri Aug 23 11:43:10 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/28/19. 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://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/a9028545828a6fcfbfe322825159b925dd006d0f

Thanks.

Kevin Traynor

---
>From a9028545828a6fcfbfe322825159b925dd006d0f Mon Sep 17 00:00:00 2001
From: Ali Alnubani <alialnu at mellanox.com>
Date: Thu, 27 Jun 2019 18:10:07 +0300
Subject: [PATCH] net/mlx5: fix 32-bit build

[ upstream commit 843e720557105750d5152f3a414655ab87fb856c ]

This is to fix the error:
  ```
  drivers/net/mlx5/mlx5_defs.h:14:26:
  error: format '%lx' expects argument of type 'long unsigned int',
  but argument 5 has type 'off_t {aka long long int}' [-Werror=format=]
  drivers/net/mlx5/mlx5_txq.c:569:48: note: format string is defined here
     DRV_LOG(DEBUG, "port %u: uar_mmap_offset 0x%lx"
                                                ~~^
                                                %llx
  ```
Which reproduces with gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0.

Fixes: 6bf10ab69be0 ("net/mlx5: support 32-bit systems")

Signed-off-by: Ali Alnubani <alialnu at mellanox.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/mlx5/mlx5_txq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index 2971f9aa2..a3c6fdd18 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -11,4 +11,5 @@
 #include <unistd.h>
 #include <sys/mman.h>
+#include <inttypes.h>
 
 /* Verbs header. */
@@ -524,5 +525,5 @@ mlx5_txq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)
 	if (qp.comp_mask & MLX5DV_QP_MASK_UAR_MMAP_OFFSET) {
 		txq_ctrl->uar_mmap_offset = qp.uar_mmap_offset;
-		DRV_LOG(DEBUG, "port %u: uar_mmap_offset 0x%lx",
+		DRV_LOG(DEBUG, "port %u: uar_mmap_offset 0x%"PRIx64,
 			dev->data->port_id, txq_ctrl->uar_mmap_offset);
 	} else {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.776129240 +0100
+++ 0020-net-mlx5-fix-32-bit-build.patch	2019-08-22 19:38:20.440026808 +0100
@@ -1 +1 @@
-From 843e720557105750d5152f3a414655ab87fb856c Mon Sep 17 00:00:00 2001
+From a9028545828a6fcfbfe322825159b925dd006d0f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 843e720557105750d5152f3a414655ab87fb856c ]
+
@@ -19 +20,0 @@
-Cc: stable at dpdk.org
@@ -28 +29 @@
-index ebb42cbff..77410955f 100644
+index 2971f9aa2..a3c6fdd18 100644
@@ -37 +38 @@
-@@ -567,5 +568,5 @@ mlx5_txq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)
+@@ -524,5 +525,5 @@ mlx5_txq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)


More information about the stable mailing list