From nobody Fri Oct 3 15:35:54 2025 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (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 80C6E322A25 for ; Fri, 29 Aug 2025 14:41:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756478481; cv=none; b=m0WM8MqIuGkrpAW2gPTPWFOLQX6gfRw9dfX0N+WHVBmqOSQmr5Zn9hVSElNbgVa/rpjp1yWGVnp8gFandcQHyI5/tuN5ixxlh79xDOzoRYjewdyexXxWvmRndHoPLRfyD4MpzfJZOQNDS28ErLhoFLRkbSWZL2XzbnRBWNsMejM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756478481; c=relaxed/simple; bh=N6+h+tsIWnMjf3ceMOGaeiYo79VIo7jfDe4CcDtFJJU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ty8a+/iKkyaql/ShQep6/zYAe9hQ/BGbzr9aWTNCtdcXxZU0PteVp4eoWJ9lHwswSpmi4mQ2XOv1noii1IX4hNO2P5n+al424Xqg83kWOm+LJulWSHMLxPYXd1ursNok785+66UK0tsugrMDl5gjVBUpCNeOgn+gBf1Xcq6AYsc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc.com header.i=@rivosinc.com header.b=EZKfemrC; arc=none smtp.client-ip=209.85.210.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (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 header.i=@rivosinc.com header.b="EZKfemrC" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-770593ba164so1760464b3a.3 for ; Fri, 29 Aug 2025 07:41:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc.com; s=google; t=1756478479; x=1757083279; 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=8n6toQkVFfP8na+ISaaEJDAIrFZoZwC9O7ud2sWM9B0=; b=EZKfemrCg3JJx0ABXxSUVRtXcQexwlRUrR0R7WCwYFk14RK5lwdIPAsgC8UrArssgf CD25+kmX/w39dCz+FrWRSb8veQYAxL4XGV3xjWhGhJzH9qg8h7aVL6kdwVyYkBc5tpyW ByqTWo1Xp3f3AiKQrvUVDyLm03cqWan70iQq1M1wrJF/Fekt5QxivRAQQdYYrOWcPME2 uClb36TjVfG0e1hoZcZ8XAsOO1fMgP8HaBs6L6FguwbgPA38TdJsjPto6iYZQ4flT5KG z9VNtcuOgB+Z/okC21BpgbjP43+3Dc9tBKl1n0qppVyPhIGWLQEVsttOgbAp6I5qb5ve /oug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756478479; x=1757083279; 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=8n6toQkVFfP8na+ISaaEJDAIrFZoZwC9O7ud2sWM9B0=; b=l5SK4RD6foBLa5uJE5IcXAvsXNGy6JwmX6+2Od8LX369pSL8cIrHi+mXQ7QU7oYsjt pebdRh59uXiSZ0a7gl4ZWPtfjQ2m3noIIBETjpLVYUYMl4rWbM8SRDyJtoZ7pQqvzAuu P5lPZO9cpmKADsv7MTTDvDQMGW1aotTTDng4M3KO2xVh6+ILlhrhC7SN7VKDhmS8yov9 7dsWgBTJqtz0XjE1jmNCYRCVN7R67l078lNNQxmfU/uktXCXeCYO0ScWqXoT1PfZh1hl qKphDMImaupY/8H3axWmPC7GD8RfUV5tddtJf6tzoaxnoqE29zoRMtcRNZaPBSjfh2jQ al4Q== X-Forwarded-Encrypted: i=1; AJvYcCWWjVQpLuZL/BPNnjorBkau//k2bp9Hj2VLS2J/UGsMq4WmSj9pyTwFRzSwLWaqO19TQ4YJzWumoFMfinc=@vger.kernel.org X-Gm-Message-State: AOJu0Yxo3yud++rfWjKvkQJtec5MLarGOOZXlgkiFd4rErXaW193UF6r 3MTFWtA9+M2NsIaIg5xydCMJdMuTzJdsfRAUIDO4MdDzZRKnedZGgaqJRpRIwC9Tqf8= X-Gm-Gg: ASbGnctv/DAbywkr683cVjIgN0K8dcys46Jayu0TVPZdtgMFZD5tWwO6hW3Tf2Udcyt lzXlmNSUSlvbRhv7oqcf+udz3eZ9Bx/OGfs5ifNK+F0TtgaC2PBd1qHU6d/UoplfDZXdi0Ks09D r0GGauqEfc9BQfKO7M7FfwjxqzkP5+L41ycV5lCYoy+HqcMqyxTHFJfZmgoyYLnDe/h/Nrw4ab7 SBMiut/5DoDaFm+XrCVUh73CtTkeRan+aCVqco6iAD2E+o8pkcvPNuWvM+FL08j3wS8RHZ03cAj bWu15HLJ3K7xJ6YTkslOeuFeDnAbuliNP4msU/d+7SXr9mJ8panBX2jh5p3EytbNN+Ic/Zbaivl RNjO2sy3RyhkdkFMPQKXzeTTJb+Yqa+G3eCc= X-Google-Smtp-Source: AGHT+IFbwzsbSElYu8KYbXCV/+je/6mE2S0/2liCEwQBNCHEuRYMQctOBLGbIAGZhqVBmpmbFujhhA== X-Received: by 2002:a05:6a00:929f:b0:772:306d:a1ed with SMTP id d2e1a72fcca58-772306dac16mr3197588b3a.32.1756478478747; Fri, 29 Aug 2025 07:41:18 -0700 (PDT) Received: from atishp.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7722a4e1f86sm2560999b3a.72.2025.08.29.07.41.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Aug 2025 07:41:16 -0700 (PDT) From: Atish Patra Date: Fri, 29 Aug 2025 07:41:09 -0700 Subject: [PATCH v5 8/9] RISC-V: KVM: Implement get event info function 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: <20250829-pmu_event_info-v5-8-9dca26139a33@rivosinc.com> References: <20250829-pmu_event_info-v5-0-9dca26139a33@rivosinc.com> In-Reply-To: <20250829-pmu_event_info-v5-0-9dca26139a33@rivosinc.com> To: Anup Patel , Will Deacon , Mark Rutland , Paul Walmsley , Palmer Dabbelt , Mayuresh Chitale Cc: linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, Atish Patra X-Mailer: b4 0.15-dev-50721 The new get_event_info funciton allows the guest to query the presence of multiple events with single SBI call. Currently, the perf driver in linux guest invokes it for all the standard SBI PMU events. Support the SBI function implementation in KVM as well. Reviewed-by: Anup Patel Signed-off-by: Atish Patra --- arch/riscv/include/asm/kvm_vcpu_pmu.h | 3 ++ arch/riscv/kvm/vcpu_pmu.c | 68 +++++++++++++++++++++++++++++++= ++++ arch/riscv/kvm/vcpu_sbi_pmu.c | 3 ++ 3 files changed, 74 insertions(+) diff --git a/arch/riscv/include/asm/kvm_vcpu_pmu.h b/arch/riscv/include/asm= /kvm_vcpu_pmu.h index 1d85b6617508..9a930afc8f57 100644 --- a/arch/riscv/include/asm/kvm_vcpu_pmu.h +++ b/arch/riscv/include/asm/kvm_vcpu_pmu.h @@ -98,6 +98,9 @@ void kvm_riscv_vcpu_pmu_init(struct kvm_vcpu *vcpu); int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_vcpu *vcpu, unsigned = long saddr_low, unsigned long saddr_high, unsigned long flags, struct kvm_vcpu_sbi_return *retdata); +int kvm_riscv_vcpu_pmu_event_info(struct kvm_vcpu *vcpu, unsigned long sad= dr_low, + unsigned long saddr_high, unsigned long num_events, + unsigned long flags, struct kvm_vcpu_sbi_return *retdata); void kvm_riscv_vcpu_pmu_deinit(struct kvm_vcpu *vcpu); void kvm_riscv_vcpu_pmu_reset(struct kvm_vcpu *vcpu); =20 diff --git a/arch/riscv/kvm/vcpu_pmu.c b/arch/riscv/kvm/vcpu_pmu.c index 851caa86cde2..bd93b0f2ed26 100644 --- a/arch/riscv/kvm/vcpu_pmu.c +++ b/arch/riscv/kvm/vcpu_pmu.c @@ -453,6 +453,74 @@ int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_v= cpu *vcpu, unsigned long s return 0; } =20 +int kvm_riscv_vcpu_pmu_event_info(struct kvm_vcpu *vcpu, unsigned long sad= dr_low, + unsigned long saddr_high, unsigned long num_events, + unsigned long flags, struct kvm_vcpu_sbi_return *retdata) +{ + struct riscv_pmu_event_info *einfo =3D NULL; + int shmem_size =3D num_events * sizeof(*einfo); + gpa_t shmem, gpa, end_shmem; + u32 eidx, etype; + u64 econfig; + int ret; + + if (flags !=3D 0 || (saddr_low & (SZ_16 - 1) || num_events =3D=3D 0)) { + ret =3D SBI_ERR_INVALID_PARAM; + goto out; + } + + shmem =3D saddr_low; + if (saddr_high !=3D 0) { + if (IS_ENABLED(CONFIG_32BIT)) { + shmem |=3D ((gpa_t)saddr_high << 32); + } else { + ret =3D SBI_ERR_INVALID_ADDRESS; + goto out; + } + } + + end_shmem =3D (shmem + shmem_size + PAGE_SIZE - 1) & PAGE_MASK; + + for (gpa =3D shmem; gpa < end_shmem; gpa +=3D PAGE_SIZE) { + if (!kvm_is_gpa_in_writable_memslot(vcpu->kvm, gpa)) { + ret =3D SBI_ERR_INVALID_ADDRESS; + goto out; + } + } + + einfo =3D kzalloc(shmem_size, GFP_KERNEL); + if (!einfo) + return -ENOMEM; + + ret =3D kvm_vcpu_read_guest(vcpu, shmem, einfo, shmem_size); + if (ret) { + ret =3D SBI_ERR_FAILURE; + goto free_mem; + } + + for (int i =3D 0; i < num_events; i++) { + eidx =3D einfo[i].event_idx; + etype =3D kvm_pmu_get_perf_event_type(eidx); + econfig =3D kvm_pmu_get_perf_event_config(eidx, einfo[i].event_data); + ret =3D riscv_pmu_get_event_info(etype, econfig, NULL); + einfo[i].output =3D (ret > 0) ? 1 : 0; + } + + ret =3D kvm_vcpu_write_guest(vcpu, shmem, einfo, shmem_size); + if (ret) { + ret =3D SBI_ERR_FAILURE; + goto free_mem; + } + + ret =3D 0; +free_mem: + kfree(einfo); +out: + retdata->err_val =3D ret; + + return 0; +} + int kvm_riscv_vcpu_pmu_num_ctrs(struct kvm_vcpu *vcpu, struct kvm_vcpu_sbi_return *retdata) { diff --git a/arch/riscv/kvm/vcpu_sbi_pmu.c b/arch/riscv/kvm/vcpu_sbi_pmu.c index e4be34e03e83..a020d979d179 100644 --- a/arch/riscv/kvm/vcpu_sbi_pmu.c +++ b/arch/riscv/kvm/vcpu_sbi_pmu.c @@ -73,6 +73,9 @@ static int kvm_sbi_ext_pmu_handler(struct kvm_vcpu *vcpu,= struct kvm_run *run, case SBI_EXT_PMU_SNAPSHOT_SET_SHMEM: ret =3D kvm_riscv_vcpu_pmu_snapshot_set_shmem(vcpu, cp->a0, cp->a1, cp->= a2, retdata); break; + case SBI_EXT_PMU_EVENT_GET_INFO: + ret =3D kvm_riscv_vcpu_pmu_event_info(vcpu, cp->a0, cp->a1, cp->a2, cp->= a3, retdata); + break; default: retdata->err_val =3D SBI_ERR_NOT_SUPPORTED; } --=20 2.43.0