From nobody Fri Dec 19 20:33:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486720762769653.8821144818605; Fri, 10 Feb 2017 01:59:22 -0800 (PST) Received: from localhost ([::1]:42821 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cc7z7-0007vn-BW for importer@patchew.org; Fri, 10 Feb 2017 04:59:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cc7qR-0000MI-9z for qemu-devel@nongnu.org; Fri, 10 Feb 2017 04:50:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cc7qP-0005On-Ug for qemu-devel@nongnu.org; Fri, 10 Feb 2017 04:50:23 -0500 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:33863) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cc7qP-0005OZ-Kz for qemu-devel@nongnu.org; Fri, 10 Feb 2017 04:50:21 -0500 Received: by mail-wm0-x244.google.com with SMTP id c85so6574022wmi.1 for ; Fri, 10 Feb 2017 01:50:21 -0800 (PST) Received: from donizetti.lan (94-39-187-56.adsl-ull.clienti.tiscali.it. [94.39.187.56]) by smtp.gmail.com with ESMTPSA id i203sm723664wmf.12.2017.02.10.01.50.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Feb 2017 01:50:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=0mxmD0y8dHdt9+3/JramW/pFY1zuRY3Z9lOaJsNU/jU=; b=L3fOKqgLtZFqgmmfAF5n0qusKFNeY929lT5/vtxp8EB/StsOMjxUMd21j4ugQ4hmfT +m3HrDaftnDt8Y8IENu6no6kvFCnPVpPcw9c00TgKTBm5ZK9SndRmdqrVuAWh/JNy2E6 Jnt2KAhHu6+C9T/MV/KhheBvXOcrQIrSA540zhWVbDcDK3EfV0NCP6OorfdfkWHVWOie X/boUGLiy7n91nBCJhCOqW7Qsi51PeY3h7zxKPjgyjoXxWBORjz+Tp9aP0WMMkv4Fejy V2ZVZMRAnjhWpSlPBEkqVgBTNvU41PvR4EWpRs9maszUJR1xmQ9iGASe3wssmKjSzXsE x0xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=0mxmD0y8dHdt9+3/JramW/pFY1zuRY3Z9lOaJsNU/jU=; b=MaxNreUBM61eQNFuRsfZGylwG5dU+lqg5164ejueICJ/4WnZ1PSTCcpc+hsQ7z65y1 TYTosBBQ5CfxpbSf/OetrcjIeTljO2987brDZICDnFiqgYjxvZG5WIuTobof9q+3ejOi ehFXSgTwlJjYXoU8inqznnXCSAB8zxfGTYGnQq9r4w0vc1DYhGUpNpYohIJXqoU7TUpB /zA7vg52ivC2pQh2VAGPAN3MPUu7ZW48s/1C/mK5n6qKxGZs/WTf2xETjmab+NhPPBqZ de0TTi2DMu4F97tsOSg6ox2+mcakhPmAtEifm4OgPmlxu+j1sx6s6T1rXbb6rtlNzWri TXPg== X-Gm-Message-State: AMke39lerzgIyy/ckrFF3W/+MptelkeecgMbhaJ+zqgr2L9FbsNZ4fUsoxBQsdpTomwiXQ== X-Received: by 10.28.138.136 with SMTP id m130mr24977961wmd.72.1486720220305; Fri, 10 Feb 2017 01:50:20 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 10 Feb 2017 10:50:11 +0100 Message-Id: <20170210095012.16039-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170210095012.16039-1-pbonzini@redhat.com> References: <20170210095012.16039-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PATCH 6/7] KVM: move SIG_IPI handling to kvm-all.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kvm@vger.kernel.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This lets us remove a bunch of CONFIG_LINUX defines. Signed-off-by: Paolo Bonzini --- cpus.c | 62 +-----------------------------------------------= ---- include/sysemu/kvm.h | 5 ++--- kvm-all.c | 60 +++++++++++++++++++++++++++++++++++++++++++++---= -- kvm-stub.c | 12 +++++----- 4 files changed, 63 insertions(+), 76 deletions(-) diff --git a/cpus.c b/cpus.c index 9e1cd76..9c351c1 100644 --- a/cpus.c +++ b/cpus.c @@ -820,69 +820,10 @@ static void qemu_init_sigbus(void) =20 prctl(PR_MCE_KILL, PR_MCE_KILL_SET, PR_MCE_KILL_EARLY, 0, 0); } - -static void dummy_signal(int sig) -{ -} - -static void qemu_kvm_init_cpu_signals(CPUState *cpu) -{ - int r; - sigset_t set; - struct sigaction sigact; - - memset(&sigact, 0, sizeof(sigact)); - sigact.sa_handler =3D dummy_signal; - sigaction(SIG_IPI, &sigact, NULL); - - pthread_sigmask(SIG_BLOCK, NULL, &set); - sigdelset(&set, SIGBUS); - pthread_sigmask(SIG_SETMASK, &set, NULL); - sigdelset(&set, SIG_IPI); - r =3D kvm_set_signal_mask(cpu, &set); - if (r) { - fprintf(stderr, "kvm_set_signal_mask: %s\n", strerror(-r)); - exit(1); - } -} - -static void qemu_kvm_eat_signals(CPUState *cpu) -{ - struct timespec ts =3D { 0, 0 }; - siginfo_t siginfo; - sigset_t waitset; - sigset_t chkset; - int r; - - sigemptyset(&waitset); - sigaddset(&waitset, SIG_IPI); - - do { - r =3D sigtimedwait(&waitset, &siginfo, &ts); - if (r =3D=3D -1 && !(errno =3D=3D EAGAIN || errno =3D=3D EINTR)) { - perror("sigtimedwait"); - exit(1); - } - - r =3D sigpending(&chkset); - if (r =3D=3D -1) { - perror("sigpending"); - exit(1); - } - } while (sigismember(&chkset, SIG_IPI)); -} #else /* !CONFIG_LINUX */ static void qemu_init_sigbus(void) { } - -static void qemu_kvm_eat_signals(CPUState *cpu) -{ -} - -static void qemu_kvm_init_cpu_signals(CPUState *cpu) -{ -} #endif /* !CONFIG_LINUX */ =20 static QemuMutex qemu_global_mutex; @@ -956,7 +897,6 @@ static void qemu_kvm_wait_io_event(CPUState *cpu) qemu_cond_wait(cpu->halt_cond, &qemu_global_mutex); } =20 - qemu_kvm_eat_signals(cpu); qemu_wait_io_event_common(cpu); } =20 @@ -979,7 +919,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) exit(1); } =20 - qemu_kvm_init_cpu_signals(cpu); + kvm_init_cpu_signals(cpu); =20 /* signal CPU creation */ cpu->created =3D true; diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index a1b019d..24281fc 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -238,9 +238,6 @@ int kvm_remove_breakpoint(CPUState *cpu, target_ulong a= ddr, target_ulong len, int type); void kvm_remove_all_breakpoints(CPUState *cpu); int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap); -#ifndef _WIN32 -int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset); -#endif =20 int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); int kvm_on_sigbus(int code, void *addr); @@ -463,6 +460,8 @@ void kvm_cpu_synchronize_state(CPUState *cpu); void kvm_cpu_synchronize_post_reset(CPUState *cpu); void kvm_cpu_synchronize_post_init(CPUState *cpu); =20 +void kvm_init_cpu_signals(CPUState *cpu); + /** * kvm_irqchip_add_msi_route - Add MSI route for specific vector * @s: KVM state diff --git a/kvm-all.c b/kvm-all.c index 1c817ac..eaff0dc 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1897,6 +1897,32 @@ static __thread void *pending_sigbus_addr; static __thread int pending_sigbus_code; static __thread bool have_sigbus_pending; =20 +static void kvm_eat_signals(CPUState *cpu) +{ + struct timespec ts =3D { 0, 0 }; + siginfo_t siginfo; + sigset_t waitset; + sigset_t chkset; + int r; + + sigemptyset(&waitset); + sigaddset(&waitset, SIG_IPI); + + do { + r =3D sigtimedwait(&waitset, &siginfo, &ts); + if (r =3D=3D -1 && !(errno =3D=3D EAGAIN || errno =3D=3D EINTR)) { + perror("sigtimedwait"); + exit(1); + } + + r =3D sigpending(&chkset); + if (r =3D=3D -1) { + perror("sigpending"); + exit(1); + } + } while (sigismember(&chkset, SIG_IPI)); +} + int kvm_cpu_exec(CPUState *cpu) { struct kvm_run *run =3D cpu->kvm_run; @@ -1945,6 +1971,7 @@ int kvm_cpu_exec(CPUState *cpu) if (run_ret < 0) { if (run_ret =3D=3D -EINTR || run_ret =3D=3D -EAGAIN) { DPRINTF("io window exit\n"); + kvm_eat_signals(cpu); ret =3D EXCP_INTERRUPT; break; } @@ -2383,16 +2410,12 @@ void kvm_remove_all_breakpoints(CPUState *cpu) } #endif /* !KVM_CAP_SET_GUEST_DEBUG */ =20 -int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset) +static int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset) { KVMState *s =3D kvm_state; struct kvm_signal_mask *sigmask; int r; =20 - if (!sigset) { - return kvm_vcpu_ioctl(cpu, KVM_SET_SIGNAL_MASK, NULL); - } - sigmask =3D g_malloc(sizeof(*sigmask) + sizeof(*sigset)); =20 sigmask->len =3D s->sigmask_len; @@ -2403,6 +2426,33 @@ int kvm_set_signal_mask(CPUState *cpu, const sigset_= t *sigset) return r; } =20 +static void dummy_signal(int sig) +{ +} + +void kvm_init_cpu_signals(CPUState *cpu) +{ + int r; + sigset_t set; + struct sigaction sigact; + + memset(&sigact, 0, sizeof(sigact)); + sigact.sa_handler =3D dummy_signal; + sigaction(SIG_IPI, &sigact, NULL); + + pthread_sigmask(SIG_BLOCK, NULL, &set); +#if defined KVM_HAVE_MCE_INJECTION + sigdelset(&set, SIGBUS); + pthread_sigmask(SIG_SETMASK, &set, NULL); +#endif + sigdelset(&set, SIG_IPI); + r =3D kvm_set_signal_mask(cpu, &set); + if (r) { + fprintf(stderr, "kvm_set_signal_mask: %s\n", strerror(-r)); + exit(1); + } +} + /* Called asynchronously in VCPU thread. */ int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr) { diff --git a/kvm-stub.c b/kvm-stub.c index b1b6b96..ef0c734 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -95,13 +95,6 @@ void kvm_remove_all_breakpoints(CPUState *cpu) { } =20 -#ifndef _WIN32 -int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset) -{ - abort(); -} -#endif - int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr) { return 1; @@ -157,4 +150,9 @@ bool kvm_has_free_slot(MachineState *ms) { return false; } + +void kvm_init_cpu_signals(CPUState *cpu) +{ + abort(); +} #endif --=20 1.8.3.1