From patchwork Fri Nov 22 10:27:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179986 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp33360ilf; Fri, 22 Nov 2019 02:50:23 -0800 (PST) X-Google-Smtp-Source: APXvYqy9MYezY3t1/R5S05bWXHfqZBW8HItXRG2OpDEekhUPCnCA2JJuH/48QV8ZQl3BZ29CWw1i X-Received: by 2002:aa7:d697:: with SMTP id d23mr249245edr.31.1574419823264; Fri, 22 Nov 2019 02:50:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574419823; cv=none; d=google.com; s=arc-20160816; b=RQuqf4GuVX4ip4gFZp/vRf8a/Kau7R+A5TCxhFOalLGaTgVl20vCKUuZ4cxn9qETwC ly110v0Oys+eocoUaU/mDyHEBjzcgfocO+UgS8zcVD6PbYYaLVSxBXNqXy7LqlRLlCjJ YvaNNxKFQqQgb8obDVFAWOulqJK/zFwtNNgoApMcAO8RwJN0U5mYuQgyRsd+g+5rnQiL M90QLawqIRWF+sis/5V36gs7OPxJKbSYoEL0za8iUUMt69ZG/VI9/oI7l/8GzUhve2la SSTIa/G/7GWonmE9moQOYV6YoII7b6gZUrTMaOYJM+StFYtS+Kpxz+99OHWO9EqyJ8mD H9wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1hEkKjx+8zhTvWKQkddjQNLmDftYlrj/rqXdg8Qg0T8=; b=SfKPmS2ur16Zy5JRzDk/EmiiUxsWlOGcCJvmnpXwn151xdq90UvMI2IpXTadrsNPZv szPZeBXw9P12+vMM6dIg8Ei8Ab5laf7qUd8+sZAYITdwHx/NGogAASZrIUIC+TwYqucK +IP0Q2XMUamNDIFzIYcllcWIxvDKEVJm1OG+h2nXV+XAWPrZyXw+oOQAPh1kBH9gwq1b EFE+OnSjsjxvNiYBfAc57O9etH020cOCrw1pxikSJcKGQw9q1xVksJmSqx6GwkH1NOXF xrMK8Z9sfGp4Rx+Cctz+5+aXjX5YknCdj+wB3o917UeKl70pTIYzA5H6tIKLj4MiZcSn V79Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jDbTStZD; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b53si4805535edb.419.2019.11.22.02.50.22; Fri, 22 Nov 2019 02:50:23 -0800 (PST) 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=@kernel.org header.s=default header.b=jDbTStZD; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729800AbfKVKuW (ORCPT + 15 others); Fri, 22 Nov 2019 05:50:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:60306 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728642AbfKVKuV (ORCPT ); Fri, 22 Nov 2019 05:50:21 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 94E6320637; Fri, 22 Nov 2019 10:50:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419821; bh=aR/t5YCcCHV0IFWZ+c2GSkzd6RjwinwwAH6PYhNmBXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jDbTStZD+H/Lh6QF6Pb1aZaqm+oSlAN4GejANE4yfP9dc/ih8+SpHQNdLX4ZyVpGI YBLR5/dvW9JwnhaxdE/FXVnwAKiP7MfdacR6JxGUc5BA+CYoKeGcvEzb9Uer/1Yi3u gpwZ3CxuAR87M5CNuPJ0LxtytXpUr9Mfj7dw4Kmg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christoffer Dall , Marc Zyngier , Eric Auger , Suzuki K Poulose , Sasha Levin Subject: [PATCH 4.14 020/122] kvm: arm/arm64: Fix stage2_flush_memslot for 4 level page table Date: Fri, 22 Nov 2019 11:27:53 +0100 Message-Id: <20191122100737.057660065@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100722.177052205@linuxfoundation.org> References: <20191122100722.177052205@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Suzuki K Poulose [ Upstream commit d2db7773ba864df6b4e19643dfc54838550d8049 ] So far we have only supported 3 level page table with fixed IPA of 40bits, where PUD is folded. With 4 level page tables, we need to check if the PUD entry is valid or not. Fix stage2_flush_memslot() to do this check, before walking down the table. Acked-by: Christoffer Dall Acked-by: Marc Zyngier Reviewed-by: Eric Auger Signed-off-by: Suzuki K Poulose Signed-off-by: Marc Zyngier Signed-off-by: Sasha Levin --- virt/kvm/arm/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c index 1f4cac53b9234..9f69202d8e49b 100644 --- a/virt/kvm/arm/mmu.c +++ b/virt/kvm/arm/mmu.c @@ -375,7 +375,8 @@ static void stage2_flush_memslot(struct kvm *kvm, pgd = kvm->arch.pgd + stage2_pgd_index(addr); do { next = stage2_pgd_addr_end(addr, end); - stage2_flush_puds(kvm, pgd, addr, next); + if (!stage2_pgd_none(*pgd)) + stage2_flush_puds(kvm, pgd, addr, next); } while (pgd++, addr = next, addr != end); }