From nobody Tue Sep 29 02:33:20 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F0B9843F8C9; Thu, 13 Aug 2026 09:46:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786614367; cv=none; b=MmpT6pnpMAQmIuJRrOdrOFBaWCv9p7iTk385V1GBpX65Ten4sSnMh/VixLiUQojyJbyUxcznhYQHqFrCA/ye1aVCqaYMlBIJ0rwSVNFxKDpNP/r19Untf8XyA8UvmQRYlVcRELdrk7+Iy1Yom+QE18oVWz3hIB9LIGAE4yTG3kY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786614367; c=relaxed/simple; bh=+tAjd6C0k7kSBbUm2ZIFNxz+zWI/GByXCXkx1R/ul4E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jqwcQ78R0CxmvuE90DB9zgfqLZh12sSjrWLLqhklGp+HV++3s1gHhqlACWxPZTcY7vDF8Bmv3RafDDIu9XUevRZftjAVsDnQVS49VvGONYdFeFG8vb+2gTNyvI2i1IgPbT8hn/pSfl5r0sSeCDBf6PTMu2a/pWFawszmobRIUWo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=bZfJF9sb; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="bZfJF9sb" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67D98viO1949806; Thu, 13 Aug 2026 09:45:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=Me4pOBVWGAwV+SjWn URhczqoZAZkgyY5rVmFqXV8CZE=; b=bZfJF9sbQsIlrEvmUD0P6DS0FFLaLOnOn HXGrdcIWxckcQ0Jb1m8FrGv+G/sVGu4tMbQ6l1bg8ao6HR1CFoMM4DhbTBQc7TKo olqp1po5sGE27a8zh7AvxEoLCvgmTl+xIMYbM7eFBAQy9nh1zePyu1cvh1QDYwGv DxvQbBucukSac4nA0EdqZ8s+kpOp+6S8dp2RwtcouG380IbwcRYllGpXHbW/IJd0 026jCXkAl4f+7oFTF87tw2HA9huats+KBnnGT48rTsb9L+7yNa/4w6ABz/hxGkZP f5EOrrxtDG+WdpUDi5xNxMJLKk685LBzzVBAlDwaZsows/tC6uvjA== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fwvnwe9dn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Aug 2026 09:45:53 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67D9fLON007509; Thu, 13 Aug 2026 09:45:52 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fxg9had5u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Aug 2026 09:45:52 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67D9jm9835324338 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 13 Aug 2026 09:45:49 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D1EF420043; Thu, 13 Aug 2026 09:45:48 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4776D20040; Thu, 13 Aug 2026 09:45:46 +0000 (GMT) Received: from localhost.localdomain (unknown [9.39.17.189]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 13 Aug 2026 09:45:46 +0000 (GMT) From: Gautam Menghani To: maddy@linux.ibm.com, atrajeev@linux.ibm.com, npiggin@gmail.com, mpe@ellerman.id.au, chleroy@kernel.org Cc: Gautam Menghani , linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2 1/3] KVM: PPC: Book3S HV: Maintain aggregate context switch values for vCPUs Date: Thu, 13 Aug 2026 15:15:30 +0530 Message-ID: <20260813094535.10083-2-gautam@linux.ibm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260813094535.10083-1-gautam@linux.ibm.com> References: <20260813094535.10083-1-gautam@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=RsP16imK c=1 sm=1 tr=0 ts=6a7d9251 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=RzCfie-kr_QcCd8fBx8p:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=8xd0QCqRopuxImrV20AA:9 X-Proofpoint-GUID: FJw04xx-zq-jRSzXgaWVKHzJ8V_3V8OC X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEzMDA2NiBTYWx0ZWRfXzbqV3NAfqiUA 4Zve2XUWRTP950oaUmfCq34ufdbDadXHR68oiBUx1wBqIBbAmKkWh8FCRZUaLfArl5dPWDm6tG5 IUiJ93qvtA/QeGtzRgQoCif45F7XeGRKeuiQoouNFX5fdoXFz5FyzvFEI6BG2VKEEPwu62pVG4N oopScX6g4uyGBadk8XwYOEfFzlrwmf3sw/tBd+rz+fxKoDtLkfixrfa1fUEe0Ip8d8Nnd+oZZQ3 s6lISq6pfYtbL4PpRzitmwXEabFCVI59A+tEEsUU3CXjCDb1v7FPc98ToyGxtWmI5FdBvKkOs69 nDXbNedTy3GLJCl/JNSbPAkVw9naW3uzeS8O5td1MgVD9iExWK6q8kOse90u8u2rzbSjQGWBKwB ikSAXWn1fI9LPzcJr1+fuKiZAmltl/JlLDk0UdBRfgQP64o9g5aNXVtkWh/atT/gPjIcrcZ3N34 wo7KKSVmPjukOalBELQ== X-Proofpoint-ORIG-GUID: tmBil1HnmRbOVSnISHa86FAV-Ok2_DWh X-Proofpoint-Spam-Info: AW1haW4tMjYwODEzMDA2NiBTYWx0ZWRfXyE901yEXWmtc /dLzIwqe0vAr9tsXGqbHMq5yb/+0ctlcRXDYEVw1hUII2G05+o+bx6v94MaAGmEl8R42WkjzOC7 KwKtHVLvxGBhfcJsU9T0yip1EUVk9fI= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-13_03,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 impostorscore=0 suspectscore=0 clxscore=1015 malwarescore=0 phishscore=0 adultscore=0 lowpriorityscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608130066 Content-Type: text/plain; charset="utf-8" The variables in vcpu->arch currently store the latest values read from PACA when the vCPU exits. Change this to instead store aggregate values so that every vCPU has its own record of total context switch latencies it has accumulated. This is essential for the vpa-pmu driver to report correct numbers. Fixes: 176cda0619b6 ("powerpc/perf: Add perf interface to expose vpa counte= rs") Cc: Signed-off-by: Gautam Menghani --- v1 -> v2: 1. Add stable/fixes tags arch/powerpc/kvm/book3s_hv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 61dbeea317f3..342168b8bfc8 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -4163,12 +4163,12 @@ static void do_trace_nested_cs_time(struct kvm_vcpu= *vcpu) trace_kvmppc_vcpu_stats(vcpu, l1_to_l2_ns - *l1_to_l2_cs_ptr, l2_to_l1_ns - *l2_to_l1_cs_ptr, l2_runtime_ns - *l2_runtime_agg_ptr); + vcpu->arch.l1_to_l2_cs +=3D (l1_to_l2_ns - *l1_to_l2_cs_ptr); + vcpu->arch.l2_to_l1_cs +=3D (l2_to_l1_ns - *l2_to_l1_cs_ptr); + vcpu->arch.l2_runtime_agg +=3D (l2_runtime_ns - *l2_runtime_agg_ptr); *l1_to_l2_cs_ptr =3D l1_to_l2_ns; *l2_to_l1_cs_ptr =3D l2_to_l1_ns; *l2_runtime_agg_ptr =3D l2_runtime_ns; - vcpu->arch.l1_to_l2_cs =3D l1_to_l2_ns; - vcpu->arch.l2_to_l1_cs =3D l2_to_l1_ns; - vcpu->arch.l2_runtime_agg =3D l2_runtime_ns; } =20 u64 kvmhv_get_l1_to_l2_cs_time(void) --=20 2.54.0 From nobody Tue Sep 29 02:33:20 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 376AC468C3C; Thu, 13 Aug 2026 09:46:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786614375; cv=none; b=nERxOZ1zIHN61bX2MbxSYGwsy2TkHcAN6m5JnGe5I+3JO9NUHaT6m8MJTjScVnpi/bp+Ad6NDmgJEpkiZr9Cwn7AL5+dqnzPIh57WovPNMC9+mOH1lDg9wnv5FBxHFAuQlH+EIpg/g5ReWjk65KYyStv5Ay1AKGpFpSJZP8SfY8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786614375; c=relaxed/simple; bh=l6e7SIrRgG5i3Z8rGkaX7NYulbx1/s3CAotonOzYcXw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jl3NCkmAwAChaHeOHxKfyswoN0W9aQk2A5gzTYDIN8rNy4CbpIgdty4OgIF8A26cpx0nfnn44H7wWY37a963gvNI8JL6Plwk5/ENr2QxXDNDRUrYK5Kx8mC2DbsX5cucIklKh4c+pB13WKW1RTrzkLqxaIjTxgQWwG6Z82Ig0UM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=lP87kjYc; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="lP87kjYc" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67D99CgK1950852; Thu, 13 Aug 2026 09:46:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=32oC7LpM9idEcIM1U nB5h0gLMNWJvK3X650Zlr9EBbQ=; b=lP87kjYcOKIsVEPbHX48UpkAu1vzb7rL/ 8YRoUOq1Tm2gnALC3i1OkoCxZUrrfK59Ba+ociRls3gkBCpUwBZNa/EJu6x9/aJ4 OrH4rq5XP3APqaxFFPEhPULKLAh9d0A18HaZ8tzxV/e/o3w+/yfjKPLLx6CP9cl9 X48MX900OI9B7CfGNHUHcRY6+l6zAYSGDvgG3Kz93ciQDtzlxDD2vMeM1wPVkWLm bCNsm1kjhIqlWnoVEEA9r45mRP6M8Tt2yiU1sMGblpzVNOgNG9/cnbe6MLPs4UGs WXsMqm3rnGoCgkGCU6YIxdEFiXLYc0qWea0notO19/JK0/myTwuKQ== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fwvnwe9e5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Aug 2026 09:46:00 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67D9fsPT020344; Thu, 13 Aug 2026 09:45:59 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fxesqaky7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Aug 2026 09:45:59 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67D9jt3b37093762 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 13 Aug 2026 09:45:55 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8099520043; Thu, 13 Aug 2026 09:45:55 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2C82C20040; Thu, 13 Aug 2026 09:45:53 +0000 (GMT) Received: from localhost.localdomain (unknown [9.39.17.189]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 13 Aug 2026 09:45:52 +0000 (GMT) From: Gautam Menghani To: maddy@linux.ibm.com, atrajeev@linux.ibm.com, npiggin@gmail.com, mpe@ellerman.id.au, chleroy@kernel.org Cc: Gautam Menghani , linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2 2/3] powerpc/perf: Use the aggregate context switch values from vcpu struct Date: Thu, 13 Aug 2026 15:15:31 +0530 Message-ID: <20260813094535.10083-3-gautam@linux.ibm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260813094535.10083-1-gautam@linux.ibm.com> References: <20260813094535.10083-1-gautam@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=RsP16imK c=1 sm=1 tr=0 ts=6a7d9258 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=RzCfie-kr_QcCd8fBx8p:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=-rbrNTDI_eUuE96cYmgA:9 X-Proofpoint-GUID: yb0obA1nLaqbo7Vd_URmiwfqML8o0VJ7 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEzMDA2NiBTYWx0ZWRfX0an1HhXNGyMh PRrQ5jdAdoiSS2wJ1o+U+8dfztQCmrIV7ma1KqngNP7MsZa/alyipdhqLaIkRcBL3gwf+LfJaNK xHfWowHSQG/Jj4GN3VE6t95qMqj7imbUeyOT5QTOGbLoS7u+vdhvQbQix4+d9eOq1AF7X2lwBvP mOOg5Cz6R+4mB2I/19QCebgV+VThxoVtZTsxt78SxrlS1Udc+VKe70/5+KVQGzD/9o/0ZDewzpw MicQtx585KeoK8DyDEShbV2qir7GahlRIaJhM447vJKGFWLcPlROOeLXAraBFLH5/Z1Ri5lUU1G JI2Scl/R/nObHy3VBUK4G236zVY5DkozJNw4XqJgCaxqLngaoYgc8w1euyD5WAjfBUxKHQnzypz Q9kNkTDQNOMa3WGP8sg5BjS+TNZH1BLm4dxVSgOCxrA5yVEtVh9KEa38uLj4R0P05P21ZZs7RxE B4dt43GgF7vzjLXFpjg== X-Proofpoint-ORIG-GUID: dcShKy_oNPpG9IT38IU7AkxfXhehCRPN X-Proofpoint-Spam-Info: AW1haW4tMjYwODEzMDA2NiBTYWx0ZWRfX+2anfcH3TdjU 3UezvfBf0qHSSf6Dd2VGKFT55xnnYTWnKovEHJDksdp+s08JMfAJcluxji3C2Wa3c0XxmYJzouv BGY29bcb3RIfHxiPASAOjcZmpDPaSkU= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-13_03,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 impostorscore=0 suspectscore=0 clxscore=1015 malwarescore=0 phishscore=0 adultscore=0 lowpriorityscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608130066 Content-Type: text/plain; charset="utf-8" The vpa-pmu driver reports incorrect numbers in 2 scenarios: 1. The vCPU process gets rescheduled to a different host cpu - Incorrect numbers are observed here because the PACA is per-host cpu resource, and the KVM vCPUs can be rescheduled to different host cpus. This causes the vpa-pmu driver to subtract wrong values when vCPUs are rescheduled. 2. The vCPU is not running when vpa_pmu_read() is called. - In this case get_counter_data() returns 0, and this can result in negative numbers getting reported. Fix the above issues by using the aggregate values from the vcpu structure to capture and report the difference in counter values. Fixes: 176cda0619b6 ("powerpc/perf: Add perf interface to expose vpa counte= rs") Cc: Signed-off-by: Gautam Menghani --- v1 -> v2: 1. Fix the output for "perf stat --cpu ..." 2. Add stable/fixes tags arch/powerpc/include/asm/kvm_book3s_64.h | 3 -- arch/powerpc/kvm/book3s_hv.c | 45 ------------------------ arch/powerpc/perf/vpa-pmu.c | 24 +++++++++---- 3 files changed, 18 insertions(+), 54 deletions(-) diff --git a/arch/powerpc/include/asm/kvm_book3s_64.h b/arch/powerpc/includ= e/asm/kvm_book3s_64.h index b936e174eefd..f620e3126d68 100644 --- a/arch/powerpc/include/asm/kvm_book3s_64.h +++ b/arch/powerpc/include/asm/kvm_book3s_64.h @@ -691,9 +691,6 @@ void kvmhv_set_l2_counters_status(int cpu, bool status); u64 kvmhv_get_l1_to_l2_cs_time(void); u64 kvmhv_get_l2_to_l1_cs_time(void); u64 kvmhv_get_l2_runtime_agg(void); -u64 kvmhv_get_l1_to_l2_cs_time_vcpu(void); -u64 kvmhv_get_l2_to_l1_cs_time_vcpu(void); -u64 kvmhv_get_l2_runtime_agg_vcpu(void); =20 #endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */ =20 diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 342168b8bfc8..b9285b7f1fed 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -4189,51 +4189,6 @@ u64 kvmhv_get_l2_runtime_agg(void) } EXPORT_SYMBOL(kvmhv_get_l2_runtime_agg); =20 -u64 kvmhv_get_l1_to_l2_cs_time_vcpu(void) -{ - struct kvm_vcpu *vcpu; - struct kvm_vcpu_arch *arch; - - vcpu =3D local_paca->kvm_hstate.kvm_vcpu; - if (vcpu) { - arch =3D &vcpu->arch; - return arch->l1_to_l2_cs; - } else { - return 0; - } -} -EXPORT_SYMBOL(kvmhv_get_l1_to_l2_cs_time_vcpu); - -u64 kvmhv_get_l2_to_l1_cs_time_vcpu(void) -{ - struct kvm_vcpu *vcpu; - struct kvm_vcpu_arch *arch; - - vcpu =3D local_paca->kvm_hstate.kvm_vcpu; - if (vcpu) { - arch =3D &vcpu->arch; - return arch->l2_to_l1_cs; - } else { - return 0; - } -} -EXPORT_SYMBOL(kvmhv_get_l2_to_l1_cs_time_vcpu); - -u64 kvmhv_get_l2_runtime_agg_vcpu(void) -{ - struct kvm_vcpu *vcpu; - struct kvm_vcpu_arch *arch; - - vcpu =3D local_paca->kvm_hstate.kvm_vcpu; - if (vcpu) { - arch =3D &vcpu->arch; - return arch->l2_runtime_agg; - } else { - return 0; - } -} -EXPORT_SYMBOL(kvmhv_get_l2_runtime_agg_vcpu); - #else int kvmhv_get_l2_counters_status(void) { diff --git a/arch/powerpc/perf/vpa-pmu.c b/arch/powerpc/perf/vpa-pmu.c index bff4cfab7b94..e79d98447c74 100644 --- a/arch/powerpc/perf/vpa-pmu.c +++ b/arch/powerpc/perf/vpa-pmu.c @@ -91,7 +91,7 @@ static int vpa_pmu_event_init(struct perf_event *event) return 0; } =20 -static unsigned long get_counter_data(struct perf_event *event) +static unsigned long get_counter_data(struct kvm_vcpu *vcpu, struct perf_e= vent *event) { unsigned int config =3D event->attr.config; u64 data; @@ -99,19 +99,19 @@ static unsigned long get_counter_data(struct perf_event= *event) switch (config) { case L1_TO_L2_CS_LAT: if (event->attach_state & PERF_ATTACH_TASK) - data =3D kvmhv_get_l1_to_l2_cs_time_vcpu(); + data =3D vcpu->arch.l1_to_l2_cs; else data =3D kvmhv_get_l1_to_l2_cs_time(); break; case L2_TO_L1_CS_LAT: if (event->attach_state & PERF_ATTACH_TASK) - data =3D kvmhv_get_l2_to_l1_cs_time_vcpu(); + data =3D vcpu->arch.l2_to_l1_cs; else data =3D kvmhv_get_l2_to_l1_cs_time(); break; case L2_RUNTIME_AGG: if (event->attach_state & PERF_ATTACH_TASK) - data =3D kvmhv_get_l2_runtime_agg_vcpu(); + data =3D vcpu->arch.l2_runtime_agg; else data =3D kvmhv_get_l2_runtime_agg(); break; @@ -126,21 +126,33 @@ static unsigned long get_counter_data(struct perf_eve= nt *event) static int vpa_pmu_add(struct perf_event *event, int flags) { u64 data; + struct kvm_vcpu *vcpu; =20 + vcpu =3D local_paca->kvm_hstate.kvm_vcpu; + if (!vcpu) + goto out; + + event->pmu_private =3D vcpu; kvmhv_set_l2_counters_status(smp_processor_id(), true); =20 - data =3D get_counter_data(event); + data =3D get_counter_data(vcpu, event); local64_set(&event->hw.prev_count, data); =20 +out: return 0; } =20 static void vpa_pmu_read(struct perf_event *event) { u64 prev_data, new_data, final_data; + struct kvm_vcpu *vcpu; + + vcpu =3D (struct kvm_vcpu *) event->pmu_private; + if (!vcpu) + return; =20 prev_data =3D local64_read(&event->hw.prev_count); - new_data =3D get_counter_data(event); + new_data =3D get_counter_data(vcpu, event); final_data =3D new_data - prev_data; =20 local64_add(final_data, &event->count); --=20 2.54.0 From nobody Tue Sep 29 02:33:20 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7135C46A60D; Thu, 13 Aug 2026 09:46:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786614379; cv=none; b=SotWjBXig053z3l4v/gnk0ONtJQvMbvr/b00wPIzAdOxQ0qOmFk3WTXTLvd0Ts4/L8m9HyemFUbxmAotfmVv3scYwpMwFuYhqiA53OBN9GIvJS7xNSWYKRtwPwFodRS3U0YXHzd9w4sF5Xn2t+iJSCgZP8GTeoKDiO32lkotfQQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786614379; c=relaxed/simple; bh=UzIn3ePdmD4aHTehfAoWiemKoDKy0fX1m/h3naEQg2w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZNZUh3YzWNKk+3lvrZHeOfFtDnMME04RSDr1z5lhoXyT9kZNQj30IX22bsHQpneKcQZdUPT5xde3BE6p3ycBdZW8+ylDhxrBdr8oOeb0kPK2nY1FT26yyXT0r2+alBxUunR5OBWfJVxwdbALXlmRhXTC/ILRnvU4daE+3BE2LBk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=qKbv2nqI; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="qKbv2nqI" Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67D98wp7811167; Thu, 13 Aug 2026 09:46:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=xzMVkPaBPArW37WMH bKa1fYCa1MnsYfvPwV0Im3Ynsw=; b=qKbv2nqIy64rse51mLJcg467ezh1tosv0 0v9GU3QGw0290tTiGBOvW+1amWk49xy7AE1WXmY3KEh3KfS4EtwnODxhHF7dXQWO 01eZV5rSmmNVv3paije5OKGgTX6aNYi6b24PHRrfSVd/+QomhPoZhnOdlGHDCisz i0USg9UsWbWaBvlq6Ew5ok45CUcuKglOQIZLZc8yMTG5o8kDy3F6kMnZZlP5qky+ NxC2Q7v/tdcc+kI4q5tq2Nf1lAuA7vlGyAqh3KjElhTV+dZoD2X/Gb65MWJf16/h BS+5qOKo7x+/ZWiJsMG0UmdFtNUf0Xorn+Dav3F185HRYk6sqKzuQ== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fyb23ymy5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Aug 2026 09:46:05 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67D9fJ29007453; Thu, 13 Aug 2026 09:46:05 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fxg9had6e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 13 Aug 2026 09:46:05 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67D9k1fT51708224 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 13 Aug 2026 09:46:01 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4778C20043; Thu, 13 Aug 2026 09:46:01 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 99F4E20040; Thu, 13 Aug 2026 09:45:58 +0000 (GMT) Received: from localhost.localdomain (unknown [9.39.17.189]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 13 Aug 2026 09:45:58 +0000 (GMT) From: Gautam Menghani To: maddy@linux.ibm.com, atrajeev@linux.ibm.com, npiggin@gmail.com, mpe@ellerman.id.au, chleroy@kernel.org Cc: Gautam Menghani , linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2 3/3] powerpc/perf: Update prev_count of event to get accurate values Date: Thu, 13 Aug 2026 15:15:32 +0530 Message-ID: <20260813094535.10083-4-gautam@linux.ibm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260813094535.10083-1-gautam@linux.ibm.com> References: <20260813094535.10083-1-gautam@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=XqfK/1F9 c=1 sm=1 tr=0 ts=6a7d925e cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=TypYd02-Uuc7vCoQRyAA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEzMDA2NiBTYWx0ZWRfXxqgqB3ZG1qdZ ErUrA78il1ezEKwjEyKfEnrnEL1onvtAhgHepV/K1iweCChlYGucWDugafzg/MxBncm4BMj5VJb SyafdIMrrsUJrULym08yy9hWwoxVsq4ecd4+kFtObOl4zRPrOUNZN9EEkRdhpJSW0cHcsizS+Sl 8+ZeMey0V/kP2flnO2tHqDTFxTMHWCoFlB8h/9f11gC8CER9ja60e4aWaJJ1KByB41L+gLfA4X0 yHSys88VqOhEhwqQg9HTQoYJQ35XkhCT30rHPndMtRRWggLaTsLmckwQgePVFG0VsxcssuEXKAx 0HOHBtare8eV4LrzWcZnKljnlmeyYgyEp+MVFa6qWUByj9/9KJEA7bZ5qk1WveySHQwGHDSTtPw H8/Svp0s8mkMWoE4AexWsdUTo9UeQh2IWIzIgcv8YpsKW3zC2rKGq8PnvjtRd+YzH5MluNA0yLz Z/5FD8ezJOkiZegRrNw== X-Proofpoint-ORIG-GUID: fJzjQxyJDKc7CjMXQGkzUAvl8JDkbBIh X-Proofpoint-GUID: ZVuaM1SgJm079P5i5UolAZq-6w_X2svt X-Proofpoint-Spam-Info: AW1haW4tMjYwODEzMDA2NiBTYWx0ZWRfX8kxVhX0VcfAA FcCrcTULJwm9eaWMvOv4674VZaU3Gxl9cIwzkvEg7pMw0w1mF/Asmqk1V9If9V86aKzNPseQaui 1KzqcJRsSFSfkintLuQf1UP7t1F11vM= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-13_03,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 adultscore=0 malwarescore=0 clxscore=1015 suspectscore=0 priorityscore=1501 impostorscore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608130066 Content-Type: text/plain; charset="utf-8" When vpa_pmu_read() is called twice while a process is running on a cpu, the "event->hw.prev_count" variable returns a stale value on the 2nd read which results in a larger value getting added to event->count. Fix this by updating the event->hw.prev_count every time vpa_pmu_read() is called. Fixes: 176cda0619b6 ("powerpc/perf: Add perf interface to expose vpa counte= rs") Cc: Signed-off-by: Gautam Menghani --- v1 -> v2: 1. Add stable/fixes tags. arch/powerpc/perf/vpa-pmu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/powerpc/perf/vpa-pmu.c b/arch/powerpc/perf/vpa-pmu.c index e79d98447c74..efc39f71553b 100644 --- a/arch/powerpc/perf/vpa-pmu.c +++ b/arch/powerpc/perf/vpa-pmu.c @@ -156,6 +156,7 @@ static void vpa_pmu_read(struct perf_event *event) final_data =3D new_data - prev_data; =20 local64_add(final_data, &event->count); + local64_set(&event->hw.prev_count, new_data); } =20 static void vpa_pmu_del(struct perf_event *event, int flags) --=20 2.54.0