From: Marcelo Tosatti <mtosatti@redhat.com> To: Anthony Liguori <aliguori@us.ibm.com> Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Jan Kiszka <jan.kiszka@siemens.com>, Huang Ying <ying.huang@intel.com>, Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>, Jin Dongming <jin.dongming@np.css.fujitsu.com>, Marcelo Tosatti <mtosatti@redhat.com> Subject: [PATCH 17/37] kvm: Add MCE signal support for !CONFIG_IOTHREAD Date: Mon, 14 Feb 2011 13:22:46 -0200 [thread overview] Message-ID: <6d9cb73c1bf80bfb0b8e7b2b3a23703e621c1405.1297696986.git.mtosatti@redhat.com> (raw) In-Reply-To: <cover.1297696986.git.mtosatti@redhat.com> From: Jan Kiszka <jan.kiszka@siemens.com> Currently, we only configure and process MCE-related SIGBUS events if CONFIG_IOTHREAD is enabled. The groundwork is laid, we just need to factor out the required handler registration and system configuration. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> CC: Huang Ying <ying.huang@intel.com> CC: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> CC: Jin Dongming <jin.dongming@np.css.fujitsu.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> --- cpus.c | 107 +++++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 65 insertions(+), 42 deletions(-) diff --git a/cpus.c b/cpus.c index 38dd506..9a3fc31 100644 --- a/cpus.c +++ b/cpus.c @@ -34,9 +34,6 @@ #include "cpus.h" #include "compatfd.h" -#ifdef CONFIG_LINUX -#include <sys/prctl.h> -#endif #ifdef SIGRTMIN #define SIG_IPI (SIGRTMIN+4) @@ -44,10 +41,24 @@ #define SIG_IPI SIGUSR1 #endif +#ifdef CONFIG_LINUX + +#include <sys/prctl.h> + #ifndef PR_MCE_KILL #define PR_MCE_KILL 33 #endif +#ifndef PR_MCE_KILL_SET +#define PR_MCE_KILL_SET 1 +#endif + +#ifndef PR_MCE_KILL_EARLY +#define PR_MCE_KILL_EARLY 1 +#endif + +#endif /* CONFIG_LINUX */ + static CPUState *next_cpu; /***********************************************************/ @@ -158,6 +169,52 @@ static void cpu_debug_handler(CPUState *env) vm_stop(EXCP_DEBUG); } +#ifdef CONFIG_LINUX +static void sigbus_reraise(void) +{ + sigset_t set; + struct sigaction action; + + memset(&action, 0, sizeof(action)); + action.sa_handler = SIG_DFL; + if (!sigaction(SIGBUS, &action, NULL)) { + raise(SIGBUS); + sigemptyset(&set); + sigaddset(&set, SIGBUS); + sigprocmask(SIG_UNBLOCK, &set, NULL); + } + perror("Failed to re-raise SIGBUS!\n"); + abort(); +} + +static void sigbus_handler(int n, struct qemu_signalfd_siginfo *siginfo, + void *ctx) +{ + if (kvm_on_sigbus(siginfo->ssi_code, + (void *)(intptr_t)siginfo->ssi_addr)) { + sigbus_reraise(); + } +} + +static void qemu_init_sigbus(void) +{ + struct sigaction action; + + memset(&action, 0, sizeof(action)); + action.sa_flags = SA_SIGINFO; + action.sa_sigaction = (void (*)(int, siginfo_t*, void*))sigbus_handler; + sigaction(SIGBUS, &action, NULL); + + prctl(PR_MCE_KILL, PR_MCE_KILL_SET, PR_MCE_KILL_EARLY, 0, 0); +} + +#else /* !CONFIG_LINUX */ + +static void qemu_init_sigbus(void) +{ +} +#endif /* !CONFIG_LINUX */ + #ifndef _WIN32 static int io_thread_fd = -1; @@ -280,8 +337,6 @@ static int qemu_signalfd_init(sigset_t mask) return 0; } -static void sigbus_reraise(void); - static void qemu_kvm_eat_signals(CPUState *env) { struct timespec ts = { 0, 0 }; @@ -302,13 +357,11 @@ static void qemu_kvm_eat_signals(CPUState *env) } switch (r) { -#ifdef CONFIG_IOTHREAD case SIGBUS: if (kvm_on_sigbus_vcpu(env, siginfo.si_code, siginfo.si_addr)) { sigbus_reraise(); } break; -#endif default: break; } @@ -397,6 +450,7 @@ static sigset_t block_synchronous_signals(void) sigset_t set; sigemptyset(&set); + sigaddset(&set, SIGBUS); if (kvm_enabled()) { /* * We need to process timer signals synchronously to avoid a race @@ -425,6 +479,8 @@ int qemu_init_main_loop(void) #endif cpu_set_debug_excp_handler(cpu_debug_handler); + qemu_init_sigbus(); + return qemu_event_init(); } @@ -561,13 +617,9 @@ static void qemu_tcg_init_cpu_signals(void) pthread_sigmask(SIG_UNBLOCK, &set, NULL); } -static void sigbus_handler(int n, struct qemu_signalfd_siginfo *siginfo, - void *ctx); - static sigset_t block_io_signals(void) { sigset_t set; - struct sigaction action; /* SIGUSR2 used by posix-aio-compat.c */ sigemptyset(&set); @@ -581,12 +633,6 @@ static sigset_t block_io_signals(void) sigaddset(&set, SIGBUS); pthread_sigmask(SIG_BLOCK, &set, NULL); - memset(&action, 0, sizeof(action)); - action.sa_flags = SA_SIGINFO; - action.sa_sigaction = (void (*)(int, siginfo_t*, void*))sigbus_handler; - sigaction(SIGBUS, &action, NULL); - prctl(PR_MCE_KILL, 1, 1, 0, 0); - return set; } @@ -597,6 +643,8 @@ int qemu_init_main_loop(void) cpu_set_debug_excp_handler(cpu_debug_handler); + qemu_init_sigbus(); + blocked_signals = block_io_signals(); ret = qemu_signalfd_init(blocked_signals); @@ -704,31 +752,6 @@ static void qemu_tcg_wait_io_event(void) } } -static void sigbus_reraise(void) -{ - sigset_t set; - struct sigaction action; - - memset(&action, 0, sizeof(action)); - action.sa_handler = SIG_DFL; - if (!sigaction(SIGBUS, &action, NULL)) { - raise(SIGBUS); - sigemptyset(&set); - sigaddset(&set, SIGBUS); - sigprocmask(SIG_UNBLOCK, &set, NULL); - } - perror("Failed to re-raise SIGBUS!\n"); - abort(); -} - -static void sigbus_handler(int n, struct qemu_signalfd_siginfo *siginfo, - void *ctx) -{ - if (kvm_on_sigbus(siginfo->ssi_code, (void *)(intptr_t)siginfo->ssi_addr)) { - sigbus_reraise(); - } -} - static void qemu_kvm_wait_io_event(CPUState *env) { while (!cpu_has_work(env)) -- 1.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Marcelo Tosatti <mtosatti@redhat.com> To: Anthony Liguori <aliguori@us.ibm.com> Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>, kvm@vger.kernel.org, Jan Kiszka <jan.kiszka@siemens.com>, Marcelo Tosatti <mtosatti@redhat.com>, qemu-devel@nongnu.org, Huang Ying <ying.huang@intel.com>, Jin Dongming <jin.dongming@np.css.fujitsu.com> Subject: [Qemu-devel] [PATCH 17/37] kvm: Add MCE signal support for !CONFIG_IOTHREAD Date: Mon, 14 Feb 2011 13:22:46 -0200 [thread overview] Message-ID: <6d9cb73c1bf80bfb0b8e7b2b3a23703e621c1405.1297696986.git.mtosatti@redhat.com> (raw) In-Reply-To: <cover.1297696986.git.mtosatti@redhat.com> From: Jan Kiszka <jan.kiszka@siemens.com> Currently, we only configure and process MCE-related SIGBUS events if CONFIG_IOTHREAD is enabled. The groundwork is laid, we just need to factor out the required handler registration and system configuration. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> CC: Huang Ying <ying.huang@intel.com> CC: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> CC: Jin Dongming <jin.dongming@np.css.fujitsu.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> --- cpus.c | 107 +++++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 65 insertions(+), 42 deletions(-) diff --git a/cpus.c b/cpus.c index 38dd506..9a3fc31 100644 --- a/cpus.c +++ b/cpus.c @@ -34,9 +34,6 @@ #include "cpus.h" #include "compatfd.h" -#ifdef CONFIG_LINUX -#include <sys/prctl.h> -#endif #ifdef SIGRTMIN #define SIG_IPI (SIGRTMIN+4) @@ -44,10 +41,24 @@ #define SIG_IPI SIGUSR1 #endif +#ifdef CONFIG_LINUX + +#include <sys/prctl.h> + #ifndef PR_MCE_KILL #define PR_MCE_KILL 33 #endif +#ifndef PR_MCE_KILL_SET +#define PR_MCE_KILL_SET 1 +#endif + +#ifndef PR_MCE_KILL_EARLY +#define PR_MCE_KILL_EARLY 1 +#endif + +#endif /* CONFIG_LINUX */ + static CPUState *next_cpu; /***********************************************************/ @@ -158,6 +169,52 @@ static void cpu_debug_handler(CPUState *env) vm_stop(EXCP_DEBUG); } +#ifdef CONFIG_LINUX +static void sigbus_reraise(void) +{ + sigset_t set; + struct sigaction action; + + memset(&action, 0, sizeof(action)); + action.sa_handler = SIG_DFL; + if (!sigaction(SIGBUS, &action, NULL)) { + raise(SIGBUS); + sigemptyset(&set); + sigaddset(&set, SIGBUS); + sigprocmask(SIG_UNBLOCK, &set, NULL); + } + perror("Failed to re-raise SIGBUS!\n"); + abort(); +} + +static void sigbus_handler(int n, struct qemu_signalfd_siginfo *siginfo, + void *ctx) +{ + if (kvm_on_sigbus(siginfo->ssi_code, + (void *)(intptr_t)siginfo->ssi_addr)) { + sigbus_reraise(); + } +} + +static void qemu_init_sigbus(void) +{ + struct sigaction action; + + memset(&action, 0, sizeof(action)); + action.sa_flags = SA_SIGINFO; + action.sa_sigaction = (void (*)(int, siginfo_t*, void*))sigbus_handler; + sigaction(SIGBUS, &action, NULL); + + prctl(PR_MCE_KILL, PR_MCE_KILL_SET, PR_MCE_KILL_EARLY, 0, 0); +} + +#else /* !CONFIG_LINUX */ + +static void qemu_init_sigbus(void) +{ +} +#endif /* !CONFIG_LINUX */ + #ifndef _WIN32 static int io_thread_fd = -1; @@ -280,8 +337,6 @@ static int qemu_signalfd_init(sigset_t mask) return 0; } -static void sigbus_reraise(void); - static void qemu_kvm_eat_signals(CPUState *env) { struct timespec ts = { 0, 0 }; @@ -302,13 +357,11 @@ static void qemu_kvm_eat_signals(CPUState *env) } switch (r) { -#ifdef CONFIG_IOTHREAD case SIGBUS: if (kvm_on_sigbus_vcpu(env, siginfo.si_code, siginfo.si_addr)) { sigbus_reraise(); } break; -#endif default: break; } @@ -397,6 +450,7 @@ static sigset_t block_synchronous_signals(void) sigset_t set; sigemptyset(&set); + sigaddset(&set, SIGBUS); if (kvm_enabled()) { /* * We need to process timer signals synchronously to avoid a race @@ -425,6 +479,8 @@ int qemu_init_main_loop(void) #endif cpu_set_debug_excp_handler(cpu_debug_handler); + qemu_init_sigbus(); + return qemu_event_init(); } @@ -561,13 +617,9 @@ static void qemu_tcg_init_cpu_signals(void) pthread_sigmask(SIG_UNBLOCK, &set, NULL); } -static void sigbus_handler(int n, struct qemu_signalfd_siginfo *siginfo, - void *ctx); - static sigset_t block_io_signals(void) { sigset_t set; - struct sigaction action; /* SIGUSR2 used by posix-aio-compat.c */ sigemptyset(&set); @@ -581,12 +633,6 @@ static sigset_t block_io_signals(void) sigaddset(&set, SIGBUS); pthread_sigmask(SIG_BLOCK, &set, NULL); - memset(&action, 0, sizeof(action)); - action.sa_flags = SA_SIGINFO; - action.sa_sigaction = (void (*)(int, siginfo_t*, void*))sigbus_handler; - sigaction(SIGBUS, &action, NULL); - prctl(PR_MCE_KILL, 1, 1, 0, 0); - return set; } @@ -597,6 +643,8 @@ int qemu_init_main_loop(void) cpu_set_debug_excp_handler(cpu_debug_handler); + qemu_init_sigbus(); + blocked_signals = block_io_signals(); ret = qemu_signalfd_init(blocked_signals); @@ -704,31 +752,6 @@ static void qemu_tcg_wait_io_event(void) } } -static void sigbus_reraise(void) -{ - sigset_t set; - struct sigaction action; - - memset(&action, 0, sizeof(action)); - action.sa_handler = SIG_DFL; - if (!sigaction(SIGBUS, &action, NULL)) { - raise(SIGBUS); - sigemptyset(&set); - sigaddset(&set, SIGBUS); - sigprocmask(SIG_UNBLOCK, &set, NULL); - } - perror("Failed to re-raise SIGBUS!\n"); - abort(); -} - -static void sigbus_handler(int n, struct qemu_signalfd_siginfo *siginfo, - void *ctx) -{ - if (kvm_on_sigbus(siginfo->ssi_code, (void *)(intptr_t)siginfo->ssi_addr)) { - sigbus_reraise(); - } -} - static void qemu_kvm_wait_io_event(CPUState *env) { while (!cpu_has_work(env)) -- 1.7.4
next prev parent reply other threads:[~2011-02-14 15:25 UTC|newest] Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-02-14 15:22 [PATCH 00/37] [PULL] qemu-kvm.git uq/master queue Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 01/37] Prevent abortion on multiple VCPU kicks Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 02/37] Stop current VCPU on synchronous reset requests Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 03/37] Process vmstop requests in IO thread Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 04/37] Trigger exit from cpu_exec_all on pending IO events Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 05/37] Leave inner main_loop faster on pending requests Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 06/37] Flatten the main loop Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 07/37] kvm: Report proper error on GET_VCPU_MMAP_SIZE failures Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 08/37] kvm: Drop redundant kvm_enabled from kvm_cpu_thread_fn Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 09/37] kvm: Handle kvm_init_vcpu errors Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 10/37] kvm: Provide sigbus services arch-independently Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 11/37] Refactor signal setup functions in cpus.c Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 12/37] kvm: Set up signal mask also for !CONFIG_IOTHREAD Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 13/37] kvm: Refactor qemu_kvm_eat_signals Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 14/37] kvm: Call qemu_kvm_eat_signals also under !CONFIG_IOTHREAD Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 15/37] Set up signalfd " Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 16/37] kvm: Fix race between timer signals and vcpu entry under !IOTHREAD Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` Marcelo Tosatti [this message] 2011-02-14 15:22 ` [Qemu-devel] [PATCH 17/37] kvm: Add MCE signal support for !CONFIG_IOTHREAD Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 18/37] Introduce VCPU self-signaling service Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 19/37] kvm: Unconditionally reenter kernel after IO exits Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 20/37] kvm: Remove static return code of kvm_handle_io Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 21/37] kvm: Leave kvm_cpu_exec directly after KVM_EXIT_SHUTDOWN Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 22/37] kvm: make tsc stable over migration and machine start Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 23/37] Refactor kvm&tcg function names in cpus.c Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 24/37] Refactor cpu_has_work/any_cpu_has_work " Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 25/37] Fix a few coding style violations " Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 26/37] Improve vm_stop reason declarations Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 27/37] Refactor debug and vmstop request interface Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 28/37] Move debug exception handling out of cpu_exec Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-03-07 1:52 ` TeLeMan 2011-03-07 1:52 ` TeLeMan 2011-03-07 8:26 ` Jan Kiszka 2011-03-07 8:26 ` Jan Kiszka 2011-03-07 8:54 ` Jan Kiszka 2011-03-07 8:54 ` Jan Kiszka 2011-03-07 10:12 ` TeLeMan 2011-03-07 10:12 ` TeLeMan 2011-02-14 15:22 ` [PATCH 29/37] kvm: Separate TCG from KVM cpu execution Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:22 ` [PATCH 30/37] kvm: x86: Prepare VCPU loop for in-kernel irqchip Marcelo Tosatti 2011-02-14 15:22 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:23 ` [PATCH 31/37] kvm: Drop return values from kvm_arch_pre/post_run Marcelo Tosatti 2011-02-14 15:23 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:23 ` [PATCH 32/37] kvm: x86: Catch and report failing IRQ and NMI injections Marcelo Tosatti 2011-02-14 15:23 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:23 ` [PATCH 33/37] kvm: Remove unneeded memory slot reservation Marcelo Tosatti 2011-02-14 15:23 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:23 ` [PATCH 34/37] Introduce log_start/log_stop in CPUPhysMemoryClient Marcelo Tosatti 2011-02-14 15:23 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:23 ` [PATCH 35/37] cirrus: Remove obsolete kvm.h include Marcelo Tosatti 2011-02-14 15:23 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:23 ` [PATCH 36/37] kvm: Make kvm_state globally available Marcelo Tosatti 2011-02-14 15:23 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 15:23 ` [PATCH 37/37] kvm: x86: Introduce kvmclock device to save/restore its state Marcelo Tosatti 2011-02-14 15:23 ` [Qemu-devel] " Marcelo Tosatti 2011-02-14 20:17 ` [Qemu-devel] [PATCH 00/37] [PULL] qemu-kvm.git uq/master queue Anthony Liguori
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=6d9cb73c1bf80bfb0b8e7b2b3a23703e621c1405.1297696986.git.mtosatti@redhat.com \ --to=mtosatti@redhat.com \ --cc=aliguori@us.ibm.com \ --cc=jan.kiszka@siemens.com \ --cc=jin.dongming@np.css.fujitsu.com \ --cc=kvm@vger.kernel.org \ --cc=qemu-devel@nongnu.org \ --cc=seto.hidetoshi@jp.fujitsu.com \ --cc=ying.huang@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.