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 7C5E5CCA47B for ; Fri, 3 Jun 2022 01:01:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240961AbiFCBAA (ORCPT ); Thu, 2 Jun 2022 21:00:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241348AbiFCAvC (ORCPT ); Thu, 2 Jun 2022 20:51:02 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 134BF34B87 for ; Thu, 2 Jun 2022 17:47:49 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id o18-20020a63fb12000000b003fb22d1c6a0so3044929pgh.12 for ; Thu, 02 Jun 2022 17:47:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=qpwmRkquR3FvD6K1c9jD4zV/5jApQvMpkB0TPkt8ar8=; b=WFcvw1+2cZu8Cveo209P1VThhIPYOt5yFZ9OE8O7eCtZELcj2TZTcwtQoBAsgPk4TX IEqu8Jy+pw9K0ST3jww1IOskbIpoy4bLx/aZfq28oMyyiv6zqXGLMZJYB+DEK4eu2leK Bg9rP7PQKkZHbUMRakziBomWVIG6gstj79UXM8pWGiRxPIAT/IozkNLnNJ7KPksohYvu DIxlMhWPWi3bCRSsO1pwiH9x2gF8w2C5rwrHHbMgKzn7ATi4CzAC2yJPEGDcCxiRVHI0 LWtA0AVJzBxPIP5JsuIao4AlAL3XPJqzU5w6WOHK5SG78XE56Pb3wL04Yz6BV4RUHpnc njoQ== 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:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=qpwmRkquR3FvD6K1c9jD4zV/5jApQvMpkB0TPkt8ar8=; b=OqD9N8CY/VgIzNBB6MHOYSADfZBJeujc0nnXzlKn3zZEVaF00oTYK7n+VFhGsH+2pG VB4Yj1eqV4duIHHfSeuNdYwbfrSKQAYTEzQFDEDQ4r1gbwVdqq5Xjd6bpoMZiY4C6DTH JtG+0MPOzn1TGhG+xjzm1MjbVNLOuWtpqm/U2Aww8RuZxQkLWTzh8yLO0AVYLyw+4xSq kryZSyUhBe90kwp1niIMXtBUQxbxsAtQJH8OANFW0P9KqP5MUyLCWKgS0ftaxioEBuDP lQWfsFOCnrUkCqihJN/p4xHNW6AXzXsC15mcm/AgVwF97OU3J0VUhcqJcV5s1QqbENth Svqw== X-Gm-Message-State: AOAM533/glsl2iAKpXz8dt0i89GyAtPXIQoQtdFCOAlimllAwamTfyUV 8jNcqWtJUjpanYc/TXHkKF+T5PXrdO8= X-Google-Smtp-Source: ABdhPJxenSwDKGN5/QFjNnoicNEsOh01ubm9F8V2A2x+4dS3UHh5Nhtv+DsPvRlf1nXQPrZIXW+dNUaqRos= X-Received: from seanjc.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3e5]) (user=seanjc job=sendgmr) by 2002:a05:6a00:1895:b0:51b:c356:c04f with SMTP id x21-20020a056a00189500b0051bc356c04fmr7450606pfh.35.1654217267465; Thu, 02 Jun 2022 17:47:47 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 3 Jun 2022 00:43:26 +0000 In-Reply-To: <20220603004331.1523888-1-seanjc@google.com> Message-Id: <20220603004331.1523888-140-seanjc@google.com> Mime-Version: 1.0 References: <20220603004331.1523888-1-seanjc@google.com> X-Mailer: git-send-email 2.36.1.255.ge46751e96f-goog Subject: [PATCH v2 139/144] KVM: selftests: Trust that MAXPHYADDR > memslot0 in vmx_apic_access_test From: Sean Christopherson To: Paolo Bonzini Cc: kvm@vger.kernel.org, Vitaly Kuznetsov , Andrew Jones , David Matlack , Ben Gardon , Oliver Upton , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use vm->max_gfn to compute the highest gpa in vmx_apic_access_test, and blindly trust that the highest gfn/gpa will be well above the memory carved out for memslot0. The existing check is beyond paranoid; KVM doesn't support CPUs with host.MAXPHYADDR < 32, and the selftests are all kinds of hosed if memslot0 overlaps the local xAPIC, which resides above "lower" (below 4gb) DRAM. Signed-off-by: Sean Christopherson --- .../testing/selftests/kvm/x86_64/vmx_apic_access_test.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/vmx_apic_access_test.c b/tools/testing/selftests/kvm/x86_64/vmx_apic_access_test.c index ef7514376b1e..ccb05ef7234e 100644 --- a/tools/testing/selftests/kvm/x86_64/vmx_apic_access_test.c +++ b/tools/testing/selftests/kvm/x86_64/vmx_apic_access_test.c @@ -72,8 +72,6 @@ static void l1_guest_code(struct vmx_pages *vmx_pages, unsigned long high_gpa) int main(int argc, char *argv[]) { unsigned long apic_access_addr = ~0ul; - unsigned int paddr_width; - unsigned int vaddr_width; vm_vaddr_t vmx_pages_gva; unsigned long high_gpa; struct vmx_pages *vmx; @@ -86,12 +84,7 @@ int main(int argc, char *argv[]) vm = vm_create_with_one_vcpu(&vcpu, l1_guest_code); - kvm_get_cpu_address_width(&paddr_width, &vaddr_width); - high_gpa = (1ul << paddr_width) - getpagesize(); - if ((unsigned long)DEFAULT_GUEST_PHY_PAGES * getpagesize() > high_gpa) { - print_skip("No unbacked physical page available"); - exit(KSFT_SKIP); - } + high_gpa = (vm->max_gfn - 1) << vm->page_shift; vmx = vcpu_alloc_vmx(vm, &vmx_pages_gva); prepare_virtualize_apic_accesses(vmx, vm); -- 2.36.1.255.ge46751e96f-goog