From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from [222.73.24.84] (helo=song.cn.fujitsu.com) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TMYzK-0005rS-UE for kexec@lists.infradead.org; Fri, 12 Oct 2012 06:44:51 +0000 Message-ID: <5077BC1F.7050108@cn.fujitsu.com> Date: Fri, 12 Oct 2012 14:43:43 +0800 From: Zhang Yanfei MIME-Version: 1.0 Subject: [PATCH 1/3] x86/kexec: clear vmcss on all cpus if necessary References: <5077BB7B.4030203@cn.fujitsu.com> In-Reply-To: <5077BB7B.4030203@cn.fujitsu.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: kexec-bounces@lists.infradead.org Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: x86@kernel.org, kexec@lists.infradead.org, linux-doc@vger.kernel.org, Avi Kivity , mtosatti@redhat.com Cc: linux-kernel@vger.kernel.org, "kvm@vger.kernel.org" This patch provides an alternative way to clear vmcss related to guests on all cpus when doing kdump. Signed-off-by: zhangyanfei --- arch/x86/include/asm/kexec.h | 3 +++ arch/x86/kernel/crash.c | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h index 317ff17..0692921 100644 --- a/arch/x86/include/asm/kexec.h +++ b/arch/x86/include/asm/kexec.h @@ -163,6 +163,9 @@ struct kimage_arch { }; #endif +extern int clear_loaded_vmcs_enabled; +extern void (*crash_clear_loaded_vmcss)(void); + #endif /* __ASSEMBLY__ */ #endif /* _ASM_X86_KEXEC_H */ diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 13ad899..947550e 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -30,6 +31,24 @@ int in_crash_kexec; +/* + * If clear_loaded_vmcs_enabled is set, vmcss + * that are loaded on all cpus will be cleared + * via crash_clear_loaded_vmcss. + */ +int clear_loaded_vmcs_enabled; +void (*crash_clear_loaded_vmcss)(void) = NULL; +EXPORT_SYMBOL_GPL(crash_clear_loaded_vmcss); + +static void cpu_emergency_clear_loaded_vmcss(void) +{ + if (clear_loaded_vmcs_enabled && + crash_clear_loaded_vmcss && + cpu_has_vmx() && cpu_vmx_enabled()) { + crash_clear_loaded_vmcss(); + } +} + #if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC) static void kdump_nmi_callback(int cpu, struct pt_regs *regs) @@ -46,6 +65,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs) #endif crash_save_cpu(regs, cpu); + cpu_emergency_clear_loaded_vmcss(); + /* Disable VMX or SVM if needed. * * We need to disable virtualization on all CPUs. @@ -88,6 +109,8 @@ void native_machine_crash_shutdown(struct pt_regs *regs) kdump_nmi_shootdown_cpus(); + cpu_emergency_clear_loaded_vmcss(); + /* Booting kdump kernel with VMX or SVM enabled won't work, * because (among other limitations) we can't disable paging * with the virt flags. -- 1.7.1 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec