From patchwork Tue Jun 16 12:53:14 2020 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: 188027 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp3624025ilo; Tue, 16 Jun 2020 05:57:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQDmuhcqEczWA/SzOqaW6jlDsF/ydPXsNSen4QttdP9MAp8yXZt40518L6hYSERUmZFdte X-Received: by 2002:a25:d755:: with SMTP id o82mr3629575ybg.166.1592312234700; Tue, 16 Jun 2020 05:57:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592312234; cv=none; d=google.com; s=arc-20160816; b=ih/2kGc4iwqL+dOqGzaBQ0PGa+SFbb3vv0qtMuR4H3TFBQCK8W8hZpgwD2JVRqPvgs z6JtOvGZO/cuWTwhTA8qKQqkXuTzAkZBUzPd5TY+gOS+yJHB9RneG/LMrJkOL9i5U8tH 0wA5lBQhq47Qid6CR6NkNcxCeDxqinh4PESrBs+31wCICCCmx75ReTOwroHVTBZiKvU/ umEIikBMtRqpFG1KRLiS7qWMdQorTnOBENSN3o/r/62RDyg+Zeioqjmthm45W2U7w26V WGlKA0lZN3zJTYI0WpmyOvWEJrm5vP5TDys1xaLOdUHvlaqQ7puBa2afzVbG+zTqls4F Mp7w== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=MxmxIyQX9ayQ5hPd4gIq4mQ/EgZcZo3pK+5EExUMVzw=; b=UykqHN2roSNCZvCbYbdp7PG/v8cyPybmeo3yjHf3T4B44Rqj8hFah7CQiaB/QL3YK4 GHS9uocC8AD3NkVIXXqQah2yLXpdo6c4D7hu/ikgB5sX1wyp53e94wZlimvJH70ZA314 VboivJFQm7mI0CevfbtuiHFw/CHCp0FiHBFmmULFDRWQwK+yvga9FCR3Qw3HEnkoSQaO ccAVGuRkAFVuK7pI9AXfUwewG0tqQvkSHdpcflf4pIF5nK944eDlH8UAUCz8K+wdrkpC 4/ynhN8vLlBhMlV8shcsM8VyNCuJSZAEz/Mi4O413vsqzFHD4ccjxQ+srSc6q9HyOuuc xnmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bqu6kKxH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id s2si15087900ybe.216.2020.06.16.05.57.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jun 2020 05:57:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bqu6kKxH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:50448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlB9O-0002Xn-5J for patch@linaro.org; Tue, 16 Jun 2020 08:57:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlB67-0004Al-3o for qemu-devel@nongnu.org; Tue, 16 Jun 2020 08:53:51 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:35613) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlB64-000097-Qp for qemu-devel@nongnu.org; Tue, 16 Jun 2020 08:53:50 -0400 Received: by mail-wm1-x334.google.com with SMTP id q25so2965880wmj.0 for ; Tue, 16 Jun 2020 05:53:48 -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=MxmxIyQX9ayQ5hPd4gIq4mQ/EgZcZo3pK+5EExUMVzw=; b=bqu6kKxHrJ796bfx8IEmNKueau3ph1STuTkpj/lW9/cKdjP/XE4wrt/L3EGnkCHU2E 373bmjmFM6uByLN7UYNlGCUvF+xE0FAyTwDJPH1/yUqTT+EucetiKKRZwbf87sYqfeco 0D6KeHffSgtmAAZvvvfF1HqggApNwcbAvd+n6aBTrj0c4YcYD5eu93udoTmFkndqBmmv 1hJq0vpgVaS5tXSXHSwIneHa3lBEbs2aiDRQPA6XwY8H3YO6VL5qCKL1+zW4VGmU3aLn hywP/dNWA+gnw2qJBv6FE/vw0AO3xiha0ggZQTrpGjW41Vai2OeoWCVSBPHYsUo0aA11 JrPQ== 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=MxmxIyQX9ayQ5hPd4gIq4mQ/EgZcZo3pK+5EExUMVzw=; b=ibpzV7Tlz+ZoXfohxKahki+G2L8wOPjYp7Y1pibFvqC3WJjLxSanPaiV1HEXlOTYIF L8btR7Sqsvtckm501IK7CkfoFtoFGB0GqKN4S8BIxV37RACg//I61sp6VQuCB9rpv4Vy b/HN1zfTmP9OrvKaNdrXtre2B2qN0ntVqsGSXB7mkcrANfNpZb1xl+TXwt4AKhl0mbzu 3nlyPeSd0W2uex03VeTwioS6Pml115oJX2v3hDsnVpvTp9A44xeGJeDGVDP/EkzejuTx 7m4203alfr102BnmxNwlfyU7ugLZ/8/viZkHAwSAd9YP05XTwZDRIjFGVKSMfJhgRbRY fpSw== X-Gm-Message-State: AOAM530hDZ8w1C9YIULlq1GTit+Yr2PwRWI1Jkhe4bEBlJQO/dOOWQOK uRGrI2vaMU7I8Zt/pfhMqLMitg== X-Received: by 2002:a1c:154:: with SMTP id 81mr3039193wmb.23.1592312023173; Tue, 16 Jun 2020 05:53:43 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r2sm30080373wrg.68.2020.06.16.05.53.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 05:53:35 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 551241FF9A; Tue, 16 Jun 2020 13:53:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 11/21] thread: add tsan annotations to QemuSpin Date: Tue, 16 Jun 2020 13:53:14 +0100 Message-Id: <20200616125324.19045-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200616125324.19045-1-alex.bennee@linaro.org> References: <20200616125324.19045-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Emilio G. Cota" , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Robert Foley Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Signed-off-by: Emilio G. Cota Signed-off-by: Robert Foley Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée Message-Id: <20200609200738.445-9-robert.foley@linaro.org> Message-Id: <20200612190237.30436-12-alex.bennee@linaro.org> -- 2.20.1 diff --git a/include/qemu/thread.h b/include/qemu/thread.h index 9479facdcc5..4baf4d17157 100644 --- a/include/qemu/thread.h +++ b/include/qemu/thread.h @@ -206,6 +206,10 @@ void qemu_thread_atexit_add(struct Notifier *notifier); */ void qemu_thread_atexit_remove(struct Notifier *notifier); +#ifdef CONFIG_TSAN +#include +#endif + struct QemuSpin { int value; }; @@ -213,23 +217,46 @@ struct QemuSpin { static inline void qemu_spin_init(QemuSpin *spin) { __sync_lock_release(&spin->value); +#ifdef CONFIG_TSAN + __tsan_mutex_create(spin, __tsan_mutex_not_static); +#endif } -static inline void qemu_spin_destroy(QemuSpin *spin) -{ } +/* const parameter because the only purpose here is the TSAN annotation */ +static inline void qemu_spin_destroy(const QemuSpin *spin) +{ +#ifdef CONFIG_TSAN + __tsan_mutex_destroy((void *)spin, __tsan_mutex_not_static); +#endif +} static inline void qemu_spin_lock(QemuSpin *spin) { +#ifdef CONFIG_TSAN + __tsan_mutex_pre_lock(spin, 0); +#endif while (unlikely(__sync_lock_test_and_set(&spin->value, true))) { while (atomic_read(&spin->value)) { cpu_relax(); } } +#ifdef CONFIG_TSAN + __tsan_mutex_post_lock(spin, 0, 0); +#endif } static inline bool qemu_spin_trylock(QemuSpin *spin) { - return __sync_lock_test_and_set(&spin->value, true); +#ifdef CONFIG_TSAN + __tsan_mutex_pre_lock(spin, __tsan_mutex_try_lock); +#endif + bool busy = __sync_lock_test_and_set(&spin->value, true); +#ifdef CONFIG_TSAN + unsigned flags = __tsan_mutex_try_lock; + flags |= busy ? __tsan_mutex_try_lock_failed : 0; + __tsan_mutex_post_lock(spin, flags, 0); +#endif + return busy; } static inline bool qemu_spin_locked(QemuSpin *spin) @@ -239,7 +266,13 @@ static inline bool qemu_spin_locked(QemuSpin *spin) static inline void qemu_spin_unlock(QemuSpin *spin) { +#ifdef CONFIG_TSAN + __tsan_mutex_pre_unlock(spin, 0); +#endif __sync_lock_release(&spin->value); +#ifdef CONFIG_TSAN + __tsan_mutex_post_unlock(spin, 0); +#endif } struct QemuLockCnt {