From nobody Fri May 8 06:00:30 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 5F37EC433EF for ; Tue, 10 May 2022 03:51:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234313AbiEJDyy (ORCPT ); Mon, 9 May 2022 23:54:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231679AbiEJDyu (ORCPT ); Mon, 9 May 2022 23:54:50 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67C1825EE; Mon, 9 May 2022 20:50:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652154649; x=1683690649; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=nbv7UmfdXbcrW16GgE7aK/oiYQcXbQEJkwqMj9eP0Gk=; b=VN66fcUAuPw9/X30HQc+PRR5L9T5PszsN4qaW3da7zwQSGb/mRJCwDbH 1S7kuTEbKa5ynqqt4eEjIALDqO33K8I+oBHgPQrmajVCyV5jpfVqXNR44 AY/jAVx/IPJuOgarMjxZpJguUVUgznfJI+c2yVK+ghHIWw/ketP7neKVS zvlBZrfpoAlq4Niua/fSrLSKC+wBjsAN6lmaM1VYllS1Q8wGZUqWoZA99 Z0zf16LOWYE3azd8lGtUfR8ybfNJNoSdyn/GPEGXuCbRGGss26WEjPSr5 WXeJzQWl+8gOaIT5sc912Idq4lim2GcD2VfDSn8SVZ53b56F//mCl+xqY w==; X-IronPort-AV: E=McAfee;i="6400,9594,10342"; a="266837547" X-IronPort-AV: E=Sophos;i="5.91,213,1647327600"; d="scan'208";a="266837547" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 May 2022 20:50:49 -0700 X-IronPort-AV: E=Sophos;i="5.91,213,1647327600"; d="scan'208";a="602270857" Received: from embargo.jf.intel.com ([10.165.9.183]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 May 2022 20:50:48 -0700 From: Yang Weijiang To: pbonzini@redhat.com Cc: likexu@tencent.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Yang Weijiang Subject: [PATCH] KVM: selftests: x86: Skip unsupported test when Arch LBR is available Date: Mon, 9 May 2022 23:50:28 -0400 Message-Id: <20220510035028.21042-1-weijiang.yang@intel.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" On Arch LBR capable platforms, LBR_FMT in perf capability msr is 0x3f, so skip invalid format test if it's running on these platforms. Opportunistically change the file name to reflect the tests actually carried out. Signed-off-by: Yang Weijiang --- tools/testing/selftests/kvm/Makefile | 2 +- .../x86_64/{vmx_pmu_msrs_test.c =3D> vmx_pmu_caps_test.c} | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) rename tools/testing/selftests/kvm/x86_64/{vmx_pmu_msrs_test.c =3D> vmx_pm= u_caps_test.c} (88%) diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests= /kvm/Makefile index 681b173aa87c..9a1a84803b01 100644 --- a/tools/testing/selftests/kvm/Makefile +++ b/tools/testing/selftests/kvm/Makefile @@ -81,7 +81,7 @@ TEST_GEN_PROGS_x86_64 +=3D x86_64/xapic_state_test TEST_GEN_PROGS_x86_64 +=3D x86_64/xss_msr_test TEST_GEN_PROGS_x86_64 +=3D x86_64/debug_regs TEST_GEN_PROGS_x86_64 +=3D x86_64/tsc_msrs_test -TEST_GEN_PROGS_x86_64 +=3D x86_64/vmx_pmu_msrs_test +TEST_GEN_PROGS_x86_64 +=3D x86_64/vmx_pmu_caps_test TEST_GEN_PROGS_x86_64 +=3D x86_64/xen_shinfo_test TEST_GEN_PROGS_x86_64 +=3D x86_64/xen_vmcall_test TEST_GEN_PROGS_x86_64 +=3D x86_64/sev_migrate_tests diff --git a/tools/testing/selftests/kvm/x86_64/vmx_pmu_msrs_test.c b/tools= /testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c similarity index 88% rename from tools/testing/selftests/kvm/x86_64/vmx_pmu_msrs_test.c rename to tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c index 2454a1f2ca0c..977c268a6ad4 100644 --- a/tools/testing/selftests/kvm/x86_64/vmx_pmu_msrs_test.c +++ b/tools/testing/selftests/kvm/x86_64/vmx_pmu_caps_test.c @@ -107,8 +107,13 @@ int main(int argc, char *argv[]) ASSERT_EQ(vcpu_get_msr(vm, VCPU_ID, MSR_IA32_PERF_CAPABILITIES), (u64)hos= t_cap.lbr_format); =20 /* testcase 3, check invalid LBR format is rejected */ - ret =3D _vcpu_set_msr(vm, 0, MSR_IA32_PERF_CAPABILITIES, PMU_CAP_LBR_FMT); - TEST_ASSERT(ret =3D=3D 0, "Bad PERF_CAPABILITIES didn't fail."); + /* Note, on Arch LBR capable platforms, LBR_FMT in perf capability msr is= 0x3f, + * so skip below test if running on these platforms. */ + if (host_cap.lbr_format !=3D PMU_CAP_LBR_FMT) { + ret =3D _vcpu_set_msr(vm, 0, MSR_IA32_PERF_CAPABILITIES, PMU_CAP_LBR_FMT= ); + TEST_ASSERT(ret =3D=3D 0, "Bad PERF_CAPABILITIES didn't fail."); + } =20 + printf("Completed pmu capability tests successfully.\n"); kvm_vm_free(vm); } --=20 2.27.0