Re: [PATCH 01/27] RISC-V: KVM: Fix error code returned for Smstateen ONE_REG

[Anup Patel]

On Tue, Jan 20, 2026 at 1:30 PM Anup Patel <anup.pa...@oss.qualcomm.com> wrote:
>
> Return -ENOENT for Smstateen ONE_REG when:
> 1) Smstateen is not enabled for a VCPU
> 2) When ONE_REG id is out of range
>
> This will make Smstateen ONE_REG error codes consistent
> with other ONE_REG interfaces of KVM RISC-V.
>
> Fixes: c04913f2b54e ("RISCV: KVM: Add sstateen0 to ONE_REG")
> Signed-off-by: Anup Patel <anup.pa...@oss.qualcomm.com>

Queued this as fix for Linux-7.0-rcX

Regards,
Anup

> ---
>  arch/riscv/kvm/vcpu_onereg.c | 18 ++++++++----------
>  1 file changed, 8 insertions(+), 10 deletions(-)
>
> diff --git a/arch/riscv/kvm/vcpu_onereg.c b/arch/riscv/kvm/vcpu_onereg.c
> index e7ab6cb00646..6dab4deed86d 100644
> --- a/arch/riscv/kvm/vcpu_onereg.c
> +++ b/arch/riscv/kvm/vcpu_onereg.c
> @@ -549,9 +549,11 @@ static inline int 
> kvm_riscv_vcpu_smstateen_set_csr(struct kvm_vcpu *vcpu,
>  {
>         struct kvm_vcpu_smstateen_csr *csr = &vcpu->arch.smstateen_csr;
>
> +       if (!riscv_isa_extension_available(vcpu->arch.isa, SMSTATEEN))
> +               return -ENOENT;
>         if (reg_num >= sizeof(struct kvm_riscv_smstateen_csr) /
>                 sizeof(unsigned long))
> -               return -EINVAL;
> +               return -ENOENT;
>
>         ((unsigned long *)csr)[reg_num] = reg_val;
>         return 0;
> @@ -563,9 +565,11 @@ static int kvm_riscv_vcpu_smstateen_get_csr(struct 
> kvm_vcpu *vcpu,
>  {
>         struct kvm_vcpu_smstateen_csr *csr = &vcpu->arch.smstateen_csr;
>
> +       if (!riscv_isa_extension_available(vcpu->arch.isa, SMSTATEEN))
> +               return -ENOENT;
>         if (reg_num >= sizeof(struct kvm_riscv_smstateen_csr) /
>                 sizeof(unsigned long))
> -               return -EINVAL;
> +               return -ENOENT;
>
>         *out_val = ((unsigned long *)csr)[reg_num];
>         return 0;
> @@ -595,10 +599,7 @@ static int kvm_riscv_vcpu_get_reg_csr(struct kvm_vcpu 
> *vcpu,
>                 rc = kvm_riscv_vcpu_aia_get_csr(vcpu, reg_num, &reg_val);
>                 break;
>         case KVM_REG_RISCV_CSR_SMSTATEEN:
> -               rc = -EINVAL;
> -               if (riscv_has_extension_unlikely(RISCV_ISA_EXT_SMSTATEEN))
> -                       rc = kvm_riscv_vcpu_smstateen_get_csr(vcpu, reg_num,
> -                                                             &reg_val);
> +               rc = kvm_riscv_vcpu_smstateen_get_csr(vcpu, reg_num, 
> &reg_val);
>                 break;
>         default:
>                 rc = -ENOENT;
> @@ -640,10 +641,7 @@ static int kvm_riscv_vcpu_set_reg_csr(struct kvm_vcpu 
> *vcpu,
>                 rc = kvm_riscv_vcpu_aia_set_csr(vcpu, reg_num, reg_val);
>                 break;
>         case KVM_REG_RISCV_CSR_SMSTATEEN:
> -               rc = -EINVAL;
> -               if (riscv_has_extension_unlikely(RISCV_ISA_EXT_SMSTATEEN))
> -                       rc = kvm_riscv_vcpu_smstateen_set_csr(vcpu, reg_num,
> -                                                             reg_val);
> +               rc = kvm_riscv_vcpu_smstateen_set_csr(vcpu, reg_num, reg_val);
>                 break;
>         default:
>                 rc = -ENOENT;
> --
> 2.43.0
>