From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 6D83D52ED50; Wed, 30 Sep 2026 18:42:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790793751; cv=none; b=QUpg/Kxa8ZDvXBQaefaZtD/eviPipR4k2vIFhXbWEuG/aslHSqg3G3gGlRxEue7mbumSn0albGMi5mM6u7i8vWwsRMftGQuoNpkWdxhRZM5iXpZ0TorbJGcFWss72ePtzaN2fk82fgCpAXKXGxCCd4IJly8iHT/2qBy7F1vuWSA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790793751; c=relaxed/simple; bh=NZkEVr0pY+pFyUOW4wMqxL1M7aQLbXRNuOk9eliOhAs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=on6fWJaUjHXW3fzehSLWYf4SOM9/HiIP+UpyQ83lETw0Us6Hw+5V4y9CdVd5+g4saKMa0bozCg1K0FZMLWGzSSJvvQJA/LVO7oAj6vBCM9nQ4pvUwnKzSSopX7tkvWoFEfvoG/AY7daQcSWQBnE23pKma90SRL1i1mt8vsXjEx8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pxHH0gYb; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="pxHH0gYb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC91C1F000FF; Wed, 30 Sep 2026 18:42:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790793750; bh=S0Gj59pMtBrGyYsceWgaTdxgQmIuP/pyclvsR24grSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pxHH0gYbOKN5P7vbwL9c8QM+kHpTKQs7yIin9WpErey/CHIVvq3gSo/seKSpIw8q+ ZQxH4CFavT2ZJovIVF7tHDZ8hXE/FmZY6I5nH7RqG73qACD6RwRixcNoJIJtSNQoUK 9j7AQFiKCvHFDU3CKCLUAxEX9yacXDNJ/B09yHkg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tan Chi , Anup Patel Subject: [PATCH 6.18 320/395] RISC-V: KVM: Fix HSM hart status error propagation Date: Wed, 30 Sep 2026 17:29:42 +0200 Message-ID: <20260930152347.602887134@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152340.591469096@linuxfoundation.org> References: <20260930152340.591469096@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tan Chi commit 41e81f7e3ef96594fb840445343c0ee7723aa550 upstream. kvm_sbi_hsm_vcpu_get_status() returns SBI_ERR_INVALID_PARAM when the requested hart does not exist. However, the HART_STATUS case returns from the SBI handler without storing this error in retdata->err_val. As a result, a guest querying the status of a non-existent hart observes SBI_SUCCESS instead of SBI_ERR_INVALID_PARAM. Use the common SBI error handling path for HART_STATUS after saving a valid hart state in retdata->out_val. This preserves the returned error when kvm_sbi_hsm_vcpu_get_status() fails. Fixes: bae0dfd74e01 ("RISC-V: KVM: Modify SBI extension handler to return SBI error code") Cc: stable@vger.kernel.org Assisted-by: LLM Signed-off-by: Tan Chi Reviewed-by: Anup Patel Link: https://lore.kernel.org/r/20260914031146.446157-1-tanchi25@mails.ucas.ac.cn Signed-off-by: Anup Patel Signed-off-by: Greg Kroah-Hartman --- arch/riscv/kvm/vcpu_sbi_hsm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/riscv/kvm/vcpu_sbi_hsm.c +++ b/arch/riscv/kvm/vcpu_sbi_hsm.c @@ -95,9 +95,9 @@ static int kvm_sbi_ext_hsm_handler(struc ret = kvm_sbi_hsm_vcpu_get_status(vcpu); if (ret >= 0) { retdata->out_val = ret; - retdata->err_val = 0; + ret = 0; } - return 0; + break; case SBI_EXT_HSM_HART_SUSPEND: switch (lower_32_bits(cp->a0)) { case SBI_HSM_SUSPEND_RET_DEFAULT: