lkml.org 
[lkml]   [2021]   [Aug]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH linux-next] x86:mmu: fix boolreturn.cocci warnings
"KVM: x86/mmu" in the shortlog please.

On Tue, Aug 24, 2021, CGEL wrote:
> From: Jing Yangyang <jing.yangyang@zte.com.cn>
>
> ./arch/x86/kvm/mmu/mmu.c:1501: 9-10:WARNING:return of 0/1 in
> function 'kvm_set_pte_rmapp' with return type bool
> ./arch/x86/kvm/mmu/mmu.c:1642:10-11:WARNING:return of 0/1 in
> function 'kvm_test_age_rmapp' with return type bool

Huh, I could have sworn this was fixed, but obviously not.

> Return statements in functions returning bool should use true/false
> instead of 1/0.
>
> Generated by: scripts/coccinelle/misc/boolreturn.cocci
>
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Jing Yangyang <jing.yangyang@zte.com.cn>
> ---
> arch/x86/kvm/mmu/mmu.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
> index c5232a0..78025e0 100644
> --- a/arch/x86/kvm/mmu/mmu.c
> +++ b/arch/x86/kvm/mmu/mmu.c
> @@ -1498,7 +1498,7 @@ static bool kvm_set_pte_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,
>
> if (need_flush && kvm_available_flush_tlb_with_range()) {
> kvm_flush_remote_tlbs_with_address(kvm, gfn, 1);
> - return 0;
> + return false;

Please also fix need_flush in this function, e.g.

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 4853c033e6ce..0a275d988c7d 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -1456,7 +1456,7 @@ static bool kvm_set_pte_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,
{
u64 *sptep;
struct rmap_iterator iter;
- int need_flush = 0;
+ bool need_flush = false;
u64 new_spte;
kvm_pfn_t new_pfn;

@@ -1468,7 +1468,7 @@ static bool kvm_set_pte_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,
rmap_printk("spte %p %llx gfn %llx (%d)\n",
sptep, *sptep, gfn, level);

- need_flush = 1;
+ need_flush = true;

if (pte_write(pte)) {
pte_list_remove(kvm, rmap_head, sptep);
> }
>
> return need_flush;
> @@ -1639,8 +1639,8 @@ static bool kvm_test_age_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,
>
> for_each_rmap_spte(rmap_head, &iter, sptep)
> if (is_accessed_spte(*sptep))
> - return 1;
> - return 0;
> + return true;
> + return false;
> }
>
> #define RMAP_RECYCLE_THRESHOLD 1000
> --
> 1.8.3.1
>
>

\
 
 \ /
  Last update: 2021-08-25 19:59    [W:1.383 / U:25.308 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site