mm/gup.c: Updating the documentation
Subsystems (2)
PATCH 1/1 mm/gup.c: Updating the documentation
This patch is an attempt to update the documentation.
* Adding / removing extra * based on type of function static / global.
* Added description for functions and their input arguments.
--- mm/gup.c | 59 ++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 19 deletions(-)
mm/gup.c +40 -19
@@ -722,7 +722,7 @@ static struct page *follow_p4d_mask(struct vm_area_struct *vma,return follow_pud_mask (vma, address, p4d, flags, ctx); } -/** +/* * follow_page_mask - look up a page descriptor from a user-virtual address * @vma: vm_area_struct mapping @address * @address: virtual address to look up
@@ -1168,7 +1168,7 @@ static bool vma_permits_fault(struct vm_area_struct *vma,return true; } -/* +/** * fixup_user_fault() - manually resolve a user page fault * @tsk: the task_struct to use for page fault accounting, or * NULL if faults are not to be recorded.
@@ -1837,7 +1837,7 @@ static long __get_user_pages_remote(struct task_struct *tsk, gup_flags | FOLL_TOUCH | FOLL_REMOTE); } -/* +/** * get_user_pages_remote() - pin user pages in memory * @tsk: the task_struct to use for page fault accounting, or * NULL if faults are not to be recorded.
@@ -1868,13 +1868,13 @@ static long __get_user_pages_remote(struct task_struct *tsk,* * Must be called with mmap_sem held for read or write. * -* get_user_pages walks a process's page tables and takes a reference to -* each struct page that each user address corresponds to at a given +* get_user_pages_remote walks a process's page tables and takes a reference +* to each struct page that each user address corresponds to at a given * instant. That is, it takes the page that would be accessed if a user * thread accesses the given user virtual address at that instant. * * This does not guarantee that the page exists in the user mappings when -* get_user_pages returns, and there may even be a completely different +* get_user_pages_remote returns, and there may even be a completely different * page there in some cases (eg. if mmapped pagecache has been invalidated * and subsequently re faulted). However it does guarantee that the page * won't be freed completely. And mostly callers simply care that the page
@@ -1886,17 +1886,17 @@ static long __get_user_pages_remote(struct task_struct *tsk,* is written to, set_page_dirty (or set_page_dirty_lock, as appropriate) must * be called after the page is finished with, and before put_page is called. * -* get_user_pages is typically used for fewer-copy IO operations, to get a -* handle on the memory by some means other than accesses via the user virtual -* addresses. The pages may be submitted for DMA to devices or accessed via -* their kernel linear mapping (via the kmap APIs). Care should be taken to -* use the correct cache flushing APIs. +* get_user_pages_remote is typically used for fewer-copy IO operations, +* to get a handle on the memory by some means other than accesses +* via the user virtual addresses. The pages may be submitted for +* DMA to devices or accessed via their kernel linear mapping (via the +* kmap APIs). Care should be taken to use the correct cache flushing APIs. * * See also get_user_pages_fast, for performance critical applications. * -* get_user_pages should be phased out in favor of +* get_user_pages_remote should be phased out in favor of * get_user_pages_locked|unlocked or get_user_pages_fast. Nothing -* should use get_user_pages because it cannot pass +* should use get_user_pages_remote because it cannot pass * FAULT_FLAG_ALLOW_RETRY to handle_mm_fault. */ long get_user_pages_remote(struct task_struct *tsk, struct mm_struct *mm,
@@ -1935,7 +1935,17 @@ static long __get_user_pages_remote(struct task_struct *tsk, }#endif /* !CONFIG_MMU */ -/* +/** +* get_user_pages() - pin user pages in memory +* @start: starting user address +* @nr_pages: number of pages from start to pin +* @gup_flags: flags modifying lookup behaviour +* @pages: array that receives pointers to the pages pinned. +* Should be at least nr_pages long. Or NULL, if caller +* only intends to ensure the pages are faulted in. +* @vmas: array of pointers to vmas corresponding to each page. +* Or NULL if the caller does not require them. +* * This is the same as get_user_pages_remote(), just with a * less-flexible calling convention where we assume that the task * and mm being operated on are the current task's and don't allow
@@ -1958,11 +1968,7 @@ long get_user_pages(unsigned long start, unsigned long nr_pages, }EXPORT_SYMBOL (get_user_pages); -/* -* We can leverage the VM_FAULT_RETRY functionality in the page fault -* paths better by using either get_user_pages_locked() or -* get_user_pages_unlocked(). -* +/** * get_user_pages_locked() is suitable to replace the form: * * down_read(&mm->mmap_sem);
@@ -1978,6 +1984,21 @@ long get_user_pages(unsigned long start, unsigned long nr_pages,* get_user_pages_locked(tsk, mm, ..., pages, &locked); * if (locked) * up_read(&mm->mmap_sem); +* +* @start: starting user address +* @nr_pages: number of pages from start to pin +* @gup_flags: flags modifying lookup behaviour +* @pages: array that receives pointers to the pages pinned. +* Should be at least nr_pages long. Or NULL, if caller +* only intends to ensure the pages are faulted in. +* @locked: pointer to lock flag indicating whether lock is held and +* subsequently whether VM_FAULT_RETRY functionality can be +* utilised. Lock must initially be held. +* +* We can leverage the VM_FAULT_RETRY functionality in the page fault +* paths better by using either get_user_pages_locked() or +* get_user_pages_unlocked(). +* */ long get_user_pages_locked(unsigned long start, unsigned long nr_pages, unsigned int gup_flags, struct page **pages,
Signature · 1 line
1.9.1
Andrew Morton
maintainerQuoted 4 lines · On Tue, 28 Apr 2020 00:23:50 +0530 Souptick Joarder <[email protected]>…
This patch is an attempt to update the documentation.
* Adding / removing extra * based on type of function static / global.
I don't think so, unless this is a new kerneldoc convention?
mm/gup.c static struct page *follow_p4d_mask(struct vm_area_struct *vma, · line 728
Quoted 11 lines
mm/gup.c +1
-1@@ -722,7 +722,7 @@ static struct page *follow_p4d_mask(struct vm_area_struct *vma,return follow_pud_mask (vma, address, p4d, flags, ctx); } -/** +/* * follow_page_mask - look up a page descriptor from a user-virtual address * @vma: vm_area_struct mapping @address * @address: virtual address to look up
/** indicates that the comment is in kerneldoc form, not that it has static scope?
Quoted 8 lines · Andrew Morton
Quoted 4 lines · On Tue, 28 Apr 2020 00:23:50 +0530 Souptick Joarder <[email protected]>…
This patch is an attempt to update the documentation.
* Adding / removing extra * based on type of function static / global.
I don't think so, unless this is a new kerneldoc convention?
It's not new, but we generally try harder to document exported or non-private interfaces and not so hard on private interfaces.
Quoted 6 lines
Quoted 6 lines
mm/gup.c +0
-0@@ -722,7 +722,7 @@ static struct page *follow_p4d_mask(struct vm_area_struct *vma,return follow_pud_mask (vma, address, p4d, flags, ctx); }
Quoted 8 lines
mm/gup.c static struct page *follow_p4d_mask(struct vm_area_struct *vma, · line 728
Quoted 5 lines
mm/gup.c +1
-1-/** +/* * follow_page_mask - look up a page descriptor from a user-virtual address * @vma: vm_area_struct mapping @address * @address: virtual address to look up /** indicates that the comment is in kerneldoc form, not that it has static scope?
Right.
Signature · 1 line
~Randy
Quoted 8 lines · On Mon, 27 Apr 2020 12:26:06 -0700 Andrew Morton <[email protected]>…
Quoted 4 lines · On Tue, 28 Apr 2020 00:23:50 +0530 Souptick Joarder <[email protected]>…
This patch is an attempt to update the documentation.
* Adding / removing extra * based on type of function static / global.
I don't think so, unless this is a new kerneldoc convention?
Nope, no new convention here. If it's a kerneldoc comment, it should be marked as such. The kerneldoc utility can sort them out later.
jon