* [xen-unstable test] 17234: regressions - FAIL
@ 2013-03-13 9:07 xen.org
2013-03-13 9:40 ` Jan Beulich
0 siblings, 1 reply; 3+ messages in thread
From: xen.org @ 2013-03-13 9:07 UTC (permalink / raw)
To: xen-devel; +Cc: ian.jackson
flight 17234 xen-unstable real [real]
http://www.chiark.greenend.org.uk/~xensrcts/logs/17234/
Regressions :-(
Tests which did not succeed and are blocking,
including tests which could not be run:
test-amd64-i386-xl 7 debian-install fail REGR. vs. 17225
test-amd64-i386-xl-qemut-win7-amd64 12 guest-localmigrate/x10 fail REGR. vs. 17225
test-amd64-i386-xl-qemut-winxpsp3-vcpus1 8 guest-saverestore fail REGR. vs. 17225
Regressions which are regarded as allowable (not blocking):
test-amd64-amd64-xl-sedf 7 debian-install fail like 17224
test-amd64-amd64-xl-sedf-pin 5 xen-boot fail REGR. vs. 17225
Tests which did not succeed, but are not blocking:
test-amd64-amd64-xl-pcipt-intel 9 guest-start fail never pass
test-amd64-amd64-xl-qemuu-win7-amd64 13 guest-stop fail never pass
test-amd64-amd64-xl-win7-amd64 13 guest-stop fail never pass
test-amd64-i386-xl-win7-amd64 13 guest-stop fail never pass
test-amd64-amd64-xl-winxpsp3 13 guest-stop fail never pass
test-amd64-amd64-xl-qemut-winxpsp3 13 guest-stop fail never pass
test-amd64-i386-xl-winxpsp3-vcpus1 13 guest-stop fail never pass
test-amd64-i386-xend-qemut-winxpsp3 16 leak-check/check fail never pass
test-amd64-i386-xend-winxpsp3 16 leak-check/check fail never pass
test-amd64-amd64-xl-qemut-win7-amd64 13 guest-stop fail never pass
test-amd64-amd64-xl-qemuu-winxpsp3 13 guest-stop fail never pass
version targeted for testing:
xen 647597124fe28ee88f3baf499f5afdfed8de341f
baseline version:
xen 65c9792df60051b5f5eaadbc47a118cfba7edd49
------------------------------------------------------------
People who touched revisions under test:
Dietmar Hahn <dietmar.hahn@ts.fujitsu.com>
Jan Beulich <jbeulich@suse.com>
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
stefan.bader@canonical.com
------------------------------------------------------------
jobs:
build-amd64 pass
build-armhf pass
build-i386 pass
build-amd64-oldkern pass
build-i386-oldkern pass
build-amd64-pvops pass
build-i386-pvops pass
test-amd64-amd64-xl pass
test-amd64-i386-xl fail
test-amd64-i386-rhel6hvm-amd pass
test-amd64-i386-qemut-rhel6hvm-amd pass
test-amd64-i386-qemuu-rhel6hvm-amd pass
test-amd64-amd64-xl-qemut-win7-amd64 fail
test-amd64-i386-xl-qemut-win7-amd64 fail
test-amd64-amd64-xl-qemuu-win7-amd64 fail
test-amd64-amd64-xl-win7-amd64 fail
test-amd64-i386-xl-win7-amd64 fail
test-amd64-i386-xl-credit2 pass
test-amd64-amd64-xl-pcipt-intel fail
test-amd64-i386-rhel6hvm-intel pass
test-amd64-i386-qemut-rhel6hvm-intel pass
test-amd64-i386-qemuu-rhel6hvm-intel pass
test-amd64-i386-xl-multivcpu pass
test-amd64-amd64-pair pass
test-amd64-i386-pair pass
test-amd64-amd64-xl-sedf-pin fail
test-amd64-amd64-pv pass
test-amd64-i386-pv pass
test-amd64-amd64-xl-sedf fail
test-amd64-i386-xl-qemut-winxpsp3-vcpus1 fail
test-amd64-i386-xl-winxpsp3-vcpus1 fail
test-amd64-i386-xend-qemut-winxpsp3 fail
test-amd64-amd64-xl-qemut-winxpsp3 fail
test-amd64-amd64-xl-qemuu-winxpsp3 fail
test-amd64-i386-xend-winxpsp3 fail
test-amd64-amd64-xl-winxpsp3 fail
------------------------------------------------------------
sg-report-flight on woking.cam.xci-test.com
logs: /home/xc_osstest/logs
images: /home/xc_osstest/images
Logs, config files, etc. are available at
http://www.chiark.greenend.org.uk/~xensrcts/logs
Test harness code can be found at
http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary
Not pushing.
------------------------------------------------------------
commit 647597124fe28ee88f3baf499f5afdfed8de341f
Author: Dietmar Hahn <dietmar.hahn@ts.fujitsu.com>
Date: Tue Mar 12 15:37:45 2013 +0100
vpmu intel: pass through cpuid bits when BTS is enabled
This patch passes the orginal cpuid bits for X86_FEATURE_DTES64 (64-bit
DS Area) and X86_FEATURE_DSCPL (CPL Qualified Debug Store) to the guest
when the BTS feature is switched on. I forgot this when I did this BTS
emulation.
Signed-off-by: Dietmar Hahn <dietmar.hahn@ts.fujitsu.com>
commit 1d80765b504b34b63a42a63aff4291e07e29f0c5
Author: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue Mar 12 15:34:22 2013 +0100
powernow: add fixups for AMD P-state figures
In the Linux kernel, these two git commits:
- f594065faf4f9067c2283a34619fc0714e79a98d
ACPI: Add fixups for AMD P-state figures
- 9855d8ce41a7801548a05d844db2f46c3e810166
ACPI: Check MSR valid bit before using P-state frequencies
Try to fix the the issue that "some AMD systems may round the
frequencies in ACPI tables to 100MHz boundaries. We can obtain the real
frequencies from MSRs, so add a quirk to fix these frequencies up
on AMD systems." (from f594065..)
In discussion (around 9855d8..) "it turned out that indeed real
HW/BIOSes may choose to not set the valid bit and thus mark the
P-state as invalid. So this could be considered a fix for broken
BIOSes." (from 9855d8..)
which is great for Linux. Unfortunatly the Linux kernel, when
it tries to do the RDMSR under Xen it fails to get the right
value (it gets zero) as Xen traps it and returns zero. Hence
when dom0 uploads the P-states they will be unmodified and
we should take care of updating the frequencies with the right
values.
I've tested it under Dell Inc. PowerEdge T105 /0RR825, BIOS 1.3.2
08/20/2008 where this quirk can be observed (x86 == 0x10, model == 2).
Also on other AMD (x86 == 0x12, A8-3850; x86 = 0x14, AMD E-350) to
make sure the quirk is not applied there.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: stefan.bader@canonical.com
Do the MSR access here (and while at it, also the one reading
MSR_PSTATE_CUR_LIMIT) on the target CPU, and bound the loop over
amd_fixup_frequency() by max_hw_pstate (matching the one in
powernow_cpufreq_cpu_init()).
Signed-off-by: Jan Beulich <jbeulich@suse.com>
(qemu changes not included)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [xen-unstable test] 17234: regressions - FAIL
2013-03-13 9:07 [xen-unstable test] 17234: regressions - FAIL xen.org
@ 2013-03-13 9:40 ` Jan Beulich
2013-03-13 10:48 ` [PATCH] " Jan Beulich
0 siblings, 1 reply; 3+ messages in thread
From: Jan Beulich @ 2013-03-13 9:40 UTC (permalink / raw)
To: xen-devel; +Cc: ian.jackson
>>> On 13.03.13 at 10:07, xen.org <ian.jackson@eu.citrix.com> wrote:
> flight 17234 xen-unstable real [real]
> http://www.chiark.greenend.org.uk/~xensrcts/logs/17234/
>
> Regressions :-(
>
> Tests which did not succeed and are blocking,
> including tests which could not be run:
> test-amd64-i386-xl 7 debian-install fail REGR. vs. 17225
Both this ...
> test-amd64-i386-xl-qemut-win7-amd64 12 guest-localmigrate/x10 fail REGR. vs. 17225
> test-amd64-i386-xl-qemut-winxpsp3-vcpus1 8 guest-saverestore fail REGR. vs. 17225
>
> Regressions which are regarded as allowable (not blocking):
> test-amd64-amd64-xl-sedf 7 debian-install fail like 17224
.. and this are due to a crashed hypervisor as an apparent result
of
(XEN) Platform timer appears to have unexpectedly wrapped 1 times.
In both cases the respective CPU was in guest context, i.e. the
triggering of the watchdog was a false one (presumably caused
by the time stamps having got corrupted with the event above).
Considering that this appears to recur, I'll look into creating a
debugging patch.
I also consider these
(XEN) CPU<n>: No irq handler for vector <v> (IRQ -1, LAPIC)
in the same machine's log problematic - they quite certainly point
at a problem too.
Jan
> test-amd64-amd64-xl-sedf-pin 5 xen-boot fail REGR. vs. 17225
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] Re: [xen-unstable test] 17234: regressions - FAIL
2013-03-13 9:40 ` Jan Beulich
@ 2013-03-13 10:48 ` Jan Beulich
0 siblings, 0 replies; 3+ messages in thread
From: Jan Beulich @ 2013-03-13 10:48 UTC (permalink / raw)
To: xen-devel; +Cc: ian.jackson
[-- Attachment #1: Type: text/plain, Size: 9227 bytes --]
>>> On 13.03.13 at 10:40, "Jan Beulich" <JBeulich@suse.com> wrote:
>>>> On 13.03.13 at 10:07, xen.org <ian.jackson@eu.citrix.com> wrote:
>> flight 17234 xen-unstable real [real]
>> http://www.chiark.greenend.org.uk/~xensrcts/logs/17234/
>>
>> Regressions :-(
>>
>> Tests which did not succeed and are blocking,
>> including tests which could not be run:
>> test-amd64-i386-xl 7 debian-install fail REGR. vs. 17225
>
> Both this ...
>
>> test-amd64-i386-xl-qemut-win7-amd64 12 guest-localmigrate/x10 fail REGR. vs. 17225
>> test-amd64-i386-xl-qemut-winxpsp3-vcpus1 8 guest-saverestore fail REGR. vs. 17225
>>
>> Regressions which are regarded as allowable (not blocking):
>> test-amd64-amd64-xl-sedf 7 debian-install fail like 17224
>
> .. and this are due to a crashed hypervisor as an apparent result
> of
>
> (XEN) Platform timer appears to have unexpectedly wrapped 1 times.
>
> In both cases the respective CPU was in guest context, i.e. the
> triggering of the watchdog was a false one (presumably caused
> by the time stamps having got corrupted with the event above).
>
> Considering that this appears to recur, I'll look into creating a
> debugging patch.
So I revived an old debugging patch of mine, having turned out
useful a number of times in the past.
Its style is intentionally violating the normal coding style to make
the debugging changes stand out. If we mean to use this only
temporarily (until we can isolate the problem observed on at
least gall-mite), I'd like to keep it that way. But if others think
this could be kept mid- or long-term, then I'd convert it to normal
coding style, and probably flip most of all BUG_ON()-s it adds to
ASSERT()-s.
Usage-wise, the patch adds only minimal checking when used
without the newly added "log_time" command line option.
There are two BUG_ON()-s active even in that basic mode
hunting for bogus time stamps, but not allowing the system to
stay up for more than (if I got my math right) about 320 days.
Those likely would then also need to be made conditional upon
the use of the new command line option.
On at least gall-mite, where time stamps getting screwed has
been observed more than once recently, making use of the
new command line option would seem desirable:
log_time[=<count>[,<start>]]
where <count> is the number of times we want the platform
time updates to get logged, and <start> specifies how many
initial rounds to ignore. Both or the second values can be
omitted - when only <start> is omitted, logging starts right
from boot, while when both are omitted, some messages are
suppressed, but logging lasts virtually forever (and also starts
right at boot time).
x86: time handling debugging code
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -43,6 +43,23 @@
static char __initdata opt_clocksource[10];
string_param("clocksource", opt_clocksource);
+static int opt_log_time;//temp
+static unsigned int opt_log_time_start;//temp
+static void __init setup_log_time(char *str) {//temp
+ if(!str || !*str) {
+ opt_log_time = -1;
+ opt_log_time_start = -1;
+ return;
+ }
+ opt_log_time = simple_strtoul(str, (const char **)&str, 0);
+ if(*str == ',') {
+ opt_log_time_start = simple_strtoul(str + 1, NULL, 0);
+ if(opt_log_time_start && opt_log_time > 0)
+ opt_log_time = -opt_log_time;
+ }
+}
+custom_param("log_time", setup_log_time);//temp
+
unsigned long __read_mostly cpu_khz; /* CPU clock frequency in kHz. */
DEFINE_SPINLOCK(rtc_lock);
unsigned long pit0_ticks;
@@ -121,6 +138,7 @@ static inline u64 scale_delta(u64 delta,
{
u64 product;
+BUG_ON((s64)delta < 0);//temp
if ( scale->shift < 0 )
delta >>= -scale->shift;
else
@@ -527,12 +545,13 @@ static void plt_overflow(void *unused)
{
int i;
u64 count;
+u64 delta;//temp
s_time_t now, plt_now, plt_wrap;
spin_lock_irq(&platform_timer_lock);
count = plt_src.read_counter();
- plt_stamp64 += (count - plt_stamp) & plt_mask;
+ plt_stamp64 += delta = (count - plt_stamp) & plt_mask;
plt_stamp = count;
now = NOW();
@@ -549,11 +568,21 @@ static void plt_overflow(void *unused)
{
static bool_t warned_once;
if ( !test_and_set_bool(warned_once) )
+{//temp
printk("Platform timer appears to have unexpectedly wrapped "
"%u%s times.\n", i, (i == 10) ? " or more" : "");
+ printk("PLT: n=%012"PRIx64" pn=%012"PRIx64" pm=%012"PRIx64" pw=%012"PRIx64"\n", now, plt_now, plt_mask, plt_wrap);
+}
}
spin_unlock_irq(&platform_timer_lock);
+if(opt_log_time) printk("PLT: c=%012"PRIx64" d=%06"PRIx64" s=%012"PRIx64"\n", count, delta, plt_stamp64);//temp
+if(opt_log_time > 0) {//temp
+ --opt_log_time;
+} else if (opt_log_time < 0 && !--opt_log_time_start) {
+ opt_log_time = -opt_log_time;
+}
+WARN_ON(platform_timer_stamp && delta < (6 << (plt_src.counter_bits - 4)));//temp
set_timer(&plt_overflow_timer, NOW() + plt_overflow_period);
}
@@ -568,6 +597,7 @@ static s_time_t read_platform_stime(void
spin_lock(&platform_timer_lock);
count = plt_stamp64 + ((plt_src.read_counter() - plt_stamp) & plt_mask);
stime = __read_platform_stime(count);
+BUG_ON((u64)stime >> 55);//temp
spin_unlock(&platform_timer_lock);
return stime;
@@ -582,9 +612,11 @@ static void platform_time_calibration(vo
spin_lock_irqsave(&platform_timer_lock, flags);
count = plt_stamp64 + ((plt_src.read_counter() - plt_stamp) & plt_mask);
stamp = __read_platform_stime(count);
+BUG_ON((u64)stamp >> 55);//temp
stime_platform_stamp = stamp;
platform_timer_stamp = count;
spin_unlock_irqrestore(&platform_timer_lock, flags);
+if(opt_log_time) printk("PLT: s=%012"PRIx64" c=%012"PRIx64"\n", stamp, count);//temp
}
static void resume_platform_timer(void)
@@ -651,6 +683,7 @@ static void __init init_platform_timer(v
printk("Platform timer is %s %s\n",
freq_string(pts->frequency), pts->name);
+if(opt_log_time) printk("PLT: m=%08x s=%d o=%012"PRIx64"\n", plt_scale.mul_frac, plt_scale.shift, plt_overflow_period);//temp
}
u64 stime2tsc(s_time_t stime)
@@ -1034,7 +1067,12 @@ static void local_time_calibration(void)
t->local_tsc_stamp = c->local_tsc_stamp;
t->stime_local_stamp = c->stime_master_stamp;
t->stime_master_stamp = c->stime_master_stamp;
+curr_local_stime = c->stime_local_stamp;//temp
local_irq_enable();
+if(opt_log_time > 0) {//temp
+ printk("UPD%02x: t=%012"PRIx64" l=%012"PRIx64" m=%012"PRIx64"\n",
+ smp_processor_id(), t->local_tsc_stamp, curr_local_stime, t->stime_master_stamp);
+}
update_vcpu_system_time(current);
goto out;
}
@@ -1050,14 +1088,14 @@ static void local_time_calibration(void)
curr_master_stime = c->stime_master_stamp;
local_irq_enable();
-#if 0
- printk("PRE%d: tsc=%"PRIu64" stime=%"PRIu64" master=%"PRIu64"\n",
+if(opt_log_time > 0) {//temp #if 0
+ printk("PRE%02x: t=%012"PRIx64" l=%012"PRIx64" m=%012"PRIx64"\n",
smp_processor_id(), prev_tsc, prev_local_stime, prev_master_stime);
- printk("CUR%d: tsc=%"PRIu64" stime=%"PRIu64" master=%"PRIu64
+ printk("CUR%02x: t=%012"PRIx64" l=%012"PRIx64" m=%012"PRIx64
" -> %"PRId64"\n",
smp_processor_id(), curr_tsc, curr_local_stime, curr_master_stime,
curr_master_stime - curr_local_stime);
-#endif
+}//temp #endif
/* Local time warps forward if it lags behind master time. */
if ( curr_local_stime < curr_master_stime )
@@ -1124,10 +1162,10 @@ static void local_time_calibration(void)
if ( error_factor != 0 )
calibration_mul_frac = mul_frac(calibration_mul_frac, error_factor);
-#if 0
- printk("---%d: %08x %08x %d\n", smp_processor_id(),
- error_factor, calibration_mul_frac, tsc_shift);
-#endif
+if(opt_log_time > 0) {//temp #if 0
+ printk("NEW%02x: e=%08x m=%08x s=%d\n",
+ smp_processor_id(), error_factor, calibration_mul_frac, tsc_shift);
+}//temp #endif
/* Record new timestamp information, atomically w.r.t. interrupts. */
local_irq_disable();
@@ -1475,6 +1513,7 @@ int __init init_xen_time(void)
/* If TSCs are not marked as 'reliable', re-sync during rendezvous. */
if ( !boot_cpu_has(X86_FEATURE_TSC_RELIABLE) )
time_calibration_rendezvous_fn = time_calibration_tsc_rendezvous;
+printk("Using %s rendezvous\n", boot_cpu_has(X86_FEATURE_TSC_RELIABLE) ? "standard" : "TSC");//temp
}
open_softirq(TIME_CALIBRATE_SOFTIRQ, local_time_calibration);
@@ -1502,6 +1541,7 @@ void __init early_time_init(void)
u64 tmp = init_pit_and_calibrate_tsc();
set_time_scale(&this_cpu(cpu_time).tsc_scale, tmp);
+if(opt_log_time) printk("INI: m=%08x s=%d\n", this_cpu(cpu_time).tsc_scale.mul_frac, this_cpu(cpu_time).tsc_scale.shift);//temp
do_div(tmp, 1000);
cpu_khz = (unsigned long)tmp;
[-- Attachment #2: x86-early-time-calibration.patch --]
[-- Type: text/plain, Size: 6453 bytes --]
x86: time handling debugging code
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -43,6 +43,23 @@
static char __initdata opt_clocksource[10];
string_param("clocksource", opt_clocksource);
+static int opt_log_time;//temp
+static unsigned int opt_log_time_start;//temp
+static void __init setup_log_time(char *str) {//temp
+ if(!str || !*str) {
+ opt_log_time = -1;
+ opt_log_time_start = -1;
+ return;
+ }
+ opt_log_time = simple_strtoul(str, (const char **)&str, 0);
+ if(*str == ',') {
+ opt_log_time_start = simple_strtoul(str + 1, NULL, 0);
+ if(opt_log_time_start && opt_log_time > 0)
+ opt_log_time = -opt_log_time;
+ }
+}
+custom_param("log_time", setup_log_time);//temp
+
unsigned long __read_mostly cpu_khz; /* CPU clock frequency in kHz. */
DEFINE_SPINLOCK(rtc_lock);
unsigned long pit0_ticks;
@@ -121,6 +138,7 @@ static inline u64 scale_delta(u64 delta,
{
u64 product;
+BUG_ON((s64)delta < 0);//temp
if ( scale->shift < 0 )
delta >>= -scale->shift;
else
@@ -527,12 +545,13 @@ static void plt_overflow(void *unused)
{
int i;
u64 count;
+u64 delta;//temp
s_time_t now, plt_now, plt_wrap;
spin_lock_irq(&platform_timer_lock);
count = plt_src.read_counter();
- plt_stamp64 += (count - plt_stamp) & plt_mask;
+ plt_stamp64 += delta = (count - plt_stamp) & plt_mask;
plt_stamp = count;
now = NOW();
@@ -549,11 +568,21 @@ static void plt_overflow(void *unused)
{
static bool_t warned_once;
if ( !test_and_set_bool(warned_once) )
+{//temp
printk("Platform timer appears to have unexpectedly wrapped "
"%u%s times.\n", i, (i == 10) ? " or more" : "");
+ printk("PLT: n=%012"PRIx64" pn=%012"PRIx64" pm=%012"PRIx64" pw=%012"PRIx64"\n", now, plt_now, plt_mask, plt_wrap);
+}
}
spin_unlock_irq(&platform_timer_lock);
+if(opt_log_time) printk("PLT: c=%012"PRIx64" d=%06"PRIx64" s=%012"PRIx64"\n", count, delta, plt_stamp64);//temp
+if(opt_log_time > 0) {//temp
+ --opt_log_time;
+} else if (opt_log_time < 0 && !--opt_log_time_start) {
+ opt_log_time = -opt_log_time;
+}
+WARN_ON(platform_timer_stamp && delta < (6 << (plt_src.counter_bits - 4)));//temp
set_timer(&plt_overflow_timer, NOW() + plt_overflow_period);
}
@@ -568,6 +597,7 @@ static s_time_t read_platform_stime(void
spin_lock(&platform_timer_lock);
count = plt_stamp64 + ((plt_src.read_counter() - plt_stamp) & plt_mask);
stime = __read_platform_stime(count);
+BUG_ON((u64)stime >> 55);//temp
spin_unlock(&platform_timer_lock);
return stime;
@@ -582,9 +612,11 @@ static void platform_time_calibration(vo
spin_lock_irqsave(&platform_timer_lock, flags);
count = plt_stamp64 + ((plt_src.read_counter() - plt_stamp) & plt_mask);
stamp = __read_platform_stime(count);
+BUG_ON((u64)stamp >> 55);//temp
stime_platform_stamp = stamp;
platform_timer_stamp = count;
spin_unlock_irqrestore(&platform_timer_lock, flags);
+if(opt_log_time) printk("PLT: s=%012"PRIx64" c=%012"PRIx64"\n", stamp, count);//temp
}
static void resume_platform_timer(void)
@@ -651,6 +683,7 @@ static void __init init_platform_timer(v
printk("Platform timer is %s %s\n",
freq_string(pts->frequency), pts->name);
+if(opt_log_time) printk("PLT: m=%08x s=%d o=%012"PRIx64"\n", plt_scale.mul_frac, plt_scale.shift, plt_overflow_period);//temp
}
u64 stime2tsc(s_time_t stime)
@@ -1034,7 +1067,12 @@ static void local_time_calibration(void)
t->local_tsc_stamp = c->local_tsc_stamp;
t->stime_local_stamp = c->stime_master_stamp;
t->stime_master_stamp = c->stime_master_stamp;
+curr_local_stime = c->stime_local_stamp;//temp
local_irq_enable();
+if(opt_log_time > 0) {//temp
+ printk("UPD%02x: t=%012"PRIx64" l=%012"PRIx64" m=%012"PRIx64"\n",
+ smp_processor_id(), t->local_tsc_stamp, curr_local_stime, t->stime_master_stamp);
+}
update_vcpu_system_time(current);
goto out;
}
@@ -1050,14 +1088,14 @@ static void local_time_calibration(void)
curr_master_stime = c->stime_master_stamp;
local_irq_enable();
-#if 0
- printk("PRE%d: tsc=%"PRIu64" stime=%"PRIu64" master=%"PRIu64"\n",
+if(opt_log_time > 0) {//temp #if 0
+ printk("PRE%02x: t=%012"PRIx64" l=%012"PRIx64" m=%012"PRIx64"\n",
smp_processor_id(), prev_tsc, prev_local_stime, prev_master_stime);
- printk("CUR%d: tsc=%"PRIu64" stime=%"PRIu64" master=%"PRIu64
+ printk("CUR%02x: t=%012"PRIx64" l=%012"PRIx64" m=%012"PRIx64
" -> %"PRId64"\n",
smp_processor_id(), curr_tsc, curr_local_stime, curr_master_stime,
curr_master_stime - curr_local_stime);
-#endif
+}//temp #endif
/* Local time warps forward if it lags behind master time. */
if ( curr_local_stime < curr_master_stime )
@@ -1124,10 +1162,10 @@ static void local_time_calibration(void)
if ( error_factor != 0 )
calibration_mul_frac = mul_frac(calibration_mul_frac, error_factor);
-#if 0
- printk("---%d: %08x %08x %d\n", smp_processor_id(),
- error_factor, calibration_mul_frac, tsc_shift);
-#endif
+if(opt_log_time > 0) {//temp #if 0
+ printk("NEW%02x: e=%08x m=%08x s=%d\n",
+ smp_processor_id(), error_factor, calibration_mul_frac, tsc_shift);
+}//temp #endif
/* Record new timestamp information, atomically w.r.t. interrupts. */
local_irq_disable();
@@ -1475,6 +1513,7 @@ int __init init_xen_time(void)
/* If TSCs are not marked as 'reliable', re-sync during rendezvous. */
if ( !boot_cpu_has(X86_FEATURE_TSC_RELIABLE) )
time_calibration_rendezvous_fn = time_calibration_tsc_rendezvous;
+printk("Using %s rendezvous\n", boot_cpu_has(X86_FEATURE_TSC_RELIABLE) ? "standard" : "TSC");//temp
}
open_softirq(TIME_CALIBRATE_SOFTIRQ, local_time_calibration);
@@ -1502,6 +1541,7 @@ void __init early_time_init(void)
u64 tmp = init_pit_and_calibrate_tsc();
set_time_scale(&this_cpu(cpu_time).tsc_scale, tmp);
+if(opt_log_time) printk("INI: m=%08x s=%d\n", this_cpu(cpu_time).tsc_scale.mul_frac, this_cpu(cpu_time).tsc_scale.shift);//temp
do_div(tmp, 1000);
cpu_khz = (unsigned long)tmp;
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-13 10:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-13 9:07 [xen-unstable test] 17234: regressions - FAIL xen.org
2013-03-13 9:40 ` Jan Beulich
2013-03-13 10:48 ` [PATCH] " Jan Beulich
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.