Skip to content

Commit 0d40c4e

Browse files
Fabio M. De Francescogregkh
authored andcommitted
mm/mempool: replace kmap_atomic() with kmap_local_page()
[ Upstream commit f2bcc99 ] kmap_atomic() has been deprecated in favor of kmap_local_page(). Therefore, replace kmap_atomic() with kmap_local_page(). kmap_atomic() is implemented like a kmap_local_page() which also disables page-faults and preemption (the latter only in !PREEMPT_RT kernels). The kernel virtual addresses returned by these two API are only valid in the context of the callers (i.e., they cannot be handed to other threads). With kmap_local_page() the mappings are per thread and CPU local like in kmap_atomic(); however, they can handle page-faults and can be called from any context (including interrupts). The tasks that call kmap_local_page() can be preempted and, when they are scheduled to run again, the kernel virtual addresses are restored and are still valid. The code blocks between the mappings and un-mappings don't rely on the above-mentioned side effects of kmap_atomic(), so that mere replacements of the old API with the new one is all that they require (i.e., there is no need to explicitly call pagefault_disable() and/or preempt_disable()). Link: https://lkml.kernel.org/r/20231120142640.7077-1-fabio.maria.de.francesco@linux.intel.com Signed-off-by: Fabio M. De Francesco <fabio.maria.de.francesco@linux.intel.com> Cc: Ira Weiny <ira.weiny@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Stable-dep-of: ec33b59 ("mm/mempool: fix poisoning order>0 pages with HIGHMEM") Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent f38b91f commit 0d40c4e

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

mm/mempool.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ static void check_element(mempool_t *pool, void *element)
6464
} else if (pool->free == mempool_free_pages) {
6565
/* Mempools backed by page allocator */
6666
int order = (int)(long)pool->pool_data;
67-
void *addr = kmap_atomic((struct page *)element);
67+
void *addr = kmap_local_page((struct page *)element);
6868

6969
__check_element(pool, addr, 1UL << (PAGE_SHIFT + order));
70-
kunmap_atomic(addr);
70+
kunmap_local(addr);
7171
}
7272
}
7373

@@ -89,10 +89,10 @@ static void poison_element(mempool_t *pool, void *element)
8989
} else if (pool->alloc == mempool_alloc_pages) {
9090
/* Mempools backed by page allocator */
9191
int order = (int)(long)pool->pool_data;
92-
void *addr = kmap_atomic((struct page *)element);
92+
void *addr = kmap_local_page((struct page *)element);
9393

9494
__poison_element(addr, 1UL << (PAGE_SHIFT + order));
95-
kunmap_atomic(addr);
95+
kunmap_local(addr);
9696
}
9797
}
9898
#else /* CONFIG_DEBUG_SLAB || CONFIG_SLUB_DEBUG_ON */

0 commit comments

Comments
 (0)