From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Daniel P . Berrange" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Nikolay Igotti" <igotti@gmail.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
"Markus Armbruster" <armbru@redhat.com>,
"Laurent Vivier" <laurent@vivier.eu>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH v1 13/15] linux-user: properly "unrealize" vCPU object
Date: Wed, 20 May 2020 15:05:39 +0100 [thread overview]
Message-ID: <20200520140541.30256-14-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200520140541.30256-1-alex.bennee@linaro.org>
We shouldn't be messing around with the CPU list in linux-user save
for the very special case of do_fork(). When threads end we need to
properly follow QOM object lifetime handling and allow the eventual
cpu_common_unrealizefn to both remove the CPU and ensure any clean-up
actions are taken place, for example calling plugin exit hooks.
There is still a race condition to avoid so use the linux-user
specific clone_lock instead of the cpu_list_lock to avoid it.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Nikolay Igotti <igotti@gmail.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Daniel P. Berrange <berrange@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
---
v2
- expand Cc list to QOM/QMP object lifetime experts
---
linux-user/syscall.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 05f03919ff0..7f6700c54e3 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7635,30 +7635,33 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
return -TARGET_ERESTARTSYS;
}
- cpu_list_lock();
+ pthread_mutex_lock(&clone_lock);
if (CPU_NEXT(first_cpu)) {
- TaskState *ts;
+ TaskState *ts = cpu->opaque;
- /* Remove the CPU from the list. */
- QTAILQ_REMOVE_RCU(&cpus, cpu, node);
+ object_property_set_bool(OBJECT(cpu), false, "realized", NULL);
+ object_unref(OBJECT(cpu));
+ /*
+ * At this point the CPU should be unrealized and removed
+ * from cpu lists. We can clean-up the rest of the thread
+ * data without the lock held.
+ */
- cpu_list_unlock();
+ pthread_mutex_unlock(&clone_lock);
- ts = cpu->opaque;
if (ts->child_tidptr) {
put_user_u32(0, ts->child_tidptr);
do_sys_futex(g2h(ts->child_tidptr), FUTEX_WAKE, INT_MAX,
NULL, NULL, 0);
}
thread_cpu = NULL;
- object_unref(OBJECT(cpu));
g_free(ts);
rcu_unregister_thread();
pthread_exit(NULL);
}
- cpu_list_unlock();
+ pthread_mutex_unlock(&clone_lock);
preexit_cleanup(cpu_env, arg1);
_exit(arg1);
return 0; /* avoid warning */
--
2.20.1
next prev parent reply other threads:[~2020-05-20 14:20 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 14:05 [PATCH v1 00/15] testing and plugin updates Alex Bennée
2020-05-20 14:05 ` [PATCH v1 01/15] configure: add alternate binary for genisoimage Alex Bennée
2020-05-20 14:05 ` [PATCH v1 02/15] tests/vm: pass --genisoimage to basevm script Alex Bennée
2020-05-20 14:05 ` [PATCH v1 03/15] travis.yml: Use clang++ in the Clang tests Alex Bennée
2020-05-20 14:05 ` [PATCH v1 04/15] tests/tcg: fix invocation of the memory record/replay tests Alex Bennée
2020-05-20 14:05 ` [PATCH v1 05/15] tests/fp: enable extf80_le_quite tests Alex Bennée
2020-05-22 2:59 ` Richard Henderson
2020-05-20 14:05 ` [PATCH v1 06/15] tests/fp: split and audit the conversion tests Alex Bennée
2020-05-22 3:00 ` Richard Henderson
2020-05-20 14:05 ` [PATCH v1 07/15] tests/tcg: better detect confused gdb which can't connect Alex Bennée
2020-05-22 3:01 ` Richard Henderson
2020-05-20 14:05 ` [PATCH v1 08/15] tests/docker: bump fedora to 32 Alex Bennée
2020-05-22 3:01 ` Richard Henderson
2020-05-20 14:05 ` [PATCH v1 09/15] tests/docker: add debian11 base image Alex Bennée
2020-05-22 3:01 ` Richard Henderson
2020-05-20 14:05 ` [PATCH v1 10/15] tests/docker: use a gcc-10 based image for arm64 tests Alex Bennée
2020-05-22 3:02 ` Richard Henderson
2020-05-20 14:05 ` [PATCH v1 11/15] tests/tcg/aarch64: Add bti smoke test Alex Bennée
2020-05-22 3:05 ` Richard Henderson
2020-05-20 14:05 ` [PATCH v1 12/15] cpus-common: ensure auto-assigned cpu_indexes don't clash Alex Bennée
2020-05-22 3:20 ` Richard Henderson
2020-05-20 14:05 ` Alex Bennée [this message]
2020-05-20 14:05 ` [PATCH v1 14/15] tests/tcg: add new threadcount test Alex Bennée
2020-05-20 14:05 ` [PATCH v1 15/15] plugins: new lockstep plugin for debugging TCG changes Alex Bennée
2020-05-20 16:37 ` [PATCH v1 00/15] testing and plugin updates no-reply
2020-05-20 16:38 ` no-reply
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=20200520140541.30256-14-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=ehabkost@redhat.com \
--cc=igotti@gmail.com \
--cc=laurent@vivier.eu \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=riku.voipio@iki.fi \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).