From patchwork Thu Jun 14 19:31:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 138620 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp2528920lji; Thu, 14 Jun 2018 12:41:10 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI+kdUIC5G1JKFeBRDPEu6H4ATsBPEP6a4iUsgxSv8QWAdLYNfL4IISPVWnwt9nJfKyFRLT X-Received: by 2002:ac8:2238:: with SMTP id o53-v6mr3727584qto.355.1529005270486; Thu, 14 Jun 2018 12:41:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529005270; cv=none; d=google.com; s=arc-20160816; b=usLy0Mlfy57OUZtHSLgk9IuhLffRakhhYWUzyOXYv1iJzU1jbjZ/tMD4g69Mm7uHkS sX56t0ucLALqR0Vg787pW+L3Rj3MVBPk6zBG2xMG6mBw2iybC7WTR2yw1Mf8/porG4AT 0gxXKduRwKtbtyfLeS3v5xQSnb/S73mqAPCvm/kuue86kWNWFV/JKeJRluy7tXE0Zk4w 4IW6Cj6LwQLljTWYZJaPYb7xp6OYXgjAAfjtn9ruJ7LyIU9kdNmDyihuyqvV46XZFi1y g5uaQPVYKZ/yX0UnzdgSPXv8eEw0ZOKc1d3tTLYFUIQ1AgDSnid/HI5Q4rW8qIoOxGcY 9/Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=0ifFvg47P31SiqVLHK249PSF/Xw/scsIziiDtRJNjko=; b=iXpHhx8XVDsI62+LjQ9i2kLV8mY/uhHV8K9jB840m+odunrd4PfoNA/nU6jTGzhvuI 3ExsWmJ11NKUIyhe4aczKJYYzXR9EmJY1qFJrNgHmQPiNWfGBBfqcu7py29sqFO7lod0 zbwsKrietoGad8oLh1s0qAEAjLlmlcYX1UkyLkI//n3CNvw+NDGfdE5bMF4PfsEaXAgh 4KSayxB8GjC0xVkFOX7wgnXkD3KjBSziCfaIT4seJiGxjzGkDQdSjQsCV4tjcFxmqmzS zpsSOdQ5ll05VTybqUU0AStqoiVyEQu/8OZ+oKO0fQyf2AQFoxBtTv2Gk2jIjg80EkRb XIXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="GLHx49/z"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p17-v6si5040594qvf.115.2018.06.14.12.41.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 14 Jun 2018 12:41:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="GLHx49/z"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42375 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTY7J-0005wh-LG for patch@linaro.org; Thu, 14 Jun 2018 15:41:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTXyS-0006qQ-0K for qemu-devel@nongnu.org; Thu, 14 Jun 2018 15:32:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTXyQ-0005hO-Ml for qemu-devel@nongnu.org; Thu, 14 Jun 2018 15:32:00 -0400 Received: from mail-pg0-x22a.google.com ([2607:f8b0:400e:c05::22a]:40832) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fTXyQ-0005h6-FK for qemu-devel@nongnu.org; Thu, 14 Jun 2018 15:31:58 -0400 Received: by mail-pg0-x22a.google.com with SMTP id w8-v6so330697pgp.7 for ; Thu, 14 Jun 2018 12:31:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0ifFvg47P31SiqVLHK249PSF/Xw/scsIziiDtRJNjko=; b=GLHx49/zPCGzimPZgIpOxzvV/uh8LnXRBoYVC/r86kQoC0OxGksZEb8aZfHnRytzPi fm9IFybwumTTWznaM4z1wXT6GPotxKWMzCnddXUydc2LnrheKTSCf3EcS0KMrCCnHfIa YVHfU5lz7MdgatvAZIqI5CdQ4LLMpk41rFBgU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0ifFvg47P31SiqVLHK249PSF/Xw/scsIziiDtRJNjko=; b=dJhNWOhgFB/lPR/a98kZiy98T/aZ/GYwM2F8xagyGVC/u7CJzsm92pbRe8H4lzVKiJ b337gvqomiV66EoTT61tN8GRhIRjiTb9uqynBh8wI72cAQ1vD0xVEQHLj3P64WGzrKTG sPKLJcQuoO2cX4zjU1H5ES4jtgmsSUuFUUhSsZSfuFEiHTD6y2BvYkJe8qNDZV5ZAiIF m5zSAuz/YIcEQMeILgUlG35R90EevZaM5VJ2gj0V20DK7ThSM/ODJjpeXdmqr5ABRzJ7 zqAyZtRhZFiIZvOvD3yZGHJaeCcAuUbBXfSuDzALtM1b/ng/NY9gmRqoqIurZET55N4T QxWA== X-Gm-Message-State: APt69E0sRMdMBnZmfvyn9DnQhw0wRuDxrEuopf/2YfvTpUbPWZKLjKFy Bwju3EI4uQzY2PCiWg+kC4Azf1ompXA= X-Received: by 2002:a62:e401:: with SMTP id r1-v6mr10817705pfh.172.1529004717298; Thu, 14 Jun 2018 12:31:57 -0700 (PDT) Received: from cloudburst.twiddle.net (rrcs-173-198-77-219.west.biz.rr.com. [173.198.77.219]) by smtp.gmail.com with ESMTPSA id x24-v6sm11532184pfj.104.2018.06.14.12.31.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Jun 2018 12:31:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 14 Jun 2018 09:31:32 -1000 Message-Id: <20180614193147.29680-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180614193147.29680-1-richard.henderson@linaro.org> References: <20180614193147.29680-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::22a Subject: [Qemu-devel] [PULL 03/18] qht: return existing entry when qht_insert fails 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: peter.maydell@linaro.org, "Emilio G. Cota" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" The meaning of "existing" is now changed to "matches in hash and ht->cmp result". This is saner than just checking the pointer value. Suggested-by: Richard Henderson Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée Signed-off-by: Emilio G. Cota Signed-off-by: Richard Henderson --- include/qemu/qht.h | 7 +++++-- accel/tcg/translate-all.c | 2 +- tests/qht-bench.c | 4 ++-- tests/test-qht.c | 8 +++++++- util/qht.c | 27 +++++++++++++++++---------- 5 files changed, 32 insertions(+), 16 deletions(-) -- 2.17.1 diff --git a/include/qemu/qht.h b/include/qemu/qht.h index 5f03a0f4cb..1fb9116fa0 100644 --- a/include/qemu/qht.h +++ b/include/qemu/qht.h @@ -70,6 +70,7 @@ void qht_destroy(struct qht *ht); * @ht: QHT to insert to * @p: pointer to be inserted * @hash: hash corresponding to @p + * @existing: address where the pointer to an existing entry can be copied to * * Attempting to insert a NULL @p is a bug. * Inserting the same pointer @p with different @hash values is a bug. @@ -78,9 +79,11 @@ void qht_destroy(struct qht *ht); * inserted into the hash table. * * Returns true on success. - * Returns false if the @p-@hash pair already exists in the hash table. + * Returns false if there is an existing entry in the table that is equivalent + * (i.e. ht->cmp matches and the hash is the same) to @p-@h. If @existing + * is !NULL, a pointer to this existing entry is copied to it. */ -bool qht_insert(struct qht *ht, void *p, uint32_t hash); +bool qht_insert(struct qht *ht, void *p, uint32_t hash, void **existing); /** * qht_lookup_custom - Look up a pointer using a custom comparison function. diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index f39123bd5a..1695f8c352 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1242,7 +1242,7 @@ static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc, /* add in the hash table */ h = tb_hash_func(phys_pc, tb->pc, tb->flags, tb->cflags & CF_HASH_MASK, tb->trace_vcpu_dstate); - qht_insert(&tb_ctx.htable, tb, h); + qht_insert(&tb_ctx.htable, tb, h, NULL); #ifdef CONFIG_USER_ONLY if (DEBUG_TB_CHECK_GATE) { diff --git a/tests/qht-bench.c b/tests/qht-bench.c index c94ac25158..f492b3a20a 100644 --- a/tests/qht-bench.c +++ b/tests/qht-bench.c @@ -163,7 +163,7 @@ static void do_rw(struct thread_info *info) bool written = false; if (qht_lookup(&ht, p, hash) == NULL) { - written = qht_insert(&ht, p, hash); + written = qht_insert(&ht, p, hash, NULL); } if (written) { stats->in++; @@ -322,7 +322,7 @@ static void htable_init(void) r = xorshift64star(r); p = &keys[r & (init_range - 1)]; hash = h(*p); - if (qht_insert(&ht, p, hash)) { + if (qht_insert(&ht, p, hash, NULL)) { break; } retries++; diff --git a/tests/test-qht.c b/tests/test-qht.c index b069881342..dda6a067be 100644 --- a/tests/test-qht.c +++ b/tests/test-qht.c @@ -27,11 +27,17 @@ static void insert(int a, int b) for (i = a; i < b; i++) { uint32_t hash; + void *existing; + bool inserted; arr[i] = i; hash = i; - qht_insert(&ht, &arr[i], hash); + inserted = qht_insert(&ht, &arr[i], hash, NULL); + g_assert_true(inserted); + inserted = qht_insert(&ht, &arr[i], hash, &existing); + g_assert_false(inserted); + g_assert_true(existing == &arr[i]); } } diff --git a/util/qht.c b/util/qht.c index 8610ce3644..9d030e7b76 100644 --- a/util/qht.c +++ b/util/qht.c @@ -511,9 +511,9 @@ void *qht_lookup(struct qht *ht, const void *userp, uint32_t hash) } /* call with head->lock held */ -static bool qht_insert__locked(struct qht *ht, struct qht_map *map, - struct qht_bucket *head, void *p, uint32_t hash, - bool *needs_resize) +static void *qht_insert__locked(struct qht *ht, struct qht_map *map, + struct qht_bucket *head, void *p, uint32_t hash, + bool *needs_resize) { struct qht_bucket *b = head; struct qht_bucket *prev = NULL; @@ -523,8 +523,9 @@ static bool qht_insert__locked(struct qht *ht, struct qht_map *map, do { for (i = 0; i < QHT_BUCKET_ENTRIES; i++) { if (b->pointers[i]) { - if (unlikely(b->pointers[i] == p)) { - return false; + if (unlikely(b->hashes[i] == hash && + ht->cmp(b->pointers[i], p))) { + return b->pointers[i]; } } else { goto found; @@ -553,7 +554,7 @@ static bool qht_insert__locked(struct qht *ht, struct qht_map *map, atomic_set(&b->hashes[i], hash); atomic_set(&b->pointers[i], p); seqlock_write_end(&head->sequence); - return true; + return NULL; } static __attribute__((noinline)) void qht_grow_maybe(struct qht *ht) @@ -577,25 +578,31 @@ static __attribute__((noinline)) void qht_grow_maybe(struct qht *ht) qemu_mutex_unlock(&ht->lock); } -bool qht_insert(struct qht *ht, void *p, uint32_t hash) +bool qht_insert(struct qht *ht, void *p, uint32_t hash, void **existing) { struct qht_bucket *b; struct qht_map *map; bool needs_resize = false; - bool ret; + void *prev; /* NULL pointers are not supported */ qht_debug_assert(p); b = qht_bucket_lock__no_stale(ht, hash, &map); - ret = qht_insert__locked(ht, map, b, p, hash, &needs_resize); + prev = qht_insert__locked(ht, map, b, p, hash, &needs_resize); qht_bucket_debug__locked(b); qemu_spin_unlock(&b->lock); if (unlikely(needs_resize) && ht->mode & QHT_MODE_AUTO_RESIZE) { qht_grow_maybe(ht); } - return ret; + if (likely(prev == NULL)) { + return true; + } + if (existing) { + *existing = prev; + } + return false; } static inline bool qht_entry_is_last(struct qht_bucket *b, int pos)