lkml.org 
[lkml]   [2021]   [Dec]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v9 07/10] mm: move pgoff_address() to vma_pgoff_address()
    Date
    Since it is not a DAX-specific function, move it into mm and rename it
    to be a generic helper.

    Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
    ---
    fs/dax.c | 12 +-----------
    include/linux/mm.h | 13 +++++++++++++
    2 files changed, 14 insertions(+), 11 deletions(-)

    diff --git a/fs/dax.c b/fs/dax.c
    index b3c737aff9de..ad8ceea1f54c 100644
    --- a/fs/dax.c
    +++ b/fs/dax.c
    @@ -853,16 +853,6 @@ static void *dax_insert_entry(struct xa_state *xas,
    return entry;
    }

    -static inline
    -unsigned long pgoff_address(pgoff_t pgoff, struct vm_area_struct *vma)
    -{
    - unsigned long address;
    -
    - address = vma->vm_start + ((pgoff - vma->vm_pgoff) << PAGE_SHIFT);
    - VM_BUG_ON_VMA(address < vma->vm_start || address >= vma->vm_end, vma);
    - return address;
    -}
    -
    /* Walk all mappings of a given index of a file and writeprotect them */
    static void dax_entry_mkclean(struct address_space *mapping, pgoff_t index,
    unsigned long pfn)
    @@ -882,7 +872,7 @@ static void dax_entry_mkclean(struct address_space *mapping, pgoff_t index,
    if (!(vma->vm_flags & VM_SHARED))
    continue;

    - address = pgoff_address(index, vma);
    + address = vma_pgoff_address(vma, index);

    /*
    * follow_invalidate_pte() will use the range to call
    diff --git a/include/linux/mm.h b/include/linux/mm.h
    index a7e4a9e7d807..3f44cd9e296c 100644
    --- a/include/linux/mm.h
    +++ b/include/linux/mm.h
    @@ -2855,6 +2855,19 @@ static inline unsigned long vma_pages(struct vm_area_struct *vma)
    return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
    }

    +/*
    + * Get user virtual address at the specific offset within a vma.
    + */
    +static inline unsigned long vma_pgoff_address(struct vm_area_struct *vma,
    + pgoff_t pgoff)
    +{
    + unsigned long address;
    +
    + address = vma->vm_start + ((pgoff - vma->vm_pgoff) << PAGE_SHIFT);
    + VM_BUG_ON_VMA(address < vma->vm_start || address >= vma->vm_end, vma);
    + return address;
    +}
    +
    /* Look up the first VMA which exactly match the interval vm_start ... vm_end */
    static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
    unsigned long vm_start, unsigned long vm_end)
    --
    2.34.1


    \
     
     \ /
      Last update: 2021-12-26 15:36    [W:4.075 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site