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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 179B1C352A3 for ; Mon, 10 Feb 2020 12:58:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E544B20714 for ; Mon, 10 Feb 2020 12:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581339533; bh=Zf0d7rLzon/jbCHyJZ1Vq1tdCpb0fWLvUNMUfudIzTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2jfXjkB3PCLVs3NEu8kWPXnHi6vDFdhD2AE/tDYyufmRvcnlFE2ke/jvikeJ8Fov+ AeKAo/T9e9rLJusaDahRKvCHm4BtzISrZ6o19xVXlyTY+lXUwlktVqatN9wrI3MmIq 7Ugm7LNiKY1aKOEOihFDEIVJWL6UXk4C7reHb9Lo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728583AbgBJM6s (ORCPT ); Mon, 10 Feb 2020 07:58:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:43130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729942AbgBJMlQ (ORCPT ); Mon, 10 Feb 2020 07:41:16 -0500 Received: from localhost (unknown [209.37.97.194]) (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 71AE920842; Mon, 10 Feb 2020 12:41:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338475; bh=Zf0d7rLzon/jbCHyJZ1Vq1tdCpb0fWLvUNMUfudIzTw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hVNg7q87wyKdzfHAhL3ei3tDdbp+yTyHMv6LkyB9uzsBGOJ7Btr+IAAjzIGH7Q3j7 xIavEvsX2yOPKj/GAQnsrEC+1ZIvU0uCFJW9qLisZFNJH9QAUhqBkoXbHTgXU55hlJ gGS9QlQ9hvSzHMA9pDfdGlaQxS8Ly/YISA0wcW84= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sean Christopherson , Paolo Bonzini Subject: [PATCH 5.5 243/367] KVM: x86/mmu: Apply max PA check for MMIO sptes to 32-bit KVM Date: Mon, 10 Feb 2020 04:32:36 -0800 Message-Id: <20200210122446.611458311@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122423.695146547@linuxfoundation.org> References: <20200210122423.695146547@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sean Christopherson commit e30a7d623dccdb3f880fbcad980b0cb589a1da45 upstream. Remove the bogus 64-bit only condition from the check that disables MMIO spte optimization when the system supports the max PA, i.e. doesn't have any reserved PA bits. 32-bit KVM always uses PAE paging for the shadow MMU, and per Intel's SDM: PAE paging translates 32-bit linear addresses to 52-bit physical addresses. The kernel's restrictions on max physical addresses are limits on how much memory the kernel can reasonably use, not what physical addresses are supported by hardware. Fixes: ce88decffd17 ("KVM: MMU: mmio page fault support") Cc: stable@vger.kernel.org Signed-off-by: Sean Christopherson Signed-off-by: Paolo Bonzini Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/mmu/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -6249,7 +6249,7 @@ static void kvm_set_mmio_spte_mask(void) * If reserved bit is not supported, clear the present bit to disable * mmio page fault. */ - if (IS_ENABLED(CONFIG_X86_64) && shadow_phys_bits == 52) + if (shadow_phys_bits == 52) mask &= ~1ull; kvm_mmu_set_mmio_spte_mask(mask, mask, ACC_WRITE_MASK | ACC_USER_MASK);