From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C09CAC43331 for ; Wed, 13 Nov 2019 02:09:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8FB54206B6 for ; Wed, 13 Nov 2019 02:09:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610964; bh=Yxln0144vos7Du5zQnUGkOlxhmdUTQgrIMTzV0Joh3c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=U/hy6BFCfKJca3v37x1VKKn+H2iD27c4+4gl6SuZSU2EHhBBPe7+9v4RpNiGVMM5K rSzQ334RGM7F94l+7S3Vm9j/AxeEt0gMrnbGAahyCM4Z8GiHh3tmTCSWLlVYpDDrx6 9ldAURsbVcsPpJM+SrqqIuJwieReZZlDQzESMSDE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730801AbfKMCJX (ORCPT ); Tue, 12 Nov 2019 21:09:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:54416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727468AbfKMB7m (ORCPT ); Tue, 12 Nov 2019 20:59:42 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 345BF22473; Wed, 13 Nov 2019 01:59:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573610382; bh=Yxln0144vos7Du5zQnUGkOlxhmdUTQgrIMTzV0Joh3c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h5MQ08L2GTlySUYyggaohedsa8Ay6N8yLdH1mlGm27WqO4xDPxIsXtTdK8bd5+9Nm V/Bb3zT5OYx6peRcmcheXxnzcRzW7qWgulv5dG7ncC5MsP26K3cT9kOlXUQRfMT/0t gOD4XjUyfdnc5IzXZkWZl6Z4LR+5S8KsaWqqw25Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Suzuki K Poulose , Christoffer Dall , Marc Zyngier , Eric Auger , Sasha Levin , kvmarm@lists.cs.columbia.edu Subject: [PATCH AUTOSEL 4.9 06/68] kvm: arm/arm64: Fix stage2_flush_memslot for 4 level page table Date: Tue, 12 Nov 2019 20:58:30 -0500 Message-Id: <20191113015932.12655-6-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191113015932.12655-1-sashal@kernel.org> References: <20191113015932.12655-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 --- arch/arm/kvm/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index b3d268a79f057..bb0d5e21d60bd 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -366,7 +366,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); } -- 2.20.1