[v1] LoongArch: KVM: add a return kvm_own_lasx() stub

[PATCH] LoongArch: KVM: add a return kvm_own_lasx() stub

Posted by Randy Dunlap 1 year, 12 months ago

The stub for kvm_own_lasx() when CONFIG_CPU_HAS_LASX is not defined
should have a return value since it returns an int, so add
"return -EINVAL;" to the stub. Fixes the build error:

In file included from ../arch/loongarch/include/asm/kvm_csr.h:12,
                 from ../arch/loongarch/kvm/interrupt.c:8:
../arch/loongarch/include/asm/kvm_vcpu.h: In function 'kvm_own_lasx':
../arch/loongarch/include/asm/kvm_vcpu.h:73:39: error: no return statement in function returning non-void [-Werror=return-type]
   73 | static inline int kvm_own_lasx(struct kvm_vcpu *vcpu) { }

Fixes: 118e10cd893d ("LoongArch: KVM: Add LASX (256bit SIMD) support")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Bibo Mao <maobibo@loongson.cn>
Cc: Tianrui Zhao <zhaotianrui@loongson.cn>
Cc: Huacai Chen <chenhuacai@loongson.cn>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: kvm@vger.kernel.org
Cc: loongarch@lists.linux.dev
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/loongarch/include/asm/kvm_vcpu.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -- a/arch/loongarch/include/asm/kvm_vcpu.h b/arch/loongarch/include/asm/kvm_vcpu.h
--- a/arch/loongarch/include/asm/kvm_vcpu.h
+++ b/arch/loongarch/include/asm/kvm_vcpu.h
@@ -70,7 +70,7 @@ int kvm_own_lasx(struct kvm_vcpu *vcpu);
 void kvm_save_lasx(struct loongarch_fpu *fpu);
 void kvm_restore_lasx(struct loongarch_fpu *fpu);
 #else
-static inline int kvm_own_lasx(struct kvm_vcpu *vcpu) { }
+static inline int kvm_own_lasx(struct kvm_vcpu *vcpu) { return -EINVAL; }
 static inline void kvm_save_lasx(struct loongarch_fpu *fpu) { }
 static inline void kvm_restore_lasx(struct loongarch_fpu *fpu) { }
 #endif

Re: [PATCH] LoongArch: KVM: add a return kvm_own_lasx() stub

Posted by Huacai Chen 1 year, 12 months ago

Hi, Randy,

Could you please fix kvm_own_lsx() together?

Huacai

On Wed, Dec 27, 2023 at 9:07 AM Randy Dunlap <rdunlap@infradead.org> wrote:
>
> The stub for kvm_own_lasx() when CONFIG_CPU_HAS_LASX is not defined
> should have a return value since it returns an int, so add
> "return -EINVAL;" to the stub. Fixes the build error:
>
> In file included from ../arch/loongarch/include/asm/kvm_csr.h:12,
>                  from ../arch/loongarch/kvm/interrupt.c:8:
> ../arch/loongarch/include/asm/kvm_vcpu.h: In function 'kvm_own_lasx':
> ../arch/loongarch/include/asm/kvm_vcpu.h:73:39: error: no return statement in function returning non-void [-Werror=return-type]
>    73 | static inline int kvm_own_lasx(struct kvm_vcpu *vcpu) { }
>
> Fixes: 118e10cd893d ("LoongArch: KVM: Add LASX (256bit SIMD) support")
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Bibo Mao <maobibo@loongson.cn>
> Cc: Tianrui Zhao <zhaotianrui@loongson.cn>
> Cc: Huacai Chen <chenhuacai@loongson.cn>
> Cc: WANG Xuerui <kernel@xen0n.name>
> Cc: kvm@vger.kernel.org
> Cc: loongarch@lists.linux.dev
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  arch/loongarch/include/asm/kvm_vcpu.h |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff -- a/arch/loongarch/include/asm/kvm_vcpu.h b/arch/loongarch/include/asm/kvm_vcpu.h
> --- a/arch/loongarch/include/asm/kvm_vcpu.h
> +++ b/arch/loongarch/include/asm/kvm_vcpu.h
> @@ -70,7 +70,7 @@ int kvm_own_lasx(struct kvm_vcpu *vcpu);
>  void kvm_save_lasx(struct loongarch_fpu *fpu);
>  void kvm_restore_lasx(struct loongarch_fpu *fpu);
>  #else
> -static inline int kvm_own_lasx(struct kvm_vcpu *vcpu) { }
> +static inline int kvm_own_lasx(struct kvm_vcpu *vcpu) { return -EINVAL; }
>  static inline void kvm_save_lasx(struct loongarch_fpu *fpu) { }
>  static inline void kvm_restore_lasx(struct loongarch_fpu *fpu) { }
>  #endif
>

Re: [PATCH] LoongArch: KVM: add a return kvm_own_lasx() stub

Posted by Randy Dunlap 1 year, 12 months ago


On 12/26/23 17:11, Huacai Chen wrote:
> Hi, Randy,
> 
> Could you please fix kvm_own_lsx() together?
> 

Sure will. Thanks.

> Huacai
> 
> On Wed, Dec 27, 2023 at 9:07 AM Randy Dunlap <rdunlap@infradead.org> wrote:
>>
>> The stub for kvm_own_lasx() when CONFIG_CPU_HAS_LASX is not defined
>> should have a return value since it returns an int, so add
>> "return -EINVAL;" to the stub. Fixes the build error:
>>
>> In file included from ../arch/loongarch/include/asm/kvm_csr.h:12,
>>                  from ../arch/loongarch/kvm/interrupt.c:8:
>> ../arch/loongarch/include/asm/kvm_vcpu.h: In function 'kvm_own_lasx':
>> ../arch/loongarch/include/asm/kvm_vcpu.h:73:39: error: no return statement in function returning non-void [-Werror=return-type]
>>    73 | static inline int kvm_own_lasx(struct kvm_vcpu *vcpu) { }
>>
>> Fixes: 118e10cd893d ("LoongArch: KVM: Add LASX (256bit SIMD) support")
>> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
>> Cc: Bibo Mao <maobibo@loongson.cn>
>> Cc: Tianrui Zhao <zhaotianrui@loongson.cn>
>> Cc: Huacai Chen <chenhuacai@loongson.cn>
>> Cc: WANG Xuerui <kernel@xen0n.name>
>> Cc: kvm@vger.kernel.org
>> Cc: loongarch@lists.linux.dev
>> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---


-- 
#Randy