Skip to content

Commit d2c20e5

Browse files
weiny2torvalds
authored andcommitted
mm/highmem: remove deprecated kmap_atomic
kmap_atomic() is being deprecated in favor of kmap_local_page(). Replace the uses of kmap_atomic() within the highmem code. On profiling clear_huge_page() using ftrace an improvement of 62% was observed on the below setup. Setup:- Below data has been collected on Qualcomm's SM7250 SoC THP enabled (kernel v4.19.113) with only CPU-0(Cortex-A55) and CPU-7(Cortex-A76) switched on and set to max frequency, also DDR set to perf governor. FTRACE Data:- Base data:- Number of iterations: 48 Mean of allocation time: 349.5 us std deviation: 74.5 us v4 data:- Number of iterations: 48 Mean of allocation time: 131 us std deviation: 32.7 us The following simple userspace experiment to allocate 100MB(BUF_SZ) of pages and writing to it gave us a good insight, we observed an improvement of 42% in allocation and writing timings. ------------------------------------------------------------- Test code snippet ------------------------------------------------------------- clock_start(); buf = malloc(BUF_SZ); /* Allocate 100 MB of memory */ for(i=0; i < BUF_SZ_PAGES; i++) { *((int *)(buf + (i*PAGE_SIZE))) = 1; } clock_end(); ------------------------------------------------------------- Malloc test timings for 100MB anon allocation:- Base data:- Number of iterations: 100 Mean of allocation time: 31831 us std deviation: 4286 us v4 data:- Number of iterations: 100 Mean of allocation time: 18193 us std deviation: 4915 us [[email protected]: fix zero_user_segments()] Link: https://lkml.kernel.org/r/[email protected] Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Ira Weiny <[email protected]> Signed-off-by: Prathu Baronia <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Matthew Wilcox <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Randy Dunlap <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent afe8605 commit d2c20e5

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

include/linux/highmem.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ static inline void invalidate_kernel_vmap_range(void *vaddr, int size)
143143
#ifndef clear_user_highpage
144144
static inline void clear_user_highpage(struct page *page, unsigned long vaddr)
145145
{
146-
void *addr = kmap_atomic(page);
146+
void *addr = kmap_local_page(page);
147147
clear_user_page(addr, vaddr, page);
148-
kunmap_atomic(addr);
148+
kunmap_local(addr);
149149
}
150150
#endif
151151

@@ -177,9 +177,9 @@ alloc_zeroed_user_highpage_movable(struct vm_area_struct *vma,
177177

178178
static inline void clear_highpage(struct page *page)
179179
{
180-
void *kaddr = kmap_atomic(page);
180+
void *kaddr = kmap_local_page(page);
181181
clear_page(kaddr);
182-
kunmap_atomic(kaddr);
182+
kunmap_local(kaddr);
183183
}
184184

185185
#ifndef __HAVE_ARCH_TAG_CLEAR_HIGHPAGE
@@ -202,7 +202,7 @@ static inline void zero_user_segments(struct page *page,
202202
unsigned start1, unsigned end1,
203203
unsigned start2, unsigned end2)
204204
{
205-
void *kaddr = kmap_atomic(page);
205+
void *kaddr = kmap_local_page(page);
206206
unsigned int i;
207207

208208
BUG_ON(end1 > page_size(page) || end2 > page_size(page));
@@ -213,7 +213,7 @@ static inline void zero_user_segments(struct page *page,
213213
if (end2 > start2)
214214
memset(kaddr + start2, 0, end2 - start2);
215215

216-
kunmap_atomic(kaddr);
216+
kunmap_local(kaddr);
217217
for (i = 0; i < compound_nr(page); i++)
218218
flush_dcache_page(page + i);
219219
}
@@ -238,11 +238,11 @@ static inline void copy_user_highpage(struct page *to, struct page *from,
238238
{
239239
char *vfrom, *vto;
240240

241-
vfrom = kmap_atomic(from);
242-
vto = kmap_atomic(to);
241+
vfrom = kmap_local_page(from);
242+
vto = kmap_local_page(to);
243243
copy_user_page(vto, vfrom, vaddr, to);
244-
kunmap_atomic(vto);
245-
kunmap_atomic(vfrom);
244+
kunmap_local(vto);
245+
kunmap_local(vfrom);
246246
}
247247

248248
#endif
@@ -253,11 +253,11 @@ static inline void copy_highpage(struct page *to, struct page *from)
253253
{
254254
char *vfrom, *vto;
255255

256-
vfrom = kmap_atomic(from);
257-
vto = kmap_atomic(to);
256+
vfrom = kmap_local_page(from);
257+
vto = kmap_local_page(to);
258258
copy_page(vto, vfrom);
259-
kunmap_atomic(vto);
260-
kunmap_atomic(vfrom);
259+
kunmap_local(vto);
260+
kunmap_local(vfrom);
261261
}
262262

263263
#endif

mm/highmem.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ void zero_user_segments(struct page *page, unsigned start1, unsigned end1,
383383
unsigned this_end = min_t(unsigned, end1, PAGE_SIZE);
384384

385385
if (end1 > start1) {
386-
kaddr = kmap_atomic(page + i);
386+
kaddr = kmap_local_page(page + i);
387387
memset(kaddr + start1, 0, this_end - start1);
388388
}
389389
end1 -= this_end;
@@ -398,15 +398,15 @@ void zero_user_segments(struct page *page, unsigned start1, unsigned end1,
398398

399399
if (end2 > start2) {
400400
if (!kaddr)
401-
kaddr = kmap_atomic(page + i);
401+
kaddr = kmap_local_page(page + i);
402402
memset(kaddr + start2, 0, this_end - start2);
403403
}
404404
end2 -= this_end;
405405
start2 = 0;
406406
}
407407

408408
if (kaddr) {
409-
kunmap_atomic(kaddr);
409+
kunmap_local(kaddr);
410410
flush_dcache_page(page + i);
411411
}
412412

0 commit comments

Comments
 (0)