From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo1-f73.google.com (mail-oo1-f73.google.com [209.85.161.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 8D8C4190067 for ; Mon, 20 Jan 2025 20:07:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737403650; cv=none; b=uNmBVgWuOFm9LPUhTJ2tqSAnzxoh2QqigoD5AFf4wj4w4brybAnU71GHKoPXlEgIf3ggQEsbPLCLf0qQSsKFNIdmZkA9Io2q4bSlLgga8uhT4ouXp0EAPH3AG5laD/ewG28oUafkGRmbOBp22B9WNVvoJTClDDI27McGY0U5WRY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737403650; c=relaxed/simple; bh=NH+aeZcweZIlJCTgdkU6lz2lcBTtsiR2fKteyRUQTIk=; h=Date:In-Reply-To:Mime-Version:Message-ID:Subject:From:To:Cc: Content-Type; b=Mz/AF8KAlV5RgApjLTpDcnXskXKVY0z9pz1HfTqjLhHOmHEjTsEzaho4TPXtWGEFGTvWisrJdYsfVzmKNiQmhnuAJ6wW5oslx4Xv/J8wrdWUo6iQGeQVIp6SGO8M07qQihwXv+tmCmw4ySxX/SS0CUid7kfA/ZksuNREjAuy+pU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--coltonlewis.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=0QjON+rQ; arc=none smtp.client-ip=209.85.161.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--coltonlewis.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="0QjON+rQ" Received: by mail-oo1-f73.google.com with SMTP id 006d021491bc7-5f6e3f02e27so1326448eaf.3 for ; Mon, 20 Jan 2025 12:07:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1737403646; x=1738008446; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:in-reply-to:date:from:to :cc:subject:date:message-id:reply-to; bh=znQc5ya/qrfgVRfkMEA3QWNUiFjrxeYAddx1iowMLag=; b=0QjON+rQ08DDQbUxWvW8Xky58Q1f5tjZ3GmoHfRkxnRChwTwUNQcHa1CN1rI26BVrI FWHvBDJRkHWuXNzN6ROp6D1JUyR16Wr8Fe/kfbMCuT5+IZI/Xs49oY3wyj/7ATl/FBPx CH4Q7efB5J80wPVHOnk7PASnHXq1JH59mrdJvWZl5oW6KQZHxEnEMxT69pESKyPMV7Kt RmRx/QSR335NM/6L7sKS53xmaziF61aYXdgVeMlA435HO78Sp7JuNRbN7lmLgafDBWms 73gNumEc69ReSdY2j1MXtC1cYswkOutUCFowq4yOMxHGqT2A4q+FKj+kn/01RAnKWZlH cN0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737403646; x=1738008446; h=cc:to:from:subject:message-id:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=znQc5ya/qrfgVRfkMEA3QWNUiFjrxeYAddx1iowMLag=; b=HJmNTqAbG7d9F3cl9o/98gHrQsID4L8rFnYwkg95HiH9HXFThNxizSg6xtXhpYjzxW ghrNPf5sjnLBfg4iZJsG2nGildteWF0loJNZ/hr+sRTs1saL5GycPFvtRWzviosyP6uT XCUmfslJ3cx6o27osxioDHC14wFg43bn8CdeWEiExARnKkRM/V4Fer/kqak6NAx1ShYu n8dYHovRmVek92o82bnpzeFQYynQ8DEhK4FpU7vr/uJP6PnXSWZh3IkQ2//aTDnxmP7N ZXOMfj3XrVOQv516vo4mZ1J5KOw2KjSOEMuoRhbxnNiArVmCTi2Cx4VLL3AI09FkfDQe RCuA== X-Forwarded-Encrypted: i=1; AJvYcCX6n1iAXnqK/SW4lwdzHfBRVz1Xogzm64a7UZAKcY+2m4IqUrIpZD+decV+gMSa25XQdlQ3lXwUWd6BHpg=@vger.kernel.org X-Gm-Message-State: AOJu0YwyEBNtcOXeYCV9nv4iNrBYXqe5YhepSNhjMcCEPAixLguAb39z GvAMEzTjdhdhDzC8kpu0DSljcuTSB5ZscXsJK782A8BIMZta/0OHU1Up815akGmy5y8rM9W/KL1 dTdXI3H9WplTGS66jIORQ3w== X-Google-Smtp-Source: AGHT+IFk0S/i7d7lkEKdU5r4pixQlkDdqhsfVj9yDj+hasgnv0qQnXftROdcmiB2uPqsBshOy5Qiy9r6hWstZDGkcA== X-Received: from oabhf8.prod.google.com ([2002:a05:6870:7a08:b0:27c:f4f:5a84]) (user=coltonlewis job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6870:2a46:b0:29e:2422:49e2 with SMTP id 586e51a60fabf-2b1c0c54eb1mr8715363fac.31.1737403646677; Mon, 20 Jan 2025 12:07:26 -0800 (PST) Date: Mon, 20 Jan 2025 20:07:25 +0000 In-Reply-To: (message from Sean Christopherson on Wed, 8 Jan 2025 11:42:43 -0800) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Message-ID: Subject: Re: [PATCH v2 6/6] KVM: x86: selftests: Test PerfMonV2 From: Colton Lewis To: Sean Christopherson Cc: kvm@vger.kernel.org, mizhang@google.com, ljr.kernel@gmail.com, jmattson@google.com, aaronlewis@google.com, pbonzini@redhat.com, shuah@kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8"; format=flowed; delsp=yes Sean Christopherson writes: > On Wed, Sep 18, 2024, Colton Lewis wrote: >> Test PerfMonV2, which defines global registers to enable multiple >> performance counters with a single MSR write, in its own function. >> If the feature is available, ensure the global control register has >> the ability to start and stop the performance counters and the global >> status register correctly flags an overflow by the associated counter. >> Signed-off-by: Colton Lewis >> --- >> .../selftests/kvm/x86_64/pmu_counters_test.c | 53 +++++++++++++++++++ >> 1 file changed, 53 insertions(+) >> diff --git a/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c >> b/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c >> index cf2941cc7c4c..a90df8b67a19 100644 >> --- a/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c >> +++ b/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c >> @@ -763,10 +763,63 @@ static void guest_test_core_events(void) >> } >> } >> +static void guest_test_perfmon_v2(void) >> +{ >> + uint64_t i; >> + uint64_t eventsel = ARCH_PERFMON_EVENTSEL_OS | >> + ARCH_PERFMON_EVENTSEL_ENABLE | >> + AMD_ZEN_CORE_CYCLES; > Hmm. I like the extra coverage, but I think the guts of this test belong > is > common code, because the core logic is the same across Intel and AMD (I > think), > only the MSRs are different. > Maybe a library helper that takes in the MSRs as parameters? Not sure. I'll explore some other options > I suspect it'll take some back and forth to figure out how best to > validate these > more "advanced" behaviors, so maybe skip this patch for the next > version? I.e. > land basic AMD coverage and then we can figure out how to test global > control and > status. Sure >> + bool core_ext = this_cpu_has(X86_FEATURE_PERF_CTR_EXT_CORE); >> + uint64_t sel_msr_base = core_ext ? MSR_F15H_PERF_CTL : MSR_K7_EVNTSEL0; >> + uint64_t cnt_msr_base = core_ext ? MSR_F15H_PERF_CTR : MSR_K7_PERFCTR0; >> + uint64_t msr_step = core_ext ? 2 : 1; >> + uint8_t nr_counters = guest_nr_core_counters(); >> + bool perfmon_v2 = this_cpu_has(X86_FEATURE_PERFMON_V2); > Zero reason to capture this in a local variable. Will delete >> + uint64_t sel_msr; >> + uint64_t cnt_msr; >> + >> + if (!perfmon_v2) >> + return; >> + >> + for (i = 0; i < nr_counters; i++) { >> + sel_msr = sel_msr_base + msr_step * i; >> + cnt_msr = cnt_msr_base + msr_step * i; >> + >> + /* Ensure count stays 0 when global register disables counter. */ >> + wrmsr(MSR_AMD64_PERF_CNTR_GLOBAL_CTL, 0); >> + wrmsr(sel_msr, eventsel); >> + wrmsr(cnt_msr, 0); >> + __asm__ __volatile__("loop ." : "+c"((int){NUM_LOOPS})); >> + GUEST_ASSERT(!_rdpmc(i)); >> + >> + /* Ensure counter is >0 when global register enables counter. */ >> + wrmsr(MSR_AMD64_PERF_CNTR_GLOBAL_CTL, BIT_ULL(i)); >> + __asm__ __volatile__("loop ." : "+c"((int){NUM_LOOPS})); >> + wrmsr(MSR_AMD64_PERF_CNTR_GLOBAL_CTL, 0); >> + GUEST_ASSERT(_rdpmc(i)); >> + >> + /* Ensure global status register flags a counter overflow. */ >> + wrmsr(cnt_msr, -1); >> + wrmsr(MSR_AMD64_PERF_CNTR_GLOBAL_STATUS_CLR, 0xff); >> + wrmsr(MSR_AMD64_PERF_CNTR_GLOBAL_CTL, BIT_ULL(i)); >> + __asm__ __volatile__("loop ." : "+c"((int){NUM_LOOPS})); >> + wrmsr(MSR_AMD64_PERF_CNTR_GLOBAL_CTL, 0); >> + GUEST_ASSERT(rdmsr(MSR_AMD64_PERF_CNTR_GLOBAL_STATUS) & >> + BIT_ULL(i)); >> + >> + /* Ensure global status register flag is cleared correctly. */ >> + wrmsr(MSR_AMD64_PERF_CNTR_GLOBAL_STATUS_CLR, BIT_ULL(i)); >> + GUEST_ASSERT(!(rdmsr(MSR_AMD64_PERF_CNTR_GLOBAL_STATUS) & >> + BIT_ULL(i))); >> + } >> +} >> + >> + >> static void guest_test_core_counters(void) >> { >> guest_test_rdwr_core_counters(); >> guest_test_core_events(); >> + guest_test_perfmon_v2(); >> GUEST_DONE(); >> } >> -- >> 2.46.0.662.g92d0881bb0-goog