From nobody Wed Feb 11 08:12:16 2026 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 5CB29C6FD1D for ; Wed, 5 Apr 2023 00:45:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236766AbjDEApr (ORCPT ); Tue, 4 Apr 2023 20:45:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236701AbjDEApd (ORCPT ); Tue, 4 Apr 2023 20:45:33 -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 78CD049F1 for ; Tue, 4 Apr 2023 17:45:31 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id h4-20020a170902f54400b001a1f5f00f3fso19958083plf.2 for ; Tue, 04 Apr 2023 17:45:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1680655530; 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=SL1I67lV9tgXgAEvmRnaRT+4/QRS9Sk5XoUvQ3XeqRI=; b=J1cGRcd7ht1RyeB1dMJiFXaAS4GM2LJk6yDcKESwIL0R8iRCfuxajLpzX5zKnLczuT bxHd8FnJcmI+SMglu4+SA0klmsqwRW5SfSo5bl5HR6bJHuu1qPq6v3juzseWWsYJgb/V qrrGQHve/MBiMDnwbl1Esflahc8hUQ8bBJobaJ6AxXYy65kpWiJyj3l4dYWC7G27Im0e t74ZnovCetz0rNdxnZIXALMXptBqCyPGES/luAPTP1pp0sriD8E2SrddR/A2hqU9zu7A ooe89p4LhjJK3UJbupaz4huRnLNo5WWpBkBpLENrTH0Edn7F1ChvNZXsQlCy9xesCATr orEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680655530; 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=SL1I67lV9tgXgAEvmRnaRT+4/QRS9Sk5XoUvQ3XeqRI=; b=rUZri2jOo4hy7CnZyCVVtunsDPameZ17yISYWfx2UhHktYTODf2YWYsmrEFf04qZlw 6LIyJVIKDoFFxCBSuQWNlaMc+32jWffIQFWJBsZbhB5vshRBwgvD4xwAYbx8XLrdNIv7 zInGsMJfrCZ7lSmMaZgRxGgQlUEa1SX4fH3UM/HfotF9o2QlMAANyDBjuaTd4wF6OZKS GoJ4Yk2+b5QPMlrUOwHeRnNdRFujA322LVeqcC8JPIwQPycw15z3M1pMi90FUOzjp0OY MOBfHkgDYRZsst7ye/s9TNaS9A0Gy5AvT0nYSPVnYtvtWvVgbgOTbyZpBa7LDzfsKS1r B7pA== X-Gm-Message-State: AAQBX9cJa3rJUx3X00HKIij32KDXdOidlcNjJOA9ViwI5mu7+U3FYWVL uD3jCg4rQ5CMGXJfT+7G3xhZOGsPOSQ= X-Google-Smtp-Source: AKy350b+7TkaPc85UJyDGGxPNsKQJ5NzJqSs32SuDcgOx/mehzhkZh/APMybqR/hRpf7gTv56c0ExKyqQ5k= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90a:4591:b0:234:acfd:c8da with SMTP id v17-20020a17090a459100b00234acfdc8damr1604747pjg.2.1680655530265; Tue, 04 Apr 2023 17:45:30 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 4 Apr 2023 17:45:18 -0700 In-Reply-To: <20230405004520.421768-1-seanjc@google.com> Mime-Version: 1.0 References: <20230405004520.421768-1-seanjc@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Message-ID: <20230405004520.421768-5-seanjc@google.com> Subject: [PATCH v4 4/6] KVM: selftests: Rework dynamic XFeature helper to take mask, not bit From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Aaron Lewis , Mingwei Zhang , Jim Mattson Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Take the XFeature mask in __vm_xsave_require_permission() instead of the bit so that there's no need to define macros for both the bit and the mask. Asserting that only a single bit is set and retrieving said bit is easy enough via log2 helpers. Opportunistically clean up the error message for the ARCH_REQ_XCOMP_GUEST_PERM sanity check. Signed-off-by: Sean Christopherson --- .../selftests/kvm/include/x86_64/processor.h | 6 +++--- .../selftests/kvm/lib/x86_64/processor.c | 17 ++++++++++------- tools/testing/selftests/kvm/x86_64/amx_test.c | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools= /testing/selftests/kvm/include/x86_64/processor.h index f6061fe7057f..41d798375570 100644 --- a/tools/testing/selftests/kvm/include/x86_64/processor.h +++ b/tools/testing/selftests/kvm/include/x86_64/processor.h @@ -1098,10 +1098,10 @@ uint64_t kvm_hypercall(uint64_t nr, uint64_t a0, ui= nt64_t a1, uint64_t a2, uint64_t __xen_hypercall(uint64_t nr, uint64_t a0, void *a1); void xen_hypercall(uint64_t nr, uint64_t a0, void *a1); =20 -void __vm_xsave_require_permission(int bit, const char *name); +void __vm_xsave_require_permission(uint64_t xfeature, const char *name); =20 -#define vm_xsave_require_permission(perm) \ - __vm_xsave_require_permission(perm, #perm) +#define vm_xsave_require_permission(xfeature) \ + __vm_xsave_require_permission(xfeature, #xfeature) =20 enum pg_level { PG_LEVEL_NONE, diff --git a/tools/testing/selftests/kvm/lib/x86_64/processor.c b/tools/tes= ting/selftests/kvm/lib/x86_64/processor.c index a12b21a2ef37..898b30096c80 100644 --- a/tools/testing/selftests/kvm/lib/x86_64/processor.c +++ b/tools/testing/selftests/kvm/lib/x86_64/processor.c @@ -697,7 +697,7 @@ uint64_t kvm_get_feature_msr(uint64_t msr_index) return buffer.entry.data; } =20 -void __vm_xsave_require_permission(int bit, const char *name) +void __vm_xsave_require_permission(uint64_t xfeature, const char *name) { int kvm_fd; u64 bitmask; @@ -705,12 +705,15 @@ void __vm_xsave_require_permission(int bit, const cha= r *name) struct kvm_device_attr attr =3D { .group =3D 0, .attr =3D KVM_X86_XCOMP_GUEST_SUPP, - .addr =3D (unsigned long) &bitmask + .addr =3D (unsigned long) &bitmask, }; =20 TEST_ASSERT(!kvm_supported_cpuid, "kvm_get_supported_cpuid() cannot be used before ARCH_REQ_XCOMP_GUES= T_PERM"); =20 + TEST_ASSERT(is_power_of_2(xfeature), + "Dynamic XFeatures must be enabled one at a time"); + kvm_fd =3D open_kvm_dev_path_or_exit(); rc =3D __kvm_ioctl(kvm_fd, KVM_GET_DEVICE_ATTR, &attr); close(kvm_fd); @@ -720,16 +723,16 @@ void __vm_xsave_require_permission(int bit, const cha= r *name) =20 TEST_ASSERT(rc =3D=3D 0, "KVM_GET_DEVICE_ATTR(0, KVM_X86_XCOMP_GUEST_SUPP= ) error: %ld", rc); =20 - __TEST_REQUIRE(bitmask & (1ULL << bit), + __TEST_REQUIRE(bitmask & xfeature, "Required XSAVE feature '%s' not supported", name); =20 - TEST_REQUIRE(!syscall(SYS_arch_prctl, ARCH_REQ_XCOMP_GUEST_PERM, bit)); + TEST_REQUIRE(!syscall(SYS_arch_prctl, ARCH_REQ_XCOMP_GUEST_PERM, ilog2(xf= eature))); =20 rc =3D syscall(SYS_arch_prctl, ARCH_GET_XCOMP_GUEST_PERM, &bitmask); TEST_ASSERT(rc =3D=3D 0, "prctl(ARCH_GET_XCOMP_GUEST_PERM) error: %ld", r= c); - TEST_ASSERT(bitmask & (1ULL << bit), - "prctl(ARCH_REQ_XCOMP_GUEST_PERM) failure bitmask=3D0x%lx", - bitmask); + TEST_ASSERT(bitmask & xfeature, + "'%s' (0x%lx) not permitted after prctl(ARCH_REQ_XCOMP_GUEST_PERM) p= errmited=3D0x%lx", + name, xfeature, bitmask); } =20 void vcpu_init_cpuid(struct kvm_vcpu *vcpu, const struct kvm_cpuid2 *cpuid) diff --git a/tools/testing/selftests/kvm/x86_64/amx_test.c b/tools/testing/= selftests/kvm/x86_64/amx_test.c index af1ef6f79d32..a0f74f5121a6 100644 --- a/tools/testing/selftests/kvm/x86_64/amx_test.c +++ b/tools/testing/selftests/kvm/x86_64/amx_test.c @@ -233,7 +233,7 @@ int main(int argc, char *argv[]) * Note, all off-by-default features must be enabled before anything * caches KVM_GET_SUPPORTED_CPUID, e.g. before using kvm_cpu_has(). */ - vm_xsave_require_permission(XSTATE_XTILE_DATA_BIT); + vm_xsave_require_permission(XFEATURE_MASK_XTILEDATA); =20 TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_XFD)); TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_XSAVE)); --=20 2.40.0.348.gf938b09366-goog