From patchwork Mon Mar 20 15:34:39 2017 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: 95561 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp996665qgd; Mon, 20 Mar 2017 08:35:48 -0700 (PDT) X-Received: by 10.200.52.9 with SMTP id u9mr26998249qtb.29.1490024148945; Mon, 20 Mar 2017 08:35:48 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 134si367925qkl.296.2017.03.20.08.35.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 20 Mar 2017 08:35:48 -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 sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpzLY-0003uU-DP for patch@linaro.org; Mon, 20 Mar 2017 11:35:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35973) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpzKA-0003tt-2e for qemu-devel@nongnu.org; Mon, 20 Mar 2017 11:34:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cpzK7-0005mR-Fj for qemu-devel@nongnu.org; Mon, 20 Mar 2017 11:34:22 -0400 Received: from mail-wr0-x236.google.com ([2a00:1450:400c:c0c::236]:33551) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cpzK7-0005l9-9w for qemu-devel@nongnu.org; Mon, 20 Mar 2017 11:34:19 -0400 Received: by mail-wr0-x236.google.com with SMTP id u48so94963518wrc.0 for ; Mon, 20 Mar 2017 08:34:19 -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=JCOuB0cYaI3X4qGcByRZd9yjVSTKJVU+gUWFORpdBV4=; b=aJT716u8D4pnz4X0i0dxiOKj6OvctEjBDyNwKte0E1m7xRkMlncsRjobI4jX1Qmgl3 fAzCyiLyciXTrCEXGAiUVP3pw+C477xM4ds4PZfMh71CLqGPGxqDJ+0DEsbLho50cOjh 0uj0df36EV5WaRg4z1cESTczLQfW0lRsnnxB0= 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=JCOuB0cYaI3X4qGcByRZd9yjVSTKJVU+gUWFORpdBV4=; b=lgJeoLG8kOQOZRRTRt6s86LAsSeEapKyjVBdvwmpBNY+Vz18BtjmQdWTu8sIXAugzb UTOmbIyTCmSlQD23dKTtUP5m5lxVjMN7kmsh4BFDC+pYz0cfqNDfBfRwcrnE2242GoQU 5QfKn9G3q1OE3aghA5oezXOnYJAwpbZyoS6vu0XRzOPNkQZUirry0UhlmOjNFpJLk5w2 wItDTSlMERG14DgV5in9F++O/1YsGgn+F9udnMgSjA+LT4AIKUZx93BNC2il7be0ODHb zePe+2hPgagmZUmLNbKNPMCR4d1I5TKLb19Ark8AkxwbxFvnRCzGoFF/PWLiXtaeYGG0 pjlQ== X-Gm-Message-State: AFeK/H0Qfh5uiytJ4kl1jeiZ7FO7wFkt8WgTqj0JFpVkW/rdWdh13QVFuYJkFumd4X6Dqks2 X-Received: by 10.223.136.183 with SMTP id f52mr24546873wrf.68.1490024058208; Mon, 20 Mar 2017 08:34:18 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q74sm11988296wrb.68.2017.03.20.08.34.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Mar 2017 08:34:16 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 8AF1D3E0145; Mon, 20 Mar 2017 15:34:41 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, rth@twiddle.net, pbonzini@redhat.com Date: Mon, 20 Mar 2017 15:34:39 +0000 Message-Id: <20170320153441.2181-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170320153441.2181-1-alex.bennee@linaro.org> References: <20170320153441.2181-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::236 Subject: [Qemu-devel] [PATCH v1 1/3] cputlb: ensure tbl_set_dirty1 updates addr_write atomically 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, nikunj@linux.vnet.ibm.com, Peter Crosthwaite , a.rigo@virtualopensystems.com, qemu-devel@nongnu.org, cota@braap.org, bobby.prani@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This was an oversight when the rest of cputlb was being updated. As before it falls back to the non-atomic version when the host can't support wider-than-bus atomics. Signed-off-by: Alex Bennée --- cputlb.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.11.0 Reviewed-by: Paolo Bonzini diff --git a/cputlb.c b/cputlb.c index f5d056cc08..0d52e45dfd 100644 --- a/cputlb.c +++ b/cputlb.c @@ -540,9 +540,17 @@ void tlb_reset_dirty(CPUState *cpu, ram_addr_t start1, ram_addr_t length) static inline void tlb_set_dirty1(CPUTLBEntry *tlb_entry, target_ulong vaddr) { +#if TCG_OVERSIZED_GUEST if (tlb_entry->addr_write == (vaddr | TLB_NOTDIRTY)) { tlb_entry->addr_write = vaddr; } +#else + uintptr_t orig_addr = atomic_mb_read(&tlb_entry->addr_write); + + if (orig_addr == (vaddr | TLB_NOTDIRTY)) { + atomic_cmpxchg(&tlb_entry->addr_write, orig_addr, vaddr); + } +#endif } /* update the TLB corresponding to virtual page vaddr