Skip to content

Commit e7392b4

Browse files
xp4ns3akpm00
authored andcommitted
mm/highmem: fix kernel-doc warnings in highmem*.h
Patch series "Extend and reorganize Highmem's documentation", v4. This series has the purpose to extend and reorganize Highmem's documentation. This is a work in progress because some information should still be moved from highmem.rst to highmem.h and highmem-internal.h. Specifically I'm talking about moving the "how to" information to the relevant headers, as it as been suggested by Ira Weiny (Intel). Also, this is a work in progress because some kdocs in highmem.h and highmem-internal.h should be improved. This patch (of 4): `scripts/kernel-doc -v -none include/linux/highmem*` reports the following warnings: include/linux/highmem.h:160: warning: expecting prototype for kunmap_atomic(). Prototype was for nr_free_highpages() instead include/linux/highmem.h:204: warning: No description found for return value of 'alloc_zeroed_user_highpage_movable' include/linux/highmem-internal.h:256: warning: Function parameter or member '__addr' not described in 'kunmap_atomic' include/linux/highmem-internal.h:256: warning: Excess function parameter 'addr' description in 'kunmap_atomic' Fix these warnings by (1) moving the kernel-doc comments from highmem.h to highmem-internal.h (which is the file were the kunmap_atomic() macro is actually defined), (2) extending and merging it with the comment which was already in highmem-internal.h, and (3) using correct parameter names (4) correcting a few technical inaccuracies in comments, and (5) adding a deprecation notice in kunmap_atomic() for consistency with kmap_atomic(). Link: https://lkml.kernel.org/r/[email protected] Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Fabio M. De Francesco <[email protected]> Reviewed-by: Sebastian Andrzej Siewior <[email protected]> Reviewed-by: Ira Weiny <[email protected]> Cc: Matthew Wilcox <[email protected]> Cc: Mike Rapoport <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: Will Deacon <[email protected]> Cc: Peter Collingbourne <[email protected]> Cc: Vlastimil Babka <[email protected]> Cc: Jonathan Corbet <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Jonathan Corbet <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent e240ac5 commit e7392b4

File tree

2 files changed

+23
-17
lines changed

2 files changed

+23
-17
lines changed

include/linux/highmem-internal.h

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,21 @@ static inline unsigned long totalhigh_pages(void) { return 0UL; }
236236

237237
#endif /* CONFIG_HIGHMEM */
238238

239-
/*
240-
* Prevent people trying to call kunmap_atomic() as if it were kunmap()
241-
* kunmap_atomic() should get the return value of kmap_atomic, not the page.
239+
/**
240+
* kunmap_atomic - Unmap the virtual address mapped by kmap_atomic() - deprecated!
241+
* @__addr: Virtual address to be unmapped
242+
*
243+
* Unmaps an address previously mapped by kmap_atomic() and re-enables
244+
* pagefaults. Depending on PREEMP_RT configuration, re-enables also
245+
* migration and preemption. Users should not count on these side effects.
246+
*
247+
* Mappings should be unmapped in the reverse order that they were mapped.
248+
* See kmap_local_page() for details on nesting.
249+
*
250+
* @__addr can be any address within the mapped page, so there is no need
251+
* to subtract any offset that has been added. In contrast to kunmap(),
252+
* this function takes the address returned from kmap_atomic(), not the
253+
* page passed to it. The compiler will warn you if you pass the page.
242254
*/
243255
#define kunmap_atomic(__addr) \
244256
do { \

include/linux/highmem.h

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static inline void *kmap(struct page *page);
3737

3838
/**
3939
* kunmap - Unmap the virtual address mapped by kmap()
40-
* @addr: Virtual address to be unmapped
40+
* @page: Pointer to the page which was mapped by kmap()
4141
*
4242
* Counterpart to kmap(). A NOOP for CONFIG_HIGHMEM=n and for mappings of
4343
* pages in the low memory area.
@@ -138,24 +138,16 @@ static inline void *kmap_local_folio(struct folio *folio, size_t offset);
138138
*
139139
* Returns: The virtual address of the mapping
140140
*
141-
* Effectively a wrapper around kmap_local_page() which disables pagefaults
142-
* and preemption.
141+
* In fact a wrapper around kmap_local_page() which also disables pagefaults
142+
* and, depending on PREEMPT_RT configuration, also CPU migration and
143+
* preemption. Therefore users should not count on the latter two side effects.
144+
*
145+
* Mappings should always be released by kunmap_atomic().
143146
*
144147
* Do not use in new code. Use kmap_local_page() instead.
145148
*/
146149
static inline void *kmap_atomic(struct page *page);
147150

148-
/**
149-
* kunmap_atomic - Unmap the virtual address mapped by kmap_atomic()
150-
* @addr: Virtual address to be unmapped
151-
*
152-
* Counterpart to kmap_atomic().
153-
*
154-
* Effectively a wrapper around kunmap_local() which additionally undoes
155-
* the side effects of kmap_atomic(), i.e. reenabling pagefaults and
156-
* preemption.
157-
*/
158-
159151
/* Highmem related interfaces for management code */
160152
static inline unsigned int nr_free_highpages(void);
161153
static inline unsigned long totalhigh_pages(void);
@@ -191,6 +183,8 @@ static inline void clear_user_highpage(struct page *page, unsigned long vaddr)
191183
* @vma: The VMA the page is to be allocated for
192184
* @vaddr: The virtual address the page will be inserted into
193185
*
186+
* Returns: The allocated and zeroed HIGHMEM page
187+
*
194188
* This function will allocate a page for a VMA that the caller knows will
195189
* be able to migrate in the future using move_pages() or reclaimed
196190
*

0 commit comments

Comments
 (0)