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=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 A431BC433E3 for ; Mon, 17 Aug 2020 18:17:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 76AB320738 for ; Mon, 17 Aug 2020 18:17:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="SLo68rlX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390732AbgHQSRa (ORCPT ); Mon, 17 Aug 2020 14:17:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390578AbgHQSRW (ORCPT ); Mon, 17 Aug 2020 14:17:22 -0400 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16330C061389 for ; Mon, 17 Aug 2020 11:17:22 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id u2so2626719plz.2 for ; Mon, 17 Aug 2020 11:17:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=U9+EZytlOJt/Kkaqc/PFAVQgMOHKp5PrDfsBMroqYxs=; b=SLo68rlXad6w4YPkRiGwTlNAxFivPAvqW63FOkTr3gQUZKwNnEVLRyNHt22UU05z2I jvzATdk757NuX0qWQT40G+32GBVhCHvITwA0CyLVOyKLsLFMPtv1ypXt1lhYeQvMpT2S 6q8mX7PsBiIBFTJjVoiEhIl6MgVnai2eu8EpTHBQlqkJqOTuiIeHZ8V3TRur2Cngnmy8 i1XozkeqgC5/iq5GEvh5Buqw+kpowAfSKPBFxh9zLha9NauINvE60z23zhihxzUpQIH9 pHHgRRKaB1W6YcSL0gOzRVqGj6TqbMhl2fqCMX+O5qm0dGzUi2UfVXwIqQWWWK5qYejm F9/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=U9+EZytlOJt/Kkaqc/PFAVQgMOHKp5PrDfsBMroqYxs=; b=jL1M+VXD4xXn3tbysnhHXg5ekm73UEG3jR+SN7E/K/b3txJDj4BxJkVv/xobRnaKFZ FxMykfEsi/7Rz6mFvRLul2uMmGvZ5PKflEma3jhH9vARpKvlw9kBVvnbdzLaOC29AKNm ZYst3/OGNxB4VOA/ZmG5D7F/Z0QCljVphBKoN76hJixuQpVcFZV/PiK09BHRayVoTItX B45+PlnbAXxwqXlam2UfJk3MAdBG+JAjMxYTtxPgulVaPgOY7psTvCWgkXhUxyr1dcnl s0A25fdqRQmnQMzBPmfmJ12WxOG/Wr6zaauR9wy9huVd99u56/Mas7qKblEV8R5zK9Xf F6Jw== X-Gm-Message-State: AOAM532TrlgvN6adbpl4dQJpfeZl+MBPpS7bOvEUzKQdG7sLo7KjKoqe 2y2/JzH1cm5A1quhs5lEeAK+D5/kW89yD2VM6BeViLLxYWSyFzBr0vLGbIZrqL/Bp+G+aZvhnk4 9D1V1tOzXkspsKeFZoVsvR/iSK6QxwUHMXB3uDCDfoay8rOECvZz4iQpw9/C1LA0= X-Google-Smtp-Source: ABdhPJz6g6yj89JoYSobFHvG9W50WiO4egz9AtKwyMlQY0515KFGMWFDbdg4bieZwQtc46yPoiiEuZFNE8RDrw== X-Received: by 2002:a17:90a:bd82:: with SMTP id z2mr2856pjr.1.1597688240087; Mon, 17 Aug 2020 11:17:20 -0700 (PDT) Date: Mon, 17 Aug 2020 11:16:55 -0700 In-Reply-To: <20200817181655.3716509-1-jmattson@google.com> Message-Id: <20200817181655.3716509-2-jmattson@google.com> Mime-Version: 1.0 References: <20200817181655.3716509-1-jmattson@google.com> X-Mailer: git-send-email 2.28.0.220.ged08abb693-goog Subject: [PATCH 2/2] kvm: x86: Toggling CR4.SMAP does not load PDPTEs in PAE mode From: Jim Mattson To: kvm@vger.kernel.org, Paolo Bonzini Cc: Jim Mattson , Xiao Guangrong , Peter Shier , Oliver Upton Content-Type: text/plain; charset="UTF-8" Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org See the SDM, volume 3, section 4.4.1: If PAE paging would be in use following an execution of MOV to CR0 or MOV to CR4 (see Section 4.1.1) and the instruction is modifying any of CR0.CD, CR0.NW, CR0.PG, CR4.PAE, CR4.PGE, CR4.PSE, or CR4.SMEP; then the PDPTEs are loaded from the address in CR3. Fixes: 0be0226f07d14 ("KVM: MMU: fix SMAP virtualization") Cc: Xiao Guangrong Signed-off-by: Jim Mattson Reviewed-by: Peter Shier Reviewed-by: Oliver Upton --- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 9e427f14e77f..d8f827063c9c 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -975,7 +975,7 @@ int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) { unsigned long old_cr4 = kvm_read_cr4(vcpu); unsigned long pdptr_bits = X86_CR4_PGE | X86_CR4_PSE | X86_CR4_PAE | - X86_CR4_SMEP | X86_CR4_SMAP; + X86_CR4_SMEP; if (kvm_valid_cr4(vcpu, cr4)) return 1; -- 2.28.0.220.ged08abb693-goog