From patchwork Thu May 18 09:47:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9733099 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AF6D9601A1 for ; Thu, 18 May 2017 09:50:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 980E1285F7 for ; Thu, 18 May 2017 09:50:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8AAAF2860A; Thu, 18 May 2017 09:50:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E76A4285F7 for ; Thu, 18 May 2017 09:50:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=B72wek+1rQyx5X4fOl6RO3bvxmP88oGSngrElpEztAg=; b=mjXfld8A/r+c3gDW3WbH8P1ycU 6nRx0lMTsXR1/z+6oh1Jy6vxjjbqbCx1yJuvQHFQn16GfbFJFQ+G/68wlUefQ7vjEbOyZFt/HjBQY TSD1bntfIA46MCXre+E0enwc2y0zDc7GYThoKoFTV1vdDQ3H/ezaFo8ub4w1qGE6dx9CbkvKrJYUc k5AhFMpWiJ4jGPkSb2ybvCT0m3ntAQd2aPMpEG6IpVIesFvvw4xis6uhxe8QecVPV1Eva7WGKjqr8 UNjjymnDZB3KJ676zG5s5WdB4tdOgzE9H/eejCWfbhU/+PGysgn+gViwOX08rdCaRfckUvvqpaS0M S+Adyx+g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dBI4y-0000lE-Kl; Thu, 18 May 2017 09:50:44 +0000 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dBI2P-0005ME-8h for linux-arm-kernel@lists.infradead.org; Thu, 18 May 2017 09:48:08 +0000 Received: by mail-wm0-x234.google.com with SMTP id 70so40081033wmq.1 for ; Thu, 18 May 2017 02:47: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; bh=McaI5ly91mGNKQ5VBUS8OAPElso0JMX7ICh0KQ7T3Q8=; b=NW3jWge0dEdJ7n2ZJ2KCJQM0ZQuZ4O2t5JSGhf47Ybt+NrEqR1KcGOSXSzn1VvxwyX dwFPKXMcOeUo+hQvWo2C0/pnW2a9rLkJa8Dc6ena+pcJZclTkMXdKBVj9brbPv0EHrLy xp0wg5RavqVYDvbutvR7xU+KYN3cTAdagVhxs= 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; bh=McaI5ly91mGNKQ5VBUS8OAPElso0JMX7ICh0KQ7T3Q8=; b=V5NGGZBoIKc4llRLuUSZJ7gRmlvBazVwAaYcb0qj4Peph9Vnf54qR7UJbo5ejRgdS6 W7/DPXLegx7MSWWt8Be0DIM1yIxqZ7gDP0/28PS2gmwdRinenBxPQgUzxNq/MwADjeYJ HK0dTKJIS8eB0HvpzYJrTLZL66k0YMPs44NV2fgoUlF1f9UcNwmpsQKtCDQld5ezZxO6 94x6vAwIEfvberoQyU1IpguweLphsiejGSdQRI7GQCZyWTLjcrpD0MdGFOehIow3ea17 ACsGZTP/jTW3dYx1tTUV4UR3iChKLZbtDuhufygEgjsXC+RNmovV8eP+pvl/4h/HMTds l+5A== X-Gm-Message-State: AODbwcCh56KRbMhUlssfBvFy+yltXYi0hmpSlerBESwwCAWrs09KbpYf wkvwt5Frhc2pckT4 X-Received: by 10.80.212.211 with SMTP id e19mr2558026edj.164.1495100867248; Thu, 18 May 2017 02:47:47 -0700 (PDT) Received: from localhost.localdomain (xd93ddc2d.cust.hiper.dk. [217.61.220.45]) by smtp.gmail.com with ESMTPSA id w15sm2377437edw.27.2017.05.18.02.47.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 May 2017 02:47:46 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PULL 10/13] kvm: arm/arm64: Force reading uncached stage2 PGD Date: Thu, 18 May 2017 11:47:19 +0200 Message-Id: <20170518094722.9926-11-cdall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170518094722.9926-1-cdall@linaro.org> References: <20170518094722.9926-1-cdall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170518_024805_909183_FE44BFFA X-CRM114-Status: GOOD ( 10.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christoffer Dall , kvm@vger.kernel.org, Suzuki K Poulose , Marc Zyngier , stable@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Suzuki K Poulose Make sure we don't use a cached value of the KVM stage2 PGD while resetting the PGD. Cc: Marc Zyngier Cc: stable@vger.kernel.org Signed-off-by: Suzuki K Poulose Reviewed-by: Christoffer Dall Signed-off-by: Christoffer Dall --- virt/kvm/arm/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c index 909a1a7..704e35f 100644 --- a/virt/kvm/arm/mmu.c +++ b/virt/kvm/arm/mmu.c @@ -837,7 +837,7 @@ void kvm_free_stage2_pgd(struct kvm *kvm) spin_lock(&kvm->mmu_lock); if (kvm->arch.pgd) { unmap_stage2_range(kvm, 0, KVM_PHYS_SIZE); - pgd = kvm->arch.pgd; + pgd = READ_ONCE(kvm->arch.pgd); kvm->arch.pgd = NULL; } spin_unlock(&kvm->mmu_lock);