8547e28bd5
23233-hvm-cr-access.patch 23234-svm-decode-assist-base.patch 23235-svm-decode-assist-crs.patch 23236-svm-decode-assist-invlpg.patch 23238-svm-decode-assist-insn-fetch.patch 23303-cpufreq-misc.patch 23304-amd-oprofile-strings.patch 23305-amd-fam15-xenoprof.patch 23306-amd-fam15-vpmu.patch 23334-amd-fam12+14-vpmu.patch 23338-vtd-force-intremap.patch - fate#310957 - Update to Xen 4.1.1-rc1 c/s 23064 - xentrace: dynamic tracebuffer allocation xen-unstable.xentrace.dynamic_tbuf.patch xen-unstable.xentrace.empty_t_info_pages.patch xen-unstable.xentrace.verbose.patch xen-unstable.xentrace.no_gdprintk.patch xen-unstable.xentrace.comments.patch xen-unstable.xentrace.printk_prefix.patch xen-unstable.xentrace.remove_debug_printk.patch xen-unstable.xentrace.t_info_pages-formula.patch xen-unstable.xentrace.register_cpu_notifier-boot_time.patch xen-unstable.xentrace.t_info_page-overflow.patch xen-unstable.xentrace.t_info_first_offset.patch xen-unstable.xentrace.data_size__read_mostly.patch xen-unstable.xentrace.__insert_record-dst-type.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=124
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
xentrace: fix t_info_pages calculation for the default case
|
|
|
|
(xen-unstable changeset 23091:67632e5cf652)
|
|
|
|
The default tracebuffer size of 32 pages was not tested with the previous patch.
|
|
As a result, t_info_pages will become zero and alloc_xenheap_pages() fails.
|
|
Catch this case and allocate at least one page.
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
|
|
---
|
|
xen/common/trace.c | 11 ++++++-----
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
|
|
Index: xen-4.1.1-testing/xen/common/trace.c
|
|
===================================================================
|
|
--- xen-4.1.1-testing.orig/xen/common/trace.c
|
|
+++ xen-4.1.1-testing/xen/common/trace.c
|
|
@@ -33,6 +33,8 @@
|
|
#include <asm/atomic.h>
|
|
#include <public/sysctl.h>
|
|
|
|
+#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
|
|
+
|
|
#ifdef CONFIG_COMPAT
|
|
#include <compat/trace.h>
|
|
#define xen_t_buf t_buf
|
|
@@ -109,6 +111,7 @@ static int calculate_tbuf_size(unsigned
|
|
{
|
|
struct t_buf dummy;
|
|
typeof(dummy.prod) size;
|
|
+ unsigned int t_info_words, t_info_bytes;
|
|
|
|
/* force maximum value for an unsigned type */
|
|
size = -1;
|
|
@@ -122,11 +125,9 @@ static int calculate_tbuf_size(unsigned
|
|
pages = size;
|
|
}
|
|
|
|
- t_info_pages = num_online_cpus() * pages + t_info_first_offset;
|
|
- t_info_pages *= sizeof(uint32_t);
|
|
- t_info_pages /= PAGE_SIZE;
|
|
- if ( t_info_pages % PAGE_SIZE )
|
|
- t_info_pages++;
|
|
+ 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);
|
|
return pages;
|
|
}
|
|
|