2021-09-29 07:32:29

by Yang Li

Subject: [PATCH -next] KVM: use vma_pages() helper

Use vma_pages function on vma object instead of explicit computation.

Fix the following coccicheck warning:
./virt/kvm/kvm_main.c:3526:29-35: WARNING: Consider using vma_pages
helper on vma

Reported-by: Abaci Robot <[email protected]>
Signed-off-by: Yang Li <[email protected]>
---
virt/kvm/kvm_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 7851f3a..8f0e9ea 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3523,7 +3523,7 @@ static vm_fault_t kvm_vcpu_fault(struct vm_fault *vmf)
static int kvm_vcpu_mmap(struct file *file, struct vm_area_struct *vma)
{
struct kvm_vcpu *vcpu = file->private_data;
- unsigned long pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+ unsigned long pages = vma_pages(vma);

if ((kvm_page_in_dirty_ring(vcpu->kvm, vma->vm_pgoff) ||
kvm_page_in_dirty_ring(vcpu->kvm, vma->vm_pgoff + pages - 1)) &&
--
1.8.3.1

2021-09-29 12:58:02

by Paolo Bonzini

Subject: Re: [PATCH -next] KVM: use vma_pages() helper

On 29/09/21 09:28, Yang Li wrote:
> Use vma_pages function on vma object instead of explicit computation.
>
> Fix the following coccicheck warning:
> ./virt/kvm/kvm_main.c:3526:29-35: WARNING: Consider using vma_pages
> helper on vma
>
> Reported-by: Abaci Robot <[email protected]>
> Signed-off-by: Yang Li <[email protected]>
> ---
> virt/kvm/kvm_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index 7851f3a..8f0e9ea 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -3523,7 +3523,7 @@ static vm_fault_t kvm_vcpu_fault(struct vm_fault *vmf)
> static int kvm_vcpu_mmap(struct file *file, struct vm_area_struct *vma)
> {
> struct kvm_vcpu *vcpu = file->private_data;
> - unsigned long pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
> + unsigned long pages = vma_pages(vma);
>
> if ((kvm_page_in_dirty_ring(vcpu->kvm, vma->vm_pgoff) ||
> kvm_page_in_dirty_ring(vcpu->kvm, vma->vm_pgoff + pages - 1)) &&
>

Queued, thanks.

Paolo