From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 05B3C2528F6; Wed, 5 Mar 2025 18:16:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741198582; cv=none; b=tJ8dkzePYiSaJ+Q7+0YXmlvr50kW21/dZPdHcdH0ZsSMBpayNXg05h0vSInLxdV1lF5Iyqf9PLJQPa6Cj4lo7uITmcO2LkLeYZ2vz5OL3FTJkzg72iMsvsj6Wnh1LLNCnKejMry+nXLl0zyzwNb/iCUr+yXtLh5HuFrkssjsQdY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741198582; c=relaxed/simple; bh=GTvxdUAe4UdCQ3bVsxAp7rlIAJT1nFaXCa87mkPvaNs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qz3D0lo6OOd4VkeI3ozL8e0GLj/EEwKxtGlJvrl2rKp4SPEthFkZz5dzxBYIS3oNbozJ3uiOS1oY4MALOiu2p25EqPav9U2081cabUh28lnulSc/hIGqYpxBRL+sq9rpOgbaiaLDFGFF3UF1JMB9DECOxpbAUr2U22hqkXkWNUs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CRhmIVGj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="CRhmIVGj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75BA9C4CEE0; Wed, 5 Mar 2025 18:16:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741198581; bh=GTvxdUAe4UdCQ3bVsxAp7rlIAJT1nFaXCa87mkPvaNs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CRhmIVGjg3Zwrz9T+A/yJXWZ9b+O0CE9F1a3ejmljzlxpwYyGifNjIEmU5o8rpgHM SSisJ7Id/QWi6Ii3VA1ciOwama3N0nsNlMtXHPsJWMoHfMKPRySCqYwS2Rgz0nU7xY YbpKck5HW1Bc5vPY9TJijRGQbJW9cL6i6TVXsAI8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andrew Jones , Anup Patel , Sasha Levin Subject: [PATCH 6.13 077/157] riscv: KVM: Fix hart suspend status check Date: Wed, 5 Mar 2025 18:48:33 +0100 Message-ID: <20250305174508.402952004@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250305174505.268725418@linuxfoundation.org> References: <20250305174505.268725418@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andrew Jones [ Upstream commit c7db342e3b4744688be1e27e31254c1d31a35274 ] "Not stopped" means started or suspended so we need to check for a single state in order to have a chance to check for each state. Also, we need to use target_vcpu when checking for the suspend state. Fixes: 763c8bed8c05 ("RISC-V: KVM: Implement SBI HSM suspend call") Signed-off-by: Andrew Jones Reviewed-by: Anup Patel Link: https://lore.kernel.org/r/20250217084506.18763-8-ajones@ventanamicro.com Signed-off-by: Anup Patel Signed-off-by: Sasha Levin --- arch/riscv/kvm/vcpu_sbi_hsm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/riscv/kvm/vcpu_sbi_hsm.c b/arch/riscv/kvm/vcpu_sbi_hsm.c index dce667f4b6ab0..13a35eb77e8e3 100644 --- a/arch/riscv/kvm/vcpu_sbi_hsm.c +++ b/arch/riscv/kvm/vcpu_sbi_hsm.c @@ -79,12 +79,12 @@ static int kvm_sbi_hsm_vcpu_get_status(struct kvm_vcpu *vcpu) target_vcpu = kvm_get_vcpu_by_id(vcpu->kvm, target_vcpuid); if (!target_vcpu) return SBI_ERR_INVALID_PARAM; - if (!kvm_riscv_vcpu_stopped(target_vcpu)) - return SBI_HSM_STATE_STARTED; - else if (vcpu->stat.generic.blocking) + if (kvm_riscv_vcpu_stopped(target_vcpu)) + return SBI_HSM_STATE_STOPPED; + else if (target_vcpu->stat.generic.blocking) return SBI_HSM_STATE_SUSPENDED; else - return SBI_HSM_STATE_STOPPED; + return SBI_HSM_STATE_STARTED; } static int kvm_sbi_ext_hsm_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, -- 2.39.5