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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACA95C433FE for ; Wed, 6 Apr 2022 22:51:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237383AbiDFWxM (ORCPT ); Wed, 6 Apr 2022 18:53:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237367AbiDFWxI (ORCPT ); Wed, 6 Apr 2022 18:53:08 -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 7CCD22013FB for ; Wed, 6 Apr 2022 15:51:09 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id n11-20020a170902d2cb00b00156c1fd01c2so1799938plc.12 for ; Wed, 06 Apr 2022 15:51:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:message-id:mime-version:subject:from:to:cc; bh=Yd7kBzJhSKPEijEgeJE9tib2Ep9gaLFvQRnKmrO5VA0=; b=LhOzIW57AkiBW9IoFzE3fgd5Yl81Y8zZfQuvILL85/Gr+Vu+KTrYjls6vIaBMC9QJm N0bWU2ZL3o8Q4FjjaiiAMCmJwhdOMq+1lkCbcOTivrGxJbt1iTJxqyhCjxK1cQxlpOuv sS3YV0phZYezDxCCRpHgL3ZymQXNgk5xGvfBDsM5VuCC14JOMqO518SgXKHYShojsObo lpAtIbHwfSBQibWtJYtJkjfQwXwaTneaRe9NmvKWwmbb/RIToCES3F2NpFni/Arj4w/E /Dp+iR9SIjTuSMdDEDA+zXxsirE/C9uEh+6d7+WYpsLFxQb5a7Y4f6hsEc8Zu5/Y1r5g yILQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:message-id:mime-version:subject :from:to:cc; bh=Yd7kBzJhSKPEijEgeJE9tib2Ep9gaLFvQRnKmrO5VA0=; b=wmYrQ9/kqd7C8/dZs3ATITyy5r3sR/ELQUwhVT+zoCU3JPUPWJlY19TbX0TNDuVe6X gU1ukcQLkOA8uGe784WbB6dFSwARhMUMsczoa1Pg13I9uIKqb423E5tHLCbHibrfcsew 1UfmhjtvWxXuQjt0E/9MRWRspPBknU1opuUGD2J8CMVYha//oDjzJ6RgKm+TfkD+yVJY WzChKd2KXHfWCNGqMwCdjBWBinwQFs+R2GZ37FvkVod2BYbhl9ixOlpBqkMF8MrwxeYd RzRG6cvKPMYcK4RniB63JvZXnqzFswFh9xbfAmzQAUAlSNKifdAN95qXZSj/KGj7L9p2 E+Jg== X-Gm-Message-State: AOAM533gk0pV8VE8VcvR9r5vchreAEb9wdqOAEa0n6bk4LmcKsDh6VFU iCvfTXNe/wkFRS8HfITXP3hIf88VXlE= X-Google-Smtp-Source: ABdhPJy4JrnizHX7G7WI5UE9Z8XjjQiqNO7CAlpFkjZZGkUTD+ezhhVU+1mJBJ7o+bw1LPRNJhg9tFsbK20= X-Received: from seanjc.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3e5]) (user=seanjc job=sendgmr) by 2002:a05:6a00:1411:b0:4fd:e594:fac0 with SMTP id l17-20020a056a00141100b004fde594fac0mr11183238pfu.79.1649285468869; Wed, 06 Apr 2022 15:51:08 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 6 Apr 2022 22:51:06 +0000 Message-Id: <20220406225106.55471-1-seanjc@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.35.1.1094.g7c7d902a7c-goog Subject: [PATCH] KVM: x86: Deplete Paolo's brown paper bag supply by one From: Sean Christopherson To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix an inverted check on CR0.PG when computing the cpu_role, the MMU is direct and all CR4 bits ignored if paging is disabled, not enabled. Fixes: d73678dc11ec ("KVM: x86/mmu: split cpu_role from mmu_role") Signed-off-by: Sean Christopherson --- I haven't done much testing on the rest of the MMU role patches, this just popped up in very, very basic testing ;-) I assume this will be squashed, hence the snarky shortlog. arch/x86/kvm/mmu/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index e41d7bba7a65..ab24fc161bac 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4699,7 +4699,7 @@ kvm_calc_cpu_role(struct kvm_vcpu *vcpu, const struct kvm_mmu_role_regs *regs) role.base.smm = is_smm(vcpu); role.base.guest_mode = is_guest_mode(vcpu); - if (____is_cr0_pg(regs)) { + if (!____is_cr0_pg(regs)) { role.base.direct = 1; return role; } base-commit: 56ba4b488353a8925b30367d72e41d1996c23554 -- 2.35.1.1094.g7c7d902a7c-goog