From nobody Mon Feb 9 10:51:48 2026 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 CA221239586 for ; Mon, 3 Mar 2025 22:53:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741042395; cv=none; b=oJdnToWBHhliLEuIGcsB3yMFi6uy3pPky4B2zVPd0U0mFvUhUQe6expIx6eck7MJE81YW/rDAGQN+bYn4nVtbv5hB+4Xd1rKpGddDDPInm1wHKbgXBzffl7Xc3QAuxdcLgp2xGUq5LLkUu8Ks6sZ9qvY5QsQiukRkcHyl/sx+n0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741042395; c=relaxed/simple; bh=DxQuXHMlgc7H5Iz7LRmGc2M8YCqPk4tOjdxPmN2FNfI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ry0dQW4qkVxNDgAleRy3TcG11T+WgaNvl8up5Qauc5zTbvzYb1A19JKG6OikfHm5lE+NFEQ5yZpRMAs4NyhZFSlf93J4q/6FPasLag5mIJniXDf7cbDGMljI1HCQQdZxRcaTVMQv9BklX2/O6xgdDBUCXhuh0+9qPgF1qTMgq/Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=WdJuMiIk; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="WdJuMiIk" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2239aa5da08so32746345ad.3 for ; Mon, 03 Mar 2025 14:53:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741042393; x=1741647193; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=mugBhowmjHeOZ8voD78niLPk8kFDSWBL6lZCl8cn1Qg=; b=WdJuMiIkIs3pUQXpxz7Z9HmUtPvCC79mJk/occ7KYGG/aZdiOmBHRmCNJhdTOf3/ef ovpBWaFkZU/v2DMGUw9V6pXveZmqaYiGBC56j7XIAZad2ocyzUG4D6T6+hEk5gaP94Fw VsXkGx+7uzLOu6QNKgxQZDi4HxBscik0se8xvAPweYri0I7hRmHEPx0d0wqW2CcqCN/h N4o+RyBR5xgif1GKI770sWlsnhnzzyufnWMaoEritGhZ29py8V5tvja0pu0oehAjlZy+ 7I/spmdEj4WD2ny8Xc1m55EZRBYIwT6a33H+8dc1T906V1Jmn7Qk8d7bPbSMbFd/dkTJ xihw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741042393; x=1741647193; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mugBhowmjHeOZ8voD78niLPk8kFDSWBL6lZCl8cn1Qg=; b=lA2Ic52qa+1GPvCg8t5CBbg4Fft0kE+V6UmgZWSGhfZxp+eZCAxFQbTqRimnFtPL95 /Xtk54Ga3TJldN+Cv7VZOU6C3rXK8hrWw6rRZ+9B27goEdp8MrJiAMNeA1Ez8TeKarrz H/hgDnh5mPftgUFg9LVfa3k6PzXJp9UbZxf51cf3PMK3/I0K+J7une5Ueq6ERcLq2PiR 9qq58FGmnu8ZQShCrzyVoy1EBpCNmYObJR+SSNczlsy8ipyga9AJLYPBPJGyn6MqM6ta c2D/0orm/JsLNm/9MDYL//tSCrNAK2zhOLuiMLWtOxXSM3QJdVBi0S/lCXesO9aqAVQs cJqQ== X-Forwarded-Encrypted: i=1; AJvYcCUgwuOI0NFQB23vpb3/y7TVhxaxsVwtDXn3gMTvVr4zMm6JY6SJpCaCJgAFok3E0K161EmzjfTg+7Fgptk=@vger.kernel.org X-Gm-Message-State: AOJu0Yxq3CKMR31bAs0kwuHECxrnEvvTlm3Vq3M+5UjzLHv3MSsKic4u lTYG11Ej6USEL4fQXWUMkfLQzS8Dcx3GA8x2cw3PEUp9SefUuG1NgNteAjJYWUg= X-Gm-Gg: ASbGncuf4G6BMP3ntbQd9eLTCIfqKXRzWA8YE5yxE1H9Un+G1UETw7Cqk9bhAyo+xRT JXDnBbHbdqIy0oWlBBXiztPfeEuuC4Emzf6ZWTV7dxOXxY0sickgBhIWC7yStszl5/jSWHGgaZh qjqOf+cbu4DkJba6DHJcaGFYdGFFuFzE30q5VCN7xZmTuAKE0uFF37JMIvmLT8gcO79+7pMNw1i mPR/z8ukRnv68Te14LcK913swm8L1NmfuRunjX16azzL+d6qpkOBuFCsiLr6PWZhbMSeLm8asuD U8khA9r6StzVPEvT0EZDhQDyP8QhC3smYso5pjDAM/3Gnv9APrVh31fyOw== X-Google-Smtp-Source: AGHT+IGcN7KmSzWUc3x2Q9hIKcCxmrhzor1ESo6ey42ZNpnLuX0uKU0+qCp3SXFy7hHj8nlBIEN6rA== X-Received: by 2002:a05:6a00:240c:b0:732:2170:b68b with SMTP id d2e1a72fcca58-734abee4a68mr22681643b3a.0.1741042393072; Mon, 03 Mar 2025 14:53:13 -0800 (PST) Received: from atishp.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-734a003eb4fsm9440601b3a.129.2025.03.03.14.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Mar 2025 14:53:12 -0800 (PST) From: Atish Patra Date: Mon, 03 Mar 2025 14:53:06 -0800 Subject: [PATCH v2 1/4] RISC-V: KVM: Disable the kernel perf counter during configure Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250303-kvm_pmu_improve-v2-1-41d177e45929@rivosinc.com> References: <20250303-kvm_pmu_improve-v2-0-41d177e45929@rivosinc.com> In-Reply-To: <20250303-kvm_pmu_improve-v2-0-41d177e45929@rivosinc.com> To: Anup Patel , Atish Patra , Paul Walmsley , Palmer Dabbelt , Andrew Jones , Paolo Bonzini , Shuah Khan Cc: kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Atish Patra X-Mailer: b4 0.15-dev-42535 The perf event should be marked disabled during the creation as it is not ready to be scheduled until there is SBI PMU start call or config matching is called with auto start. Otherwise, event add/start gets called during perf_event_create_kernel_counter function. It will be enabled and scheduled to run via perf_event_enable during either the above mentioned scenario. Fixes: 0cb74b65d2e5 ("RISC-V: KVM: Implement perf support without sampling") Reviewed-by: Andrew Jones Signed-off-by: Atish Patra --- arch/riscv/kvm/vcpu_pmu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/riscv/kvm/vcpu_pmu.c b/arch/riscv/kvm/vcpu_pmu.c index 2707a51b082c..78ac3216a54d 100644 --- a/arch/riscv/kvm/vcpu_pmu.c +++ b/arch/riscv/kvm/vcpu_pmu.c @@ -666,6 +666,7 @@ int kvm_riscv_vcpu_pmu_ctr_cfg_match(struct kvm_vcpu *v= cpu, unsigned long ctr_ba .type =3D etype, .size =3D sizeof(struct perf_event_attr), .pinned =3D true, + .disabled =3D true, /* * It should never reach here if the platform doesn't support the sscofp= mf * extension as mode filtering won't work without it. --=20 2.43.0 From nobody Mon Feb 9 10:51:48 2026 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 1463D23ED58 for ; Mon, 3 Mar 2025 22:53:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741042396; cv=none; b=oGVSOf6sQijvJN6Bn00CWXx99AVj9O9q8+dEIoXz6AssgY3nj+769+Pkwo0Ubt5LEFF1AxRUK63FdamI9QkUbAOoMxqAqNQikJCayRJdbrYd6UBLg9I1kaB1a21lRT0NUq/GY1wiuqD+z3a+uSm5bfsUZR2tTgKBtjXjBXUDKbQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741042396; c=relaxed/simple; bh=gBJ6uGpDPU8VQvhfth2yUutlzUR6uu8KN/4t8mgGmWk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CtnEZ6yaqpdPSvel071eH7zvyb7qUvQIckGp3DEpvwRCFEiyk0FrAJUxfLXyaaCf8KeqVAGv/ZqX3Qye53G6G+jjWAdGeu2S4SqMFz3j+GcnOPXJ56zyVBEZFz/4d7Pm+Ns4HJG6cNu9vhVh/a+bQSLlU/ZFWnNGDlRPRKBcmYw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=rw2Ic0j3; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="rw2Ic0j3" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2235c5818a3so58348225ad.1 for ; Mon, 03 Mar 2025 14:53:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741042394; x=1741647194; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=b5xoxucipI3r87CV5kbgeUb/z0QLUAJbC0b2XlScuLU=; b=rw2Ic0j3xtkPH5LOGEOzDrhI//tfDv7NUln4/ovKnCAWLlp2odyXKMBNCkL8tmQr1b BijZYi3maGEJae5FyLgl0p7zTT/VBS9tlibysY0nINZf1GjUlGQEyyEyI2VrffrghxUZ GofPyfjlVVQ4qC4i0R7VqLCPPX1Bs+k3MqU2aCLrZIjmvWkouO6OqlOzNVAz6wQHkwN1 Vqu6ZyAZscDwpOjgSrteRa7FMx5x0hWKPKXS8upLHgacv7qgCiD4HWMWtIEJ/yWBENSR g4gpcvrLIvL5ZRzP8QlyK1JnvIHPrvK9V2o/aws0n1uNK625KzRv+eUkKEJHyZudS2bK GOAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741042394; x=1741647194; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b5xoxucipI3r87CV5kbgeUb/z0QLUAJbC0b2XlScuLU=; b=qVHcc0Yx4Uup6Rf5yFek2c7PJcNXQxYBYcwW9e8P4VvYVrOMrjV/mH+KacdPNV4ewo c3XAK6Iz9bFtIIGXEphkNDTFnpEiWSlxFCfZ3j1Ilnurq7LY0krDL10Swc9c9+clML0J JEHvcQu3R3pp7Z4rjubhJs9z4RjLEIm89RXe593tne2sKnHpkOqvZ5Zmc696SvaVF/mb aqr/RxKwSeAXoTqz1Wvl/9zZWNOO7vP58gJly5A3dPDxeBi3d07djGp3uNgiBCc6ZAJm gSQxncQ0ldIn0HiwEunuOfHb2PLlHr5E0u0mZL8itxaGIRj4omxmg1GDUMMaYo4sJDmQ /fFg== X-Forwarded-Encrypted: i=1; AJvYcCVmNNC1xBfA/p+Q01zccS2a6m6cPBKtGBet6S3u6H08yUkYyVLakxjyck9e2VIimmuy6QsCO75Lm0GcWq0=@vger.kernel.org X-Gm-Message-State: AOJu0Yy7j6xx84xa51kaEKPj52AgSLPGwZaOfEjjg3t/trGpok4eVCDP vHAchhkIe8XnJEh7brjgkmx9bhMwnfJxt9ljxe6FK0KxI8i1C8Tt/wy5en9fAQ8= X-Gm-Gg: ASbGncuEW5yuv25Gd7gDlp0i998YlezLobaLOV4LhMVuiwpvC6M6anqz3zFjwCWoD4C W2/YmnRHw+1sdIhTAATutskm2E8djshcx7bbzmGA6RgzL2es8rH8JWlTJyWi++vWYGye8eQ47sp 7ilcYgPFJOCsrwPbMB6gntI4jkNVJJedC7BOJIB9WCQOtCgj2+fegqud42y9RRMz4VlHVIHtusq hhEplF2Q4l+vrkAXsBzTnQIBTXtecnTfZWjc6IMCBpz/E5gXuLXXW4tWKfnT2yaGrgM1gCe6qhj zEtUZ2OGPgkTt5tdrBVF7IuxA6Kn80rnySXZt6Y593o2WEJCz/Tb8tLoAw== X-Google-Smtp-Source: AGHT+IGy8hMH+W8RZy5SJOGyzi1MeiJvJku2zV+j7M0txVehkixRDHS/MmEvMDbU3gziq5b3wIbZEQ== X-Received: by 2002:a17:903:230c:b0:21f:78f:c178 with SMTP id d9443c01a7336-22368fa5425mr202955235ad.3.1741042394242; Mon, 03 Mar 2025 14:53:14 -0800 (PST) Received: from atishp.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-734a003eb4fsm9440601b3a.129.2025.03.03.14.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Mar 2025 14:53:13 -0800 (PST) From: Atish Patra Date: Mon, 03 Mar 2025 14:53:07 -0800 Subject: [PATCH v2 2/4] KVM: riscv: selftests: Do not start the counter in the overflow handler Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250303-kvm_pmu_improve-v2-2-41d177e45929@rivosinc.com> References: <20250303-kvm_pmu_improve-v2-0-41d177e45929@rivosinc.com> In-Reply-To: <20250303-kvm_pmu_improve-v2-0-41d177e45929@rivosinc.com> To: Anup Patel , Atish Patra , Paul Walmsley , Palmer Dabbelt , Andrew Jones , Paolo Bonzini , Shuah Khan Cc: kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Atish Patra X-Mailer: b4 0.15-dev-42535 There is no need to start the counter in the overflow handler as we intend to trigger precise number of LCOFI interrupts through these tests. The overflow irq handler has already stopped the counter. As a result, the stop call from the test function may return already stopped error which is fine as well. Reviewed-by: Andrew Jones Signed-off-by: Atish Patra --- tools/testing/selftests/kvm/riscv/sbi_pmu_test.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c b/tools/testi= ng/selftests/kvm/riscv/sbi_pmu_test.c index f45c0ecc902d..284bc80193bd 100644 --- a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c +++ b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c @@ -118,8 +118,8 @@ static void stop_counter(unsigned long counter, unsigne= d long stop_flags) =20 ret =3D sbi_ecall(SBI_EXT_PMU, SBI_EXT_PMU_COUNTER_STOP, counter, 1, stop= _flags, 0, 0, 0); - __GUEST_ASSERT(ret.error =3D=3D 0, "Unable to stop counter %ld error %ld\= n", - counter, ret.error); + __GUEST_ASSERT(ret.error =3D=3D 0 || ret.error =3D=3D SBI_ERR_ALREADY_STO= PPED, + "Unable to stop counter %ld error %ld\n", counter, ret.error); } =20 static void guest_illegal_exception_handler(struct ex_regs *regs) @@ -137,7 +137,6 @@ static void guest_irq_handler(struct ex_regs *regs) unsigned int irq_num =3D regs->cause & ~CAUSE_IRQ_FLAG; struct riscv_pmu_snapshot_data *snapshot_data =3D snapshot_gva; unsigned long overflown_mask; - unsigned long counter_val =3D 0; =20 /* Validate that we are in the correct irq handler */ GUEST_ASSERT_EQ(irq_num, IRQ_PMU_OVF); @@ -151,10 +150,6 @@ static void guest_irq_handler(struct ex_regs *regs) GUEST_ASSERT(overflown_mask & 0x01); =20 WRITE_ONCE(vcpu_shared_irq_count, vcpu_shared_irq_count+1); - - counter_val =3D READ_ONCE(snapshot_data->ctr_values[0]); - /* Now start the counter to mimick the real driver behavior */ - start_counter(counter_in_use, SBI_PMU_START_FLAG_SET_INIT_VALUE, counter_= val); } =20 static unsigned long get_counter_index(unsigned long cbase, unsigned long = cmask, --=20 2.43.0 From nobody Mon Feb 9 10:51:48 2026 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 2F78D23F28F for ; Mon, 3 Mar 2025 22:53:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741042397; cv=none; b=bgFt2oYkEh1O3eZ+pTyeetCVYzGrjpzZVJ4KXPcC3ppMAFeSyis+OGCEpL86Fbk9JaF5aeSeD+F5G3wbrfAkNM2Nt/vybeDb/+U5H3XrBbaSfNpoOcAcecILjgqijB42c9UJ3C3Vkwf5yiC79os1j4+L3tDsaGufhUBj9qLgQ6s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741042397; c=relaxed/simple; bh=oMiBPDZwgZr5dhcoZQIs4/IJPi1MUwF4a7itoyTuCso=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NOfFOgVytHTDE2DJWEWMMDQajBTUja83X3nM7vSh5MBscqWfaYWrmk6ZBx1PKkNfzsDDKO/HBK9vdxZPVZfLyjVhf2klsB7NFVk1/kHlCL+ZVQEfB/uyH/jtqI+Ezm7VjvJFRahkc53tdrGCaO0374VUo2Oj6vyRF8F0XM9br0Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=CxnXxHYZ; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="CxnXxHYZ" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-22113560c57so95208435ad.2 for ; Mon, 03 Mar 2025 14:53:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741042395; x=1741647195; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=SSJ9VliM2a+aTryqldG0CH+Q28sfdpKDs8cwc/DPQU0=; b=CxnXxHYZW+6+02UjXEd/W0U3wCrXSGBHe5FKWLIm7dbBruAZmKN6C9dcX/tu1NQY1q BprpyoGcQRYAEtF1KCEIJEt4EwqZ1Uyl06fgk03q1ZyLs4Jlyu4iwKwEwtlyjoHLFupM tr82bZmHNAJdXI2LQM+XN5S0pvMSJ9ALGN9YmyJr2nNjaC823i5J6eu3cWm4T6bNCy2q RVMEiEabtG4vcf/MjHC2zkscNo57KM0H47wL39B27hvQ2YJ2TUOfvx2SNXuNVT4W763J 2GsHMK4iZ04DL+69CXkaDHcGReLSyRKfeYGNplNSrSeG3u0GXR2vATY+w/GlDVFZ4I9Y BauQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741042395; x=1741647195; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SSJ9VliM2a+aTryqldG0CH+Q28sfdpKDs8cwc/DPQU0=; b=mYgAGZcScZiRUTSh7NJZAkbak8icqZDhiMScgXMSZ8TnExVfNiZNm8H8OHTxn8e+Z5 YX5CGfP2brHtaQ6qxAkmZC4if9k0r7JT4QrY1KJiEeAUFVVgjeVWgdETQUGjc+RtdUHg xsumZTHdK6WA0YoJpdbIRggOSP/3Jzh5rO+iMFAudlL3+NPFeZ8hXTtedtjFS5rPHDWK KdFQsPvEKNMsUDTygJs52FazZ2W4FBgJGbfCsvtU6mtPQ/c38Qcx29WTc6Rl0Vk2ZHPr leHbN5OF/B7geNlQuncI3xhWEpMgKFUPEoA13l5/IFuBXVS/F0KRJBj06ZVvPhOsArKM l6Dw== X-Forwarded-Encrypted: i=1; AJvYcCUGru7Jki1Y+t56Io8wpEdIOWxEsPuBsS0uFM1pzeaTM3t1dBEbRIBYKxnH9GjBbc/oKxosqJDfa9BJCpA=@vger.kernel.org X-Gm-Message-State: AOJu0Ywux7Zun0o7pdZJn/BRbTS5rPHq50dPhOnCVHTrwzO8j0FXTUIr eTMgI/aITi0D09u/RtRPWe4hDw8rSlTC3VEpxGCKlNssoz0Dc/Ee1IiF7uSnRks= X-Gm-Gg: ASbGncuJcjuqnPXODN3+amJP1G+Q+racGY1rxanp+T2k2MRDXYChBrAwPrBmykBXTmb fkHPu7pW9gP/Hut2yFtA93SPTxwhniPstsANfy2/3FXffJ0EWaaq/AOkSjGG+Qr3V4rNaTqbNC7 I+QHz+C3ntIeueab16W20eyCYHhBqsAnrfIgERj4WLZpPx7BAagvPMo1lpJGf4UMgzxJo/WutYG 0vlTfPTOWyOTf4A82MnazSL2iWmzlzfiAaqB3WxA347V2V2xtIHpPdzDuET/XgtcSt5idvfLD3M J7SAHSzwzpcRMyb3zwcVz9JiYh75PX8P0LrdDHQk6bAsQDFPTkllU5gOQQ== X-Google-Smtp-Source: AGHT+IFgJxk7LwSBEIbBrY7Dr1CLOJZk/TMcnbzG8visvcRF+/r9iXWzrvGMz6kqm+x+c1jOver7mQ== X-Received: by 2002:a05:6a00:244d:b0:736:5504:e8af with SMTP id d2e1a72fcca58-7365504e9edmr9350148b3a.24.1741042395376; Mon, 03 Mar 2025 14:53:15 -0800 (PST) Received: from atishp.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-734a003eb4fsm9440601b3a.129.2025.03.03.14.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Mar 2025 14:53:15 -0800 (PST) From: Atish Patra Date: Mon, 03 Mar 2025 14:53:08 -0800 Subject: [PATCH v2 3/4] KVM: riscv: selftests: Change command line option Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250303-kvm_pmu_improve-v2-3-41d177e45929@rivosinc.com> References: <20250303-kvm_pmu_improve-v2-0-41d177e45929@rivosinc.com> In-Reply-To: <20250303-kvm_pmu_improve-v2-0-41d177e45929@rivosinc.com> To: Anup Patel , Atish Patra , Paul Walmsley , Palmer Dabbelt , Andrew Jones , Paolo Bonzini , Shuah Khan Cc: kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Atish Patra X-Mailer: b4 0.15-dev-42535 The PMU test commandline option takes an argument to disable a certain test. The initial assumption behind this was a common use case is just to run all the test most of the time. However, running a single test seems more useful instead. Especially, the overflow test has been helpful to validate PMU virtualizaiton interrupt changes. Switching the command line option to run a single test instead of disabling a single test also allows to provide additional test specific arguments to the test. The default without any options remains unchanged which continues to run all the tests. Reviewed-by: Andrew Jones Signed-off-by: Atish Patra --- tools/testing/selftests/kvm/riscv/sbi_pmu_test.c | 40 +++++++++++++++-----= ---- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c b/tools/testi= ng/selftests/kvm/riscv/sbi_pmu_test.c index 284bc80193bd..de66099235d9 100644 --- a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c +++ b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c @@ -39,7 +39,11 @@ static bool illegal_handler_invoked; #define SBI_PMU_TEST_SNAPSHOT BIT(2) #define SBI_PMU_TEST_OVERFLOW BIT(3) =20 -static int disabled_tests; +struct test_args { + int disabled_tests; +}; + +static struct test_args targs; =20 unsigned long pmu_csr_read_num(int csr_num) { @@ -604,7 +608,11 @@ static void test_vm_events_overflow(void *guest_code) vcpu_init_vector_tables(vcpu); /* Initialize guest timer frequency. */ timer_freq =3D vcpu_get_reg(vcpu, RISCV_TIMER_REG(frequency)); + + /* Export the shared variables to the guest */ sync_global_to_guest(vm, timer_freq); + sync_global_to_guest(vm, vcpu_shared_irq_count); + sync_global_to_guest(vm, targs); =20 run_vcpu(vcpu); =20 @@ -613,28 +621,30 @@ static void test_vm_events_overflow(void *guest_code) =20 static void test_print_help(char *name) { - pr_info("Usage: %s [-h] [-d ]\n", name); - pr_info("\t-d: Test to disable. Available tests are 'basic', 'events', 's= napshot', 'overflow'\n"); + pr_info("Usage: %s [-h] [-t ]\n", name); + pr_info("\t-t: Test to run (default all). Available tests are 'basic', 'e= vents', 'snapshot', 'overflow'\n"); pr_info("\t-h: print this help screen\n"); } =20 static bool parse_args(int argc, char *argv[]) { int opt; - - while ((opt =3D getopt(argc, argv, "hd:")) !=3D -1) { + int temp_disabled_tests =3D SBI_PMU_TEST_BASIC | SBI_PMU_TEST_EVENTS | SB= I_PMU_TEST_SNAPSHOT | + SBI_PMU_TEST_OVERFLOW; + while ((opt =3D getopt(argc, argv, "ht:")) !=3D -1) { switch (opt) { - case 'd': + case 't': if (!strncmp("basic", optarg, 5)) - disabled_tests |=3D SBI_PMU_TEST_BASIC; + temp_disabled_tests &=3D ~SBI_PMU_TEST_BASIC; else if (!strncmp("events", optarg, 6)) - disabled_tests |=3D SBI_PMU_TEST_EVENTS; + temp_disabled_tests &=3D ~SBI_PMU_TEST_EVENTS; else if (!strncmp("snapshot", optarg, 8)) - disabled_tests |=3D SBI_PMU_TEST_SNAPSHOT; + temp_disabled_tests &=3D ~SBI_PMU_TEST_SNAPSHOT; else if (!strncmp("overflow", optarg, 8)) - disabled_tests |=3D SBI_PMU_TEST_OVERFLOW; + temp_disabled_tests &=3D ~SBI_PMU_TEST_OVERFLOW; else goto done; + targs.disabled_tests =3D temp_disabled_tests; break; case 'h': default: @@ -650,25 +660,27 @@ static bool parse_args(int argc, char *argv[]) =20 int main(int argc, char *argv[]) { + targs.disabled_tests =3D 0; + if (!parse_args(argc, argv)) exit(KSFT_SKIP); =20 - if (!(disabled_tests & SBI_PMU_TEST_BASIC)) { + if (!(targs.disabled_tests & SBI_PMU_TEST_BASIC)) { test_vm_basic_test(test_pmu_basic_sanity); pr_info("SBI PMU basic test : PASS\n"); } =20 - if (!(disabled_tests & SBI_PMU_TEST_EVENTS)) { + if (!(targs.disabled_tests & SBI_PMU_TEST_EVENTS)) { test_vm_events_test(test_pmu_events); pr_info("SBI PMU event verification test : PASS\n"); } =20 - if (!(disabled_tests & SBI_PMU_TEST_SNAPSHOT)) { + if (!(targs.disabled_tests & SBI_PMU_TEST_SNAPSHOT)) { test_vm_events_snapshot_test(test_pmu_events_snaphost); pr_info("SBI PMU event verification with snapshot test : PASS\n"); } =20 - if (!(disabled_tests & SBI_PMU_TEST_OVERFLOW)) { + if (!(targs.disabled_tests & SBI_PMU_TEST_OVERFLOW)) { test_vm_events_overflow(test_pmu_events_overflow); pr_info("SBI PMU event verification with overflow test : PASS\n"); } --=20 2.43.0 From nobody Mon Feb 9 10:51:48 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 1592B23958C for ; Mon, 3 Mar 2025 22:53:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741042398; cv=none; b=arZoOhIYICFAm9w+q3eJjJaFM0GPnnzQrqTWo2Z6vmdr2QMv0q1S9mXj63ghSGZWUFtDKRXqh40hVA3z1HJ4C/aujLoYYtFrUF+XUgXnT181HGffVoWBER4MgafOq9KO+a+ea1PZ3RwKUE1gKKu2lzw0LsEJ57SLr/9rg5h3fKg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741042398; c=relaxed/simple; bh=nT1SZDmhRpluE6T0UXqXL8ivt7r+ikBYyrkgQ9kcFWM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kPX2VQgOzN2N+m6qBucFXib/W5tM6TOS5vbRdCiYJuc4B8w35+mnaqh7bCHvRDTHUc4e6XP0TQy0YMYfFpBJSpRvI79LKk5V1fhafUbwngXHEYTID/Om1uc8G8pPNdHxvAA7C+o74AaXr/KQLkoUtfTvl7nN3lJKtjg8aBAFDEE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=jifWr2nx; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="jifWr2nx" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-22349dc31bcso87156495ad.3 for ; Mon, 03 Mar 2025 14:53:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741042396; x=1741647196; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ZCtM/lSFNLHVQ6KX2EDg2QNHrviALMnTGfDgB4f3TXM=; b=jifWr2nx4e35qYZjqR6eXb8khK+zuhylyXa25mW3z0ZH4ij1JG0qWGVhxOdHF+Sgy9 wukzH02Bb5J1DpS8p0esZEhFF/Kh9//vKDoMhAO1MfgK2/DtIR9i/ThlSo5XDiwtDTG1 TsPpTZW9Y2+ZbjzJrLNHni7BhU+lxelqzeJD8kOO6uTCksLY8Iatmnvj+0bPUbrtvmmf yx9+JEMt4jOF7DJ2KLnZKbEeheVPsLMlvFYSdLb5yANVm2x1+ry2hEGgCtSJqUmzxMpc mbnZubhuU57YEdRdIIGVBLQ6d3SIi7Pt/k0Jpb/VR2YCLYtJ/ivNdeijVS8+qn8OWl6C vq1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741042396; x=1741647196; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZCtM/lSFNLHVQ6KX2EDg2QNHrviALMnTGfDgB4f3TXM=; b=oFNRhMHXFeUKtmK3loRJVLdo5Jh+i9bT9QA40XnX5ZieOZs3byFH/T8yzTOy+BWFZn r6dSyT5Bshi4qcoIy7lvh8z041caUpjvfwx6GgZTV8Ggrzf60aLj/E6yxHT4QyrhqTb+ zDXigsL39nzF4ZY8mmRFgQtAzeue+/oyp8eRtTtw+QGq3PUAwoSGkY/T546nwSm3CLjn 7kZYRTUvc6fYvg5KK6bcAWxWWGZQMLdyfdOS23xyKrs+t3gb+kpkCAfWckfO0qAHsqav W2aWRu1Y/FMNXbaS3o3HRxuD2Yhi1hHUtqmC5FtQnkCf8F142YQRU7xp2MN0MjBW+de5 +zgQ== X-Forwarded-Encrypted: i=1; AJvYcCUcisIy68RCZyIMDEjrTjEjidbeXADCxWjL1Gr6LCDzIHzJdk/jLZB55iGAxCEBhJMRxcrRikYBqjZxGnU=@vger.kernel.org X-Gm-Message-State: AOJu0Yws7zklYqY/ULi/F459VA7M80CeXcQ32X/SMm63bXvge/DMYv3z fr7XQ1n0zc9e+S66peJ5c66DcN7ByefxYsQapYilhFziRzjwP60gtM2LUZIGn4BCLLBjLxKy8vl V X-Gm-Gg: ASbGncsb3cmCj/QH6iZD9eIeVtaNYZvxTvK7073xjFHwIpgBg5jAk2/mo1zhURQDP3F NLYaUmR530xZiWGhd4qz4cjNRVEDvjNi4sLQS4dmbGsjabWS8jgSriCC/stlHWwX4AINvfThQYt OWw6PdVKQ+lnmNOA4s1YqoDYkE3whEtxtwlYQ/QPOFCnEKPu58qI4atj+90b204BwvqAddrzYh7 xnALmCEBK2WdhmoYnFjMJl7UiiDFetdVBMf6vlD0VNIZIS0Nglg3E0Q5KpgCji9w2rmMktTLcOc lPWL+vOageqrMRzPGvMsMivmr/FXRqnss2fxg6z1xS2PIL5XjgIwcseEWg== X-Google-Smtp-Source: AGHT+IGXirVkG7YmM+e3F/UoJqVCuA4YUPHtWRuh1VU5G5YFfQvPrt0/VrZAaOMzGSWX8Cr6YTAmAg== X-Received: by 2002:a05:6a00:92a1:b0:736:3ed1:e842 with SMTP id d2e1a72fcca58-7363ed1ec20mr10954047b3a.20.1741042396365; Mon, 03 Mar 2025 14:53:16 -0800 (PST) Received: from atishp.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-734a003eb4fsm9440601b3a.129.2025.03.03.14.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Mar 2025 14:53:16 -0800 (PST) From: Atish Patra Date: Mon, 03 Mar 2025 14:53:09 -0800 Subject: [PATCH v2 4/4] KVM: riscv: selftests: Allow number of interrupts to be configurable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250303-kvm_pmu_improve-v2-4-41d177e45929@rivosinc.com> References: <20250303-kvm_pmu_improve-v2-0-41d177e45929@rivosinc.com> In-Reply-To: <20250303-kvm_pmu_improve-v2-0-41d177e45929@rivosinc.com> To: Anup Patel , Atish Patra , Paul Walmsley , Palmer Dabbelt , Andrew Jones , Paolo Bonzini , Shuah Khan Cc: kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Atish Patra X-Mailer: b4 0.15-dev-42535 It is helpful to vary the number of the LCOFI interrupts generated by the overflow test. Allow additional argument for overflow test to accommodate that. It can be easily cross-validated with /proc/interrupts output in the host. Signed-off-by: Atish Patra --- tools/testing/selftests/kvm/riscv/sbi_pmu_test.c | 38 +++++++++++++++++++-= ---- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c b/tools/testi= ng/selftests/kvm/riscv/sbi_pmu_test.c index de66099235d9..03406de4989d 100644 --- a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c +++ b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c @@ -39,8 +39,10 @@ static bool illegal_handler_invoked; #define SBI_PMU_TEST_SNAPSHOT BIT(2) #define SBI_PMU_TEST_OVERFLOW BIT(3) =20 +#define SBI_PMU_OVERFLOW_IRQNUM_DEFAULT 5 struct test_args { int disabled_tests; + int overflow_irqnum; }; =20 static struct test_args targs; @@ -478,7 +480,7 @@ static void test_pmu_events_snaphost(void) =20 static void test_pmu_events_overflow(void) { - int num_counters =3D 0; + int num_counters =3D 0, i =3D 0; =20 /* Verify presence of SBI PMU and minimum requrired SBI version */ verify_sbi_requirement_assert(); @@ -495,11 +497,15 @@ static void test_pmu_events_overflow(void) * Qemu supports overflow for cycle/instruction. * This test may fail on any platform that do not support overflow for th= ese two events. */ - test_pmu_event_overflow(SBI_PMU_HW_CPU_CYCLES); - GUEST_ASSERT_EQ(vcpu_shared_irq_count, 1); + for (i =3D 0; i < targs.overflow_irqnum; i++) + test_pmu_event_overflow(SBI_PMU_HW_CPU_CYCLES); + GUEST_ASSERT_EQ(vcpu_shared_irq_count, targs.overflow_irqnum); + + vcpu_shared_irq_count =3D 0; =20 - test_pmu_event_overflow(SBI_PMU_HW_INSTRUCTIONS); - GUEST_ASSERT_EQ(vcpu_shared_irq_count, 2); + for (i =3D 0; i < targs.overflow_irqnum; i++) + test_pmu_event_overflow(SBI_PMU_HW_INSTRUCTIONS); + GUEST_ASSERT_EQ(vcpu_shared_irq_count, targs.overflow_irqnum); =20 GUEST_DONE(); } @@ -621,8 +627,11 @@ static void test_vm_events_overflow(void *guest_code) =20 static void test_print_help(char *name) { - pr_info("Usage: %s [-h] [-t ]\n", name); + pr_info("Usage: %s [-h] [-t ] [-n ]\n", + name); pr_info("\t-t: Test to run (default all). Available tests are 'basic', 'e= vents', 'snapshot', 'overflow'\n"); + pr_info("\t-n: Number of LCOFI interrupt to trigger for each event in ove= rflow test (default: %d)\n", + SBI_PMU_OVERFLOW_IRQNUM_DEFAULT); pr_info("\t-h: print this help screen\n"); } =20 @@ -631,7 +640,9 @@ static bool parse_args(int argc, char *argv[]) int opt; int temp_disabled_tests =3D SBI_PMU_TEST_BASIC | SBI_PMU_TEST_EVENTS | SB= I_PMU_TEST_SNAPSHOT | SBI_PMU_TEST_OVERFLOW; - while ((opt =3D getopt(argc, argv, "ht:")) !=3D -1) { + int overflow_interrupts =3D 0; + + while ((opt =3D getopt(argc, argv, "ht:n:")) !=3D -1) { switch (opt) { case 't': if (!strncmp("basic", optarg, 5)) @@ -646,12 +657,24 @@ static bool parse_args(int argc, char *argv[]) goto done; targs.disabled_tests =3D temp_disabled_tests; break; + case 'n': + overflow_interrupts =3D atoi_positive("Number of LCOFI", optarg); + break; case 'h': default: goto done; } } =20 + if (overflow_interrupts > 0) { + if (targs.disabled_tests & SBI_PMU_TEST_OVERFLOW) { + pr_info("-n option is only available for overflow test\n"); + goto done; + } else { + targs.overflow_irqnum =3D overflow_interrupts; + } + } + return true; done: test_print_help(argv[0]); @@ -661,6 +684,7 @@ static bool parse_args(int argc, char *argv[]) int main(int argc, char *argv[]) { targs.disabled_tests =3D 0; + targs.overflow_irqnum =3D SBI_PMU_OVERFLOW_IRQNUM_DEFAULT; =20 if (!parse_args(argc, argv)) exit(KSFT_SKIP); --=20 2.43.0