All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jan Kiszka <jan.kiszka@siemens.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org
Subject: [PATCH 01/22] Prevent abortion on multiple VCPU kicks
Date: Thu, 27 Jan 2011 14:09:45 +0100	[thread overview]
Message-ID: <a7a2a912167d2ef699844c8c0e7b170b4d6f3fb1.1296133797.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1296133797.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1296133797.git.jan.kiszka@siemens.com>

If we call qemu_cpu_kick more than once before the target was able to
process the signal, pthread_kill will fail, and qemu will abort. Prevent
this by avoiding the redundant signal.

This logic can be found in qemu-kvm as well.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 cpu-defs.h |    1 +
 cpus.c     |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/cpu-defs.h b/cpu-defs.h
index 8d4bf86..db809ed 100644
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -205,6 +205,7 @@ typedef struct CPUWatchpoint {
     uint32_t stopped; /* Artificially stopped */                        \
     struct QemuThread *thread;                                          \
     struct QemuCond *halt_cond;                                         \
+    int thread_kicked;                                                  \
     struct qemu_work_item *queued_work_first, *queued_work_last;        \
     const char *cpu_model_str;                                          \
     struct KVMState *kvm_state;                                         \
diff --git a/cpus.c b/cpus.c
index 4c9928e..ab6e40e 100644
--- a/cpus.c
+++ b/cpus.c
@@ -481,6 +481,7 @@ static void qemu_wait_io_event_common(CPUState *env)
         qemu_cond_signal(&qemu_pause_cond);
     }
     flush_queued_work(env);
+    env->thread_kicked = false;
 }
 
 static void qemu_tcg_wait_io_event(void)
@@ -648,7 +649,10 @@ void qemu_cpu_kick(void *_env)
 {
     CPUState *env = _env;
     qemu_cond_broadcast(env->halt_cond);
-    qemu_thread_signal(env->thread, SIG_IPI);
+    if (!env->thread_kicked) {
+        qemu_thread_signal(env->thread, SIG_IPI);
+        env->thread_kicked = true;
+    }
 }
 
 int qemu_cpu_self(void *_env)
-- 
1.7.1


WARNING: multiple messages have this Message-ID (diff)
From: Jan Kiszka <jan.kiszka@siemens.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org
Subject: [Qemu-devel] [PATCH 01/22] Prevent abortion on multiple VCPU kicks
Date: Thu, 27 Jan 2011 14:09:45 +0100	[thread overview]
Message-ID: <a7a2a912167d2ef699844c8c0e7b170b4d6f3fb1.1296133797.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1296133797.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1296133797.git.jan.kiszka@siemens.com>

If we call qemu_cpu_kick more than once before the target was able to
process the signal, pthread_kill will fail, and qemu will abort. Prevent
this by avoiding the redundant signal.

This logic can be found in qemu-kvm as well.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 cpu-defs.h |    1 +
 cpus.c     |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/cpu-defs.h b/cpu-defs.h
index 8d4bf86..db809ed 100644
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -205,6 +205,7 @@ typedef struct CPUWatchpoint {
     uint32_t stopped; /* Artificially stopped */                        \
     struct QemuThread *thread;                                          \
     struct QemuCond *halt_cond;                                         \
+    int thread_kicked;                                                  \
     struct qemu_work_item *queued_work_first, *queued_work_last;        \
     const char *cpu_model_str;                                          \
     struct KVMState *kvm_state;                                         \
diff --git a/cpus.c b/cpus.c
index 4c9928e..ab6e40e 100644
--- a/cpus.c
+++ b/cpus.c
@@ -481,6 +481,7 @@ static void qemu_wait_io_event_common(CPUState *env)
         qemu_cond_signal(&qemu_pause_cond);
     }
     flush_queued_work(env);
+    env->thread_kicked = false;
 }
 
 static void qemu_tcg_wait_io_event(void)
@@ -648,7 +649,10 @@ void qemu_cpu_kick(void *_env)
 {
     CPUState *env = _env;
     qemu_cond_broadcast(env->halt_cond);
-    qemu_thread_signal(env->thread, SIG_IPI);
+    if (!env->thread_kicked) {
+        qemu_thread_signal(env->thread, SIG_IPI);
+        env->thread_kicked = true;
+    }
 }
 
 int qemu_cpu_self(void *_env)
-- 
1.7.1

  reply	other threads:[~2011-01-27 13:10 UTC|newest]

