From nobody Wed Nov 5 13:14:13 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1536606584925177.38435313302455; Mon, 10 Sep 2018 12:09:44 -0700 (PDT) Received: from localhost ([::1]:53577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fzRZ9-0000Pz-Q0 for importer@patchew.org; Mon, 10 Sep 2018 15:09:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fzRPX-0001Nw-5w for qemu-devel@nongnu.org; Mon, 10 Sep 2018 14:59:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fzRPP-0001Dq-Fw for qemu-devel@nongnu.org; Mon, 10 Sep 2018 14:59:43 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:32811) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fzRPP-000195-5r for qemu-devel@nongnu.org; Mon, 10 Sep 2018 14:59:39 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 101D321F3D; Mon, 10 Sep 2018 14:59:08 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 10 Sep 2018 14:59:08 -0400 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 958B610298; Mon, 10 Sep 2018 14:59:07 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=mesmtp; bh=RLCfPMTL/JO1SO5Zh/J+HY0LJY /mMkWgZmokCbT6yfE=; b=INYCbVZ0h3ShsSzsMwqXmsys4CVGFMKd3RMcGrp59H BOtIjjxgZ5aCpYPmR9TkieKObyXVWmfWAd7Qw7CwBDzHDQYORLRLQZQFqiH8trVx aCdV07Vr6AFswuhy8PZ++0DxCDzciz530o6+xPtshNMK4L+qLQ2koTwJDervrnk9 8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=RLCfPM TL/JO1SO5Zh/J+HY0LJY/mMkWgZmokCbT6yfE=; b=S5eImlJp4wq8Le30XZ1lE7 1oI3PxVfpDN011aP89+gNJ55sWr3U/TI6eHCxAOH4GFuGOMILK2ekpXBhjv3pJS2 SnICNkWtZVJtMMCQJ3Pc1ObnAwNwcL4PUCLKFXeSX231SvEMNgh3RYCFB/HTTyH3 IXfC6BZLU6llHGfPUC0/lRfWgCSYKegc7k957BjtqQfdIh5tZp8X5Z6MqIyXMdhk yjZWqoSSAlkt03ZmhgvLbqaujx1NWHrzIdB9+U5OTOD6DwBYRoxl8RJlJKCZY60+ 8uRdr2el76RJX2JeXVn8io8NIzZAxNVBBNF7WlK7Z8vZavy6C1lL2+i29aLiXafw == X-ME-Proxy: X-ME-Sender: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Mon, 10 Sep 2018 14:58:54 -0400 Message-Id: <20180910185859.27917-8-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180910185859.27917-1-cota@braap.org> References: <20180910185859.27917-1-cota@braap.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.25 Subject: [Qemu-devel] [PATCH v2 07/12] qht: drop ht argument from qht iterators 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Accessing the HT from an iterator results almost always in a deadlock. Given that only one qht-internal function uses this argument, drop it from the interface. Suggested-by: Alex Benn=C3=A9e Signed-off-by: Emilio G. Cota --- include/qemu/qht.h | 5 ++--- accel/tcg/translate-all.c | 6 ++---- tests/test-qht.c | 6 +++--- util/qht.c | 29 +++++++++++++++++++---------- util/qsp.c | 11 +++++------ 5 files changed, 31 insertions(+), 26 deletions(-) diff --git a/include/qemu/qht.h b/include/qemu/qht.h index 3a9618db69..6484837487 100644 --- a/include/qemu/qht.h +++ b/include/qemu/qht.h @@ -43,9 +43,8 @@ struct qht_stats { }; =20 typedef bool (*qht_lookup_func_t)(const void *obj, const void *userp); -typedef void (*qht_iter_func_t)(struct qht *ht, void *p, uint32_t h, void = *up); -typedef bool (*qht_iter_bool_func_t)(struct qht *ht, void *p, uint32_t h, - void *up); +typedef void (*qht_iter_func_t)(void *p, uint32_t h, void *up); +typedef bool (*qht_iter_bool_func_t)(void *p, uint32_t h, void *up); =20 #define QHT_MODE_AUTO_RESIZE 0x1 /* auto-resize when heavily loaded */ #define QHT_MODE_RAW_MUTEXES 0x2 /* bypass the profiler (QSP) */ diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 898c3bb3d1..9ffbbc2fbd 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1282,8 +1282,7 @@ void tb_flush(CPUState *cpu) */ #ifdef CONFIG_USER_ONLY =20 -static void -do_tb_invalidate_check(struct qht *ht, void *p, uint32_t hash, void *userp) +static void do_tb_invalidate_check(void *p, uint32_t hash, void *userp) { TranslationBlock *tb =3D p; target_ulong addr =3D *(target_ulong *)userp; @@ -1304,8 +1303,7 @@ static void tb_invalidate_check(target_ulong address) qht_iter(&tb_ctx.htable, do_tb_invalidate_check, &address); } =20 -static void -do_tb_page_check(struct qht *ht, void *p, uint32_t hash, void *userp) +static void do_tb_page_check(void *p, uint32_t hash, void *userp) { TranslationBlock *tb =3D p; int flags1, flags2; diff --git a/tests/test-qht.c b/tests/test-qht.c index 1ec039d636..4d23cefab6 100644 --- a/tests/test-qht.c +++ b/tests/test-qht.c @@ -98,7 +98,7 @@ static void check(int a, int b, bool expected) qht_statistics_destroy(&stats); } =20 -static void count_func(struct qht *ht, void *p, uint32_t hash, void *userp) +static void count_func(void *p, uint32_t hash, void *userp) { unsigned int *curr =3D userp; =20 @@ -122,7 +122,7 @@ static void iter_check(unsigned int count) g_assert_cmpuint(curr, =3D=3D, count); } =20 -static void sum_func(struct qht *ht, void *p, uint32_t hash, void *userp) +static void sum_func(void *p, uint32_t hash, void *userp) { uint32_t *sum =3D userp; uint32_t a =3D *(uint32_t *)p; @@ -138,7 +138,7 @@ static void iter_sum_check(unsigned int expected) g_assert_cmpuint(sum, =3D=3D, expected); } =20 -static bool rm_mod_func(struct qht *ht, void *p, uint32_t hash, void *user= p) +static bool rm_mod_func(void *p, uint32_t hash, void *userp) { uint32_t a =3D *(uint32_t *)p; unsigned int mod =3D *(unsigned int *)userp; diff --git a/util/qht.c b/util/qht.c index c190e89f5b..50ed7a2102 100644 --- a/util/qht.c +++ b/util/qht.c @@ -746,7 +746,7 @@ bool qht_remove(struct qht *ht, const void *p, uint32_t= hash) return ret; } =20 -static inline void qht_bucket_iter(struct qht *ht, struct qht_bucket *head, +static inline void qht_bucket_iter(struct qht_bucket *head, const struct qht_iter *iter, void *user= p) { struct qht_bucket *b =3D head; @@ -759,10 +759,10 @@ static inline void qht_bucket_iter(struct qht *ht, st= ruct qht_bucket *head, } switch (iter->type) { case QHT_ITER_VOID: - iter->f.retvoid(ht, b->pointers[i], b->hashes[i], userp); + iter->f.retvoid(b->pointers[i], b->hashes[i], userp); break; case QHT_ITER_RM: - if (iter->f.retbool(ht, b->pointers[i], b->hashes[i], user= p)) { + if (iter->f.retbool(b->pointers[i], b->hashes[i], userp)) { /* replace i with the last valid element in the bucket= */ seqlock_write_begin(&head->sequence); qht_bucket_remove_entry(b, i); @@ -782,14 +782,14 @@ static inline void qht_bucket_iter(struct qht *ht, st= ruct qht_bucket *head, } =20 /* call with all of the map's locks held */ -static inline void qht_map_iter__all_locked(struct qht *ht, struct qht_map= *map, +static inline void qht_map_iter__all_locked(struct qht_map *map, const struct qht_iter *iter, void *userp) { size_t i; =20 for (i =3D 0; i < map->n_buckets; i++) { - qht_bucket_iter(ht, &map->buckets[i], iter, userp); + qht_bucket_iter(&map->buckets[i], iter, userp); } } =20 @@ -800,8 +800,7 @@ do_qht_iter(struct qht *ht, const struct qht_iter *iter= , void *userp) =20 map =3D atomic_rcu_read(&ht->map); qht_map_lock_buckets(map); - /* Note: ht here is merely for carrying ht->mode; ht->map won't be rea= d */ - qht_map_iter__all_locked(ht, map, iter, userp); + qht_map_iter__all_locked(map, iter, userp); qht_map_unlock_buckets(map); } =20 @@ -825,9 +824,16 @@ void qht_iter_remove(struct qht *ht, qht_iter_bool_fun= c_t func, void *userp) do_qht_iter(ht, &iter, userp); } =20 -static void qht_map_copy(struct qht *ht, void *p, uint32_t hash, void *use= rp) +struct qht_map_copy_data { + struct qht *ht; + struct qht_map *new; +}; + +static void qht_map_copy(void *p, uint32_t hash, void *userp) { - struct qht_map *new =3D userp; + struct qht_map_copy_data *data =3D userp; + struct qht *ht =3D data->ht; + struct qht_map *new =3D data->new; struct qht_bucket *b =3D qht_map_to_bucket(new, hash); =20 /* no need to acquire b->lock because no thread has seen this map yet = */ @@ -845,6 +851,7 @@ static void qht_do_resize_reset(struct qht *ht, struct = qht_map *new, bool reset) .f.retvoid =3D qht_map_copy, .type =3D QHT_ITER_VOID, }; + struct qht_map_copy_data data; =20 old =3D ht->map; qht_map_lock_buckets(old); @@ -859,7 +866,9 @@ static void qht_do_resize_reset(struct qht *ht, struct = qht_map *new, bool reset) } =20 g_assert(new->n_buckets !=3D old->n_buckets); - qht_map_iter__all_locked(ht, old, &iter, new); + data.ht =3D ht; + data.new =3D new; + qht_map_iter__all_locked(old, &iter, &data); qht_map_debug__all_locked(new); =20 atomic_rcu_set(&ht->map, new); diff --git a/util/qsp.c b/util/qsp.c index b0c2575d10..2de3a97594 100644 --- a/util/qsp.c +++ b/util/qsp.c @@ -533,7 +533,7 @@ static gint qsp_tree_cmp(gconstpointer ap, gconstpointe= r bp, gpointer up) } } =20 -static void qsp_sort(struct qht *ht, void *p, uint32_t h, void *userp) +static void qsp_sort(void *p, uint32_t h, void *userp) { QSPEntry *e =3D p; GTree *tree =3D userp; @@ -541,7 +541,7 @@ static void qsp_sort(struct qht *ht, void *p, uint32_t = h, void *userp) g_tree_insert(tree, e, NULL); } =20 -static void qsp_aggregate(struct qht *global_ht, void *p, uint32_t h, void= *up) +static void qsp_aggregate(void *p, uint32_t h, void *up) { struct qht *ht =3D up; const QSPEntry *e =3D p; @@ -553,7 +553,7 @@ static void qsp_aggregate(struct qht *global_ht, void *= p, uint32_t h, void *up) qsp_entry_aggregate(agg, e); } =20 -static void qsp_iter_diff(struct qht *orig, void *p, uint32_t hash, void *= htp) +static void qsp_iter_diff(void *p, uint32_t hash, void *htp) { struct qht *ht =3D htp; QSPEntry *old =3D p; @@ -583,8 +583,7 @@ static void qsp_diff(struct qht *orig, struct qht *new) qht_iter(orig, qsp_iter_diff, new); } =20 -static void -qsp_iter_callsite_coalesce(struct qht *orig, void *p, uint32_t h, void *ht= p) +static void qsp_iter_callsite_coalesce(void *p, uint32_t h, void *htp) { struct qht *ht =3D htp; QSPEntry *old =3D p; @@ -603,7 +602,7 @@ qsp_iter_callsite_coalesce(struct qht *orig, void *p, u= int32_t h, void *htp) e->n_acqs +=3D old->n_acqs; } =20 -static void qsp_ht_delete(struct qht *ht, void *p, uint32_t h, void *htp) +static void qsp_ht_delete(void *p, uint32_t h, void *htp) { g_free(p); } --=20 2.17.1