From cffeab25d6f1d1eb5f2b4d2d6bea6236f7bc55a4 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 9 May 2011 09:45:32 +0200 Subject: [PATCH] kvm tools: Dump vCPUs in order * Ingo Molnar wrote: > The patch below addresses these concerns, serializes the output, tidies up the > printout, resulting in this new output: There's one bug remaining that my patch does not address: the vCPUs are not printed in order: # vCPU #0's dump: # vCPU #2's dump: # vCPU #24's dump: # vCPU #5's dump: # vCPU #39's dump: # vCPU #38's dump: # vCPU #51's dump: # vCPU #11's dump: # vCPU #10's dump: # vCPU #12's dump: This is undesirable as the order of printout is highly random, so successive dumps are difficult to compare. The patch below serializes the signalling itself. (this is on top of the previous patch) The patch also tweaks the vCPU printout line a bit so that it does not start with '#', which is discarded if such messages are pasted into Git commit messages. Signed-off-by: Ingo Molnar Signed-off-by: Pekka Enberg --- kvm-run.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/kvm-run.c b/kvm-run.c index 43e5dc7..85b13fd 100644 --- a/kvm-run.c +++ b/kvm-run.c @@ -25,6 +25,7 @@ #include #include #include +#include /* header files for gitish interface */ #include @@ -132,7 +133,7 @@ static const struct option options[] = { * Serialize debug printout so that the output of multiple vcpus does not * get mixed up: */ -static DEFINE_MUTEX(printout_mutex); +static int printout_done; static void handle_sigusr1(int sig) { @@ -141,13 +142,13 @@ static void handle_sigusr1(int sig) if (!cpu) return; - mutex_lock(&printout_mutex); - printf("\n#\n# vCPU #%ld's dump:\n#\n", cpu->cpu_id); + printf("\n #\n # vCPU #%ld's dump:\n #\n", cpu->cpu_id); kvm_cpu__show_registers(cpu); kvm_cpu__show_code(cpu); kvm_cpu__show_page_tables(cpu); fflush(stdout); - mutex_unlock(&printout_mutex); + printout_done = 1; + mb(); } static void handle_sigquit(int sig) @@ -160,7 +161,15 @@ static void handle_sigquit(int sig) if (!cpu) continue; + printout_done = 0; pthread_kill(cpu->thread, SIGUSR1); + /* + * Wait for the vCPU to dump state before signalling + * the next thread. Since this is debug code it does + * not matter that we are burning CPU time a bit: + */ + while (!printout_done) + mb(); } serial8250__inject_sysrq(kvm);