From patchwork Thu Sep 22 10:13:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 76741 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp2525049qgf; Thu, 22 Sep 2016 03:53:08 -0700 (PDT) X-Received: by 10.55.185.197 with SMTP id j188mr1236022qkf.288.1474541588919; Thu, 22 Sep 2016 03:53:08 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f4si687003qkh.213.2016.09.22.03.53.08 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 22 Sep 2016 03:53:08 -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; 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 dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37952 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bn1cq-0008Ba-Fn for patch@linaro.org; Thu, 22 Sep 2016 06:53:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bn11W-00085m-OZ for qemu-devel@nongnu.org; Thu, 22 Sep 2016 06:14:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bn11S-0006pW-12 for qemu-devel@nongnu.org; Thu, 22 Sep 2016 06:14:33 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:38832) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bn11R-0006pO-Qu for qemu-devel@nongnu.org; Thu, 22 Sep 2016 06:14:29 -0400 Received: by mail-wm0-f42.google.com with SMTP id l132so139222450wmf.1 for ; Thu, 22 Sep 2016 03:14:29 -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=y+j0fGJWMjYzmOp/E5CyC6/pNa93uKvcX7Rr3TfQ4tY=; b=bGK8ZRr+Obhi5DoCthwtkEgx+tEvN2RoW1hy49B4/n6cVskDOb+LxjNJXUytWYY7WB 0Aq7kYtj6sCyOYnO/vQ9Y6ScTnFpJLSfR3itcoRDm260AtA0WtKcF+ssUicD4OgKYkoV 0h22D1W3wqKRHyMkufDGnxkexLAyAJ3m9g4bI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y+j0fGJWMjYzmOp/E5CyC6/pNa93uKvcX7Rr3TfQ4tY=; b=lMhdPDixBkdMBU9eJnBM/4+wMXMSFE214YvK8nwAn03butozSeaAVMmPJHDnfmwGyh BbCWIYZo4HHeUDW5RKxwSQpWW4wn/YM6YqOjhCP/G3e1IS+kX/Ogk1evc0kShGErvlwl pIHtgNfQuchjr7CzQ/AQejahH6yw5N0YUsjcIv9ZyJvL8GvOa/klpUtAy+woHVG1oAyL AYmGPmoB8XTwS1BeB3MYEtxlJ+iEY/UtxZiXVwcIosc21AFf+8OM0zCGG1FEuNWXeqW/ BjF+57CilPmuWnkkja9aNx95qEm3zc+P6v6Ombim+bHAb0jv30Kzaiuwg8nUh4FItlQv l5MQ== X-Gm-Message-State: AE9vXwOaqc+btrVkNo9TzUnCpdEGPrBnDTvAcbnlW3P2+iiSiEd+cpF6xEiB5cucyIgoSqK3 X-Received: by 10.28.131.199 with SMTP id f190mr8124595wmd.30.1474539209190; Thu, 22 Sep 2016 03:13:29 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a84sm37073515wme.6.2016.09.22.03.13.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Sep 2016 03:13:25 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id F1A013E02B0; Thu, 22 Sep 2016 11:13:22 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org, pbonzini@redhat.com, cota@braap.org, stefanha@redhat.com, kwolf@redhat.com Date: Thu, 22 Sep 2016 11:13:14 +0100 Message-Id: <20160922101316.13064-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160922101316.13064-1-alex.bennee@linaro.org> References: <20160922101316.13064-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.42 Subject: [Qemu-devel] [PATCH v2 7/9] util/qht: atomically set b->hashes 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: mttcg@listserver.greensocs.com, peter.maydell@linaro.org, claudio.fontana@huawei.com, nikunj@linux.vnet.ibm.com, jan.kiszka@siemens.com, mark.burton@greensocs.com, a.rigo@virtualopensystems.com, serge.fdrv@gmail.com, bobby.prani@gmail.com, rth@twiddle.net, =?UTF-8?q?Alex=20Benn=C3=A9e?= , fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" ThreadSanitizer detects a possible race between reading/writing the hashes. As ordering semantics are already documented for qht we just need to ensure a race can't tear the hash value so we can use the relaxed atomic_set/read functions. Signed-off-by: Alex Bennée --- util/qht.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.9.3 diff --git a/util/qht.c b/util/qht.c index 16a8d79..571639d 100644 --- a/util/qht.c +++ b/util/qht.c @@ -379,7 +379,7 @@ static void qht_bucket_reset__locked(struct qht_bucket *head) if (b->pointers[i] == NULL) { goto done; } - b->hashes[i] = 0; + atomic_set(&b->hashes[i], 0); atomic_set(&b->pointers[i], NULL); } b = b->next; @@ -444,7 +444,7 @@ void *qht_do_lookup(struct qht_bucket *head, qht_lookup_func_t func, do { for (i = 0; i < QHT_BUCKET_ENTRIES; i++) { - if (b->hashes[i] == hash) { + if (atomic_read(&b->hashes[i]) == hash) { /* The pointer is dereferenced before seqlock_read_retry, * so (unlike qht_insert__locked) we need to use * atomic_rcu_read here. @@ -538,8 +538,8 @@ static bool qht_insert__locked(struct qht *ht, struct qht_map *map, if (new) { atomic_rcu_set(&prev->next, b); } - b->hashes[i] = hash; /* smp_wmb() implicit in seqlock_write_begin. */ + atomic_set(&b->hashes[i], hash); atomic_set(&b->pointers[i], p); seqlock_write_end(&head->sequence); return true; @@ -607,10 +607,10 @@ qht_entry_move(struct qht_bucket *to, int i, struct qht_bucket *from, int j) qht_debug_assert(to->pointers[i]); qht_debug_assert(from->pointers[j]); - to->hashes[i] = from->hashes[j]; + atomic_set(&to->hashes[i], from->hashes[j]); atomic_set(&to->pointers[i], from->pointers[j]); - from->hashes[j] = 0; + atomic_set(&from->hashes[j], 0); atomic_set(&from->pointers[j], NULL); }