From nobody Fri Oct 3 01:10:46 2025 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (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 1D43A3019B3 for ; Tue, 9 Sep 2025 07:03:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757401413; cv=none; b=kjdhShkEjMCDofi8dnmz5hJATWKIIfXFgtR1b2pFkdYcYnZco9H4gF9w9EQSCYj1p1hWAlKKoSdDuPEdDqXCrqDm3xvqcptnna+R6P7fI+g+A/71XS7vLcwUmlncIyCQ9Ojq0mmWTDjoKaDg5VuWc2ILWfFDyXwhm9Bc124au7M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757401413; c=relaxed/simple; bh=ooi3OGf1oecfma3ZZjoqxpvaZ+wyxfduuHE3R1xZ6to=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GDGbeUmY5l7V3x92LKRURvzBYRDu+7Dec+QT/oBxukWMCDNw0u6uG1WjXGWdcmFRxfFYVOuo1mBEj1+Ahe72L3Bc3WsBDCz3lRcs0nIcpwjYd40kARoXQ6h5xDYD3WDj6S4JKjuMgzsXR2QiTkVtXibObItU+wS7YSWQ8YX13Vg= 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=ToUPNSGs; arc=none smtp.client-ip=209.85.216.42 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="ToUPNSGs" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-32b6108f2d5so3777126a91.3 for ; Tue, 09 Sep 2025 00:03:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc.com; s=google; t=1757401411; x=1758006211; 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=1acfgimCOFblXvFIi2ykb4JvdpnCtTT9WTI2WJXrlYg=; b=ToUPNSGs5GEfZwVxVNh8uEdwXFZjZgMgXFxR9xwSlZWLZb5xOZxT5sfOJEn5hSraVQ /SL2eO8Q9NXpwm7naD6Y2BG8eMCOfIoCc0JH+mTcVljLW2Kk84lmZx6ZF10mLOMDk7LH 8Sq4KtxPWzSgGnIBDHaTnJUKtkXVG6efqOO9pgE6CrawRcxSrL7kUwP9eLLWIo78bu0c n/NEu/oMre1H9pQVV3VOEPXLSxTIEdjDFFEqB0VWelgOITK9RCVnp/KWEcpkcn/syD3a ANicO0INdeHwXeax/zfxJZYnERYrqNcHNByGc0R9/HW6uBkMVjwNSqM6pp4yXNoNAvN+ 9Z0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757401411; x=1758006211; 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=1acfgimCOFblXvFIi2ykb4JvdpnCtTT9WTI2WJXrlYg=; b=k/G6HhF1c9ptiF1EclgyOhCFsw5issFHPW2vCoV+OpFSo35Kjc1T93js5aMjNQXSjA XuC+e2GzlBrkPRIccdtTAroclAX6JgmqGHmPa3iPHqFHb/a4NPSey1+siJIPK8/Mv1Tl hMlgidVR5dwfuUaL5fvRG0JExDX/aNLrp2SghrRbJqm5EV/DTJ4Xn9ybSUrjW34AOYVj mOVqAoAL3az5ynXARyWuYKnDuLUpi5GlhjhPQyXhd6DmnvvR7isqxeLEH01xrgge4CIi UwYFdiAjqf6EeBBU1aY8lS+bykGlaeJ7mhH/5eV71B2rpGFnbRK9CCIORBgPURf4Gvu4 Hj6Q== X-Forwarded-Encrypted: i=1; AJvYcCWQj1M3fZtKWfEcrtbFpl6eEb262DjsKBTuJCjFJsjh0XbsodlGuEO57Dsw4SwrRnevkc56qoJUiECZVsc=@vger.kernel.org X-Gm-Message-State: AOJu0YzSeNRapKWtg56QD6TURkSXALjKCJfsvTAn1aBsmtk16PEfvUBw KjQ4cl4xASF2/afuvqcYgaEKDd7fcbvSJX49DZhL/Wu5IjB9ojjNBfav9UgdhYpnZLU= X-Gm-Gg: ASbGnct4jB9iKb9LL9Jnaj6TLGC9v4ZlkdPvY7wPl/3XxQBCHrVxhwOoEdrXKO0iXdq ZoEoBw+GXzrVRY6EMOsExVVlQS8PkOTny+zwILYkXeIYJvu+hNy83U9oRnfoX7qC/A8gdb+XfPS j+8QXuReeY+a70byrDOP44ep32w+9TSx6nQkaxVoEItDfDPVuoV0RM6JuFJO0kLXg9TJCNTXlZ6 LgQ0dQGyR2YeZvCVTpn73V5IuoWDfEPyda6S8AlORxxr6gbaZPpAJ3uzyLWk3/Y3lgSoWjg/D2t IBvH4kESjMiYQCqRW2ygxaNLRKQWDUhRkL6v0W4XA7axcbwBAobDp4fnQoOPilIZxO0+A1OG34u zdpfQMcszCLIF8ETMmFXgXqgO2mGsPVhxwkI= X-Google-Smtp-Source: AGHT+IHkDiF/6YwaQUzgE/xNLZqLa3zDoLihcHBPhzjoYmHrHw+d+76R53kpaEg8N/1vJrkgHwEwEw== X-Received: by 2002:a17:90b:35c6:b0:32c:2c5:e21 with SMTP id 98e67ed59e1d1-32d43f85d9emr12290210a91.32.1757401411327; Tue, 09 Sep 2025 00:03:31 -0700 (PDT) Received: from atishp.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-774662c7158sm1025535b3a.72.2025.09.09.00.03.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Sep 2025 00:03:30 -0700 (PDT) From: Atish Patra Date: Tue, 09 Sep 2025 00:03:26 -0700 Subject: [PATCH v6 7/8] 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: <20250909-pmu_event_info-v6-7-d8f80cacb884@rivosinc.com> References: <20250909-pmu_event_info-v6-0-d8f80cacb884@rivosinc.com> In-Reply-To: <20250909-pmu_event_info-v6-0-d8f80cacb884@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 | 59 +++++++++++++++++++++++++++++++= ++++ arch/riscv/kvm/vcpu_sbi_pmu.c | 3 ++ 3 files changed, 65 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 f8514086bd6b..a2fae70ee174 100644 --- a/arch/riscv/kvm/vcpu_pmu.c +++ b/arch/riscv/kvm/vcpu_pmu.c @@ -449,6 +449,65 @@ 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; + 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; + } + } + + 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_INVALID_ADDRESS; + 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