dec64939c6
- arm/virt: Fix vcpu hotplug idx_from_topo_ids - Revert patches related to the vSVA - sync some bugfix patches from upstream - add generic vDPA device support Signed-off-by: yezengruan <yezengruan@huawei.com> (cherry picked from commit b99dbfd9847104300672fb4f559f1c2abba8aa33)
63 lines
2.4 KiB
Diff
63 lines
2.4 KiB
Diff
From de10e9df6bcb2d56dcfd2017e66593e6e62dbb22 Mon Sep 17 00:00:00 2001
|
|
From: cmss_dx <dingxiang@cmss.chinamobile.com>
|
|
Date: Tue, 22 Nov 2022 09:56:55 +0000
|
|
Subject: [PATCH 01/29] memory: Fix wrong end address dump mainline inclusion
|
|
from mainline-v7.2.0-rc1 commit f9c307c3f9dfda64355fd2c6d73b002913d6752c
|
|
category: bugfix
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
--------------------------------
|
|
|
|
The end address of memory region section isn't correctly calculated
|
|
which leads to overflowed mtree dump:
|
|
|
|
Dispatch
|
|
Physical sections
|
|
......
|
|
#70 @0000000000002000..0000000000011fff io [ROOT]
|
|
#71 @0000000000005000..0000000000005fff (noname)
|
|
#72 @0000000000005000..0000000000014fff io [ROOT]
|
|
#73 @0000000000005658..0000000000005658 vmport
|
|
#74 @0000000000005659..0000000000015658 io [ROOT]
|
|
#75 @0000000000006000..0000000000015fff io [ROOT]
|
|
|
|
After fix:
|
|
#70 @0000000000002000..0000000000004fff io [ROOT]
|
|
#71 @0000000000005000..0000000000005fff (noname)
|
|
#72 @0000000000005000..0000000000005657 io [ROOT]
|
|
#73 @0000000000005658..0000000000005658 vmport
|
|
#74 @0000000000005659..0000000000005fff io [ROOT]
|
|
#75 @0000000000006000..000000000000ffff io [ROOT]
|
|
|
|
Fixes: 5e8fd94 ("memory: Rework "info mtree" to print flat views and dispatch trees")
|
|
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
Reviewed-by: Peter Xu <peterx@redhat.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Message-Id: <20220622095912.3430583-1-zhenzhong.duan@intel.com>
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
|
|
Signed-off-by: cmss_dx <dingxiang@cmss.chinamobile.com>
|
|
---
|
|
softmmu/physmem.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/softmmu/physmem.c b/softmmu/physmem.c
|
|
index 0e709ae384..e5c3557d54 100644
|
|
--- a/softmmu/physmem.c
|
|
+++ b/softmmu/physmem.c
|
|
@@ -3719,7 +3719,7 @@ void mtree_print_dispatch(AddressSpaceDispatch *d, MemoryRegion *root)
|
|
" %s%s%s%s%s",
|
|
i,
|
|
s->offset_within_address_space,
|
|
- s->offset_within_address_space + MR_SIZE(s->mr->size),
|
|
+ s->offset_within_address_space + MR_SIZE(s->size),
|
|
s->mr->name ? s->mr->name : "(noname)",
|
|
i < ARRAY_SIZE(names) ? names[i] : "",
|
|
s->mr == root ? " [ROOT]" : "",
|
|
--
|
|
2.27.0
|
|
|