From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1K11dB-0002Ps-Fd for qemu-devel@nongnu.org; Tue, 27 May 2008 12:02:33 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1K11d9-0002O3-SO for qemu-devel@nongnu.org; Tue, 27 May 2008 12:02:32 -0400 Received: from [199.232.76.173] (port=54046 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1K11d9-0002Nl-HU for qemu-devel@nongnu.org; Tue, 27 May 2008 12:02:31 -0400 Received: from gecko.sbs.de ([194.138.37.40]:22263) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1K11d9-0006SO-9s for qemu-devel@nongnu.org; Tue, 27 May 2008 12:02:31 -0400 Received: from mail2.sbs.de (localhost [127.0.0.1]) by gecko.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id m4RG1M8q012490 for ; Tue, 27 May 2008 18:01:22 +0200 Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged)) by mail2.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id m4RG1MAD016065 for ; Tue, 27 May 2008 18:01:22 +0200 Message-ID: <483C3052.1080807@siemens.com> Date: Tue, 27 May 2008 18:01:22 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <47EE86E0.4070703@reactos.org> <9C7667CB-2CF0-4AC0-843B-6EF442196CAC@csgraf.de> <47F0B445.4030806@suse.de> <4804D254.5040301@siemens.com> <4805F4B0.5020802@siemens.com> <4806009E.8060407@suse.de> <48060ACC.2020309@siemens.com> <48060E28.7000606@suse.de> <480613D3.3080509@suse.de> <4808AAD3.5080405@codemonkey.ws> <480C803D.7050100@suse.de> <483ACD2C.5090004@siemens.com> In-Reply-To: <483ACD2C.5090004@siemens.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] x86: Reboot CPU on triple fault - Version 8 Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Jan Kiszka wrote: > To pick this up again, as the problem is still unfixed: > > Kevin Wolf wrote: >> Anthony Liguori schrieb: >>>> Index: dyngen-exec.h >>>> =================================================================== >>>> --- dyngen-exec.h (Revision 4215) >>>> +++ dyngen-exec.h (Arbeitskopie) >>>> @@ -86,6 +86,7 @@ >>>> extern int fprintf(FILE *, const char *, ...); >>>> extern int fputs(const char *, FILE *); >>>> extern int printf(const char *, ...); >>>> +extern FILE *stderr; >>>> >>> This is unnecessary. >> Right. I'll fix this with the next version. > > To accelerate this "a bit" ;), I attached a refreshed version of your > patch. And here is a version that even compiles (sorry). I assume that we do not want to let a triple fault in SVM context escalate to the guest's host context, right? So I left the check in (while it was removed meanwhile from cpu_abort). Signed-off-by: Jan Kiszka --- cpu-all.h | 1 + exec.c | 2 ++ target-i386/helper.c | 15 +++++++++++++-- target-i386/helper2.c | 5 +++++ 4 files changed, 21 insertions(+), 2 deletions(-) Index: b/exec.c =================================================================== --- a/exec.c +++ b/exec.c @@ -1302,6 +1302,8 @@ CPULogItem cpu_log_items[] = { #ifdef TARGET_I386 { CPU_LOG_PCALL, "pcall", "show protected mode far calls/returns/exceptions" }, + { CPU_LOG_RESET, "cpu_reset", + "show CPU state before CPU resets" }, #endif #ifdef DEBUG_IOPORT { CPU_LOG_IOPORT, "ioport", Index: b/target-i386/helper.c =================================================================== --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1261,6 +1261,9 @@ void do_interrupt(int intno, int is_int, } } +/* This should come from sysemu.h - if we could include it here... */ +void qemu_system_reset_request(void); + /* * Check nested exceptions and change to double or triple fault if * needed. It should only be called, if this is not an interrupt. @@ -1278,8 +1281,16 @@ static int check_exception(int intno, in fprintf(logfile, "check_exception old: 0x%x new 0x%x\n", env->old_exception, intno); - if (env->old_exception == EXCP08_DBLE) - cpu_abort(env, "triple fault"); + if (env->old_exception == EXCP08_DBLE) { + if (env->intercept & INTERCEPT_SVM_MASK) + helper_vmexit(SVM_EXIT_SHUTDOWN, 0); + + if (loglevel & CPU_LOG_RESET) + fprintf(logfile, "Triple fault\n"); + + qemu_system_reset_request(); + return EXCP_HLT; + } if ((first_contributory && second_contributory) || (env->old_exception == EXCP0E_PAGE && Index: b/target-i386/helper2.c =================================================================== --- a/target-i386/helper2.c +++ b/target-i386/helper2.c @@ -363,6 +363,11 @@ void cpu_reset(CPUX86State *env) { int i; + if (loglevel & CPU_LOG_RESET) { + fprintf(logfile, "CPU Reset (CPU %d)\n", env->cpu_index); + cpu_dump_state(env, logfile, fprintf, X86_DUMP_FPU | X86_DUMP_CCOP); + } + memset(env, 0, offsetof(CPUX86State, breakpoints)); tlb_flush(env, 1); Index: b/cpu-all.h =================================================================== --- a/cpu-all.h +++ b/cpu-all.h @@ -824,6 +824,7 @@ target_phys_addr_t cpu_get_phys_page_deb #define CPU_LOG_PCALL (1 << 6) #define CPU_LOG_IOPORT (1 << 7) #define CPU_LOG_TB_CPU (1 << 8) +#define CPU_LOG_RESET (1 << 9) /* define log items */ typedef struct CPULogItem {