From nobody Tue Apr 7 19:49:27 2026 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 A66B32FC01B for ; Wed, 11 Mar 2026 23:18:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773271123; cv=none; b=e/vCDMEpt418Ee0eZal5NQTqU7tr4nadm0zPA5/qHhg9ODQY+FMhmfIarO78a0ZzV2eN2dgECkOm5BP0/7yx9pTCtyL1pSjxpgQiSGP82PBocal2roP5BoM8ZC4byQTiTB24ZETg9+GgtcBvOkREQMqwBQmGeyoArxtNqAxK5h8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773271123; c=relaxed/simple; bh=T8TEJyz8kcyblPtbhT0zewCP5AyJ5vZtAEr4d0wvJNE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ZU5VWVNrfbdaj81VyASA4vCQKZ83oaLm8Z/kU7HVTBBQ3atjuH/48kwdg6JzFbXM4zRWv0d9/oSE+P7f0H8aiGzW7b7I2CsN9h4xdAXbyPFBgE5LhCXplSjFmb6xZk4FJRIjZyz6ROeDEoyaH+4mV7Xnf/uA30vb/22VC9wUDCc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AAEhbn7T; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AAEhbn7T" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4852e9ca034so3513685e9.2 for ; Wed, 11 Mar 2026 16:18:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773271120; x=1773875920; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=q/PJeovjjoGLMcedyN4Hvdo++XuOQtv9Fm+hj7Ucl68=; b=AAEhbn7TzdFD2838XSY4jblB3aOu5Cp8ru6iQRfK5Lj1o/biUFUuwIVLmc9BSAIEUr X92ALtXmZODUvotL89tCSm0cWBahJxwVnyB6LH2xU/kklGlw3gYY+wDEzZF3ckjA41mE SNzMAqo78klOrk0VdQ/VUrKVGHMrw5aQdlOCzBFlG0WkxKgsUOFigky7M9BLiGPHPLC3 7nwnT3Dm2JtZbNt1qgl/KOgypzEyKTJdbls6+2M8PfwGVfGeuWNJWGRqTmCo0RU4LFBI gH8Oaeqsaxg1SKdZFdKVIXfuHpHbIozDjNg78c3rFK8MCpMRROAC/KQ/T/7ZNNehKxaz Dfpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773271120; x=1773875920; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=q/PJeovjjoGLMcedyN4Hvdo++XuOQtv9Fm+hj7Ucl68=; b=ltZ88rOuMMhK5ukL7MQC5uPY0225+5PCKlw2/e6pJ9AMZayW/FCC1KzU83OgSxL66x BQWk//y0szXBtleSvmYTK97r8fjuHp5Haca86O8RSSUzqA3aKCYDzNag1OXE34Yb45Kc gFvqk9URX2uWg6OHTJoTmlVwfuXBfCxkEyXrKiFY1JBv//RR+fCc7mdffkICUt8X2jLt dbmASlzvUMOXSl67syFxNRXdxVy9J5tl2f6HrD/GmKu/HtFcN7P3YBxXlibCpEhM6AZY COXKm7vFoeM9sldXsJuUdQ5USpZsAjmAptP/do390uhfqJg7Di7RZCJfNjErSuD7Bp5X BFOA== X-Forwarded-Encrypted: i=1; AJvYcCU4zuLaBc2W0rExDRnVjuxjAh18A3dzTQ4iEg/CNxdu2FSYD+qwOKrrGLbYbmFkAY0Omzc56mZBG33p52g=@vger.kernel.org X-Gm-Message-State: AOJu0YwmQmosCo7+fdX4vPcUq53EOKiZRP3t5SdsyWiS9YLRBTnOcJE/ Nsxhj90Uk2g6wr0Y0lgHo3qfAPSo9CAGYvsICQG0lTue8Mah0wSP265T X-Gm-Gg: ATEYQzy1xEvS+H0d91pSou4mUPtm2uTlbIpYHyRfTPMKbUwDK1qej3F3XpeqPhFIqsw uXPQvRbLhl+qzwVLmSAWcX7zFgkk/kBCapsNdQJLqDt+uW+yHMPmnNmtxFssXzQR0Qw6XjW41+z X9adL75UwobgFckc5rQJxRp3eH+PLa039DamKTvVaut8m9A2Axclbvf3i8OcPkbgWH9oHQJVqrM gzLndZQcKEFxS5MYdc0gDfblI61MSkA92GGMzf0iGO4NSwfewtQJYM0UFOwlqIsZdPVSIK+jTzp uqabCIFsAZeuubhrkjOaZFVBCRRiPbeNxD2RbjsqYqRpV5pYGWrrg+5kRWHL18hymm6a0ljZJ7m fIoc6iezJv20oAXddWANZNZ+u5ZSwy/IclGQaAC8gZ31wyLWNNuMw5pc1xXEFkA7IUMkc6pL4+2 5m1GFxkUDF6ai122aDqTk6rVNwrq5PHkVtZynigD0Cje8FOXETBziCCmOANs9/ X-Received: by 2002:a05:600c:1e8f:b0:477:561f:6fc8 with SMTP id 5b1f17b1804b1-4854b0a6c39mr71236095e9.5.1773271119975; Wed, 11 Mar 2026 16:18:39 -0700 (PDT) Received: from osama.. ([156.223.222.252]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4854b5f6bb4sm83586675e9.4.2026.03.11.16.18.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 16:18:39 -0700 (PDT) From: Osama Abdelkader To: Anup Patel , Atish Patra , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Andrew Jones , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Osama Abdelkader , Andrew Jones Subject: [PATCH v2] RISC-V: KVM: fix PMU snapshot_set_shmem on 32-bit hosts Date: Thu, 12 Mar 2026 00:18:32 +0100 Message-ID: <20260311231833.13189-1-osama.abdelkader@gmail.com> X-Mailer: git-send-email 2.43.0 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 Content-Type: text/plain; charset="utf-8" When saddr_high !=3D 0 on RV32, the goto out was unconditional, causing valid 64-bit addresses to be rejected. Only goto out when the address is invalid (64-bit host with saddr_high !=3D 0). Fixes: c2f41ddbcdd7 ("RISC-V: KVM: Implement SBI PMU Snapshot feature") Signed-off-by: Osama Abdelkader Reviewed-by: Andrew Jones --- v2: - balance braces properly --- arch/riscv/kvm/vcpu_pmu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/riscv/kvm/vcpu_pmu.c b/arch/riscv/kvm/vcpu_pmu.c index 4d8d5e9aa53d..ec0c15726da9 100644 --- a/arch/riscv/kvm/vcpu_pmu.c +++ b/arch/riscv/kvm/vcpu_pmu.c @@ -423,11 +423,12 @@ int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_= vcpu *vcpu, unsigned long s saddr =3D saddr_low; =20 if (saddr_high !=3D 0) { - if (IS_ENABLED(CONFIG_32BIT)) + if (IS_ENABLED(CONFIG_32BIT)) { saddr |=3D ((gpa_t)saddr_high << 32); - else + } else { sbiret =3D SBI_ERR_INVALID_ADDRESS; - goto out; + goto out; + } } =20 kvpmu->sdata =3D kzalloc(snapshot_area_size, GFP_ATOMIC); --=20 2.43.0