| Message ID | 20210917164756.8586-3-peterx@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mm/smaps: Fixes and optimizations on shmem swap handling | expand |
On 9/17/21 18:47, Peter Xu wrote: > As it's trying to cover the whole vma anyways, use direct vm_pgoff value and > vma_pages() rather than linear_page_index. > > Cc: Vlastimil Babka <vbabka@suse.cz> > Cc: Hugh Dickins <hughd@google.com> > Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Vlastimil Babka <vbabka@suse.cz> > --- > mm/shmem.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/mm/shmem.c b/mm/shmem.c > index 96ccf6e941aa..d2620db8c938 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -856,9 +856,8 @@ unsigned long shmem_swap_usage(struct vm_area_struct *vma) > return swapped << PAGE_SHIFT; > > /* Here comes the more involved part */ > - return shmem_partial_swap_usage(mapping, > - linear_page_index(vma, vma->vm_start), > - linear_page_index(vma, vma->vm_end)); > + return shmem_partial_swap_usage(mapping, vma->vm_pgoff, > + vma->vm_pgoff + vma_pages(vma)); > } > > /* >
diff --git a/mm/shmem.c b/mm/shmem.c index 96ccf6e941aa..d2620db8c938 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -856,9 +856,8 @@ unsigned long shmem_swap_usage(struct vm_area_struct *vma) return swapped << PAGE_SHIFT; /* Here comes the more involved part */ - return shmem_partial_swap_usage(mapping, - linear_page_index(vma, vma->vm_start), - linear_page_index(vma, vma->vm_end)); + return shmem_partial_swap_usage(mapping, vma->vm_pgoff, + vma->vm_pgoff + vma_pages(vma)); } /*
As it's trying to cover the whole vma anyways, use direct vm_pgoff value and vma_pages() rather than linear_page_index. Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Hugh Dickins <hughd@google.com> Signed-off-by: Peter Xu <peterx@redhat.com> --- mm/shmem.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)