From: Jan Kiszka <jan.kiszka@web.de> To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com> Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org Subject: [PATCH 04/18] Refactor signal setup functions in cpus.c Date: Mon, 10 Jan 2011 09:31:57 +0100 [thread overview] Message-ID: <299ea98f86173e2e0cd826f307557d802075085f.1294648329.git.jan.kiszka@web.de> (raw) In-Reply-To: <cover.1294648329.git.jan.kiszka@web.de> In-Reply-To: <cover.1294648329.git.jan.kiszka@web.de> From: Jan Kiszka <jan.kiszka@siemens.com> Move {tcg,kvm}_init_ipi and block_io_signals to avoid prototypes, rename the former two to clarify that they deal with more than SIG_IPI. No functional changes. The forward declaration of sigbus_handler is just temporarily, it will be moved in a succeeding patch. qemu_kvm_init_cpu_signals is moved into the !_WIN32 block as we will soon need it also for !CONFIG_IOTHREAD. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> --- cpus.c | 162 ++++++++++++++++++++++++++++++++------------------------------- 1 files changed, 82 insertions(+), 80 deletions(-) diff --git a/cpus.c b/cpus.c index 081ac30..a21e2d6 100644 --- a/cpus.c +++ b/cpus.c @@ -222,7 +222,35 @@ fail: close(fds[1]); return err; } -#else + +#ifdef CONFIG_IOTHREAD +static void dummy_signal(int sig) +{ +} + +static void qemu_kvm_init_cpu_signals(CPUState *env) +{ + int r; + sigset_t set; + struct sigaction sigact; + + memset(&sigact, 0, sizeof(sigact)); + sigact.sa_handler = dummy_signal; + sigaction(SIG_IPI, &sigact, NULL); + + pthread_sigmask(SIG_BLOCK, NULL, &set); + sigdelset(&set, SIG_IPI); + sigdelset(&set, SIGBUS); + r = kvm_set_signal_mask(env, &set); + if (r) { + fprintf(stderr, "kvm_set_signal_mask: %s\n", strerror(r)); + exit(1); + } +} +#endif + +#else /* _WIN32 */ + HANDLE qemu_event_handle; static void dummy_event_handler(void *opaque) @@ -248,7 +276,7 @@ static void qemu_event_increment(void) exit (1); } } -#endif +#endif /* _WIN32 */ #ifndef CONFIG_IOTHREAD int qemu_init_main_loop(void) @@ -337,10 +365,6 @@ static QemuCond qemu_system_cond; static QemuCond qemu_pause_cond; static QemuCond qemu_work_cond; -static void tcg_init_ipi(void); -static void kvm_init_ipi(CPUState *env); -static sigset_t block_io_signals(void); - /* If we have signalfd, we mask out the signals we want to handle and then * use signalfd to listen for them. We rely on whatever the current signal * handler is to dispatch the signals when we receive them. @@ -376,6 +400,56 @@ static void sigfd_handler(void *opaque) } } +static void cpu_signal(int sig) +{ + if (cpu_single_env) + cpu_exit(cpu_single_env); + exit_request = 1; +} + +static void qemu_tcg_init_cpu_signals(void) +{ + sigset_t set; + struct sigaction sigact; + + memset(&sigact, 0, sizeof(sigact)); + sigact.sa_handler = cpu_signal; + sigaction(SIG_IPI, &sigact, NULL); + + sigemptyset(&set); + sigaddset(&set, SIG_IPI); + 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); + sigaddset(&set, SIGUSR2); + pthread_sigmask(SIG_UNBLOCK, &set, NULL); + + sigemptyset(&set); + sigaddset(&set, SIGIO); + sigaddset(&set, SIGALRM); + sigaddset(&set, SIG_IPI); + 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; +} + static int qemu_signalfd_init(sigset_t mask) { int sigfd; @@ -597,8 +671,7 @@ static void *kvm_cpu_thread_fn(void *arg) qemu_thread_self(env->thread); kvm_init_vcpu(env); - - kvm_init_ipi(env); + qemu_kvm_init_cpu_signals(env); /* signal CPU creation */ env->created = 1; @@ -621,7 +694,7 @@ static void *tcg_cpu_thread_fn(void *arg) { CPUState *env = arg; - tcg_init_ipi(); + qemu_tcg_init_cpu_signals(); qemu_thread_self(env->thread); /* signal CPU creation */ @@ -659,77 +732,6 @@ int qemu_cpu_self(void *_env) return qemu_thread_equal(&this, env->thread); } -static void cpu_signal(int sig) -{ - if (cpu_single_env) - cpu_exit(cpu_single_env); - exit_request = 1; -} - -static void tcg_init_ipi(void) -{ - sigset_t set; - struct sigaction sigact; - - memset(&sigact, 0, sizeof(sigact)); - sigact.sa_handler = cpu_signal; - sigaction(SIG_IPI, &sigact, NULL); - - sigemptyset(&set); - sigaddset(&set, SIG_IPI); - pthread_sigmask(SIG_UNBLOCK, &set, NULL); -} - -static void dummy_signal(int sig) -{ -} - -static void kvm_init_ipi(CPUState *env) -{ - int r; - sigset_t set; - struct sigaction sigact; - - memset(&sigact, 0, sizeof(sigact)); - sigact.sa_handler = dummy_signal; - sigaction(SIG_IPI, &sigact, NULL); - - pthread_sigmask(SIG_BLOCK, NULL, &set); - sigdelset(&set, SIG_IPI); - sigdelset(&set, SIGBUS); - r = kvm_set_signal_mask(env, &set); - if (r) { - fprintf(stderr, "kvm_set_signal_mask: %s\n", strerror(r)); - exit(1); - } -} - -static sigset_t block_io_signals(void) -{ - sigset_t set; - struct sigaction action; - - /* SIGUSR2 used by posix-aio-compat.c */ - sigemptyset(&set); - sigaddset(&set, SIGUSR2); - pthread_sigmask(SIG_UNBLOCK, &set, NULL); - - sigemptyset(&set); - sigaddset(&set, SIGIO); - sigaddset(&set, SIGALRM); - sigaddset(&set, SIG_IPI); - 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; -} - void qemu_mutex_lock_iothread(void) { if (kvm_enabled()) { -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kiszka <jan.kiszka@web.de> To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com> Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 04/18] Refactor signal setup functions in cpus.c Date: Mon, 10 Jan 2011 09:31:57 +0100 [thread overview] Message-ID: <299ea98f86173e2e0cd826f307557d802075085f.1294648329.git.jan.kiszka@web.de> (raw) In-Reply-To: <cover.1294648329.git.jan.kiszka@web.de> In-Reply-To: <cover.1294648329.git.jan.kiszka@web.de> From: Jan Kiszka <jan.kiszka@siemens.com> Move {tcg,kvm}_init_ipi and block_io_signals to avoid prototypes, rename the former two to clarify that they deal with more than SIG_IPI. No functional changes. The forward declaration of sigbus_handler is just temporarily, it will be moved in a succeeding patch. qemu_kvm_init_cpu_signals is moved into the !_WIN32 block as we will soon need it also for !CONFIG_IOTHREAD. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> --- cpus.c | 162 ++++++++++++++++++++++++++++++++------------------------------- 1 files changed, 82 insertions(+), 80 deletions(-) diff --git a/cpus.c b/cpus.c index 081ac30..a21e2d6 100644 --- a/cpus.c +++ b/cpus.c @@ -222,7 +222,35 @@ fail: close(fds[1]); return err; } -#else + +#ifdef CONFIG_IOTHREAD +static void dummy_signal(int sig) +{ +} + +static void qemu_kvm_init_cpu_signals(CPUState *env) +{ + int r; + sigset_t set; + struct sigaction sigact; + + memset(&sigact, 0, sizeof(sigact)); + sigact.sa_handler = dummy_signal; + sigaction(SIG_IPI, &sigact, NULL); + + pthread_sigmask(SIG_BLOCK, NULL, &set); + sigdelset(&set, SIG_IPI); + sigdelset(&set, SIGBUS); + r = kvm_set_signal_mask(env, &set); + if (r) { + fprintf(stderr, "kvm_set_signal_mask: %s\n", strerror(r)); + exit(1); + } +} +#endif + +#else /* _WIN32 */ + HANDLE qemu_event_handle; static void dummy_event_handler(void *opaque) @@ -248,7 +276,7 @@ static void qemu_event_increment(void) exit (1); } } -#endif +#endif /* _WIN32 */ #ifndef CONFIG_IOTHREAD int qemu_init_main_loop(void) @@ -337,10 +365,6 @@ static QemuCond qemu_system_cond; static QemuCond qemu_pause_cond; static QemuCond qemu_work_cond; -static void tcg_init_ipi(void); -static void kvm_init_ipi(CPUState *env); -static sigset_t block_io_signals(void); - /* If we have signalfd, we mask out the signals we want to handle and then * use signalfd to listen for them. We rely on whatever the current signal * handler is to dispatch the signals when we receive them. @@ -376,6 +400,56 @@ static void sigfd_handler(void *opaque) } } +static void cpu_signal(int sig) +{ + if (cpu_single_env) + cpu_exit(cpu_single_env); + exit_request = 1; +} + +static void qemu_tcg_init_cpu_signals(void) +{ + sigset_t set; + struct sigaction sigact; + + memset(&sigact, 0, sizeof(sigact)); + sigact.sa_handler = cpu_signal; + sigaction(SIG_IPI, &sigact, NULL); + + sigemptyset(&set); + sigaddset(&set, SIG_IPI); + 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); + sigaddset(&set, SIGUSR2); + pthread_sigmask(SIG_UNBLOCK, &set, NULL); + + sigemptyset(&set); + sigaddset(&set, SIGIO); + sigaddset(&set, SIGALRM); + sigaddset(&set, SIG_IPI); + 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; +} + static int qemu_signalfd_init(sigset_t mask) { int sigfd; @@ -597,8 +671,7 @@ static void *kvm_cpu_thread_fn(void *arg) qemu_thread_self(env->thread); kvm_init_vcpu(env); - - kvm_init_ipi(env); + qemu_kvm_init_cpu_signals(env); /* signal CPU creation */ env->created = 1; @@ -621,7 +694,7 @@ static void *tcg_cpu_thread_fn(void *arg) { CPUState *env = arg; - tcg_init_ipi(); + qemu_tcg_init_cpu_signals(); qemu_thread_self(env->thread); /* signal CPU creation */ @@ -659,77 +732,6 @@ int qemu_cpu_self(void *_env) return qemu_thread_equal(&this, env->thread); } -static void cpu_signal(int sig) -{ - if (cpu_single_env) - cpu_exit(cpu_single_env); - exit_request = 1; -} - -static void tcg_init_ipi(void) -{ - sigset_t set; - struct sigaction sigact; - - memset(&sigact, 0, sizeof(sigact)); - sigact.sa_handler = cpu_signal; - sigaction(SIG_IPI, &sigact, NULL); - - sigemptyset(&set); - sigaddset(&set, SIG_IPI); - pthread_sigmask(SIG_UNBLOCK, &set, NULL); -} - -static void dummy_signal(int sig) -{ -} - -static void kvm_init_ipi(CPUState *env) -{ - int r; - sigset_t set; - struct sigaction sigact; - - memset(&sigact, 0, sizeof(sigact)); - sigact.sa_handler = dummy_signal; - sigaction(SIG_IPI, &sigact, NULL); - - pthread_sigmask(SIG_BLOCK, NULL, &set); - sigdelset(&set, SIG_IPI); - sigdelset(&set, SIGBUS); - r = kvm_set_signal_mask(env, &set); - if (r) { - fprintf(stderr, "kvm_set_signal_mask: %s\n", strerror(r)); - exit(1); - } -} - -static sigset_t block_io_signals(void) -{ - sigset_t set; - struct sigaction action; - - /* SIGUSR2 used by posix-aio-compat.c */ - sigemptyset(&set); - sigaddset(&set, SIGUSR2); - pthread_sigmask(SIG_UNBLOCK, &set, NULL); - - sigemptyset(&set); - sigaddset(&set, SIGIO); - sigaddset(&set, SIGALRM); - sigaddset(&set, SIG_IPI); - 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; -} - void qemu_mutex_lock_iothread(void) { if (kvm_enabled()) { -- 1.7.1
next prev parent reply other threads:[~2011-01-10 8:32 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-01-10 8:31 [PATCH 00/18] [uq/master] MCE & IO exit fixes, prepare for VCPU loop reuse Jan Kiszka 2011-01-10 8:31 ` [Qemu-devel] " Jan Kiszka 2011-01-10 8:31 ` [PATCH 01/18] Revert "kvm: Drop return value of kvm_cpu_exec" Jan Kiszka 2011-01-10 8:31 ` [Qemu-devel] " Jan Kiszka 2011-01-10 8:31 ` [PATCH 02/18] kvm: Drop redundant kvm_enabled from kvm_cpu_thread_fn Jan Kiszka 2011-01-10 8:31 ` [Qemu-devel] " Jan Kiszka 2011-01-10 8:31 ` [PATCH 03/18] kvm: Provide sigbus services arch-independently Jan Kiszka 2011-01-10 8:31 ` [Qemu-devel] " Jan Kiszka 2011-01-10 10:13 ` Paolo Bonzini 2011-01-10 10:13 ` [Qemu-devel] " Paolo Bonzini 2011-01-10 10:30 ` Jan Kiszka 2011-01-10 10:30 ` [Qemu-devel] " Jan Kiszka 2011-01-10 8:31 ` Jan Kiszka [this message] 2011-01-10 8:31 ` [Qemu-devel] [PATCH 04/18] Refactor signal setup functions in cpus.c Jan Kiszka 2011-01-10 8:31 ` [PATCH 05/18] kvm: Set up signal mask also for !CONFIG_IOTHREAD Jan Kiszka 2011-01-10 8:31 ` [Qemu-devel] " Jan Kiszka 2011-01-10 8:31 ` [PATCH 06/18] kvm: Refactor qemu_kvm_eat_signals Jan Kiszka 2011-01-10 8:31 ` [Qemu-devel] " Jan Kiszka 2011-01-10 10:15 ` Paolo Bonzini 2011-01-10 10:15 ` [Qemu-devel] " Paolo Bonzini 2011-01-10 8:32 ` [PATCH 07/18] kvm: Add MCE signal support for !CONFIG_IOTHREAD Jan Kiszka 2011-01-10 8:32 ` [Qemu-devel] " Jan Kiszka 2011-01-24 11:17 ` Marcelo Tosatti 2011-01-24 11:17 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 12:36 ` Jan Kiszka 2011-01-24 12:36 ` [Qemu-devel] " Jan Kiszka 2011-01-26 8:09 ` Jan Kiszka 2011-01-26 8:09 ` [Qemu-devel] " Jan Kiszka 2011-01-26 12:01 ` Marcelo Tosatti 2011-01-26 12:01 ` [Qemu-devel] " Marcelo Tosatti 2011-01-26 12:06 ` Jan Kiszka 2011-01-26 12:06 ` [Qemu-devel] " Jan Kiszka 2011-01-10 8:32 ` [PATCH 08/18] kvm: Handle kvm_init_vcpu errors Jan Kiszka 2011-01-10 8:32 ` [Qemu-devel] " Jan Kiszka 2011-01-10 8:32 ` [PATCH 09/18] Refactor kvm&tcg function names in cpus.c Jan Kiszka 2011-01-10 8:32 ` [Qemu-devel] " Jan Kiszka 2011-01-10 8:32 ` [PATCH 10/18] Fix a few coding style violations " Jan Kiszka 2011-01-10 8:32 ` [Qemu-devel] " Jan Kiszka 2011-01-10 8:32 ` [PATCH 11/18] Introduce VCPU self-signaling service Jan Kiszka 2011-01-10 8:32 ` [Qemu-devel] " Jan Kiszka 2011-01-24 11:47 ` Marcelo Tosatti 2011-01-24 11:47 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 12:36 ` Jan Kiszka 2011-01-24 12:36 ` [Qemu-devel] " Jan Kiszka 2011-01-10 8:32 ` [PATCH 12/18] kvm: Move irqchip event processing out of inner loop Jan Kiszka 2011-01-10 8:32 ` [Qemu-devel] " Jan Kiszka 2011-01-10 8:32 ` [PATCH 13/18] kvm: Unconditionally reenter kernel after IO exits Jan Kiszka 2011-01-10 8:32 ` [Qemu-devel] " Jan Kiszka 2011-01-10 8:32 ` [PATCH 14/18] kvm: Remove static return code of kvm_handle_io Jan Kiszka 2011-01-10 8:32 ` [Qemu-devel] " Jan Kiszka 2011-01-10 8:32 ` [PATCH 15/18] kvm: Leave kvm_cpu_exec directly after KVM_EXIT_SHUTDOWN Jan Kiszka 2011-01-10 8:32 ` [Qemu-devel] " Jan Kiszka 2011-01-10 8:32 ` [PATCH 16/18] kvm: Separate TCG from KVM cpu execution Jan Kiszka 2011-01-10 8:32 ` [Qemu-devel] " Jan Kiszka 2011-01-10 8:32 ` [PATCH 17/18] kvm: x86: Prepare VCPU loop for in-kernel irqchip Jan Kiszka 2011-01-10 8:32 ` [Qemu-devel] " Jan Kiszka 2011-01-10 8:32 ` [PATCH 18/18] kvm: Drop return values from kvm_arch_pre/post_run Jan Kiszka 2011-01-10 8:32 ` [Qemu-devel] " Jan Kiszka 2011-01-10 10:10 ` [PATCH 00/18] [uq/master] MCE & IO exit fixes, prepare for VCPU loop reuse Jan Kiszka 2011-01-10 10:10 ` [Qemu-devel] " Jan Kiszka
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=299ea98f86173e2e0cd826f307557d802075085f.1294648329.git.jan.kiszka@web.de \ --to=jan.kiszka@web.de \ --cc=avi@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=mtosatti@redhat.com \ --cc=qemu-devel@nongnu.org \ /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.