From nobody Fri Dec 19 17:35:17 2025 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 735C6C433FE for ; Thu, 6 Oct 2022 00:51:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229746AbiJFAvh (ORCPT ); Wed, 5 Oct 2022 20:51:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229534AbiJFAva (ORCPT ); Wed, 5 Oct 2022 20:51:30 -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 EAED33FED5 for ; Wed, 5 Oct 2022 17:51:29 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id m3-20020a170902bb8300b0017f7e7e4385so170843pls.20 for ; Wed, 05 Oct 2022 17:51:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=XxYR0Lkn6CCkh677bL/wbSatCverNNjIGoBZGWzb7uE=; b=rtjuEcE8eBMnkiZsklkvRGCWw/lx47FXOLn+am0B7nOEEhCrZXnANcvhuxEpH8py/u vUaoQ8N7ffoa+n3j2ZtBA+ptziQwxa/weJ/tLVkkXtKEngUdq85Ipuu5KWtfCQ6hcIUy KrcWToxXF/H3T9llkPPcbX9FnZ+rkEoR8mGoJvsQDnhenxbdN7l1UnUwXkEt+NfiGrk5 6QBqHbWyTpUaHz5GmpCW5qwahozR+cc5iuTU7ee/FoFObTfn92Rx8Npzo/p+04vJsXGe zNWrYAjfm47S/0NPCBWXEndYFsFaSYb9CHObQO7pjg1bdrmF8i9SIFepGHQf/IHWPDuJ Gxjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XxYR0Lkn6CCkh677bL/wbSatCverNNjIGoBZGWzb7uE=; b=qYnEWbSHSIVu6vsyDCl3fnXkoTmRZddNkM6vV0o7sVjYQzQlFrJy8QXsU6ihY0IcmI OPyd+miFOB+sD0my8rglXReBG+jtNye0Z2VwSI6Fhis7Ua/TaCz12nozVx6DE3Y/XO2V fjnKkebvQ2j6Z098f+wLyou9pPCfHXsJHIL6uBjyWwEqySVMu89rPNc0ZU9CDo+ViW/C zdB9b9RmDne/Dehu3xLoXCiqFTeX/k/bX3ZNInvpOxWBsFsPVQAvOMJjdIhn7aCh6Jgs ZE+QTNCWhZWlp8Xdv/YEvQs4GkA36ybjlp5DPu/+BUQWWlFNxK1r3ypcth1mqwP6r9cB kL+A== X-Gm-Message-State: ACrzQf3+9xVZ5Heo+wrxEod12/J4EUAXOomoa0IepiI4vEqrpLedUNui gtBfBlfNRYEndSYb0O5rl2MUwKAvmY0= X-Google-Smtp-Source: AMsMyM6Sr7oPHPIqLpUIKlwFZraTv88JsjN/i7EZ62EoPfwIRZyfDc4x7Zs2nmulI0UyAHbg1Hc+uQZoTU0= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90b:3147:b0:203:6eaa:4894 with SMTP id ip7-20020a17090b314700b002036eaa4894mr7897314pjb.230.1665017489582; Wed, 05 Oct 2022 17:51:29 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 6 Oct 2022 00:51:14 +0000 In-Reply-To: <20221006005125.680782-1-seanjc@google.com> Mime-Version: 1.0 References: <20221006005125.680782-1-seanjc@google.com> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog Message-ID: <20221006005125.680782-2-seanjc@google.com> Subject: [PATCH 01/12] KVM: selftests: Add X86_FEATURE_PAE and use it calc "fallback" MAXPHYADDR From: Sean Christopherson To: Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Sean Christopherson Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add X86_FEATURE_PAE and use it to guesstimate the MAXPHYADDR when the MAXPHYADDR CPUID entry isn't supported. No functional change intended. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/include/x86_64/processor.h | 1 + tools/testing/selftests/kvm/lib/x86_64/processor.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools= /testing/selftests/kvm/include/x86_64/processor.h index e8ca0d8a6a7e..bb9c5f34a893 100644 --- a/tools/testing/selftests/kvm/include/x86_64/processor.h +++ b/tools/testing/selftests/kvm/include/x86_64/processor.h @@ -89,6 +89,7 @@ struct kvm_x86_cpu_feature { #define X86_FEATURE_XSAVE KVM_X86_CPU_FEATURE(0x1, 0, ECX, 26) #define X86_FEATURE_OSXSAVE KVM_X86_CPU_FEATURE(0x1, 0, ECX, 27) #define X86_FEATURE_RDRAND KVM_X86_CPU_FEATURE(0x1, 0, ECX, 30) +#define X86_FEATURE_PAE KVM_X86_CPU_FEATURE(0x1, 0, EDX, 6) #define X86_FEATURE_MCE KVM_X86_CPU_FEATURE(0x1, 0, EDX, 7) #define X86_FEATURE_APIC KVM_X86_CPU_FEATURE(0x1, 0, EDX, 9) #define X86_FEATURE_CLFLUSH KVM_X86_CPU_FEATURE(0x1, 0, EDX, 19) diff --git a/tools/testing/selftests/kvm/lib/x86_64/processor.c b/tools/tes= ting/selftests/kvm/lib/x86_64/processor.c index 39c4409ef56a..ca49944a6bce 100644 --- a/tools/testing/selftests/kvm/lib/x86_64/processor.c +++ b/tools/testing/selftests/kvm/lib/x86_64/processor.c @@ -1060,12 +1060,10 @@ bool is_amd_cpu(void) void kvm_get_cpu_address_width(unsigned int *pa_bits, unsigned int *va_bit= s) { const struct kvm_cpuid_entry2 *entry; - bool pae; =20 /* SDM 4.1.4 */ if (kvm_get_cpuid_max_extended() < 0x80000008) { - pae =3D kvm_get_supported_cpuid_entry(1)->edx & (1 << 6); - *pa_bits =3D pae ? 36 : 32; + *pa_bits =3D=3D kvm_cpu_has(X86_FEATURE_PAE) ? 36 : 32; *va_bits =3D 32; } else { entry =3D kvm_get_supported_cpuid_entry(0x80000008); --=20 2.38.0.rc1.362.ged0d419d3c-goog