patch 'vhost: fix offset while mapping log base address' has been queued to stable release 23.11.3

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.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 11/30/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=1f2330c670d1bedb5e54a790eda3874d402ab88d

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 1f2330c670d1bedb5e54a790eda3874d402ab88d Mon Sep 17 00:00:00 2001
From: Bill Xiang <xiangwencheng at dayudpu.com>
Date: Mon, 8 Jul 2024 14:57:49 +0800
Subject: [PATCH] vhost: fix offset while mapping log base address
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit bdd96d8ac76ca412165b2d1bbd3701e978246d8e ]

For sanity the offset should be the last parameter of mmap.

Fixes: fbc4d248b198 ("vhost: fix offset while mmaping log base address")

Signed-off-by: Bill Xiang <xiangwencheng at dayudpu.com>
Reviewed-by: Chenbo Xia <chenbox at nvidia.com>
---
 .mailmap               | 1 +
 lib/vhost/vhost_user.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 4022645615..f4d2a72009 100644
--- a/.mailmap
+++ b/.mailmap
@@ -177,6 +177,7 @@ Bert van Leeuwen <bert.vanleeuwen at netronome.com>
 Bhagyada Modali <bhagyada.modali at amd.com>
 Bharat Mota <bmota at vmware.com>
 Bill Hong <bhong at brocade.com>
+Bill Xiang <xiangwencheng at dayudpu.com>
 Billy McFall <bmcfall at redhat.com>
 Billy O'Mahony <billy.o.mahony at intel.com>
 Bing Zhao <bingz at nvidia.com> <bingz at mellanox.com> <bing.zhao at hxt-semitech.com>
diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c
index f8e42dd619..5b6c90437c 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -2328,7 +2328,7 @@ vhost_user_set_log_base(struct virtio_net **pdev,
 	 * mmap from 0 to workaround a hugepage mmap bug: mmap will
 	 * fail when offset is not page size aligned.
 	 */
-	addr = mmap(0, size + off, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+	addr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, off);
 	alignment = get_blk_size(fd);
 	close(fd);
 	if (addr == MAP_FAILED) {
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-11 14:23:07.286278496 +0800
+++ 0046-vhost-fix-offset-while-mapping-log-base-address.patch	2024-11-11 14:23:05.112192840 +0800
@@ -1 +1 @@
-From bdd96d8ac76ca412165b2d1bbd3701e978246d8e Mon Sep 17 00:00:00 2001
+From 1f2330c670d1bedb5e54a790eda3874d402ab88d Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit bdd96d8ac76ca412165b2d1bbd3701e978246d8e ]
@@ -9 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index ed4ea17c4c..544e62df7d 100644
+index 4022645615..f4d2a72009 100644
@@ -22,3 +24,3 @@
-@@ -183,6 +183,7 @@ Bhagyada Modali <bhagyada.modali at amd.com>
- Bharat Mota <bharat.mota at broadcom.com> <bmota at vmware.com>
- Bhuvan Mital <bhuvan.mital at amd.com>
+@@ -177,6 +177,7 @@ Bert van Leeuwen <bert.vanleeuwen at netronome.com>
+ Bhagyada Modali <bhagyada.modali at amd.com>
+ Bharat Mota <bmota at vmware.com>
@@ -31 +33 @@
-index 5f470da38a..0893ae80bb 100644
+index f8e42dd619..5b6c90437c 100644
@@ -34 +36 @@
-@@ -2399,7 +2399,7 @@ vhost_user_set_log_base(struct virtio_net **pdev,
+@@ -2328,7 +2328,7 @@ vhost_user_set_log_base(struct virtio_net **pdev,