Thread overview: 146+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-27 13:09 [PATCH 00/22] [uq/master] Patch queue, part II Jan Kiszka
2011-01-27 13:09 ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:09 ` Jan Kiszka [this message]
2011-01-27 13:09   ` [Qemu-devel] [PATCH 01/22] Prevent abortion on multiple VCPU kicks Jan Kiszka
2011-01-31  9:44   ` Avi Kivity
2011-01-31  9:44     ` [Qemu-devel] " Avi Kivity
2011-01-31 11:19     ` Jan Kiszka
2011-01-31 11:19       ` [Qemu-devel] " Jan Kiszka
2011-01-31 13:16       ` Avi Kivity
2011-01-31 13:16         ` [Qemu-devel] " Avi Kivity
2011-01-27 13:09 ` [PATCH 02/22] Stop current VCPU on synchronous reset requests Jan Kiszka
2011-01-27 13:09   ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:09 ` [PATCH 03/22] Process vmstop requests in IO thread Jan Kiszka
2011-01-27 13:09   ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:09 ` [PATCH 04/22] Leave inner main_loop faster on pending requests Jan Kiszka
2011-01-27 13:09   ` [Qemu-devel] " Jan Kiszka
2011-01-31  9:52   ` Avi Kivity
2011-01-31  9:52     ` [Qemu-devel] " Avi Kivity
2011-01-31 11:22     ` Jan Kiszka
2011-01-31 11:22       ` [Qemu-devel] " Jan Kiszka
2011-01-31 13:17       ` Avi Kivity
2011-01-31 13:17         ` [Qemu-devel] " Avi Kivity
2011-01-31 14:32         ` Jan Kiszka
2011-01-31 14:32           ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:09 ` [PATCH 05/22] kvm: Report proper error on GET_VCPU_MMAP_SIZE failures Jan Kiszka
2011-01-27 13:09   ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:09 ` [PATCH 06/22] kvm: Drop redundant kvm_enabled from kvm_cpu_thread_fn Jan Kiszka
2011-01-27 13:09   ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:09 ` [PATCH 07/22] kvm: Handle kvm_init_vcpu errors Jan Kiszka
2011-01-27 13:09   ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:09 ` [PATCH 08/22] kvm: Provide sigbus services arch-independently Jan Kiszka
2011-01-27 13:09   ` [Qemu-devel] " Jan Kiszka
2011-01-27 16:39   ` Paolo Bonzini
2011-01-27 16:39     ` [Qemu-devel] " Paolo Bonzini
2011-01-30 14:51   ` Alexander Graf
2011-01-30 14:51     ` [Qemu-devel] " Alexander Graf
2011-01-27 13:09 ` [PATCH 09/22] Refactor signal setup functions in cpus.c Jan Kiszka
2011-01-27 13:09   ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:09 ` [PATCH 10/22] kvm: Set up signal mask also for !CONFIG_IOTHREAD Jan Kiszka
2011-01-27 13:09   ` [Qemu-devel] " Jan Kiszka
2011-01-28  8:08   ` Paolo Bonzini
2011-01-28  8:08     ` [Qemu-devel] " Paolo Bonzini
2011-01-27 13:09 ` [PATCH 11/22] kvm: Refactor qemu_kvm_eat_signals Jan Kiszka
2011-01-27 13:09   ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:09 ` [PATCH 12/22] kvm: Call qemu_kvm_eat_signals also under !CONFIG_IOTHREAD Jan Kiszka
2011-01-27 13:09   ` [Qemu-devel] " Jan Kiszka
2011-01-28  8:09   ` Paolo Bonzini
2011-01-28  8:09     ` [Qemu-devel] " Paolo Bonzini
2011-02-01 12:38   ` Marcelo Tosatti
2011-02-01 12:38     ` [Qemu-devel] " Marcelo Tosatti
2011-02-01 12:49     ` Marcelo Tosatti
2011-02-01 12:49       ` [Qemu-devel] " Marcelo Tosatti
2011-02-01 13:21     ` Jan Kiszka
2011-02-01 13:21       ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:09 ` [PATCH 13/22] Set up signalfd " Jan Kiszka
2011-01-27 13:09   ` [Qemu-devel] " Jan Kiszka
2011-01-28  8:11   ` Paolo Bonzini
2011-01-28  8:11     ` [Qemu-devel] " Paolo Bonzini
2011-01-27 13:09 ` [PATCH 14/22] kvm: Fix race between timer signals and vcpu entry under !IOTHREAD Jan Kiszka
2011-01-27 13:09   ` [Qemu-devel] " Jan Kiszka
2011-01-27 14:20   ` [PATCH v2 " Jan Kiszka
2011-01-27 14:20     ` [Qemu-devel] " Jan Kiszka
2011-01-27 14:33     ` [PATCH v3 " Jan Kiszka
2011-01-27 14:33       ` [Qemu-devel] " Jan Kiszka
2011-01-31 10:03       ` Avi Kivity
2011-01-31 10:03         ` [Qemu-devel] " Avi Kivity
2011-01-31 11:27         ` Jan Kiszka
2011-01-31 11:27           ` [Qemu-devel] " Jan Kiszka
2011-01-31 12:13           ` Stefan Hajnoczi
2011-01-31 12:13             ` Stefan Hajnoczi
2011-01-31 12:18             ` Jan Kiszka
2011-01-31 12:18               ` Jan Kiszka
2011-01-31 13:35               ` Stefan Hajnoczi
2011-01-31 13:35                 ` Stefan Hajnoczi
2011-01-31 13:22           ` Avi Kivity
2011-01-31 13:22             ` [Qemu-devel] " Avi Kivity
2011-01-31 14:31             ` Jan Kiszka
2011-01-31 14:31               ` [Qemu-devel] " Jan Kiszka
2011-01-31 16:30               ` Avi Kivity
2011-01-31 16:30                 ` [Qemu-devel] " Avi Kivity
2011-02-01 12:47   ` [PATCH " Marcelo Tosatti
2011-02-01 12:47     ` [Qemu-devel] " Marcelo Tosatti
2011-02-01 13:32     ` Jan Kiszka
2011-02-01 13:32       ` [Qemu-devel] " Jan Kiszka
2011-02-01 13:48       ` Marcelo Tosatti
2011-02-01 13:48         ` [Qemu-devel] " Marcelo Tosatti
2011-02-01 13:58         ` Jan Kiszka
2011-02-01 13:58           ` [Qemu-devel] " Jan Kiszka
2011-02-01 14:10           ` Marcelo Tosatti
2011-02-01 14:10             ` [Qemu-devel] " Marcelo Tosatti
2011-02-01 14:21             ` Jan Kiszka
2011-02-01 14:21               ` [Qemu-devel] " Jan Kiszka
2011-02-01 14:37               ` Jan Kiszka
2011-02-01 14:37                 ` [Qemu-devel] " Jan Kiszka
2011-02-01 14:45                 ` Jan Kiszka
2011-02-01 14:45                   ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:09 ` [PATCH 15/22] kvm: Add MCE signal support for !CONFIG_IOTHREAD Jan Kiszka
2011-01-27 13:09   ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:10 ` [PATCH 16/22] Introduce VCPU self-signaling service Jan Kiszka
2011-01-27 13:10   ` [Qemu-devel] " Jan Kiszka
2011-02-01 13:14   ` Marcelo Tosatti
2011-02-01 13:14     ` [Qemu-devel] " Marcelo Tosatti
2011-02-01 13:33     ` Jan Kiszka
2011-02-01 13:33       ` [Qemu-devel] " Jan Kiszka
2011-02-01 13:50       ` Marcelo Tosatti
2011-02-01 13:50         ` [Qemu-devel] " Marcelo Tosatti
2011-02-01 13:59         ` Jan Kiszka
2011-02-01 13:59           ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:10 ` [PATCH 17/22] kvm: Move irqchip event processing out of inner loop Jan Kiszka
2011-01-27 13:10   ` [Qemu-devel] " Jan Kiszka
2011-01-31 10:08   ` Avi Kivity
2011-01-31 10:08     ` [Qemu-devel] " Avi Kivity
2011-01-31 11:36     ` Jan Kiszka
2011-01-31 11:36       ` [Qemu-devel] " Jan Kiszka
2011-01-31 13:04       ` Jan Kiszka
2011-01-31 13:04         ` [Qemu-devel] " Jan Kiszka
2011-01-31 15:40         ` Jan Kiszka
2011-01-31 15:40           ` [Qemu-devel] " Jan Kiszka
2011-01-31 16:38           ` Gleb Natapov
2011-01-31 16:38             ` [Qemu-devel] " Gleb Natapov
2011-01-31 16:41             ` Jan Kiszka
2011-01-31 16:41               ` [Qemu-devel] " Jan Kiszka
2011-01-31 16:45               ` Jan Kiszka
2011-01-31 16:45                 ` [Qemu-devel] " Jan Kiszka
2011-01-31 16:50               ` Gleb Natapov
2011-01-31 16:50                 ` [Qemu-devel] " Gleb Natapov
2011-01-31 16:52                 ` Jan Kiszka
2011-01-31 16:52                   ` [Qemu-devel] " Jan Kiszka
2011-01-31 16:56                   ` Gleb Natapov
2011-01-31 16:56                     ` [Qemu-devel] " Gleb Natapov
2011-01-31 18:06                     ` [PATCH v2 17&18/22] kvm: Unconditionally reenter kernel after IO exits Jan Kiszka
2011-01-31 18:06                       ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:10 ` [PATCH 18/22] " Jan Kiszka
2011-01-27 13:10   ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:10 ` [PATCH 19/22] kvm: Remove static return code of kvm_handle_io Jan Kiszka
2011-01-27 13:10   ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:10 ` [PATCH 20/22] kvm: Leave kvm_cpu_exec directly after KVM_EXIT_SHUTDOWN Jan Kiszka
2011-01-27 13:10   ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:10 ` [PATCH 21/22] Refactor kvm&tcg function names in cpus.c Jan Kiszka
2011-01-27 13:10   ` [Qemu-devel] " Jan Kiszka
2011-01-27 13:10 ` [PATCH 22/22] Fix a few coding style violations " Jan Kiszka
2011-01-27 13:10   ` [Qemu-devel] " Jan Kiszka
2011-01-31 10:12 ` [PATCH 00/22] [uq/master] Patch queue, part II Avi Kivity
2011-01-31 10:12   ` [Qemu-devel] " Avi Kivity
2011-01-31 12:03   ` Jan Kiszka
2011-01-31 12:03     ` [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=a7a2a912167d2ef699844c8c0e7b170b4d6f3fb1.1296133797.git.jan.kiszka@siemens.com \
    --to=jan.kiszka@siemens.com \
    --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: link
Be 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.