patch 'vhost: restore device information in log messages' has been queued to stable release 21.11.2

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 21.11.2

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

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

Thanks.

Luca Boccassi

---
>From c353b1de9ffb95000d021ab6b80e9584fa78012b Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Fri, 1 Jul 2022 09:55:09 +0200
Subject: [PATCH] vhost: restore device information in log messages

[ upstream commit bb15129da98aa4cfa34a5a33a443436e5cdb18ea ]

device information in the log messages was dropped.

Fixes: 52ade97e3641 ("vhost: fix physical address mapping")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia at intel.com>
---
 lib/vhost/vhost_user.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index ff47247d2b..df780fd7d6 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -174,7 +174,8 @@ async_dma_map(struct virtio_net *dev, bool do_map)
 					return;
 
 				/* DMA mapping errors won't stop VHOST_USER_SET_MEM_TABLE. */
-				VHOST_LOG_CONFIG(ERR, "DMA engine map failed\n");
+				VHOST_LOG_CONFIG(ERR, "(%s) DMA engine map failed\n",
+					dev->ifname);
 			}
 		}
 
@@ -190,7 +191,8 @@ async_dma_map(struct virtio_net *dev, bool do_map)
 				if (rte_errno == EINVAL)
 					return;
 
-				VHOST_LOG_CONFIG(ERR, "DMA engine unmap failed\n");
+				VHOST_LOG_CONFIG(ERR, "(%s) DMA engine unmap failed\n",
+					dev->ifname);
 			}
 		}
 	}
@@ -990,7 +992,8 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,
 					dev->max_guest_pages * sizeof(*page),
 					RTE_CACHE_LINE_SIZE);
 		if (dev->guest_pages == NULL) {
-			VHOST_LOG_CONFIG(ERR, "cannot realloc guest_pages\n");
+			VHOST_LOG_CONFIG(ERR, "(%s) cannot realloc guest_pages\n",
+				dev->ifname);
 			rte_free(old_pages);
 			return -1;
 		}
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-07-06 21:07:54.113017809 +0100
+++ 0016-vhost-restore-device-information-in-log-messages.patch	2022-07-06 21:07:53.547518784 +0100
@@ -1 +1 @@
-From bb15129da98aa4cfa34a5a33a443436e5cdb18ea Mon Sep 17 00:00:00 2001
+From c353b1de9ffb95000d021ab6b80e9584fa78012b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bb15129da98aa4cfa34a5a33a443436e5cdb18ea ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index cc03f679a3..4b25512f91 100644
+index ff47247d2b..df780fd7d6 100644
@@ -21 +22 @@
-@@ -144,7 +144,8 @@ async_dma_map(struct virtio_net *dev, bool do_map)
+@@ -174,7 +174,8 @@ async_dma_map(struct virtio_net *dev, bool do_map)
@@ -31 +32 @@
-@@ -160,7 +161,8 @@ async_dma_map(struct virtio_net *dev, bool do_map)
+@@ -190,7 +191,8 @@ async_dma_map(struct virtio_net *dev, bool do_map)
@@ -41 +42 @@
-@@ -945,7 +947,8 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,
+@@ -990,7 +992,8 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,