800917b5a2
- Update to Xen 4.1.2_rc2 c/s 23152 - bnc#716695 - domUs using tap devices will not start updated multi-xvdp.patch - Upstream patches from Jan 23803-intel-pmu-models.patch 23800-x86_64-guest-addr-range.patch 23795-intel-ich10-quirk.patch 23804-x86-IPI-counts.patch - bnc#706106 - Inconsistent reporting of VM names during migration xend-migration-domname-fix.patch - bnc#712823 - L3:Xen guest does not start reliable when rebooted xend-vcpu-affinity-fix.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=143
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
xentrace: correct formula to calculate t_info_pages
|
|
|
|
(xen-unstable changeset 23128:4a335f1000ea)
|
|
|
|
The current formula to calculate t_info_pages, based on the initial
|
|
code, is slightly incorrect. It may allocate more than needed.
|
|
Each cpu has some pages/mfns stored as uint32_t.
|
|
That list is stored with an offset at tinfo.
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
|
|
---
|
|
xen/common/trace.c | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
Index: xen-4.1.2-testing/xen/common/trace.c
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/xen/common/trace.c
|
|
+++ xen-4.1.2-testing/xen/common/trace.c
|
|
@@ -111,7 +111,7 @@ static int calculate_tbuf_size(unsigned
|
|
{
|
|
struct t_buf dummy;
|
|
typeof(dummy.prod) size;
|
|
- unsigned int t_info_words, t_info_bytes;
|
|
+ unsigned int t_info_words;
|
|
|
|
/* force maximum value for an unsigned type */
|
|
size = -1;
|
|
@@ -126,9 +126,8 @@ static int calculate_tbuf_size(unsigned
|
|
pages = size;
|
|
}
|
|
|
|
- t_info_words = num_online_cpus() * pages + t_info_first_offset;
|
|
- t_info_bytes = t_info_words * sizeof(uint32_t);
|
|
- t_info_pages = PFN_UP(t_info_bytes);
|
|
+ t_info_words = num_online_cpus() * pages * sizeof(uint32_t);
|
|
+ t_info_pages = PFN_UP(t_info_first_offset + t_info_words);
|
|
printk(XENLOG_INFO "xentrace: requesting %u t_info pages "
|
|
"for %u trace pages on %u cpus\n",
|
|
t_info_pages, pages, num_online_cpus());
|