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: 100077 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp634564qge; Thu, 18 May 2017 02:48:17 -0700 (PDT) X-Received: by 10.84.178.101 with SMTP id y92mr3766112plb.116.1495100896931; Thu, 18 May 2017 02:48:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495100896; cv=none; d=google.com; s=arc-20160816; b=MI/pbO2+hWLq6oAMUiW429ajkCBjF+721Mz+kaRZtavM1VuGJBekaXbO4D9QXAQHBm gJcZr0a67Zxf5o1mZmiaMPTKXoxeBXVMfySYMnxHxJ/1KMQtkwKfPd+RqwL4sPmFlavk zZQDEUi6EZxMdrZoIhoZkN60hTZNZYSF8SbeKi/eyJB+B5vN7ZMCrAKFnxpZDasHad6t mMJuJ4EXYtv3IkPJcSAjLx87TcEryOfF2qXvipHSEgvQRJ2gSiCcv4do+BHTZvKwgrp5 0csaDP79opY1LjNCyWN071fDjzNwfvwiMvuJiuAc7wIdhwWVjpiPE7ORyDOrgcpge8AJ l9wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=McaI5ly91mGNKQ5VBUS8OAPElso0JMX7ICh0KQ7T3Q8=; b=fgPc5xJblLbnUu7HyBhnVfEXW88kZ4MLy8/ItK0TIgQtF+gDfZesfYM/6l9pQQ3+o5 uJ5k/uWemIGrGMw+2XBz41MQn3An0fiKGFxRyXyQyuLThVGQ81Q9wG2bqcip7tWT6u5p Hc9nRavqrNl+IpBiBemp579K0L7l2YMlBjQyOoJbZv2eF9krH/9EB1EpkBmz4Pfks8kj nVyQ8xSV4FiXh+4+9gGkUiUHOykx/Eg7MH1R4/6X4DL9ifY3F2NusWXmB/dHByazlQdf IS6gbr/nTlXna/2+h0dJMzzuQfSCw4GQJLgKm7rvCvI55U3tgSLJlaG0VWrPT3O8GhY7 o/BQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i35si4751361plg.102.2017.05.18.02.48.16; Thu, 18 May 2017 02:48:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755414AbdERJsQ (ORCPT + 6 others); Thu, 18 May 2017 05:48:16 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:35006 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755410AbdERJr6 (ORCPT ); Thu, 18 May 2017 05:47:58 -0400 Received: by mail-wm0-f46.google.com with SMTP id b84so195121467wmh.0 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=i6ytlGKttYMZr5OnOObPiVqV9AnF+Ck84nwRm3wHrx2MA7OQ3WeN878WGN5c4ZC/vI LhdqZwWPvM+R7hTCx0eEPJFEuCoQFvN0VZucpZ+Ym53YvBudGKi8n/x2Q35sTlqzNp/m zXLlSf5JG+GUAdiR35VmdCxZ/h3c0DBG+Vr6/KEMKTmh6S6mGmy83B7QPwmEl9XBHYZz IzA86t5pVliYtEErvTLF3i43uN3EbW9idcTdkK1wZCfnNINDjng/U0zusMaraM/+sBOR CKTU42b2BaXsVzllEvUv7ybcNhDCKSGS4zMQAmh8WQxPIQwIeZdrWyPF3G+FjCE9S4i/ Uw9w== X-Gm-Message-State: AODbwcDM8y1D1cZKQbPuOpO/YvxlQNylIEaVudr6pAiZfLHRxXJANvsH 2BboJW+20PRjR6i/ 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?b?UmFkaW0gS3LEjW3DocWZ?= Cc: Marc Zyngier , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Suzuki K Poulose , stable@vger.kernel.org, Christoffer Dall 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> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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(-) -- 2.9.0 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);