From nobody Fri Oct 24 20:17:18 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 151971079002546.767879132579424; Mon, 26 Feb 2018 21:53:10 -0800 (PST) Received: from localhost ([::1]:34991 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqYCF-0006Ye-VF for importer@patchew.org; Tue, 27 Feb 2018 00:53:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqXzH-0004bZ-WB for qemu-devel@nongnu.org; Tue, 27 Feb 2018 00:39:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqXzD-0000R6-6w for qemu-devel@nongnu.org; Tue, 27 Feb 2018 00:39:40 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:40001) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eqXzD-0000QK-1f for qemu-devel@nongnu.org; Tue, 27 Feb 2018 00:39:35 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 91FFE20CD4; Tue, 27 Feb 2018 00:39:34 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Tue, 27 Feb 2018 00:39:34 -0500 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 488757E26F; Tue, 27 Feb 2018 00:39:34 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=mesmtp; bh=bYj3nck1xZc9MW uXmMCF8SASG8HiZwLZ5YuyWfC2m3E=; b=2yy5e66H0bdnbC2ASigqaV+SKTu/4v najHj8wft3WK+7OAMRw8zHilVnltxyXo8/JOSgwT0mdsjnHAMdUrtmdSYDbvBsRz pxK2YHoCpHFd/rEXkKabvg97MgSxe+FqTnhZL2Nn/SD0lveSS9JR0F5DlZxjXaRW e0AYgzP1653XI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=bYj3nck1xZc9MWuXmMCF8SASG8HiZwLZ5YuyWfC2m3E=; b=In2ZUGmJ hSyPm+L2i6Cv2RLijsXHsWVg5HENUIWkjY27fXegNKzAw3YSFPc9LoU4Lbu40AiR A9Um/Cghi26eTZOGS4Q5qrjh/kaKGJ3i51l6RMtO44LOXz5bgQNRYMu1gYTKEikq 8MvYAxcDnZOmtZN85ibs7edYBOou8p4wYYMqIkvprMK8hNapeQzYM9YskOMTdui+ 9C+OVs8KJDgstv3DgEEP+Z2bBf3Dl7doxvjx4KDthx8ZjwcHdX+Jo58ElB9kb8ND J12Yw9oV29g0W/11xfiwaHoUbQEIySLERJa68LpAAO+eOIdUGd7yDuBbk8qkbDN4 UX/EYsVLgwT9Ag== X-ME-Sender: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Tue, 27 Feb 2018 00:39:20 -0500 Message-Id: <1519709965-29833-12-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519709965-29833-1-git-send-email-cota@braap.org> References: <1519709965-29833-1-git-send-email-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.26 Subject: [Qemu-devel] [PATCH 11/16] translate-all: add page_collection assertions 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: Paolo Bonzini , Richard Henderson 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" The appended adds assertions to make sure we do not longjmp with page locks held. Some notes: - user-mode has nothing to check, since page_locks are !user-mode only. - The checks only apply to page collections, since these have relatively complex callers. - Some simple page_lock/unlock callers have been left unchecked -- namely page_lock_tb, tb_phys_invalidate and tb_link_page. Signed-off-by: Emilio G. Cota Reviewed-by: Alex Benn=C3=A9e --- accel/tcg/cpu-exec.c | 1 + accel/tcg/translate-all.c | 22 ++++++++++++++++++++++ include/exec/exec-all.h | 8 ++++++++ 3 files changed, 31 insertions(+) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 8c68727..7c83887 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -271,6 +271,7 @@ void cpu_exec_step_atomic(CPUState *cpu) tcg_debug_assert(!have_mmap_lock()); #endif tb_lock_reset(); + assert_page_collection_locked(false); } =20 if (in_exclusive_region) { diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 07527d5..82832ef 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -605,6 +605,24 @@ void page_collection_unlock(struct page_collection *se= t) { } #else /* !CONFIG_USER_ONLY */ =20 +#ifdef CONFIG_DEBUG_TCG +static __thread bool page_collection_locked; + +void assert_page_collection_locked(bool val) +{ + tcg_debug_assert(page_collection_locked =3D=3D val); +} + +static inline void set_page_collection_locked(bool val) +{ + page_collection_locked =3D val; +} +#else +static inline void set_page_collection_locked(bool val) +{ +} +#endif /* !CONFIG_DEBUG_TCG */ + static inline void page_lock(PageDesc *pd) { qemu_spin_lock(&pd->lock); @@ -677,6 +695,7 @@ static void do_page_entry_lock(struct page_entry *pe) page_lock(pe->pd); g_assert(!pe->locked); pe->locked =3D true; + set_page_collection_locked(true); } =20 static gboolean page_entry_lock(gpointer key, gpointer value, gpointer dat= a) @@ -769,6 +788,7 @@ page_collection_lock(tb_page_addr_t start, tb_page_addr= _t end) set->tree =3D g_tree_new_full(tb_page_addr_cmp, NULL, NULL, page_entry_destroy); set->max =3D NULL; + assert_page_collection_locked(false); =20 retry: g_tree_foreach(set->tree, page_entry_lock, NULL); @@ -787,6 +807,7 @@ page_collection_lock(tb_page_addr_t start, tb_page_addr= _t end) page_trylock_add(set, tb->page_addr[1]))) { /* drop all locks, and reacquire in order */ g_tree_foreach(set->tree, page_entry_unlock, NULL); + set_page_collection_locked(false); goto retry; } } @@ -799,6 +820,7 @@ void page_collection_unlock(struct page_collection *set) /* entries are unlocked and freed via page_entry_destroy */ g_tree_destroy(set->tree); g_free(set); + set_page_collection_locked(false); } =20 #endif /* !CONFIG_USER_ONLY */ diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index aeaa127..7911e69 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -431,6 +431,14 @@ void tb_lock(void); void tb_unlock(void); void tb_lock_reset(void); =20 +#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_DEBUG_TCG) +void assert_page_collection_locked(bool val); +#else +static inline void assert_page_collection_locked(bool val) +{ +} +#endif + #if !defined(CONFIG_USER_ONLY) =20 struct MemoryRegion *iotlb_to_region(CPUState *cpu, --=20 2.7.4