From mboxrd@z Thu Jan 1 00:00:00 1970 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 328212E0417 for ; Wed, 6 Aug 2025 19:58:39 +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=1754510324; cv=none; b=nkhzu56EmVHpsDfMi9WG6FpCKYBds61+Tad2BjekB7PNXBnJCUTgLARWNYc54u3PthMUY+ow+KtjQOGWdxhNxYnFkJcPrOljziUB9MkICgSbyqdu2E3r2mpBW6oJdCzXo/hWuQUSQANqHNkqbDEi2V+/FVHVi2Kc0Tswndj8nec= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754510324; c=relaxed/simple; bh=eowlj8R0vSVTi/YxsD+P1ORI9OIx1rmOow0uWDRXpQc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=DNMEW9C65aitGfS4dTxPCsuuf766z/QeeMtm7VVpLBny8F2L2JpowVSKzp1Y6nLWaDdQ2gsB9NITJQIRfFOlb+evFgbV2ysHfYuP/SxDDz+TkYNCnKTxFMORWIRF8axbuVE9GI3wO1DQGHtUCLPPl8CVTrJJySsql38/wVzDncY= 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=30xjL2Me; 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="30xjL2Me" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-31f32271a1fso373505a91.0 for ; Wed, 06 Aug 2025 12:58:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1754510319; x=1755115119; darn=lists.linux.dev; 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=AlJpQpYzAXA8yQUaTEjcLu5rmW1zUT5mjcWEtsvn+qY=; b=30xjL2MeNnG5U9vZwxJDYShJce1jybpTTFCO03W7fGXhotXzLvkeikUgaXE+7JawHZ ExeqU1+lngAfJ/s6YQrC/cqXIABXchevD2RQKAY48JRUTYxcqouxQv/gwNY3WJ7jauHC dW/3RT78RI29L5lYUPYQh0ucICb4Oeg6ot+epQy1Tq6KXWXJsbu5lY1Q0kYkC56D7kgb 3c9cVR1dninz9OoPJhO54Utm0zNxDE4cnlaZ9KWEv7JdBSvnj9QACDqF7jR4v/W0LOlF W7SGI2n3NseSXwj/CyFSaX+0nQL+yN2rR+m6WpRUrcAZEDU5PVcHSnKxgi+2b6Zkk/2N pwag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754510319; x=1755115119; 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=AlJpQpYzAXA8yQUaTEjcLu5rmW1zUT5mjcWEtsvn+qY=; b=jKb5ekzn7B5gCoJwEIbnewHClyWvn45mgEx5y0nC2g5HJ8dA4eCJX2parPbQqNeVia ymiJndOTYV6UYDARSw4d/dxVuVxRNH0ypLHvtoAH58HmA0yGEP/cfM/wF89OnNgisbn9 jwL5wWDUrp1O6BoLCWcmQyfrKKckn1rgevuHcbYkjeAU3IoGKEZws/J4hOiNX+exEY28 9Tu1UKc8NMUvSl3zsSt7xqFI2GWyN+PBK0dPgT/jFxnoowKaNbjKpyIBkzxwPElUPrYx z2JAJB34f1dvPcg2qN5wvtvmqYXRfOOGnjD7Iw6ySerO+eu+MLTgczwDeg+EGWAY0Lr1 FtxQ== X-Forwarded-Encrypted: i=1; AJvYcCUJnkWSPhFZYanC0UQoL9lf59wyZ8M56NAJN+VKN8x+j6s4mK3YUMIebk3nnr1aKIRHHLNxVr0=@lists.linux.dev X-Gm-Message-State: AOJu0YziaSM1HLtQqo0V/UOKdEv9UCFs+actEwfp7Zb1JnmkokJE9btL fqORcJZjwi+3thiniLm52tMlzHB1mAaG34A8N4XplXU+FaaDjcXkUXCrrgwAkrfgmoMFP9J9DIB h8tX6xQ== X-Google-Smtp-Source: AGHT+IFAT6PWSjUL0hLa4l6orw0CuXbesqbqOENgS6V/LUSfRrl7M4gZLDmaQmAh4Zg14qO5rj6Zp5FZNJo= X-Received: from pjx15.prod.google.com ([2002:a17:90b:568f:b0:31c:32f8:3f88]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5110:b0:31f:4e9b:7c6a with SMTP id 98e67ed59e1d1-3217562accemr1061143a91.15.1754510319397; Wed, 06 Aug 2025 12:58:39 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 6 Aug 2025 12:57:01 -0700 In-Reply-To: <20250806195706.1650976-1-seanjc@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250806195706.1650976-1-seanjc@google.com> X-Mailer: git-send-email 2.50.1.565.gc32cd1483b-goog Message-ID: <20250806195706.1650976-40-seanjc@google.com> Subject: [PATCH v5 39/44] KVM: x86/pmu: Handle emulated instruction for mediated vPMU From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Xin Li , "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Sean Christopherson , Paolo Bonzini Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, loongarch@lists.linux.dev, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Kan Liang , Yongwei Ma , Mingwei Zhang , Xiong Zhang , Sandipan Das , Dapeng Mi Content-Type: text/plain; charset="UTF-8" From: Dapeng Mi Mediated vPMU needs to accumulate the emulated instructions into counter and load the counter into HW at vm-entry. Moreover, if the accumulation leads to counter overflow, KVM needs to update GLOBAL_STATUS and inject PMI into guest as well. Suggested-by: Sean Christopherson Signed-off-by: Dapeng Mi Signed-off-by: Mingwei Zhang Signed-off-by: Sean Christopherson --- arch/x86/kvm/pmu.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c index 77042cad3155..ddab1630a978 100644 --- a/arch/x86/kvm/pmu.c +++ b/arch/x86/kvm/pmu.c @@ -1018,10 +1018,45 @@ void kvm_pmu_destroy(struct kvm_vcpu *vcpu) kvm_pmu_reset(vcpu); } +static bool pmc_is_pmi_enabled(struct kvm_pmc *pmc) +{ + u8 fixed_ctr_ctrl; + + if (pmc_is_gp(pmc)) + return pmc->eventsel & ARCH_PERFMON_EVENTSEL_INT; + + fixed_ctr_ctrl = fixed_ctrl_field(pmc_to_pmu(pmc)->fixed_ctr_ctrl, + pmc->idx - KVM_FIXED_PMC_BASE_IDX); + return fixed_ctr_ctrl & INTEL_FIXED_0_ENABLE_PMI; +} + static void kvm_pmu_incr_counter(struct kvm_pmc *pmc) { - pmc->emulated_counter++; - kvm_pmu_request_counter_reprogram(pmc); + struct kvm_vcpu *vcpu = pmc->vcpu; + + /* + * For perf-based PMUs, accumulate software-emulated events separately + * from pmc->counter, as pmc->counter is offset by the count of the + * associated perf event. Request reprogramming, which will consult + * both emulated and hardware-generated events to detect overflow. + */ + if (!kvm_vcpu_has_mediated_pmu(vcpu)) { + pmc->emulated_counter++; + kvm_pmu_request_counter_reprogram(pmc); + return; + } + + /* + * For mediated PMUs, pmc->counter is updated when the vCPU's PMU is + * put, and will be loaded into hardware when the PMU is loaded. Simply + * increment the counter and signal overflow if it wraps to zero. + */ + pmc->counter = (pmc->counter + 1) & pmc_bitmask(pmc); + if (!pmc->counter) { + pmc_to_pmu(pmc)->global_status |= BIT_ULL(pmc->idx); + if (pmc_is_pmi_enabled(pmc)) + kvm_make_request(KVM_REQ_PMI, vcpu); + } } static inline bool cpl_is_matched(struct kvm_pmc *pmc) -- 2.50.1.565.gc32cd1483b-goog