From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934413Ab2J3U0y (ORCPT ); Tue, 30 Oct 2012 16:26:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58334 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756252Ab2J3U0w (ORCPT ); Tue, 30 Oct 2012 16:26:52 -0400 From: Prarit Bhargava To: linux-kernel@vger.kernel.org Cc: Prarit Bhargava , Avi Kivity , Gleb Natapov , Alex Williamson , Marcelo Tostatti , Ingo Molnar , kvm@vger.kernel.org, x86@kernel.org Subject: [PATCH] x86, add hypervisor name to dump_stack() [v4] Date: Tue, 30 Oct 2012 16:26:33 -0400 Message-Id: <1351628793-27180-1-git-send-email-prarit@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Debugging crash, panics, stack trace WARN_ONs, etc., from both virtual and bare-metal boots can get difficult very quickly. While there are ways to decipher the output and determine if the output is from a virtual guest, the in-kernel hypervisors now have a single registration point and set x86_hyper. We can use this to output additional debug information during a panic/oops/stack trace. Signed-off-by: Prarit Bhargava Cc: Avi Kivity Cc: Gleb Natapov Cc: Alex Williamson Cc: Marcelo Tostatti Cc: Ingo Molnar Cc: kvm@vger.kernel.org Cc: x86@kernel.org [v2]: Modifications suggested by Ingo and added changes for similar output from process.c [v3]: Unify common code and move output to end of line --- arch/x86/kernel/dumpstack.c | 6 +----- arch/x86/kernel/process.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index ae42418b..96d40ed 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -188,11 +188,7 @@ void dump_stack(void) unsigned long stack; bp = stack_frame(current, NULL); - printk("Pid: %d, comm: %.20s %s %s %.*s\n", - current->pid, current->comm, print_tainted(), - init_utsname()->release, - (int)strcspn(init_utsname()->version, " "), - init_utsname()->version); + show_regs_common(); show_trace(NULL, NULL, &stack, bp); } EXPORT_SYMBOL(dump_stack); diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index b644e1c..7ea4692 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -28,6 +28,7 @@ #include #include #include +#include /* * per-CPU TSS segments. Threads are completely 'soft' on Linux, @@ -124,6 +125,13 @@ void exit_thread(void) void show_regs_common(void) { const char *vendor, *product, *board; + const char *machine_name = "x86"; + const char *kernel_type = "native"; + + if (x86_hyper) { + machine_name = x86_hyper->name; + kernel_type = "guest"; + } vendor = dmi_get_system_info(DMI_SYS_VENDOR); if (!vendor) @@ -135,14 +143,16 @@ void show_regs_common(void) /* Board Name is optional */ board = dmi_get_system_info(DMI_BOARD_NAME); - printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s %s%s%s\n", + printk(KERN_DEFAULT + "Pid: %d, comm: %.20s %s %s %.*s %s %s%s%s [%s %s kernel]\n", current->pid, current->comm, print_tainted(), init_utsname()->release, (int)strcspn(init_utsname()->version, " "), init_utsname()->version, vendor, product, board ? "/" : "", - board ? board : ""); + board ? board : "", + machine_name, kernel_type); } void flush_thread(void) -- 1.7.9.3