From nobody Thu Oct 2 07:43:59 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E34517A31E for ; Fri, 19 Sep 2025 00:45:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758242718; cv=none; b=mI7AjTM7HF0yhQEfgjI27FxTfscHPRVLXDJjB2rABL/jmAMelPQmaP90/dfwdwvFZKhlhD9pz1kR+boACr5c9AT39GJji/YEwwK1sZmZiICWl+IKaeJX8AjfZmnn22NEv8UHqV33xVx86313XU+YLB7EKWa13ua6yBXcSuniz1w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758242718; c=relaxed/simple; bh=GHMlzr2FhTOv+c4T5nvr/lgKTQoMQ7IduiCxorVExs4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ZfuTNtsyPkkfOIgU/5N2Rn3fCpveZnqwWPuRwPPnqFl7jU48Zuh2+hn/yJLqyO+RLxQGHfKvw67hyqnh36asXTmucv0FaW4kwFXgObAoAfXlCDC7dbZx5nlgeqrrr81EO0xOgKnNpAb45PVfY0hETNYdk51OknE8h0LF+h7IE14= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Xt9S23kh; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Xt9S23kh" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-32eb2b284e4so2743461a91.1 for ; Thu, 18 Sep 2025 17:45:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758242717; x=1758847517; darn=vger.kernel.org; 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=R7qTTFNHE+fMvr5BObVOavYnDFvgMV9D5f5f8nLVk4s=; b=Xt9S23khpUuy6g+Di4Bh0WueLU9HR6NBYOJSI7b8/7AYxJofrUe+JHBVf2L1oRdVHX ODPboho/IAfwT08Vjgqh6yMn5jWvGvjFGBLRsVb68trSL1XHHAtG2FdFbTgEFckrbj3Y FPZVU5uOWtH068yMU2un28d+rDyXGXPnP/z2xDvC+6nSYsgmzm6icECdgpQi6O+oAgx2 9lYTr6vnXkSyr4Uw9tpTN8Jq81FbUTj9t9US1uAHtw72YiYEBT3AE23bJsJEw9bfGx8q pEYKm+InPUjF6M8Rf+Tcfmkouk9dA7WhAF9Oe/zR8CVl78L8TKr0FJJ7cwXa/+MjOKw3 4hww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758242717; x=1758847517; 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=R7qTTFNHE+fMvr5BObVOavYnDFvgMV9D5f5f8nLVk4s=; b=GZ54d/til8k986wTMz/NO+J7pM3r4lSHIVj96fTCqL8SkkqWTotM7h/IFLDZ5ZbQp+ gLKtfe7NCuw8xHxsVkdHzcpVDgw3EH9UrL/5cKJ1KDLjO+BwlVEn7oTcEoB8IwcLdsmc hXdecayAJx7gqkmYtEuT9aqljm1X/p/w+xU9+9EzUoyBTNjH+e8z5Rk1GtAeBBgXMWUI 6KKKygupdjkg8ILsqmJwqbZtBToLRt6mEAInI39Xvks2ITM1SwGoRGNC+9YTph5WizCG HuA9bXjrtZmUfS+5IPzFa+h4QNm07p7IUYHpVPSHOXql70HpRQSxLuF/N5S7WSLN4T8B LEaA== X-Forwarded-Encrypted: i=1; AJvYcCV3bSb3TcnBUvF1/nlv4UgfP+c9Rnl5reo+LbbGUgSQehujgew65eSjeQiFuHFgKgzqhWxfU/5W2OnYGxw=@vger.kernel.org X-Gm-Message-State: AOJu0Yzxa+t3nAsJEBAFgL7voUjVhNOVOYkfIjTrvQWKz91tsGkywChw xM/2aK5eIQKUXR3f0rCO2v/myr25vlxu0NOATsotjG4XysSDXIxUtkW1apiUiKjx1CbUcJ6lPUv OInj30A== X-Google-Smtp-Source: AGHT+IEEQlj+6vJmW7RI1wxr1KK79HNPPL0eXn3RaPBcrhTf3Zc0J6v5CiAnOUQURMTOOtmxXlInkuLtiJk= X-Received: from pjbhl16.prod.google.com ([2002:a17:90b:1350:b0:32d:a0b1:2b03]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5408:b0:32b:9506:1780 with SMTP id 98e67ed59e1d1-33097ff640dmr1633505a91.9.1758242716558; Thu, 18 Sep 2025 17:45:16 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 18 Sep 2025 17:45:08 -0700 In-Reply-To: <20250919004512.1359828-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250919004512.1359828-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.470.ga7dc726c21-goog Message-ID: <20250919004512.1359828-2-seanjc@google.com> Subject: [PATCH v3 1/5] KVM: selftests: Add timing_info bit support in vmx_pmu_caps_test From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Dapeng Mi , Yi Lai , dongsheng Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Dapeng Mi A new bit PERF_CAPABILITIES[17] called "PEBS_TIMING_INFO" bit is added to indicated if PEBS supports to record timing information in a new "Retried Latency" field. Since KVM requires user can only set host consistent PEBS capabilities, otherwise the PERF_CAPABILITIES setting would fail, add pebs_timing_info into the "immutable_caps" to block host inconsistent PEBS configuration and cause errors. Opportunistically drop the anythread_deprecated bit. It isn't and likely never was a PERF_CAPABILITIES flag, the test's definition snuck in when the union was copy+pasted from the kernel's definition. Signed-off-by: Dapeng Mi Tested-by: Yi Lai [sean: call out anythread_deprecated change] Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/x86/vmx_pmu_caps_test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/kvm/x86/vmx_pmu_caps_test.c b/tools/te= sting/selftests/kvm/x86/vmx_pmu_caps_test.c index a1f5ff45d518..f8deea220156 100644 --- a/tools/testing/selftests/kvm/x86/vmx_pmu_caps_test.c +++ b/tools/testing/selftests/kvm/x86/vmx_pmu_caps_test.c @@ -29,7 +29,7 @@ static union perf_capabilities { u64 pebs_baseline:1; u64 perf_metrics:1; u64 pebs_output_pt_available:1; - u64 anythread_deprecated:1; + u64 pebs_timing_info:1; }; u64 capabilities; } host_cap; @@ -44,6 +44,7 @@ static const union perf_capabilities immutable_caps =3D { .pebs_arch_reg =3D 1, .pebs_format =3D -1, .pebs_baseline =3D 1, + .pebs_timing_info =3D 1, }; =20 static const union perf_capabilities format_caps =3D { --=20 2.51.0.470.ga7dc726c21-goog From nobody Thu Oct 2 07:43:59 2025 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 35DF924A043 for ; Fri, 19 Sep 2025 00:45:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758242720; cv=none; b=DatUf8uFnoXEdPs8vSseoZe/4h9Juf4Jcm28dN/SnFh4w/DUhUZVr7p1+pqIdnH6R8zmpnUm4T9idwXMFHwm78fgh8fEP+3vxPDZORjpMFFsoHYSgwZgVHKDUAKmFNxl2fZ0mq2oaaYrxB50hCp2UdpPLLcK+OAzlfAvJe0kxMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758242720; c=relaxed/simple; bh=n0lGTXdJXDqaN89mbd7Okod6ZlkW2k1r1YS8bLqSbb8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=N/yQnr+CP5ko77BEN68nLpyLyLXGDIolhwMDL0Z+WSIm1kfn0H7PuhzETntvc/Ap7yUtRS+N9HJCUwcz7EJlCV8D5nrY+KR0KETqvzfiEjxjPyaDMhS6hYuXugijuJKQiUd67YYCkCKpJqAoK3VHzWmvMvDIju5V1VGetGdiw+4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=WexQMwAy; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="WexQMwAy" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-32edda89a37so1551546a91.1 for ; Thu, 18 Sep 2025 17:45:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758242718; x=1758847518; darn=vger.kernel.org; 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=jN6rhPeVGRVi73ZHie02xg4mhMvvpNhrGmG7Qp0E2dY=; b=WexQMwAy8wBZLZ8VtAcAYSuQUx8pqKIWKbQtX7zI71Ib7F3V3VILHAbkRO7Xn+FLOg 52w+c5JTHiXU1WH8KZbIdMKUuj1CuSXSTf33itWt41/ysmGEWjjk4aZa8xMRmNUGJvY+ E2M68ygh2Dw22hGu76gkJMEEZZ73LrvUy+ZgfN7lVZCQAFER7RBnskngmhNM3hMFkS/c CON3hmbBycUGh4RsD8PHhAWr7lPIN2jvn/VTx2u7K5avzvRSLQwnAIOcq8ROJ2DeLIv8 rFhrIGshrFTiiHwWLZlI93s0YxZQ0F0AwqXH2ltkGoyO21r72pLvyz3IvoxAwdGFgEig 6JOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758242718; x=1758847518; 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=jN6rhPeVGRVi73ZHie02xg4mhMvvpNhrGmG7Qp0E2dY=; b=aclt4CFJyo47aVghkwe2QvFZugazp8aC5MwmQMylV8BQOGfowr23OlJbAOi5qDtit5 Yqks0Cb8+Dzk6Wd3tlGZoF5gF6TLHCloDOTc0ArH4P4J7Y8uAWtn+22M69aTUT+NiCyU cYnMlzP1zncrOSlq2Gp6NYsvqkY8h0r9nHqneTQ9OgVGZNyTkykDd19W7K3fH9v6pPvd ct6vYbSJZ9DQ1TrtQA13ZlazKyoOx8X4u6cVFas0mv2BjkZV7RwYF3vOn8Ks/4THuyWd 7wwjTON0oRj7zyJw6kJmQQyapG4BTN8BCxS5/R6ZZYmryTQC7Pq+p26tKTwS4LAJCuY/ dw7g== X-Forwarded-Encrypted: i=1; AJvYcCWT/eTLWXPUhMJfnFXlBj9DsUo96lGrxmSX44h/2BgFpwLP4y7thyRAleX0cGXgoZXbAaOgUtWXT30pAJo=@vger.kernel.org X-Gm-Message-State: AOJu0YwYkQOVeSVLB0D+tnI1J1D2T/NSPheJ8NItc/GZVCSUXXLWfE2Y bY/bHARFo1LzAdkEKGO0MTYP5PhwunHf24Fz2B/RXZrLx85t/WjXumOhchKsADqo08eNuUcZdyf AHzwQYg== X-Google-Smtp-Source: AGHT+IHfM7qCYUHfiD5AV0H2ir90EI6DDUYjXYxQmhPxyE03eZSP5eh6GJQ146r0RZIYnzEhBfVolQcpFIk= X-Received: from pjcl16.prod.google.com ([2002:a17:90a:3f10:b0:32e:cc38:a694]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:1b50:b0:32e:859:c79 with SMTP id 98e67ed59e1d1-33097c2d656mr1882865a91.0.1758242718385; Thu, 18 Sep 2025 17:45:18 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 18 Sep 2025 17:45:09 -0700 In-Reply-To: <20250919004512.1359828-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250919004512.1359828-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.470.ga7dc726c21-goog Message-ID: <20250919004512.1359828-3-seanjc@google.com> Subject: [PATCH v3 2/5] KVM: selftests: Track unavailable_mask for PMU events as 32-bit value From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Dapeng Mi , Yi Lai , dongsheng Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Track the mask of "unavailable" PMU events as a 32-bit value. While bits 31:9 are currently reserved, silently truncating those bits is unnecessary and asking for missed coverage. To avoid running afoul of the sanity check in vcpu_set_cpuid_property(), explicitly adjust the mask based on the non-reserved bits as reported by KVM's supported CPUID. Opportunistically update the "all ones" testcase to pass -1u instead of 0xff. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/x86/pmu_counters_test.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/x86/pmu_counters_test.c b/tools/te= sting/selftests/kvm/x86/pmu_counters_test.c index 8aaaf25b6111..cfeed0103341 100644 --- a/tools/testing/selftests/kvm/x86/pmu_counters_test.c +++ b/tools/testing/selftests/kvm/x86/pmu_counters_test.c @@ -311,7 +311,7 @@ static void guest_test_arch_events(void) } =20 static void test_arch_events(uint8_t pmu_version, uint64_t perf_capabiliti= es, - uint8_t length, uint8_t unavailable_mask) + uint8_t length, uint32_t unavailable_mask) { struct kvm_vcpu *vcpu; struct kvm_vm *vm; @@ -320,6 +320,9 @@ static void test_arch_events(uint8_t pmu_version, uint6= 4_t perf_capabilities, if (!pmu_version) return; =20 + unavailable_mask =3D GENMASK(X86_PROPERTY_PMU_EVENTS_MASK.hi_bit, + X86_PROPERTY_PMU_EVENTS_MASK.lo_bit); + vm =3D pmu_vm_create_with_one_vcpu(&vcpu, guest_test_arch_events, pmu_version, perf_capabilities); =20 @@ -630,7 +633,7 @@ static void test_intel_counters(void) */ for (j =3D 0; j <=3D NR_INTEL_ARCH_EVENTS + 1; j++) { test_arch_events(v, perf_caps[i], j, 0); - test_arch_events(v, perf_caps[i], j, 0xff); + test_arch_events(v, perf_caps[i], j, -1u); =20 for (k =3D 0; k < NR_INTEL_ARCH_EVENTS; k++) test_arch_events(v, perf_caps[i], j, BIT(k)); --=20 2.51.0.470.ga7dc726c21-goog From nobody Thu Oct 2 07:43:59 2025 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 99D4E18C2C for ; Fri, 19 Sep 2025 00:45:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758242722; cv=none; b=joRGH3+9iCEAJaP3dUQMVcBINRVQ8okeiELW5KMlamYyGmMj66htznBlLPDU+i4hD3uvlBH6vEaYCgYhb0q6f53+zGMuiusjlqfwk2P7Urt+x57MDdfqEOaQ4EyQN5BZvP7GqzONSD4PvvlEKqT3gQvpV38p0efYgw18FYmBxOY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758242722; c=relaxed/simple; bh=G6eMhQa9bWNC+XplAop1XK+Xh9jgbUrMu5W7u7341tE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=k0+B6NHDOGtxp/tn1ej/7hFwMPKicGGTf1Yfb4wzKe6xOQ1bQihyzhoDbX2gcghXhBQV9UesA5Sg36MpfuwdcheVkBsO/3QfSlgK8+VyDEDvhd7JlFJ1nOfZBn+AKi+vobfs2S2I8lOfGzI7hGdy19CcdYSUUEM2Grlr99joP+M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=a9sUMLYD; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="a9sUMLYD" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2445805d386so17578475ad.1 for ; Thu, 18 Sep 2025 17:45:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758242720; x=1758847520; darn=vger.kernel.org; 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=vXIBv0GQwub5RA4uH8L4E8fQo/KxZfvrFKX34u31kBs=; b=a9sUMLYDx+78mOE2FcKlLpy4gjpX1fu9Gxwi0jp/nJMQqf2mnWabqaM9MViPJc/63k 6rZZnG+8FOcWMMe6S4SlZ92JeQ4LLO83U2JN+33RWw+D0bC0tVrD5+qeOCr1QkpIKr9b qPk1eJpHspO4i15kmQS6EFuWzhxmAO2/bHemtFLG7YriZUZHWk5hNd4K243PSvQoMXeQ m7GPu7C+VGvKVYgoSOn3Hrb+iQjlQsyssYEyVXxkiBXZaTSq7P/Z/XXpRucfEMy9TbnF 0A63Knh8O3KkQp8nWpPiU6zZN8kSd/wxlRlUd41WFc4UVQDW+8uGYJdqSk8iEi3DUgoI mkaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758242720; x=1758847520; 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=vXIBv0GQwub5RA4uH8L4E8fQo/KxZfvrFKX34u31kBs=; b=nen9yWuSf7LWoyU+zD20stljq37B5erDXPcl/RJe2U4hhgCH5drB/jOmiDrkgxc753 M0F6iVuB35HJ25jklznS8R4hj9A2hTeyvNQzMCYUB7u4KEt9l7/0byIgY2QQVFpzr7yC 95qI06UIQJi+Hs7y+S6ZUCl0Zz/uguur+SczgS7Bl9r/G7ETjQK3XN6pqn2FkydZwGBu +jvC9m6BBStKJUzJu6AiBMfbo0VzMLR/KkkEVSYbNpG6UxVtWTm4VWKmGWrUkC5rvBdW NrJ4qv3MtLFjrPIsSA07tydS92KVJ9uHw5gHjHvwKLhilE2Isq9SlzyK3/YvZkOACPVD 2ZQQ== X-Forwarded-Encrypted: i=1; AJvYcCXTqpV050jRzWMggkbRj9xi/1e6KU3tr+nf6xMbvQs3OCinG/GIA9kDlHME9lBtWeyeL6WhZs24ZOr6icU=@vger.kernel.org X-Gm-Message-State: AOJu0Ywc9/U8Uk+dvMMDpNxnMMaprxLFXf2xKo9gD9RSUCfZae26Mjxu G8uJ9iBmPmdyoXngI7JioQzhCPNnsZjyasQQ8aleQ8c59f6yyXCAgFfRDmVM0XMPgci9W7jdEfC jGHuqYA== X-Google-Smtp-Source: AGHT+IH4P8o7YsHg2AvqNf6MyeD4mOg5GT4mfEZFfwOPrDg+yC4Lmup3ALcz80Gr9PLAOz55sh2XicSWDG0= X-Received: from pjc6.prod.google.com ([2002:a17:90b:2f46:b0:329:d461:9889]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2ac7:b0:264:4e4a:904d with SMTP id d9443c01a7336-269ba431f33mr17669575ad.15.1758242719892; Thu, 18 Sep 2025 17:45:19 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 18 Sep 2025 17:45:10 -0700 In-Reply-To: <20250919004512.1359828-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250919004512.1359828-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.470.ga7dc726c21-goog Message-ID: <20250919004512.1359828-4-seanjc@google.com> Subject: [PATCH v3 3/5] KVM: selftests: Reduce number of "unavailable PMU events" combos tested From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Dapeng Mi , Yi Lai , dongsheng Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Reduce the number of combinations of unavailable PMU events masks that are testing by the PMU counters test. In reality, testing every possible combination isn't all that interesting, and certainly not worth the tens of seconds (or worse, minutes) of runtime. Fully testing the N^2 space will be especially problematic in the near future, as 5! new arch events are on their way. Use alternating bit patterns (and 0 and -1u) in the hopes that _if_ there is ever a KVM bug, it's not something horribly convoluted that shows up only with a super specific pattern/value. Reported-by: Dapeng Mi Signed-off-by: Sean Christopherson Reviewed-by: Dapeng Mi --- .../selftests/kvm/x86/pmu_counters_test.c | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/tools/testing/selftests/kvm/x86/pmu_counters_test.c b/tools/te= sting/selftests/kvm/x86/pmu_counters_test.c index cfeed0103341..e805882bc306 100644 --- a/tools/testing/selftests/kvm/x86/pmu_counters_test.c +++ b/tools/testing/selftests/kvm/x86/pmu_counters_test.c @@ -577,6 +577,26 @@ static void test_intel_counters(void) PMU_CAP_FW_WRITES, }; =20 + /* + * To keep the total runtime reasonable, test only a handful of select, + * semi-arbitrary values for the mask of unavailable PMU events. Test + * 0 (all events available) and all ones (no events available) as well + * as alternating bit sequencues, e.g. to detect if KVM is checking the + * wrong bit(s). + */ + const uint32_t unavailable_masks[] =3D { + 0x0, + 0xffffffffu, + 0xaaaaaaaau, + 0x55555555u, + 0xf0f0f0f0u, + 0x0f0f0f0fu, + 0xa0a0a0a0u, + 0x0a0a0a0au, + 0x50505050u, + 0x05050505u, + }; + /* * Test up to PMU v5, which is the current maximum version defined by * Intel, i.e. is the last version that is guaranteed to be backwards @@ -614,16 +634,7 @@ static void test_intel_counters(void) =20 pr_info("Testing arch events, PMU version %u, perf_caps =3D %lx\n", v, perf_caps[i]); - /* - * To keep the total runtime reasonable, test every - * possible non-zero, non-reserved bitmap combination - * only with the native PMU version and the full bit - * vector length. - */ - if (v =3D=3D pmu_version) { - for (k =3D 1; k < (BIT(NR_INTEL_ARCH_EVENTS) - 1); k++) - test_arch_events(v, perf_caps[i], NR_INTEL_ARCH_EVENTS, k); - } + /* * Test single bits for all PMU version and lengths up * the number of events +1 (to verify KVM doesn't do @@ -632,11 +643,8 @@ static void test_intel_counters(void) * ones i.e. all events being available and unavailable. */ for (j =3D 0; j <=3D NR_INTEL_ARCH_EVENTS + 1; j++) { - test_arch_events(v, perf_caps[i], j, 0); - test_arch_events(v, perf_caps[i], j, -1u); - - for (k =3D 0; k < NR_INTEL_ARCH_EVENTS; k++) - test_arch_events(v, perf_caps[i], j, BIT(k)); + for (k =3D 1; k < ARRAY_SIZE(unavailable_masks); k++) + test_arch_events(v, perf_caps[i], j, unavailable_masks[k]); } =20 pr_info("Testing GP counters, PMU version %u, perf_caps =3D %lx\n", --=20 2.51.0.470.ga7dc726c21-goog From nobody Thu Oct 2 07:43:59 2025 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A0BE231845 for ; Fri, 19 Sep 2025 00:45:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758242723; cv=none; b=rND+Pv11gCTN3tNfMuRcQ2k4tUyVhwmZYuQHeXrSqhbmpSOaBXHZp75bKccEwTh+83WR8ows13trJv9qMCYE1yVhqg6twk7QmaxVi+OSUgY5adg0tzqVbnNRcp8uy9+WJ+zFRUGDxroZ5xcvhCFf7WtJN4xVMERs/oV7XVETgIE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758242723; c=relaxed/simple; bh=y/seMVy+n2WKrkuRdFkuPjRdrwjTyV6rxc7KmBNyaEc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=N0yDf18Qc/98JQWu4Lm7ct8q/bzBKK3kjMCJQH1/DEuAisnnSEJxrySKYQaaB5b1BpL1SLkNz+HN75KRgqSsgIt43ArRoWwOFRfb9W+rFf+LnwWZntS4Y6oqK98zZ2ASS9984F5ypYEnmq447Jv44rivt2qmU0IBtxGLxJd+G5A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=HqA7K8aD; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HqA7K8aD" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-32ecab3865dso2106593a91.1 for ; Thu, 18 Sep 2025 17:45:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758242721; x=1758847521; darn=vger.kernel.org; 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=8XWRINSrfIHcCfIWgI9zyBD2U4gnpJ5y2a7/S7VF5Jc=; b=HqA7K8aDCuCDuIc5Hqn0PvTcF63u7dl7zHYy9PGcekkdgle6B1JeZTPR3E3JG0tzgm Il8UHSdZPCmVJzF97B/OH79wp1a9Fk6b8vIdE5i7mDcyHQOlyEpyFpk1oDjRr4Lg0844 uwzISz0Ij4Cults8VpbcVwtlHaDKyFjcapekKX+HvasQmW/n6mTeU35/jDgfJa770cwS y+VRleKW3njkK/sWILD+i0oKhZRfzrXcOxNphZRIXKYlLyBZpwBmysl2t+DUAl3Dcjb+ QMxhOW7rq0fW7gbg3eEtPAx4+yGQbdqf+V339SCiARZlqNRsn1f6bvjjmPVMS2J+gbyH N/bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758242721; x=1758847521; 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=8XWRINSrfIHcCfIWgI9zyBD2U4gnpJ5y2a7/S7VF5Jc=; b=RNbBrTqh8zrH/Z8Dv/X2RMM3TnRvurNYiCDL9JkhoJcakKxpybkLMhOnNxDu+Aqrmm vm6SOLLcNita3LQpH8ICp8DIGDHOxoTp2lhdbqEY8gQK/ruWvkckePEKGnJ4ORHqH/WM tC5l4RX4Mq/KvIzRGfEKBDDyVY/fqdyBLCPa8sU6kYFJy9Mx5SNDstG5cCC1tXE3Blvs WJVm1KW/6vkkVxBh65+NmZ3mHzRoveR29FEy/4vCzLdxLacRO72uQ75gmhmjV2nwyCyG uCTcspY9ZU3xIZ0/NyKQFckf9cMBSAjNuEWiMc/UCpe76sbRbQWd2Eu/KmlfMMKy/20S iY2w== X-Forwarded-Encrypted: i=1; AJvYcCUdGFs+SvPrSnaHNSRKCHGZkF5T3hhJws97Mw4ZappTxgwZhCp/jM+x2FzsgdZ+Ulwzyzb1YMToLQYuPwo=@vger.kernel.org X-Gm-Message-State: AOJu0Yw+h7Vsf4eujLPRHGhU+e9Vj8jQVdMoLyPdBUQZMpdxjvvwX1I7 D+FKayB5x1BQvFh5a+c61ftaoG/c8Z8MU+YMic+MlnC2+7e1IQz0mlc8x9UB7kpmu+BAmgdgAyn Reg2iLg== X-Google-Smtp-Source: AGHT+IFlqFSE78I8H6DoSdEJHGBpeUjI/fKspB93yw3fdiNtIsVir90ZwUjXmIvbS26m1ju3QrxoTab4tXE= X-Received: from pjbpq15.prod.google.com ([2002:a17:90b:3d8f:b0:32e:d03b:ade9]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:164d:b0:32e:e150:8937 with SMTP id 98e67ed59e1d1-33097fd4137mr1950022a91.6.1758242721467; Thu, 18 Sep 2025 17:45:21 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 18 Sep 2025 17:45:11 -0700 In-Reply-To: <20250919004512.1359828-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250919004512.1359828-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.470.ga7dc726c21-goog Message-ID: <20250919004512.1359828-5-seanjc@google.com> Subject: [PATCH v3 4/5] KVM: selftests: Validate more arch-events in pmu_counters_test From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Dapeng Mi , Yi Lai , dongsheng Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Dapeng Mi Add support for 5 new architectural events (4 topdown level 1 metrics events and LBR inserts event) that will first show up in Intel's Clearwater Forest CPUs. Detailed info about the new events can be found in SDM section 21.2.7 "Pre-defined Architectural Performance Events". Signed-off-by: Dapeng Mi Tested-by: Yi Lai [sean: drop "unavailable_mask" changes] Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/include/x86/pmu.h | 10 ++++++++++ tools/testing/selftests/kvm/include/x86/processor.h | 7 ++++++- tools/testing/selftests/kvm/lib/x86/pmu.c | 5 +++++ tools/testing/selftests/kvm/x86/pmu_counters_test.c | 8 ++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/kvm/include/x86/pmu.h b/tools/testing/= selftests/kvm/include/x86/pmu.h index 3c10c4dc0ae8..2aabda2da002 100644 --- a/tools/testing/selftests/kvm/include/x86/pmu.h +++ b/tools/testing/selftests/kvm/include/x86/pmu.h @@ -61,6 +61,11 @@ #define INTEL_ARCH_BRANCHES_RETIRED RAW_EVENT(0xc4, 0x00) #define INTEL_ARCH_BRANCHES_MISPREDICTED RAW_EVENT(0xc5, 0x00) #define INTEL_ARCH_TOPDOWN_SLOTS RAW_EVENT(0xa4, 0x01) +#define INTEL_ARCH_TOPDOWN_BE_BOUND RAW_EVENT(0xa4, 0x02) +#define INTEL_ARCH_TOPDOWN_BAD_SPEC RAW_EVENT(0x73, 0x00) +#define INTEL_ARCH_TOPDOWN_FE_BOUND RAW_EVENT(0x9c, 0x01) +#define INTEL_ARCH_TOPDOWN_RETIRING RAW_EVENT(0xc2, 0x02) +#define INTEL_ARCH_LBR_INSERTS RAW_EVENT(0xe4, 0x01) =20 #define AMD_ZEN_CORE_CYCLES RAW_EVENT(0x76, 0x00) #define AMD_ZEN_INSTRUCTIONS_RETIRED RAW_EVENT(0xc0, 0x00) @@ -80,6 +85,11 @@ enum intel_pmu_architectural_events { INTEL_ARCH_BRANCHES_RETIRED_INDEX, INTEL_ARCH_BRANCHES_MISPREDICTED_INDEX, INTEL_ARCH_TOPDOWN_SLOTS_INDEX, + INTEL_ARCH_TOPDOWN_BE_BOUND_INDEX, + INTEL_ARCH_TOPDOWN_BAD_SPEC_INDEX, + INTEL_ARCH_TOPDOWN_FE_BOUND_INDEX, + INTEL_ARCH_TOPDOWN_RETIRING_INDEX, + INTEL_ARCH_LBR_INSERTS_INDEX, NR_INTEL_ARCH_EVENTS, }; =20 diff --git a/tools/testing/selftests/kvm/include/x86/processor.h b/tools/te= sting/selftests/kvm/include/x86/processor.h index efcc4b1de523..e8bad89fbb7f 100644 --- a/tools/testing/selftests/kvm/include/x86/processor.h +++ b/tools/testing/selftests/kvm/include/x86/processor.h @@ -265,7 +265,7 @@ struct kvm_x86_cpu_property { #define X86_PROPERTY_PMU_NR_GP_COUNTERS KVM_X86_CPU_PROPERTY(0xa, 0, EAX,= 8, 15) #define X86_PROPERTY_PMU_GP_COUNTERS_BIT_WIDTH KVM_X86_CPU_PROPERTY(0xa, 0= , EAX, 16, 23) #define X86_PROPERTY_PMU_EBX_BIT_VECTOR_LENGTH KVM_X86_CPU_PROPERTY(0xa, 0= , EAX, 24, 31) -#define X86_PROPERTY_PMU_EVENTS_MASK KVM_X86_CPU_PROPERTY(0xa, 0, EBX, 0,= 7) +#define X86_PROPERTY_PMU_EVENTS_MASK KVM_X86_CPU_PROPERTY(0xa, 0, EBX, 0,= 12) #define X86_PROPERTY_PMU_FIXED_COUNTERS_BITMASK KVM_X86_CPU_PROPERTY(0xa, = 0, ECX, 0, 31) #define X86_PROPERTY_PMU_NR_FIXED_COUNTERS KVM_X86_CPU_PROPERTY(0xa, 0, ED= X, 0, 4) #define X86_PROPERTY_PMU_FIXED_COUNTERS_BIT_WIDTH KVM_X86_CPU_PROPERTY(0xa= , 0, EDX, 5, 12) @@ -332,6 +332,11 @@ struct kvm_x86_pmu_feature { #define X86_PMU_FEATURE_BRANCH_INSNS_RETIRED KVM_X86_PMU_FEATURE(EBX, 5) #define X86_PMU_FEATURE_BRANCHES_MISPREDICTED KVM_X86_PMU_FEATURE(EBX, 6) #define X86_PMU_FEATURE_TOPDOWN_SLOTS KVM_X86_PMU_FEATURE(EBX, 7) +#define X86_PMU_FEATURE_TOPDOWN_BE_BOUND KVM_X86_PMU_FEATURE(EBX, 8) +#define X86_PMU_FEATURE_TOPDOWN_BAD_SPEC KVM_X86_PMU_FEATURE(EBX, 9) +#define X86_PMU_FEATURE_TOPDOWN_FE_BOUND KVM_X86_PMU_FEATURE(EBX, 10) +#define X86_PMU_FEATURE_TOPDOWN_RETIRING KVM_X86_PMU_FEATURE(EBX, 11) +#define X86_PMU_FEATURE_LBR_INSERTS KVM_X86_PMU_FEATURE(EBX, 12) =20 #define X86_PMU_FEATURE_INSNS_RETIRED_FIXED KVM_X86_PMU_FEATURE(ECX, 0) #define X86_PMU_FEATURE_CPU_CYCLES_FIXED KVM_X86_PMU_FEATURE(ECX, 1) diff --git a/tools/testing/selftests/kvm/lib/x86/pmu.c b/tools/testing/self= tests/kvm/lib/x86/pmu.c index f31f0427c17c..5ab44bf54773 100644 --- a/tools/testing/selftests/kvm/lib/x86/pmu.c +++ b/tools/testing/selftests/kvm/lib/x86/pmu.c @@ -19,6 +19,11 @@ const uint64_t intel_pmu_arch_events[] =3D { INTEL_ARCH_BRANCHES_RETIRED, INTEL_ARCH_BRANCHES_MISPREDICTED, INTEL_ARCH_TOPDOWN_SLOTS, + INTEL_ARCH_TOPDOWN_BE_BOUND, + INTEL_ARCH_TOPDOWN_BAD_SPEC, + INTEL_ARCH_TOPDOWN_FE_BOUND, + INTEL_ARCH_TOPDOWN_RETIRING, + INTEL_ARCH_LBR_INSERTS, }; kvm_static_assert(ARRAY_SIZE(intel_pmu_arch_events) =3D=3D NR_INTEL_ARCH_E= VENTS); =20 diff --git a/tools/testing/selftests/kvm/x86/pmu_counters_test.c b/tools/te= sting/selftests/kvm/x86/pmu_counters_test.c index e805882bc306..baa7b8a2d459 100644 --- a/tools/testing/selftests/kvm/x86/pmu_counters_test.c +++ b/tools/testing/selftests/kvm/x86/pmu_counters_test.c @@ -75,6 +75,11 @@ static struct kvm_intel_pmu_event intel_event_to_feature= (uint8_t idx) [INTEL_ARCH_BRANCHES_RETIRED_INDEX] =3D { X86_PMU_FEATURE_BRANCH_INSNS_= RETIRED, X86_PMU_FEATURE_NULL }, [INTEL_ARCH_BRANCHES_MISPREDICTED_INDEX] =3D { X86_PMU_FEATURE_BRANCHES_= MISPREDICTED, X86_PMU_FEATURE_NULL }, [INTEL_ARCH_TOPDOWN_SLOTS_INDEX] =3D { X86_PMU_FEATURE_TOPDOWN_SLOTS, X= 86_PMU_FEATURE_TOPDOWN_SLOTS_FIXED }, + [INTEL_ARCH_TOPDOWN_BE_BOUND_INDEX] =3D { X86_PMU_FEATURE_TOPDOWN_BE_BO= UND, X86_PMU_FEATURE_NULL }, + [INTEL_ARCH_TOPDOWN_BAD_SPEC_INDEX] =3D { X86_PMU_FEATURE_TOPDOWN_BAD_S= PEC, X86_PMU_FEATURE_NULL }, + [INTEL_ARCH_TOPDOWN_FE_BOUND_INDEX] =3D { X86_PMU_FEATURE_TOPDOWN_FE_BO= UND, X86_PMU_FEATURE_NULL }, + [INTEL_ARCH_TOPDOWN_RETIRING_INDEX] =3D { X86_PMU_FEATURE_TOPDOWN_RETIR= ING, X86_PMU_FEATURE_NULL }, + [INTEL_ARCH_LBR_INSERTS_INDEX] =3D { X86_PMU_FEATURE_LBR_INSERTS, X86_= PMU_FEATURE_NULL }, }; =20 kvm_static_assert(ARRAY_SIZE(__intel_event_to_feature) =3D=3D NR_INTEL_AR= CH_EVENTS); @@ -171,9 +176,12 @@ static void guest_assert_event_count(uint8_t idx, uint= 32_t pmc, uint32_t pmc_msr fallthrough; case INTEL_ARCH_CPU_CYCLES_INDEX: case INTEL_ARCH_REFERENCE_CYCLES_INDEX: + case INTEL_ARCH_TOPDOWN_BE_BOUND_INDEX: + case INTEL_ARCH_TOPDOWN_FE_BOUND_INDEX: GUEST_ASSERT_NE(count, 0); break; case INTEL_ARCH_TOPDOWN_SLOTS_INDEX: + case INTEL_ARCH_TOPDOWN_RETIRING_INDEX: __GUEST_ASSERT(count >=3D NUM_INSNS_RETIRED, "Expected top-down slots >=3D %u, got count =3D %lu", NUM_INSNS_RETIRED, count); --=20 2.51.0.470.ga7dc726c21-goog From nobody Thu Oct 2 07:43:59 2025 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF4842561C2 for ; Fri, 19 Sep 2025 00:45:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758242725; cv=none; b=q/x3fuDxtXLnJywo80RUJzB2xaaOvhkCzstHFuhVc7Dq9aBg0dlaShsjERSbxaQ4nGBiax+nEee3xmSVDLQt3ROZj7tviBdfBsd5/odKFrbfGIdzpNOgLGLRKqCRDBCZmVhY8sbCb7zIZUI74Jpeex9JJuSLA/bkEiGR7WOHhdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758242725; c=relaxed/simple; bh=pu5kp6pYW+tq5sBpPFCMOucqNiW0W1L/AzTSZAL567I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=T05WzK82RTjks4BzP3MBTGO21hL8zjJ3weqvmxg4NFuqHmGr1WWsRvjLAn3DBBV+jHBOHwpf9IKQgVDfu/usesUp/HDB2npW9ePke8KbLHPEDrV2ztJYfl5/rP4EK3xZkFj9LOgJRYhJI7gCMDMR9j/DxmXxC08scXRZbQgx+5s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=y46bmjHf; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="y46bmjHf" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2697c4e7354so15153485ad.0 for ; Thu, 18 Sep 2025 17:45:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758242723; x=1758847523; darn=vger.kernel.org; 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=K3g1+aaL01ByoZzXTzpQww+Yiuz3bE8C4orevXKBlGM=; b=y46bmjHfNM//N+tnuverzhAUKh6zhEwq0lyGxA+JraXRyV67jZIKPW8RToW6/UtZ9+ IPkAxHDOvAgNoeDosvObbOI6L8fZ5evd4JoBaGH+nUKZqPhGv+8lPyEhXaq8N+oDld1v sRt4S26YqC1iESf9ySvyAcOdyOiecfm+qyjLselma9jrttbIYUQsemTI62f8RUEambHF G4sDSrIwb6TB0L0I3Cfc1V9SwQuyYC2vF+Jb4Trxk3w07XKi6cmivhB7fJ2UGYtkiHeh dWEoDJicnIroXMj/K1D6vkQ9kEYe54efJkaTWZzz5AAu0XrbZW+pw4apR7tgVZW46wv8 ciWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758242723; x=1758847523; 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=K3g1+aaL01ByoZzXTzpQww+Yiuz3bE8C4orevXKBlGM=; b=AkNkU2VFbNfEbnex/dnkTwxomiZsmQ5hB2OnINe+gB7tuyBEZkEHqSVMwip72zqMDK qZ4tBzHzQry6w48Pwatm0jH6lld90DIOC2RtLakkr5b4bhy3f53cAijtYna72lIYG8gx K6QXfGiV4UNIYaqkDeKoBhR8D5hLkJ0nFl3D2RFkhdUuA9gG34kQI/Ex6wQQBTOw8jrS iM/veebUzdHNqQSe1HZK6mmixJl7cwKwvaOBKhuz7VQXMSZSnh9O6PNIYBIvsxXg7xav SSw56bKKLOMxiKMv2KmzmstBpx7FZlbxb4GDxbwxSz7VofHTnEQOlId4MTDtq6CemUHw uvBQ== X-Forwarded-Encrypted: i=1; AJvYcCVUpjRlIakzleg4aeGPjA4DTHepb7QV8ZRjL2dBDAWC2k2N+shmZ3xgYfM30KySXiGjIf6JyqXis8jhxUk=@vger.kernel.org X-Gm-Message-State: AOJu0Yxem6IOkicIhtd5gCsWAE3K2MKi9jru/hm4BlpmV4hPb4r1fpC/ Fjq8J6GYZkcmag0qeMin98a21a1PnoaNloiPHSp/Vh+q4uvR1CjAojN4l+Uqea2zEMVNk+nzRYK G2eNkHw== X-Google-Smtp-Source: AGHT+IFR49E4UblXd44Lqj4iHyLUQu+gME1thr5lLZEYp1+FSVWGE5J7nHz78BmbEwgwpc2lagPA2VtxBbY= X-Received: from pjbnw4.prod.google.com ([2002:a17:90b:2544:b0:32b:65c6:661a]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e547:b0:251:a3b3:1572 with SMTP id d9443c01a7336-2697c815446mr66755475ad.9.1758242723280; Thu, 18 Sep 2025 17:45:23 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 18 Sep 2025 17:45:12 -0700 In-Reply-To: <20250919004512.1359828-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250919004512.1359828-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.470.ga7dc726c21-goog Message-ID: <20250919004512.1359828-6-seanjc@google.com> Subject: [PATCH v3 5/5] KVM: selftests: Handle Intel Atom errata that leads to PMU event overcount From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Dapeng Mi , Yi Lai , dongsheng Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: dongsheng Add a PMU errata framework and use it to relax precise event counts on Atom platforms that overcount "Instruction Retired" and "Branch Instruction Retired" events, as the overcount issues on VM-Exit/VM-Entry are impossible to prevent from userspace, e.g. the test can't prevent host IRQs. Setup errata during early initialization and automatically sync the mask to VMs so that tests can check for errata without having to manually manage host=3D>guest variables. For Intel Atom CPUs, the PMU events "Instruction Retired" or "Branch Instruction Retired" may be overcounted for some certain instructions, like FAR CALL/JMP, RETF, IRET, VMENTRY/VMEXIT/VMPTRLD and complex SGX/SMX/CSTATE instructions/flows. The detailed information can be found in the errata (section SRF7): https://edc.intel.com/content/www/us/en/design/products-and-solutions/proce= ssors-and-chipsets/sierra-forest/xeon-6700-series-processor-with-e-cores-sp= ecification-update/errata-details/ For the Atom platforms before Sierra Forest (including Sierra Forest), Both 2 events "Instruction Retired" and "Branch Instruction Retired" would be overcounted on these certain instructions, but for Clearwater Forest only "Instruction Retired" event is overcounted on these instructions. Signed-off-by: dongsheng Co-developed-by: Dapeng Mi Signed-off-by: Dapeng Mi Tested-by: Yi Lai Co-developed-by: Sean Christopherson Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/include/x86/pmu.h | 14 ++++++ tools/testing/selftests/kvm/lib/x86/pmu.c | 44 +++++++++++++++++++ .../testing/selftests/kvm/lib/x86/processor.c | 4 ++ .../selftests/kvm/x86/pmu_counters_test.c | 12 ++++- .../selftests/kvm/x86/pmu_event_filter_test.c | 4 +- 5 files changed, 75 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/kvm/include/x86/pmu.h b/tools/testing/= selftests/kvm/include/x86/pmu.h index 2aabda2da002..25d2b476daf4 100644 --- a/tools/testing/selftests/kvm/include/x86/pmu.h +++ b/tools/testing/selftests/kvm/include/x86/pmu.h @@ -5,6 +5,7 @@ #ifndef SELFTEST_KVM_PMU_H #define SELFTEST_KVM_PMU_H =20 +#include #include =20 #define KVM_PMU_EVENT_FILTER_MAX_EVENTS 300 @@ -104,4 +105,17 @@ enum amd_pmu_zen_events { extern const uint64_t intel_pmu_arch_events[]; extern const uint64_t amd_pmu_zen_events[]; =20 +enum pmu_errata { + INSTRUCTIONS_RETIRED_OVERCOUNT, + BRANCHES_RETIRED_OVERCOUNT, +}; +extern uint64_t pmu_errata_mask; + +void kvm_init_pmu_errata(void); + +static inline bool this_pmu_has_errata(enum pmu_errata errata) +{ + return pmu_errata_mask & errata; +} + #endif /* SELFTEST_KVM_PMU_H */ diff --git a/tools/testing/selftests/kvm/lib/x86/pmu.c b/tools/testing/self= tests/kvm/lib/x86/pmu.c index 5ab44bf54773..34cb57d1d671 100644 --- a/tools/testing/selftests/kvm/lib/x86/pmu.c +++ b/tools/testing/selftests/kvm/lib/x86/pmu.c @@ -8,6 +8,7 @@ #include =20 #include "kvm_util.h" +#include "processor.h" #include "pmu.h" =20 const uint64_t intel_pmu_arch_events[] =3D { @@ -34,3 +35,46 @@ const uint64_t amd_pmu_zen_events[] =3D { AMD_ZEN_BRANCHES_MISPREDICTED, }; kvm_static_assert(ARRAY_SIZE(amd_pmu_zen_events) =3D=3D NR_AMD_ZEN_EVENTS); + +/* + * For Intel Atom CPUs, the PMU events "Instruction Retired" or + * "Branch Instruction Retired" may be overcounted for some certain + * instructions, like FAR CALL/JMP, RETF, IRET, VMENTRY/VMEXIT/VMPTRLD + * and complex SGX/SMX/CSTATE instructions/flows. + * + * The detailed information can be found in the errata (section SRF7): + * https://edc.intel.com/content/www/us/en/design/products-and-solutions/p= rocessors-and-chipsets/sierra-forest/xeon-6700-series-processor-with-e-core= s-specification-update/errata-details/ + * + * For the Atom platforms before Sierra Forest (including Sierra Forest), + * Both 2 events "Instruction Retired" and "Branch Instruction Retired" wo= uld + * be overcounted on these certain instructions, but for Clearwater Forest + * only "Instruction Retired" event is overcounted on these instructions. + */ +static uint64_t get_pmu_errata(void) +{ + if (!this_cpu_is_intel()) + return 0; + + if (this_cpu_family() !=3D 0x6) + return 0; + + switch (this_cpu_model()) { + case 0xDD: /* Clearwater Forest */ + return BIT_ULL(INSTRUCTIONS_RETIRED_OVERCOUNT); + case 0xAF: /* Sierra Forest */ + case 0x4D: /* Avaton, Rangely */ + case 0x5F: /* Denverton */ + case 0x86: /* Jacobsville */ + return BIT_ULL(INSTRUCTIONS_RETIRED_OVERCOUNT) | + BIT_ULL(BRANCHES_RETIRED_OVERCOUNT); + default: + return 0; + } +} + +uint64_t pmu_errata_mask; + +void kvm_init_pmu_errata(void) +{ + pmu_errata_mask =3D get_pmu_errata(); +} diff --git a/tools/testing/selftests/kvm/lib/x86/processor.c b/tools/testin= g/selftests/kvm/lib/x86/processor.c index 3b63c99f7b96..4402d2e1ea69 100644 --- a/tools/testing/selftests/kvm/lib/x86/processor.c +++ b/tools/testing/selftests/kvm/lib/x86/processor.c @@ -6,6 +6,7 @@ #include "linux/bitmap.h" #include "test_util.h" #include "kvm_util.h" +#include "pmu.h" #include "processor.h" #include "sev.h" =20 @@ -638,6 +639,7 @@ void kvm_arch_vm_post_create(struct kvm_vm *vm) sync_global_to_guest(vm, host_cpu_is_intel); sync_global_to_guest(vm, host_cpu_is_amd); sync_global_to_guest(vm, is_forced_emulation_enabled); + sync_global_to_guest(vm, pmu_errata_mask); =20 if (is_sev_vm(vm)) { struct kvm_sev_init init =3D { 0 }; @@ -1269,6 +1271,8 @@ void kvm_selftest_arch_init(void) host_cpu_is_intel =3D this_cpu_is_intel(); host_cpu_is_amd =3D this_cpu_is_amd(); is_forced_emulation_enabled =3D kvm_is_forced_emulation_enabled(); + + kvm_init_pmu_errata(); } =20 bool sys_clocksource_is_based_on_tsc(void) diff --git a/tools/testing/selftests/kvm/x86/pmu_counters_test.c b/tools/te= sting/selftests/kvm/x86/pmu_counters_test.c index baa7b8a2d459..acb5a5c37296 100644 --- a/tools/testing/selftests/kvm/x86/pmu_counters_test.c +++ b/tools/testing/selftests/kvm/x86/pmu_counters_test.c @@ -163,10 +163,18 @@ static void guest_assert_event_count(uint8_t idx, uin= t32_t pmc, uint32_t pmc_msr =20 switch (idx) { case INTEL_ARCH_INSTRUCTIONS_RETIRED_INDEX: - GUEST_ASSERT_EQ(count, NUM_INSNS_RETIRED); + /* Relax precise count check due to VM-EXIT/VM-ENTRY overcount issue */ + if (this_pmu_has_errata(INSTRUCTIONS_RETIRED_OVERCOUNT)) + GUEST_ASSERT(count >=3D NUM_INSNS_RETIRED); + else + GUEST_ASSERT_EQ(count, NUM_INSNS_RETIRED); break; case INTEL_ARCH_BRANCHES_RETIRED_INDEX: - GUEST_ASSERT_EQ(count, NUM_BRANCH_INSNS_RETIRED); + /* Relax precise count check due to VM-EXIT/VM-ENTRY overcount issue */ + if (this_pmu_has_errata(BRANCHES_RETIRED_OVERCOUNT)) + GUEST_ASSERT(count >=3D NUM_BRANCH_INSNS_RETIRED); + else + GUEST_ASSERT_EQ(count, NUM_BRANCH_INSNS_RETIRED); break; case INTEL_ARCH_LLC_REFERENCES_INDEX: case INTEL_ARCH_LLC_MISSES_INDEX: diff --git a/tools/testing/selftests/kvm/x86/pmu_event_filter_test.c b/tool= s/testing/selftests/kvm/x86/pmu_event_filter_test.c index c15513cd74d1..1c5b7611db24 100644 --- a/tools/testing/selftests/kvm/x86/pmu_event_filter_test.c +++ b/tools/testing/selftests/kvm/x86/pmu_event_filter_test.c @@ -214,8 +214,10 @@ static void remove_event(struct __kvm_pmu_event_filter= *f, uint64_t event) do { \ uint64_t br =3D pmc_results.branches_retired; \ uint64_t ir =3D pmc_results.instructions_retired; \ + bool br_matched =3D this_pmu_has_errata(BRANCHES_RETIRED_OVERCOUNT) ? \ + br >=3D NUM_BRANCHES : br =3D=3D NUM_BRANCHES; \ \ - if (br && br !=3D NUM_BRANCHES) \ + if (br && !br_matched) \ pr_info("%s: Branch instructions retired =3D %lu (expected %u)\n", \ __func__, br, NUM_BRANCHES); \ TEST_ASSERT(br, "%s: Branch instructions retired =3D %lu (expected > 0)",= \ --=20 2.51.0.470.ga7dc726c21-goog