fs: Replace kmap{,_atomic}() with kmap_local_page()
Subsystems (6)
PATCH 1/1 fs: Replace kmap{,_atomic}() with kmap_local_page()
The use of kmap() and kmap_atomic() are being deprecated in favor of kmap_local_page().
With kmap_local_page(), the mappings are per thread, CPU local and not globally visible. Furthermore, the mappings can be acquired from any context (including interrupts).
Therefore, use kmap_local_page() in exec.c because these mappings are per thread, CPU local, and not globally visible.
Tested with xfstests on a QEMU + KVM 32-bits VM booting a kernel with HIGHMEM64GB enabled.
--- fs/exec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
fs/exec.c +7 -7
@@ -583,11 +583,11 @@ static int copy_strings(int argc, struct user_arg_ptr argv,if (kmapped_page) {flush_dcache_page (kmapped_page); -kunmap (kmapped_page); +kunmap_local (kaddr);put_arg_page (kmapped_page); } kmapped_page = page; - kaddr =kmap (kmapped_page); + kaddr =kmap_local_page (kmapped_page); kpos = pos &PAGE_MASK ;flush_arg_page (bprm, kpos, kmapped_page); }
@@ -601,7 +601,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv, out:if (kmapped_page) {flush_dcache_page (kmapped_page); -kunmap (kmapped_page); +kunmap_local (kaddr);put_arg_page (kmapped_page); }return ret;
@@ -883,11 +883,11 @@ int transfer_args_to_stack(struct linux_binprm *bprm,for (index =MAX_ARG_PAGES -1 ; index >= stop; index--) {unsigned int offset = index == stop ? bprm->p & ~PAGE_MASK :0 ; -char *src =kmap (bprm->page[index]) + offset; +char *src =kmap_local_page (bprm->page[index]) + offset; sp -=PAGE_SIZE - offset;if (copy_to_user ((void *) sp, src,PAGE_SIZE - offset) !=0 ) ret = -EFAULT ; -kunmap (bprm->page[index]); +kunmap_local (src);if (ret) goto out; }
@@ -1680,13 +1680,13 @@ int remove_arg_zero(struct linux_binprm *bprm) ret = -EFAULT ; goto out; } - kaddr =kmap_atomic (page); + kaddr =kmap_local_page (page);for (; offset <PAGE_SIZE && kaddr[offset]; offset++, bprm->p++) ; -kunmap_atomic (kaddr); +kunmap_local (kaddr);put_arg_page (page); }while (offset ==PAGE_SIZE );
Signature · 1 line
2.36.1
Quoted 7 lines · Fabio M. De Francesco
The use of
kmap()andkmap_atomic()are being deprecated in favor ofkmap_local_page().With
kmap_local_page(), the mappings are per thread, CPU local and not globally visible. Furthermore, the mappings can be acquired from any context (including interrupts).
Quoted 5 lines
Therefore, use
kmap_local_page()inexec.cbecause these mappings are per thread, CPU local, and not globally visible.Tested with xfstests on a QEMU + KVM 32-bits VM booting a kernel with HIGHMEM64GB enabled.
Can someone please refresh my memory on what is going on.
I remember there were limitations that kmap_atomic had that are hard to meet so something I think it was kmap_local was invented and created to be the kmap_atomic replacement.
What are the requirements on kmap_local? In copy_strings kmap is called in contexts that can sleep in page faults so any nearly any requirement except a thread local use is invalidated.
As you have described kmap_local above it does not sound like kmap_local is safe in this context, but that could just be a problem in description that my poor memory does is not recalling the necessary details to correct.
Eric
Quoted 62 lines
Suggested-by Ira Weiny <[email protected]>Signed-off-by Fabio M. De Francesco <[email protected]>--- fs/exec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)fs/exec.c +7
-7@@ -583,11 +583,11 @@ static int copy_strings(int argc, struct user_arg_ptr argv,if (kmapped_page) {flush_dcache_page (kmapped_page); -kunmap (kmapped_page); +kunmap_local (kaddr);put_arg_page (kmapped_page); } kmapped_page = page; - kaddr =kmap (kmapped_page); + kaddr =kmap_local_page (kmapped_page); kpos = pos &PAGE_MASK ;flush_arg_page (bprm, kpos, kmapped_page); }@@ -601,7 +601,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv, out:if (kmapped_page) {flush_dcache_page (kmapped_page); -kunmap (kmapped_page); +kunmap_local (kaddr);put_arg_page (kmapped_page); }return ret;@@ -883,11 +883,11 @@ int transfer_args_to_stack(struct linux_binprm *bprm,for (index =MAX_ARG_PAGES -1 ; index >= stop; index--) {unsigned int offset = index == stop ? bprm->p & ~PAGE_MASK :0 ; -char *src =kmap (bprm->page[index]) + offset; +char *src =kmap_local_page (bprm->page[index]) + offset; sp -=PAGE_SIZE - offset;if (copy_to_user ((void *) sp, src,PAGE_SIZE - offset) !=0 ) ret = -EFAULT ; -kunmap (bprm->page[index]); +kunmap_local (src);if (ret) goto out; }@@ -1680,13 +1680,13 @@ int remove_arg_zero(struct linux_binprm *bprm) ret = -EFAULT ; goto out; } - kaddr =kmap_atomic (page); + kaddr =kmap_local_page (page);for (; offset <PAGE_SIZE && kaddr[offset]; offset++, bprm->p++) ; -kunmap_atomic (kaddr); +kunmap_local (kaddr);put_arg_page (page); }while (offset ==PAGE_SIZE );
Quoted 10 lines · On giovedì 30 giugno 2022 19:38:08 CEST Eric W. Biederman wrote:
Quoted 8 lines · Fabio M. De Francesco
The use of
kmap()andkmap_atomic()are being deprecated in favor ofkmap_local_page().With
kmap_local_page(), the mappings are per thread, CPU local and not globally visible. Furthermore, the mappings can be acquired from any context (including interrupts).Therefore, use
kmap_local_page()inexec.cbecause these mappings are
per
Quoted 10 lines
Quoted 4 lines
thread, CPU local, and not globally visible.
Tested with xfstests on a QEMU + KVM 32-bits VM booting a kernel with HIGHMEM64GB enabled.
Can someone please refresh my memory on what is going on.
I remember there were limitations that
kmap_atomichad that are hard to meet so something I think it waskmap_localwas invented and created to be thekmap_atomicreplacement.
Please read highmem.rst. I've updated that document weeks ago:
https://docs.kernel.org/vm/highmem.html?highlight=highmem
Currently it contains many more information I can ever place here in order to answer your questions.
Believe me, this is not by any means a way to elude your questions. I'm pretty sure that by reading that document you'll have a clear vision on what is going on :-)
Quoted 3 lines
What are the requirements on
kmap_local? Incopy_stringskmap is called in contexts that can sleep in page faults
No problems with kmap_local_page() with regard to page faults (again, please read the above-mentioned document).
From that document...
"It’s valid to take pagefaults in a local kmap region []".
"Each call of kmap_atomic() in the kernel creates a non-preemptible section and disable pagefaults. This could be a source of unwanted latency. Therefore users should prefer kmap_local_page() instead of kmap_atomic().".
Quoted 5 lines
so any
nearly any requirement except a thread local use is invalidated.As you have described
kmap_localabove it does not sound likekmap_localis safe in this context,
Sorry, probably I should add that taking page faults is allowed. Would you prefer I send a v2 and add this information?
Thanks,
Fabio
Quoted 12 lines
but that could just be a problem in description
that my poor memory does is not recalling the necessary details to correct.Eric
Quoted 6 lines
Suggested-by Ira Weiny <[email protected]>Signed-off-by Fabio M. De Francesco <[email protected]>--- fs/exec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
Quoted 5 lines
fs/exec.c static int copy_strings(int argc, struct
Quoted 5 lines
fs/exec.c +0
-0@@ -583,11 +583,11 @@ static int copy_strings(int argc, struct
user_arg_ptr argv,
Quoted 3 lines
fs/exec.c static int copy_strings(int argc, struct · line 584
Quoted 3 lines
fs/exec.c +0
-0if (kmapped_page) {
flush_dcache_page(kmapped_page);
Quoted 3 lines
fs/exec.c static int copy_strings(int argc, struct user_arg_ptr argv,
Quoted 3 lines
fs/exec.c +1
-1-kunmap (kmapped_page); +kunmap_local (kaddr);
put_arg_page(kmapped_page);
Quoted 4 lines
fs/exec.c static int copy_strings(int argc, struct user_arg_ptr argv,
Quoted 4 lines
fs/exec.c +1
-1} kmapped_page = page; - kaddr =kmap (kmapped_page); + kaddr =
kmap_local_page(kmapped_page);
Quoted 2 lines
fs/exec.c static int copy_strings(int argc, struct · line 591
Quoted 2 lines
fs/exec.c +0
-0kpos = pos &PAGE_MASK ; flush_arg_page(bprm, kpos,
kmapped_page);
Quoted 2 lines
fs/exec.c static int copy_strings(int argc, struct
Quoted 2 lines
fs/exec.c +0
-0}@@ -601,7 +601,7 @@ static int copy_strings(int argc, struct
user_arg_ptr argv,
Quoted 9 lines
fs/exec.c int transfer_args_to_stack(struct linux_binprm
Quoted 9 lines
fs/exec.c +1
-1out:if (kmapped_page) {flush_dcache_page (kmapped_page); -kunmap (kmapped_page); +kunmap_local (kaddr);put_arg_page (kmapped_page); }return ret;@@ -883,11 +883,11 @@ int transfer_args_to_stack(struct linux_binprm
*bprm,
Quoted 3 lines
fs/exec.c int transfer_args_to_stack(struct linux_binprm · line 884
Quoted 3 lines
fs/exec.c +0
-0for (index =MAX_ARG_PAGES -1 ; index >= stop; index--) { unsigned int offset = index == stop ? bprm->p &
~PAGE_MASK : 0;
Quoted 2 lines
fs/exec.c int transfer_args_to_stack(struct linux_binprm · line 885
Quoted 2 lines
fs/exec.c +1
-1-char *src =kmap (bprm->page[index]) + offset; + char *src = kmap_local_page(bprm->page[index]) +
offset;
Quoted 2 lines
fs/exec.c int transfer_args_to_stack(struct linux_binprm · line 887
Quoted 2 lines
fs/exec.c +0
-0sp -=PAGE_SIZE - offset; if (copy_to_user((void *) sp, src, PAGE_SIZE - offset)
!= 0)
Quoted 22 lines
Quoted 21 lines
fs/exec.c +3
-3ret = -EFAULT ; -kunmap (bprm->page[index]); +kunmap_local (src);if (ret) goto out; }@@ -1680,13 +1680,13 @@ int remove_arg_zero(struct linux_binprm *bprm) ret = -EFAULT ; goto out; } - kaddr =kmap_atomic (page); + kaddr =kmap_local_page (page);for (; offset <PAGE_SIZE && kaddr[offset]; offset++, bprm->p++) ; -kunmap_atomic (kaddr); +kunmap_local (kaddr);put_arg_page (page); }while (offset ==PAGE_SIZE );
Quoted 7 lines · Fabio M. De Francesco
The use of
kmap()andkmap_atomic()are being deprecated in favor ofkmap_local_page().With
kmap_local_page(), the mappings are per thread, CPU local and not globally visible. Furthermore, the mappings can be acquired from any context (including interrupts).
Quoted 7 lines
Therefore, use
kmap_local_page()inexec.cbecause these mappings are per thread, CPU local, and not globally visible.Tested with xfstests on a QEMU + KVM 32-bits VM booting a kernel with HIGHMEM64GB enabled.
Suggested-by Ira Weiny <[email protected]>
This looks good but there is a kmap_atomic() in this file which I _think_ can be converted as well. But that is good as a separate patch.
Quoted 65 lines
Signed-off-by Fabio M. De Francesco <[email protected]>--- fs/exec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)fs/exec.c +7
-7@@ -583,11 +583,11 @@ static int copy_strings(int argc, struct user_arg_ptr argv,if (kmapped_page) {flush_dcache_page (kmapped_page); -kunmap (kmapped_page); +kunmap_local (kaddr);put_arg_page (kmapped_page); } kmapped_page = page; - kaddr =kmap (kmapped_page); + kaddr =kmap_local_page (kmapped_page); kpos = pos &PAGE_MASK ;flush_arg_page (bprm, kpos, kmapped_page); }@@ -601,7 +601,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv, out:if (kmapped_page) {flush_dcache_page (kmapped_page); -kunmap (kmapped_page); +kunmap_local (kaddr);put_arg_page (kmapped_page); }return ret;@@ -883,11 +883,11 @@ int transfer_args_to_stack(struct linux_binprm *bprm,for (index =MAX_ARG_PAGES -1 ; index >= stop; index--) {unsigned int offset = index == stop ? bprm->p & ~PAGE_MASK :0 ; -char *src =kmap (bprm->page[index]) + offset; +char *src =kmap_local_page (bprm->page[index]) + offset; sp -=PAGE_SIZE - offset;if (copy_to_user ((void *) sp, src,PAGE_SIZE - offset) !=0 ) ret = -EFAULT ; -kunmap (bprm->page[index]); +kunmap_local (src);if (ret) goto out; }@@ -1680,13 +1680,13 @@ int remove_arg_zero(struct linux_binprm *bprm) ret = -EFAULT ; goto out; } - kaddr =kmap_atomic (page); + kaddr =kmap_local_page (page);for (; offset <PAGE_SIZE && kaddr[offset]; offset++, bprm->p++) ; -kunmap_atomic (kaddr); +kunmap_local (kaddr);put_arg_page (page); }while (offset ==PAGE_SIZE );Signature · 1 line
2.36.1
Quoted 9 lines · On venerdì 8 luglio 2022 22:18:35 CEST Ira Weiny wrote:
Quoted 8 lines · Fabio M. De Francesco
The use of
kmap()andkmap_atomic()are being deprecated in favor ofkmap_local_page().With
kmap_local_page(), the mappings are per thread, CPU local and not globally visible. Furthermore, the mappings can be acquired from any context (including interrupts).Therefore, use
kmap_local_page()inexec.cbecause these mappings are
per
Quoted 8 lines
Quoted 6 lines
thread, CPU local, and not globally visible.
Tested with xfstests on a QEMU + KVM 32-bits VM booting a kernel with HIGHMEM64GB enabled.
Suggested-by Ira Weiny <[email protected]>This looks good but there is a
kmap_atomic()in this file which I _think_
can
Quoted 4 lines
be converted as well. But that is good as a separate patch.
Reviewed-by Ira Weiny <[email protected]>
Thanks for your review!
I didn't notice that kmap_atomic(). I'll send a conversion with a separate patch.
Fabio