mm/gup: remove FOLL_FORCE usage from drivers (reliable R/O long-term pinning)
Subsystems (17)
cover mm/gup: remove FOLL_FORCE usage from drivers (reliable R/O long-term pinning)
For now, we did not support reliable R/O long-term pinning in COW mappings. That means, if we would trigger R/O long-term pinning in MAP_PRIVATE mapping, we could end up pinning the (R/O-mapped) shared zeropage or a pagecache page.
The next write access would trigger a write fault and replace the pinned page by an exclusive anonymous page in the process page table; whatever the process would write to that private page copy would not be visible by the owner of the previous page pin: for example, RDMA could read stale data. The end result is essentially an unexpected and hard-to-debug memory corruption.
Some drivers tried working around that limitation by using "FOLL_FORCE|FOLL_WRITE|FOLL_LONGTERM" for R/O long-term pinning for now. FOLL_WRITE would trigger a write fault, if required, and break COW before pinning the page. FOLL_FORCE is required because the VMA might lack write permissions, and drivers wanted to make that working as well, just like one would expect (no write access, but still triggering a write access to break COW).
However, that is not a practical solution, because
(1) Drivers that don't stick to that undocumented and debatable pattern would still run into that issue. For example, VFIO only uses FOLL_LONGTERM for R/O long-term pinning.
(2) Using FOLL_WRITE just to work around a COW mapping + page pinning limitation is unintuitive. FOLL_WRITE would, for example, mark the page softdirty or trigger uffd-wp, even though, there actually isn't going to be any write access.
(3) The purpose of FOLL_FORCE is debug access, not access without lack of VMA permissions by arbitrarty drivers.
So instead, make R/O long-term pinning work as expected, by breaking COW in a COW mapping early, such that we can remove any FOLL_FORCE usage from drivers. More details in patch #8.
Patches #1--#3 add COW tests for non-anonymous pages.
Patches #4--#7 prepare core MM for extended FAULT_FLAG_UNSHARE support in COW mappings.
Patch #8 implements reliable R/O long-term pinning in COW mappings Patches #9--#19 remove any FOLL_FORCE usage from drivers.
I'm refraining from CCing all driver maintainers on the whole patch set.
David Hildenbrand (19):
selftests/vm: anon_cow: prepare for non-anonymous COW tests selftests/vm: cow: basic COW tests for non-anonymous pages selftests/vm: cow: R/O long-term pinning reliability tests for
non-anon pages
mm: add early FAULT_FLAG_UNSHARE consistency checks
mm: add early FAULT_FLAG_WRITE consistency checks
mm: rework handling in do_wp_page() based on private vs. shared
mappings
mm: don't call vm_ops->huge_fault() in wp_huge_pmd()/wp_huge_pud() for
private mappings
mm: extend FAULT_FLAG_UNSHARE support to anything in a COW mapping mm/gup: reliable R/O long-term pinning in COW mappings RDMA/umem: remove FOLL_FORCE usage
RDMA/usnic: remove FOLL_FORCE usage
RDMA/siw: remove FOLL_FORCE usage
media: videobuf-dma-sg: remove FOLL_FORCE usage drm/etnaviv: remove FOLL_FORCE usage
media: pci/ivtv: remove FOLL_FORCE usage
mm/frame-vector: remove FOLL_FORCE usage
drm/exynos: remove FOLL_FORCE usage RDMA/hw/qib/qib_user_pages: remove FOLL_FORCE usage
habanalabs: remove FOLL_FORCE usage
drivers/gpu/drm/etnaviv/etnaviv_gem.c | 8 +-
drivers/gpu/drm/exynos/exynos_drm_g2d.c | 2 +-
drivers/infiniband/core/umem.c | 8 +-
drivers/infiniband/hw/qib/qib_user_pages.c | 2 +-
drivers/infiniband/hw/usnic/usnic_uiom.c | 9 +-
drivers/infiniband/sw/siw/siw_mem.c | 9 +-
drivers/media/common/videobuf2/frame_vector.c | 2 +-
drivers/media/pci/ivtv/ivtv-udma.c | 2 +-
drivers/media/pci/ivtv/ivtv-yuv.c | 5 +-
drivers/media/v4l2-core/videobuf-dma-sg.c | 14 +-
drivers/misc/habanalabs/common/memory.c | 3 +-
include/linux/mm.h | 27 +-
include/linux/mm_types.h | 8 +-
mm/gup.c | 10 +-
mm/huge_memory.c | 5 +-
mm/hugetlb.c | 12 +-
mm/memory.c | 97 +++--
tools/testing/selftests/vm/.gitignore | 2 +-
tools/testing/selftests/vm/Makefile | 10 +-
tools/testing/selftests/vm/check_config.sh | 4 +-
.../selftests/vm/{anon_cow.c => cow.c} | 387 +++++++++++++++++-
tools/testing/selftests/vm/run_vmtests.sh | 8 +-
22 files changed, 516 insertions(+), 118 deletions(-)
rename tools/testing/selftests/vm/{anon_cow.c => cow.c} (74%)Signature · 1 line
2.38.1
RFC PATCH 1/19 selftests/vm: anon_cow: prepare for non-anonymous COW tests
Originally, the plan was to have a separate tests for testing COW of non-anonymous (e.g., shared zeropage) pages.
Turns out, that we'd need a lot of similar functionality and that there isn't a really good reason to separate it. So let's prepare for non-anon tests by renaming to "cow".
---
tools/testing/selftests/vm/.gitignore | 2 +-
tools/testing/selftests/vm/Makefile | 10 ++++----
tools/testing/selftests/vm/check_config.sh | 4 +--
.../selftests/vm/{anon_cow.c => cow.c} | 25 +++++++++++--------
tools/testing/selftests/vm/run_vmtests.sh | 8 +++---
5 files changed, 27 insertions(+), 22 deletions(-)
rename tools/testing/selftests/vm/{anon_cow.c => cow.c} (97%)tools/testing/selftests/vm/.gitignore +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -anon_cow +cow hugepage-mmap hugepage-mremap hugepage-shm
tools/testing/selftests/vm/Makefile +5 -5
@@ -27,7 +27,7 @@ MAKEFLAGS += --no-builtin-rules CFLAGS = -Wall -I $(top_srcdir) -I $(top_srcdir)/usr/include $(EXTRA_CFLAGS) $(KHDR_INCLUDES) LDLIBS = -lrt -lpthread -TEST_GEN_FILES = anon_cow +TEST_GEN_FILES = cow TEST_GEN_FILES += compaction_test TEST_GEN_FILES += gup_test TEST_GEN_FILES += hmm-tests
@@ -99,7 +99,7 @@ TEST_FILES += va_128TBswitch.sh include ../lib.mk -$(OUTPUT)/anon_cow: vm_util.c +$(OUTPUT)/cow: vm_util.c $(OUTPUT)/khugepaged: vm_util.c $(OUTPUT)/ksm_functional_tests: vm_util.c $(OUTPUT)/madv_populate: vm_util.c
@@ -156,8 +156,8 @@ warn_32bit_failure: endif endif -# ANON_COW_EXTRA_LIBS may get set in local_config.mk, or it may be left empty. -$(OUTPUT)/anon_cow: LDLIBS += $(ANON_COW_EXTRA_LIBS) +# cow_EXTRA_LIBS may get set in local_config.mk, or it may be left empty. +$(OUTPUT)/cow: LDLIBS += $(COW_EXTRA_LIBS) $(OUTPUT)/mlock-random-test $(OUTPUT)/memfd_secret: LDLIBS += -lcap
@@ -170,7 +170,7 @@ local_config.mk local_config.h: check_config.sh EXTRA_CLEAN += local_config.mk local_config.h -ifeq ($(ANON_COW_EXTRA_LIBS),) +ifeq ($(COW_EXTRA_LIBS),) all: warn_missing_liburing warn_missing_liburing:
tools/testing/selftests/vm/check_config.sh +2 -2
@@ -21,11 +21,11 @@ $CC -c $tmpfile_c -o $tmpfile_o >/dev/null 2>&1 if [ -f $tmpfile_o ]; then echo "#define LOCAL_CONFIG_HAVE_LIBURING 1" > $OUTPUT_H_FILE - echo "ANON_COW_EXTRA_LIBS = -luring" > $OUTPUT_MKFILE + echo "COW_EXTRA_LIBS = -luring" > $OUTPUT_MKFILE else echo "// No liburing support found" > $OUTPUT_H_FILE echo "# No liburing support found, so:" > $OUTPUT_MKFILE - echo "ANON_COW_EXTRA_LIBS = " >> $OUTPUT_MKFILE + echo "COW_EXTRA_LIBS = " >> $OUTPUT_MKFILE fi rm ${tmpname}.*
tools/testing/selftests/vm/cow.c renamed from tools/testing/selftests/vm/anon_cow.c +15 -10
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* COW (Copy On Write) tests for anonymous memory. +* COW (Copy On Write) tests. * * Copyright 2022, Red Hat, Inc. *
@@ -959,7 +959,11 @@ struct test_case {test_fn fn; }; -static const struct test_case test_cases[] = { +/* +* Test cases that are specific to anonymous pages: pages in private mappings +* that may get shared via COW during fork(). +*/ +static const struct test_case anon_test_cases[] = {/* * Basic COW tests for fork() without any GUP. If we miss to break COW, * either the child can observe modifications by the parent or the
@@ -1061,7 +1065,7 @@ static const struct test_case test_cases[] = { }, }; -static void run_test_case (struct test_case const *test_case) +static void run_anon_test_case (struct test_case const *test_case) {int i;
@@ -1082,15 +1086,17 @@ static void run_test_case(struct test_case const *test_case) hugetlbsizes[i]); } -static void run_test_cases (void ) +static void run_anon_test_cases (void ) {int i; -for (i =0 ; i <ARRAY_SIZE (test_cases); i++) -run_test_case (&test_cases[i]); +ksft_print_msg ("[INFO] Anonymous memory tests in private mappings\n" ); + +for (i =0 ; i <ARRAY_SIZE (anon_test_cases); i++) +run_anon_test_case (&anon_test_cases[i]); } -static int tests_per_test_case (void ) +static int tests_per_anon_test_case (void ) {int tests =2 + nr_hugetlbsizes;
@@ -1101,7 +1107,6 @@ static int tests_per_test_case(void)int main (int argc,char **argv) { -int nr_test_cases =ARRAY_SIZE (test_cases);int err; pagesize =getpagesize ();
@@ -1109,14 +1114,14 @@ int main(int argc, char **argv)detect_hugetlbsizes ();ksft_print_header (); -ksft_set_plan (nr_test_cases *tests_per_test_case ()); +ksft_set_plan (ARRAY_SIZE (anon_test_cases) *tests_per_anon_test_case ()); gup_fd =open ("/sys/kernel/debug/gup_test" ,O_RDWR ); pagemap_fd =open ("/proc/self/pagemap" ,O_RDONLY );if (pagemap_fd <0 )ksft_exit_fail_msg ("opening pagemap failed\n" ); -run_test_cases (); +run_anon_test_cases (); err =ksft_get_fail_cnt ();if (err)
tools/testing/selftests/vm/run_vmtests.sh +4 -4
@@ -50,8 +50,8 @@ separated by spaces: memory protection key tests - soft_dirty test soft dirty page bit semantics -- anon_cow - test anonymous copy-on-write semantics +- cow + test copy-on-write semantics example: ./run_vmtests.sh -t "hmm mmap ksm" EOF exit 0
@@ -267,7 +267,7 @@ fi CATEGORY="soft_dirty" run_test ./soft-dirty -# COW tests for anonymous memory -CATEGORY="anon_cow" run_test ./anon_cow +# COW tests +CATEGORY="cow" run_test ./cow exit $exitcode
Signature · 1 line
2.38.1
RFC PATCH 2/19 selftests/vm: cow: basic COW tests for non-anonymous pages
In reply to David HildenbrandLet's add basic tests for COW with non-anonymous pages in private
mappings: write access should properly trigger COW and result in the private changes not being visible through other page mappings.
Especially, add tests for:
* Zeropage
* Huge zeropage
* Ordinary pagecache pages via memfd and tmpfile()
* Hugetlb pages via memfd
Fortunately, all tests pass.
--- tools/testing/selftests/vm/cow.c | 338 ++++++++++++++++++++++++++++++- 1 file changed, 337 insertions(+), 1 deletion(-)
tools/testing/selftests/vm/cow.c +337 -1
@@ -19,6 +19,7 @@#include <sys/mman.h> #include <sys/ioctl.h> #include <sys/wait.h> +#include <linux/memfd.h> #include "local_config.h" #ifdef LOCAL_CONFIG_HAVE_LIBURING
@@ -35,6 +36,7 @@ static size_t thpsize;static int nr_hugetlbsizes;static size_t hugetlbsizes[10 ];static int gup_fd; +static bool has_huge_zeropage;static void detect_thpsize (void ) {
@@ -64,6 +66,31 @@ static void detect_thpsize(void)close (fd); } +static void detect_huge_zeropage (void ) +{ +int fd =open ("/sys/kernel/mm/transparent_hugepage/use_zero_page" , +O_RDONLY ); +size_t enabled =0 ; +char buf[15 ]; +int ret; + +if (fd <0 ) +return ; + + ret =pread (fd, buf,sizeof (buf),0 ); +if (ret >0 && ret <sizeof (buf)) { + buf[ret] =0 ; + + enabled =strtoul (buf,NULL ,10 ); +if (enabled ==1 ) { + has_huge_zeropage = true; +ksft_print_msg ("[INFO] huge zeropage is enabled\n" ); + } + } + +close (fd); +} +static void detect_hugetlbsizes (void ) {DIR *dir =opendir ("/sys/kernel/mm/hugepages/" );
@@ -1105,6 +1132,312 @@ static int tests_per_anon_test_case(void)return tests; } +typedef void (*non_anon_test_fn )(char *mem,const char *smem,size_t size); + +static void test_cow (char *mem,const char *smem,size_t size) +{ +char *old =malloc (size); + +/* Backup the original content. */ +memcpy (old, smem, size); + +/* Modify the page. */ +memset (mem,0xff , size); + +/* See if we still read the old values via the other mapping. */ +ksft_test_result (!memcmp (smem, old, size), +"Other mapping not modified\n" ); +free (old); +} + +static void run_with_zeropage (non_anon_test_fn fn,const char *desc) +{ +char *mem, *smem, tmp; + +ksft_print_msg ("[RUN] %s ... with shared zeropage\n" , desc); + + mem =mmap (NULL , pagesize,PROT_READ |PROT_WRITE , +MAP_PRIVATE |MAP_ANON ,-1 ,0 ); +if (mem ==MAP_FAILED ) { +ksft_test_result_fail ("mmap() failed\n" ); +return ; + } + + smem =mmap (NULL , pagesize,PROT_READ ,MAP_PRIVATE |MAP_ANON ,-1 ,0 ); +if (mem ==MAP_FAILED ) { +ksft_test_result_fail ("mmap() failed\n" ); + goto munmap; + } + +/* Read from the page to populate the shared zeropage. */ + tmp = *mem + *smem; + asmvolatile ("" :"+r" (tmp)); + +fn (mem, smem, pagesize); +munmap: +munmap (mem, pagesize); +if (smem !=MAP_FAILED ) +munmap (smem, pagesize); +} + +static void run_with_huge_zeropage (non_anon_test_fn fn,const char *desc) +{ +char *mem, *smem, *mmap_mem, *mmap_smem, tmp; +size_t mmap_size; +int ret; + +ksft_print_msg ("[RUN] %s ... with huge zeropage\n" , desc); + +if (!has_huge_zeropage) { +ksft_test_result_skip ("Huge zeropage not enabled\n" ); +return ; + } + +/* For alignment purposes, we need twice the thp size. */ + mmap_size =2 * thpsize; + mmap_mem =mmap (NULL , mmap_size,PROT_READ |PROT_WRITE , +MAP_PRIVATE |MAP_ANONYMOUS ,-1 ,0 ); +if (mmap_mem ==MAP_FAILED ) { +ksft_test_result_fail ("mmap() failed\n" ); +return ; + } + mmap_smem =mmap (NULL , mmap_size,PROT_READ , +MAP_PRIVATE |MAP_ANONYMOUS ,-1 ,0 ); +if (mmap_smem ==MAP_FAILED ) { +ksft_test_result_fail ("mmap() failed\n" ); + goto munmap; + } + +/* We need a THP-aligned memory area. */ + mem = (char *)(((uintptr_t )mmap_mem + thpsize) & ~(thpsize -1 )); + smem = (char *)(((uintptr_t )mmap_smem + thpsize) & ~(thpsize -1 )); + + ret =madvise (mem, thpsize,MADV_HUGEPAGE ); + ret |=madvise (smem, thpsize,MADV_HUGEPAGE ); +if (ret) { +ksft_test_result_fail ("MADV_HUGEPAGE failed\n" ); + goto munmap; + } + +/* +* Read from the memory to populate the huge shared zeropage. Read from +* the first sub-page and test if we get another sub-page populated +* automatically. +*/ + tmp = *mem + *smem; + asmvolatile ("" :"+r" (tmp)); +if (!pagemap_is_populated (pagemap_fd, mem + pagesize) || + !pagemap_is_populated (pagemap_fd, smem + pagesize)) { +ksft_test_result_skip ("Did not get THPs populated\n" ); + goto munmap; + } + +fn (mem, smem, thpsize); +munmap: +munmap (mmap_mem, mmap_size); +if (mmap_smem !=MAP_FAILED ) +munmap (mmap_smem, mmap_size); +} + +static void run_with_memfd (non_anon_test_fn fn,const char *desc) +{ +char *mem, *smem, tmp; +int fd; + +ksft_print_msg ("[RUN] %s ... with memfd\n" , desc); + + fd =memfd_create ("test" ,0 ); +if (fd <0 ) { +ksft_test_result_fail ("memfd_create() failed\n" ); +return ; + } + +/* File consists of a single page filled with zeroes. */ +if (fallocate (fd,0 ,0 , pagesize)) { +ksft_test_result_fail ("fallocate() failed\n" ); + goto close; + } + +/* Create a private mapping of the memfd. */ + mem =mmap (NULL , pagesize,PROT_READ |PROT_WRITE ,MAP_PRIVATE , fd,0 ); +if (mem ==MAP_FAILED ) { +ksft_test_result_fail ("mmap() failed\n" ); + goto close; + } + smem =mmap (NULL , pagesize,PROT_READ ,MAP_SHARED , fd,0 ); +if (mem ==MAP_FAILED ) { +ksft_test_result_fail ("mmap() failed\n" ); + goto munmap; + } + +/* Fault the page in. */ + tmp = *mem + *smem; + asmvolatile ("" :"+r" (tmp)); + +fn (mem, smem, pagesize); +munmap: +munmap (mem, pagesize); +if (smem !=MAP_FAILED ) +munmap (smem, pagesize); +close: +close (fd); +} + +static void run_with_tmpfile (non_anon_test_fn fn,const char *desc) +{ +char *mem, *smem, tmp; +FILE *file; +int fd; + +ksft_print_msg ("[RUN] %s ... with tmpfile\n" , desc); + + file =tmpfile (); +if (!file) { +ksft_test_result_fail ("tmpfile() failed\n" ); +return ; + } + + fd =fileno (file); +if (fd <0 ) { +ksft_test_result_skip ("fileno() failed\n" ); +return ; + } + +/* File consists of a single page filled with zeroes. */ +if (fallocate (fd,0 ,0 , pagesize)) { +ksft_test_result_fail ("fallocate() failed\n" ); + goto close; + } + +/* Create a private mapping of the memfd. */ + mem =mmap (NULL , pagesize,PROT_READ |PROT_WRITE ,MAP_PRIVATE , fd,0 ); +if (mem ==MAP_FAILED ) { +ksft_test_result_fail ("mmap() failed\n" ); + goto close; + } + smem =mmap (NULL , pagesize,PROT_READ ,MAP_SHARED , fd,0 ); +if (mem ==MAP_FAILED ) { +ksft_test_result_fail ("mmap() failed\n" ); + goto munmap; + } + +/* Fault the page in. */ + tmp = *mem + *smem; + asmvolatile ("" :"+r" (tmp)); + +fn (mem, smem, pagesize); +munmap: +munmap (mem, pagesize); +if (smem !=MAP_FAILED ) +munmap (smem, pagesize); +close: +fclose (file); +} + +static void run_with_memfd_hugetlb (non_anon_test_fn fn,const char *desc, +size_t hugetlbsize) +{ +int flags =MFD_HUGETLB ; +char *mem, *smem, tmp; +int fd; + +ksft_print_msg ("[RUN] %s ... with memfd hugetlb (%zu kB)\n" , desc, + hugetlbsize /1024 ); + + flags |=__builtin_ctzll (hugetlbsize) <<MFD_HUGE_SHIFT ; + + fd =memfd_create ("test" , flags); +if (fd <0 ) { +ksft_test_result_skip ("memfd_create() failed\n" ); +return ; + } + +/* File consists of a single page filled with zeroes. */ +if (fallocate (fd,0 ,0 , hugetlbsize)) { +ksft_test_result_skip ("need more free huge pages\n" ); + goto close; + } + +/* Create a private mapping of the memfd. */ + mem =mmap (NULL , hugetlbsize,PROT_READ |PROT_WRITE ,MAP_PRIVATE , fd, +0 ); +if (mem ==MAP_FAILED ) { +ksft_test_result_skip ("need more free huge pages\n" ); + goto close; + } + smem =mmap (NULL , hugetlbsize,PROT_READ ,MAP_SHARED , fd,0 ); +if (mem ==MAP_FAILED ) { +ksft_test_result_fail ("mmap() failed\n" ); + goto munmap; + } + +/* Fault the page in. */ + tmp = *mem + *smem; + asmvolatile ("" :"+r" (tmp)); + +fn (mem, smem, hugetlbsize); +munmap: +munmap (mem, hugetlbsize); +if (mem !=MAP_FAILED ) +munmap (smem, hugetlbsize); +close: +close (fd); +} + +struct non_anon_test_case { +const char *desc; +non_anon_test_fn fn; +}; + +/* +* Test cases that target any pages in private mappings that are non anonymous: +* pages that may get shared via COW ndependent of fork(). This includes +* the shared zeropage(s), pagecache pages, ... +*/ +static const struct non_anon_test_case non_anon_test_cases[] = { +/* +* Basic COW test without any GUP. If we miss to break COW, changes are +* visible via other private/shared mappings. +*/ + { +"Basic COW" , + test_cow, + }, +}; + +static void run_non_anon_test_case (struct non_anon_test_case const *test_case) +{ +int i; + +run_with_zeropage (test_case->fn, test_case->desc); +run_with_memfd (test_case->fn, test_case->desc); +run_with_tmpfile (test_case->fn, test_case->desc); +if (thpsize) +run_with_huge_zeropage (test_case->fn, test_case->desc); +for (i =0 ; i < nr_hugetlbsizes; i++) +run_with_memfd_hugetlb (test_case->fn, test_case->desc, + hugetlbsizes[i]); +} + +static void run_non_anon_test_cases (void ) +{ +int i; + +ksft_print_msg ("[RUN] Non-anonymous memory tests in private mappings\n" ); + +for (i =0 ; i <ARRAY_SIZE (non_anon_test_cases); i++) +run_non_anon_test_case (&non_anon_test_cases[i]); +} + +static int tests_per_non_anon_test_case (void ) +{ +int tests =3 + nr_hugetlbsizes; + +if (thpsize) + tests +=1 ; +return tests; +} +int main (int argc,char **argv) {int err;
@@ -1112,9 +1445,11 @@ int main(int argc, char **argv) pagesize =getpagesize ();detect_thpsize ();detect_hugetlbsizes (); +detect_huge_zeropage ();ksft_print_header (); -ksft_set_plan (ARRAY_SIZE (anon_test_cases) *tests_per_anon_test_case ()); +ksft_set_plan (ARRAY_SIZE (anon_test_cases) *tests_per_anon_test_case () + +ARRAY_SIZE (non_anon_test_cases) *tests_per_non_anon_test_case ()); gup_fd =open ("/sys/kernel/debug/gup_test" ,O_RDWR ); pagemap_fd =open ("/proc/self/pagemap" ,O_RDONLY );
@@ -1122,6 +1457,7 @@ int main(int argc, char **argv)ksft_exit_fail_msg ("opening pagemap failed\n" );run_anon_test_cases (); +run_non_anon_test_cases (); err =ksft_get_fail_cnt ();if (err)
Signature · 1 line
2.38.1
RFC PATCH 3/19 selftests/vm: cow: R/O long-term pinning reliability tests for non-anon pages
In reply to David HildenbrandLet's test whether R/O long-term pinning is reliable for non-anonymous
memory: when R/O long-term pinning a page, the expectation is that we break COW early before pinning, such that actual write access via the page tables won't break COW later and end up replacing the R/O-pinned page in the page table.
Consequently, R/O long-term pinning in private mappings would only target exclusive anonymous pages.
For now, all tests fail:
# [RUN] R/O longterm GUP pin ... with shared zeropage
not ok 151 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP pin ... with memfd
not ok 152 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP pin ... with tmpfile
not ok 153 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP pin ... with huge zeropage
not ok 154 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP pin ... with memfd hugetlb (2048 kB) not ok 155 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP pin ... with memfd hugetlb (1048576 kB) not ok 156 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP-fast pin ... with shared zeropage not ok 157 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP-fast pin ... with memfd
not ok 158 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP-fast pin ... with tmpfile
not ok 159 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP-fast pin ... with huge zeropage not ok 160 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP-fast pin ... with memfd hugetlb (2048 kB) not ok 161 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP-fast pin ... with memfd hugetlb (1048576 kB) not ok 162 Longterm R/O pin is reliable
--- tools/testing/selftests/vm/cow.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-)
tools/testing/selftests/vm/cow.c +27 -1
@@ -534,6 +534,7 @@ static void test_iouring_fork(char *mem, size_t size)#endif /* LOCAL_CONFIG_HAVE_LIBURING */ enum ro_pin_test { +RO_PIN_TEST ,RO_PIN_TEST_SHARED ,RO_PIN_TEST_PREVIOUSLY_SHARED ,RO_PIN_TEST_RO_EXCLUSIVE ,
@@ -566,6 +567,8 @@ static void do_test_ro_pin(char *mem, size_t size, enum ro_pin_test test, }switch (test) { +case RO_PIN_TEST : +break ;case RO_PIN_TEST_SHARED :case RO_PIN_TEST_PREVIOUSLY_SHARED :/*
@@ -1150,6 +1153,16 @@ static void test_cow(char *mem, const char *smem, size_t size)free (old); } +static void test_ro_pin (char *mem,const char *smem,size_t size) +{ +do_test_ro_pin (mem, size,RO_PIN_TEST , false); +} + +static void test_ro_fast_pin (char *mem,const char *smem,size_t size) +{ +do_test_ro_pin (mem, size,RO_PIN_TEST , true); +} +static void run_with_zeropage (non_anon_test_fn fn,const char *desc) {char *mem, *smem, tmp;
@@ -1390,7 +1403,7 @@ struct non_anon_test_case { };/* -* Test cases that target any pages in private mappings that are non anonymous: +* Test cases that target any pages in private mappings that are not anonymous: * pages that may get shared via COW ndependent of fork(). This includes * the shared zeropage(s), pagecache pages, ... */
@@ -1403,6 +1416,19 @@ static const struct non_anon_test_case non_anon_test_cases[] = { "Basic COW", test_cow, }, +/* +* Take a R/O longterm pin. When modifying the page via the page table, +* the page content change must be visible via the pin. +*/ + { +"R/O longterm GUP pin" , + test_ro_pin, + }, + /* Same as above, but using GUP-fast. */ + { +"R/O longterm GUP-fast pin" , + test_ro_fast_pin, + }, };static void run_non_anon_test_case (struct non_anon_test_case const *test_case)
Signature · 1 line
2.38.1
RFC PATCH 4/19 mm: add early FAULT_FLAG_UNSHARE consistency checks
In reply to David HildenbrandFor now, FAULT_FLAG_UNSHARE only applies to anonymous pages, which implies a COW mapping. Let's hide FAULT_FLAG_UNSHARE early if we're not dealing with a COW mapping, such that we treat it like a read fault as documented and don't have to worry about the flag throughout all fault handlers.
While at it, centralize the check for mutual exclusion of FAULT_FLAG_UNSHARE and FAULT_FLAG_WRITE and just drop the check that either flag is set in the WP handler.
--- mm/huge_memory.c | 3 --- mm/hugetlb.c | 5 ----- mm/memory.c | 23 ++++++++++++++++++++--- 3 files changed, 20 insertions(+), 11 deletions(-)
mm/huge_memory.c +0 -3
@@ -1267,9 +1267,6 @@ vm_fault_t do_huge_pmd_wp_page(struct vm_fault *vmf) vmf->ptl =pmd_lockptr (vma->vm_mm, vmf->pmd);VM_BUG_ON_VMA (!vma->anon_vma, vma); -VM_BUG_ON (unshare && (vmf->flags &FAULT_FLAG_WRITE )); -VM_BUG_ON (!unshare && !(vmf->flags &FAULT_FLAG_WRITE )); -if (is_huge_zero_pmd (orig_pmd)) goto fallback;
mm/hugetlb.c +0 -5
@@ -5316,9 +5316,6 @@ static vm_fault_t hugetlb_wp(struct mm_struct *mm, struct vm_area_struct *vma,unsigned long haddr = address &huge_page_mask (h);struct mmu_notifier_range range; -VM_BUG_ON (unshare && (flags &FOLL_WRITE )); -VM_BUG_ON (!unshare && !(flags &FOLL_WRITE )); -/* * hugetlb does not support FOLL_FORCE-style write faults that keep the * PTE mapped R/O such as maybe_mkwrite() would do.
@@ -5328,8 +5325,6 @@ static vm_fault_t hugetlb_wp(struct mm_struct *mm, struct vm_area_struct *vma,/* Let's take out MAP_SHARED mappings first. */ if (vma->vm_flags &VM_MAYSHARE ) { -if (unlikely (unshare)) -return 0 ;set_huge_ptep_writable (vma, haddr, ptep);return 0 ; }
mm/memory.c +20 -3
@@ -3343,9 +3343,6 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf)struct vm_area_struct *vma = vmf->vma;struct folio *folio; -VM_BUG_ON (unshare && (vmf->flags &FAULT_FLAG_WRITE )); -VM_BUG_ON (!unshare && !(vmf->flags &FAULT_FLAG_WRITE )); -if (likely (!unshare)) {if (userfaultfd_pte_wp (vma, *vmf->pte)) {pte_unmap_unlock (vmf->pte, vmf->ptl);
@@ -5150,6 +5147,22 @@ static void lru_gen_exit_fault(void) }#endif /* CONFIG_LRU_GEN */ +static vm_fault_t sanitize_fault_flags (struct vm_area_struct *vma, +unsigned int *flags) +{ +if (unlikely (*flags &FAULT_FLAG_UNSHARE )) { +if (WARN_ON_ONCE (*flags &FAULT_FLAG_WRITE )) +return VM_FAULT_SIGSEGV ; +/* +* FAULT_FLAG_UNSHARE only applies to COW mappings. Let's +* just treat it like an ordinary read-fault otherwise. +*/ +if (!is_cow_mapping (vma->vm_flags)) + *flags &= ~FAULT_FLAG_UNSHARE ; + } +return 0 ; +} +/* * By the time we get here, we already hold the mm semaphore *
@@ -5166,6 +5179,10 @@ vm_fault_t handle_mm_fault(struct vm_area_struct *vma, unsigned long address,count_vm_event (PGFAULT );count_memcg_event_mm (vma->vm_mm,PGFAULT ); + ret =sanitize_fault_flags (vma, &flags); +if (ret) +return ret; +if (!arch_vma_access_permitted (vma, flags &FAULT_FLAG_WRITE , flags &FAULT_FLAG_INSTRUCTION , flags &FAULT_FLAG_REMOTE ))
Signature · 1 line
2.38.1
RFC PATCH 5/19 mm: add early FAULT_FLAG_WRITE consistency checks
In reply to David HildenbrandLet's catch abuse of FAULT_FLAG_WRITE early, such that we don't have to care in all other handlers and might get "surprises" if we forget to do so.
Write faults without VM_MAYWRITE don't make any sense, and our maybe_mkwrite() logic could have hidden such abuse for now.
Write faults without VM_WRITE on something that is not a COW mapping is similarly broken, and e.g., do_wp_page() could end up placing an anonymous page into a shared mapping, which would be bad.
This is a preparation for reliable R/O long-term pinning of pages in private mappings, whereby we want to make sure that we will never break COW in a read-only private mapping.
--- mm/memory.c | 8 ++++++++ 1 file changed, 8 insertions(+)
mm/memory.c +8 -0
@@ -5159,6 +5159,14 @@ static vm_fault_t sanitize_fault_flags(struct vm_area_struct *vma,*/ if (!is_cow_mapping (vma->vm_flags)) *flags &= ~FAULT_FLAG_UNSHARE ; + }else if (*flags &FAULT_FLAG_WRITE ) { +/* Write faults on read-only mappings are impossible ... */ +if (WARN_ON_ONCE (!(vma->vm_flags &VM_MAYWRITE ))) +return VM_FAULT_SIGSEGV ; +/* ... and FOLL_FORCE only applies to COW mappings. */ +if (WARN_ON_ONCE (!(vma->vm_flags &VM_WRITE ) && + !is_cow_mapping (vma->vm_flags))) +return VM_FAULT_SIGSEGV ; }return 0 ; }
Signature · 1 line
2.38.1
Re: [PATCH RFC 05/19] mm: add early FAULT_FLAG_WRITE consistency checks
Quoted 28 lines · David Hildenbrand
!! External Email
Let's catch abuse of
FAULT_FLAG_WRITEearly, such that we don't have to care in all other handlers and might get "surprises" if we forget to do so.Write faults without
VM_MAYWRITEdon't make any sense, and ourmaybe_mkwrite()logic could have hidden such abuse for now.Write faults without
VM_WRITEon something that is not a COW mapping is similarly broken, and e.g.,do_wp_page()could end up placing an anonymous page into a shared mapping, which would be bad.This is a preparation for reliable R/O long-term pinning of pages in private mappings, whereby we want to make sure that we will never break COW in a read-only private mapping.
Signed-off-by David Hildenbrand <[email protected]>---
mm/memory.c| 8 ++++++++1 file changed, 8 insertions(+)mm/memory.c +0
-0@@ -5159,6 +5159,14 @@ static vm_fault_t sanitize_fault_flags(struct vm_area_struct *vma,*/
mm/memory.c static vm_fault_t sanitize_fault_flags(struct vm_area_struct *vma, · line 5169
Quoted 10 lines
mm/memory.c +8
-0if (!is_cow_mapping (vma->vm_flags)) *flags &= ~FAULT_FLAG_UNSHARE ; + }else if (*flags &FAULT_FLAG_WRITE ) { +/* Write faults on read-only mappings are impossible ... */ +if (WARN_ON_ONCE (!(vma->vm_flags &VM_MAYWRITE ))) +return VM_FAULT_SIGSEGV ; +/* ... and FOLL_FORCE only applies to COW mappings. */ +if (WARN_ON_ONCE (!(vma->vm_flags &VM_WRITE ) && + !is_cow_mapping (vma->vm_flags))) +return VM_FAULT_SIGSEGV ;
Not sure about the WARN_*(). Seems as if it might trigger in benign even if rare scenarios, e.g., mprotect() racing with page-fault.
Re: [PATCH RFC 05/19] mm: add early FAULT_FLAG_WRITE consistency checks
Quoted 35 lines · Nadav Amit
Quoted 33 lines · David Hildenbrand
!! External Email
Let's catch abuse of
FAULT_FLAG_WRITEearly, such that we don't have to care in all other handlers and might get "surprises" if we forget to do so.Write faults without
VM_MAYWRITEdon't make any sense, and ourmaybe_mkwrite()logic could have hidden such abuse for now.Write faults without
VM_WRITEon something that is not a COW mapping is similarly broken, and e.g.,do_wp_page()could end up placing an anonymous page into a shared mapping, which would be bad.This is a preparation for reliable R/O long-term pinning of pages in private mappings, whereby we want to make sure that we will never break COW in a read-only private mapping.
Signed-off-by David Hildenbrand <[email protected]>---
mm/memory.c| 8 ++++++++1 file changed, 8 insertions(+)mm/memory.c +3
-0@@ -5159,6 +5159,14 @@ static vm_fault_t sanitize_fault_flags(struct vm_area_struct *vma,*/ if (!is_cow_mapping (vma->vm_flags)) *flags &= ~FAULT_FLAG_UNSHARE ; + }else if (*flags &FAULT_FLAG_WRITE ) { +/* Write faults on read-only mappings are impossible ... */ +if (WARN_ON_ONCE (!(vma->vm_flags &VM_MAYWRITE )))
Quoted 9 lines
mm/memory.c static vm_fault_t sanitize_fault_flags(struct vm_area_struct *vma, · line 5169
Quoted 5 lines
mm/memory.c +5
-0+return VM_FAULT_SIGSEGV ; +/* ... and FOLL_FORCE only applies to COW mappings. */ +if (WARN_ON_ONCE (!(vma->vm_flags &VM_WRITE ) && + !is_cow_mapping (vma->vm_flags))) +return VM_FAULT_SIGSEGV ;Not sure about the WARN_*(). Seems as if it might trigger in benign even if rare scenarios, e.g.,
mprotect()racing with page-fault.
We most certainly would want to catch any such broken/racy cases. There are no benign cases I could possibly think of.
Page faults need the mmap lock in read. mprotect() / VMA changes need the mmap lock in write. Whoever calls handle_mm_fault() is supposed to properly check VMA permissions.
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH RFC 05/19] mm: add early FAULT_FLAG_WRITE consistency checks
Quoted 47 lines · David Hildenbrand
!! External Email
Quoted 35 lines · Nadav Amit
Quoted 33 lines · David Hildenbrand
!! External Email
Let's catch abuse of
FAULT_FLAG_WRITEearly, such that we don't have to care in all other handlers and might get "surprises" if we forget to do so.Write faults without
VM_MAYWRITEdon't make any sense, and ourmaybe_mkwrite()logic could have hidden such abuse for now.Write faults without
VM_WRITEon something that is not a COW mapping is similarly broken, and e.g.,do_wp_page()could end up placing an anonymous page into a shared mapping, which would be bad.This is a preparation for reliable R/O long-term pinning of pages in private mappings, whereby we want to make sure that we will never break COW in a read-only private mapping.
Signed-off-by David Hildenbrand <[email protected]>---
mm/memory.c| 8 ++++++++1 file changed, 8 insertions(+)mm/memory.c +3
-0@@ -5159,6 +5159,14 @@ static vm_fault_t sanitize_fault_flags(struct vm_area_struct *vma,*/ if (!is_cow_mapping (vma->vm_flags)) *flags &= ~FAULT_FLAG_UNSHARE ; + }else if (*flags &FAULT_FLAG_WRITE ) { +/* Write faults on read-only mappings are impossible ... */ +if (WARN_ON_ONCE (!(vma->vm_flags &VM_MAYWRITE )))Quoted 8 lines
mm/memory.c static vm_fault_t sanitize_fault_flags(struct vm_area_struct *vma, · line 5169
Quoted 5 lines
mm/memory.c +5
-0+return VM_FAULT_SIGSEGV ; +/* ... and FOLL_FORCE only applies to COW mappings. */ +if (WARN_ON_ONCE (!(vma->vm_flags &VM_WRITE ) && + !is_cow_mapping (vma->vm_flags))) +return VM_FAULT_SIGSEGV ;Not sure about the WARN_*(). Seems as if it might trigger in benign even if rare scenarios, e.g.,
mprotect()racing with page-fault.
Quoted 6 lines
We most certainly would want to catch any such broken/racy cases. There are no benign cases I could possibly think of.
Page faults need the mmap lock in read.
mprotect()/ VMA changes need the mmap lock in write. Whoever callshandle_mm_fault()is supposed to properly check VMA permissions.
My bad. I now see it. Thanks for explaining.
RFC PATCH 6/19 mm: rework handling in do_wp_page() based on private vs. shared mappings
In reply to David HildenbrandWe want to extent FAULT_FLAG_UNSHARE support to anything mapped into a COW mapping (pagecache page, zeropage, PFN, ...), not just anonymous pages. Let's prepare for that by handling shared mappings first such that we can handle private mappings last.
While at it, use folio-based functions instead of page-based functions where we touch the code either way.
--- mm/memory.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-)
mm/memory.c +17 -21
@@ -3341,7 +3341,7 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf) {const bool unshare = vmf->flags &FAULT_FLAG_UNSHARE ;struct vm_area_struct *vma = vmf->vma; -struct folio *folio; +struct folio *folio =NULL ;if (likely (!unshare)) {if (userfaultfd_pte_wp (vma, *vmf->pte)) {
@@ -3359,13 +3359,12 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf) } vmf->page =vm_normal_page (vma, vmf->address, vmf->orig_pte); -if (!vmf->page) { -if (unlikely (unshare)) { -/* No anonymous page -> nothing to do. */ -pte_unmap_unlock (vmf->pte, vmf->ptl); -return 0 ; - } +/* +* Shared mapping: we are guaranteed to have VM_WRITE and +* FAULT_FLAG_WRITE set at this point. +*/ +if (vma->vm_flags & (VM_SHARED |VM_MAYSHARE )) {/* * VM_MIXEDMAP !pfn_valid() case, or VM_SOFTDIRTY clear on a * VM_PFNMAP VMA.
@@ -3373,20 +3372,19 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf)* We should not cow pages in a shared writeable mapping. * Just mark the pages writable and/or call ops->pfn_mkwrite. */ -if ((vma->vm_flags & (VM_WRITE |VM_SHARED )) == - (VM_WRITE |VM_SHARED )) +if (!vmf->page)return wp_pfn_shared (vmf); - -pte_unmap_unlock (vmf->pte, vmf->ptl); -return wp_page_copy (vmf); +return wp_page_shared (vmf); } +if (vmf->page) + folio =page_folio (vmf->page); +/* -* Take out anonymous pages first, anonymous shared vmas are -* not dirty accountable. +* Private mapping: create an exclusive anonymous page copy if reuse +* is impossible. We might miss VM_WRITE for FOLL_FORCE handling. */ - folio =page_folio (vmf->page); -if (folio_test_anon (folio)) { +if (folio &&folio_test_anon (folio)) {/* * If the page is exclusive to this process we must reuse the * page without further checks.
@@ -3437,19 +3435,17 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf)/* No anonymous page -> nothing to do. */ pte_unmap_unlock (vmf->pte, vmf->ptl);return 0 ; - }else if (unlikely ((vma->vm_flags & (VM_WRITE |VM_SHARED )) == - (VM_WRITE |VM_SHARED ))) { -return wp_page_shared (vmf); } copy:/* * Ok, we need to copy. Oh, well.. */ -get_page (vmf->page); +if (folio) +folio_get (folio);pte_unmap_unlock (vmf->pte, vmf->ptl);#ifdef CONFIG_KSM -if (PageKsm (vmf->page)) +if (folio &&folio_test_ksm (folio))count_vm_event (COW_KSM );#endif return wp_page_copy (vmf);
Signature · 1 line
2.38.1
RFC PATCH 7/19 mm: don't call vm_ops->huge_fault() in wp_huge_pmd()/wp_huge_pud() for private mappings
In reply to David HildenbrandIf we already have a PMD/PUD mapped write-protected in a private mapping and we want to break COW either due to FAULT_FLAG_WRITE or FAULT_FLAG_UNSHARE, there is no need to inform the file system just like on the PTE path.
Let's just split (->zap) + fallback in that case.
This is a preparation for more generic FAULT_FLAG_UNSHARE support in COW mappings.
--- mm/memory.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
mm/memory.c +15 -9
@@ -4791,6 +4791,7 @@ static inline vm_fault_t create_huge_pmd(struct vm_fault *vmf)static inline vm_fault_t wp_huge_pmd (struct vm_fault *vmf) {const bool unshare = vmf->flags &FAULT_FLAG_UNSHARE ; +vm_fault_t ret;if (vma_is_anonymous (vmf->vma)) { if (likely(!unshare) &&
@@ -4798,11 +4799,13 @@ static inline vm_fault_t wp_huge_pmd(struct vm_fault *vmf)return handle_userfault (vmf,VM_UFFD_WP );return do_huge_pmd_wp_page (vmf); } -if (vmf->vma->vm_ops->huge_fault) { -vm_fault_t ret = vmf->vma->vm_ops->huge_fault (vmf,PE_SIZE_PMD ); -if (!(ret &VM_FAULT_FALLBACK )) -return ret; +if (vmf->vma->vm_flags & (VM_SHARED |VM_MAYSHARE )) { +if (vmf->vma->vm_ops->huge_fault) { + ret = vmf->vma->vm_ops->huge_fault (vmf,PE_SIZE_PMD ); +if (!(ret &VM_FAULT_FALLBACK )) +return ret; + } }/* COW or write-notify handled on pte level: split pmd. */
@@ -4828,14 +4831,17 @@ static vm_fault_t wp_huge_pud(struct vm_fault *vmf, pud_t orig_pud) {#if defined(CONFIG_TRANSPARENT_HUGEPAGE ) && \ defined(CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD ) +vm_fault_t ret; +/* No support for anonymous transparent PUD pages yet */ if (vma_is_anonymous (vmf->vma)) goto split; -if (vmf->vma->vm_ops->huge_fault) { -vm_fault_t ret = vmf->vma->vm_ops->huge_fault (vmf,PE_SIZE_PUD ); - -if (!(ret &VM_FAULT_FALLBACK )) -return ret; +if (vmf->vma->vm_flags & (VM_SHARED |VM_MAYSHARE )) { +if (vmf->vma->vm_ops->huge_fault) { + ret = vmf->vma->vm_ops->huge_fault (vmf,PE_SIZE_PUD ); +if (!(ret &VM_FAULT_FALLBACK )) +return ret; + } } split:/* COW or write-notify not handled on PUD level: split pud.*/
Signature · 1 line
2.38.1
RFC PATCH 8/19 mm: extend FAULT_FLAG_UNSHARE support to anything in a COW mapping
In reply to David HildenbrandExtend FAULT_FLAG_UNSHARE to break COW on anything mapped into a COW (i.e., private writable) mapping and adjust the documentation accordingly.
FAULT_FLAG_UNSHARE will now also break COW when encountering the shared zeropage, a pagecache page, a PFNMAP, ... inside a COW mapping, by properly replacing the mapped page/pfn by a private copy (an exclusive anonymous page).
Note that only do_wp_page() needs care: hugetlb_wp() already handles FAULT_FLAG_UNSHARE correctly. wp_huge_pmd()/wp_huge_pud() also handles it correctly, for example, splitting the huge zeropage on FAULT_FLAG_UNSHARE such that we can handle FAULT_FLAG_UNSHARE on the PTE level.
This change is a requirement for reliable long-term R/O pinning in COW mappings.
--- include/linux/mm_types.h | 8 ++++---- mm/memory.c | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-)
include/linux/mm_types.h +4 -4
@@ -965,9 +965,9 @@ typedef struct {* @FAULT_FLAG_REMOTE: The fault is not for current task/mm. * @FAULT_FLAG_INSTRUCTION: The fault was during an instruction fetch. * @FAULT_FLAG_INTERRUPTIBLE: The fault can be interrupted by non-fatal signals. -* @FAULT_FLAG_UNSHARE: The fault is an unsharing request to unshare (and mark -* exclusive) a possibly shared anonymous page that is -* mapped R/O. +* @FAULT_FLAG_UNSHARE: The fault is an unsharing request to break COW in a +* COW mapping, making sure that an exclusive anon page is +* mapped after the fault. * @FAULT_FLAG_ORIG_PTE_VALID: whether the fault has vmf->orig_pte cached. * We should only access orig_pte if this flag set. *
@@ -992,7 +992,7 @@ typedef struct {* * The combination FAULT_FLAG_WRITE|FAULT_FLAG_UNSHARE is illegal. * FAULT_FLAG_UNSHARE is ignored and treated like an ordinary read fault when -* no existing R/O-mapped anonymous page is encountered. +* applied to mappings that are not COW mappings. */ enum fault_flag {FAULT_FLAG_WRITE =1 <<0 ,
mm/memory.c +0 -4
@@ -3431,10 +3431,6 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf) }wp_page_reuse (vmf);return 0 ; - }else if (unshare) { -/* No anonymous page -> nothing to do. */ -pte_unmap_unlock (vmf->pte, vmf->ptl); -return 0 ; } copy:/*
Signature · 1 line
2.38.1
RFC PATCH 9/19 mm/gup: reliable R/O long-term pinning in COW mappings
In reply to David HildenbrandWe already support reliable R/O pinning of anonymous memory. However, assume we end up pinning (R/O long-term) a pagecache page or the shared zeropage inside a writable private ("COW") mapping. The next write access will trigger a write-fault and replace the pinned page by an exclusive anonymous page in the process page tables to break COW: the pinned page no longer corresponds to the page mapped into the process' page table.
Now that FAULT_FLAG_UNSHARE can break COW on anything mapped into a COW mapping, let's properly break COW first before R/O long-term pinning something that's not an exclusive anon page inside a COW mapping. FAULT_FLAG_UNSHARE will break COW and map an exclusive anon page instead that can get pinned safely.
With this change, we can stop using FOLL_FORCE|FOLL_WRITE for reliable R/O long-term pinning in COW mappings.
With this change, the new R/O long-term pinning tests for non-anonymous memory succeed:
# [RUN] R/O longterm GUP pin ... with shared zeropage
ok 151 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP pin ... with memfd
ok 152 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP pin ... with tmpfile
ok 153 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP pin ... with huge zeropage
ok 154 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP pin ... with memfd hugetlb (2048 kB) ok 155 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP pin ... with memfd hugetlb (1048576 kB) ok 156 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP-fast pin ... with shared zeropage ok 157 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP-fast pin ... with memfd
ok 158 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP-fast pin ... with tmpfile
ok 159 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP-fast pin ... with huge zeropage ok 160 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP-fast pin ... with memfd hugetlb (2048 kB) ok 161 Longterm R/O pin is reliable
# [RUN] R/O longterm GUP-fast pin ... with memfd hugetlb (1048576 kB) ok 162 Longterm R/O pin is reliable
Note 1: We don't care about short-term R/O-pinning, because they have snapshot semantics: they are not supposed to observe modifications that happen after pinning.
As one example, assume we start direct I/O to read from a page and store page content into a file: modifications to page content after starting direct I/O are not guaranteed to end up in the file. So even if we'd pin the shared zeropage, the end result would be as expected -- getting zeroes stored to the file.
Note 2: For shared mappings we'll now always fallback to the slow path to lookup the VMA when R/O long-term pining. While that's the necessary price we have to pay right now, it's actually not that bad in practice: most FOLL_LONGTERM users already specify FOLL_WRITE, for example, along with FOLL_FORCE because they tried dealing with COW mappings correctly ...
Note 3: For users that use FOLL_LONGTERM right now without FOLL_WRITE, such as VFIO, we'd now no longer pin the shared zeropage. Instead, we'd populate exclusive anon pages that we can pin. There was a concern that this could affect the memlock limit of existing setups.
For example, a VM running with VFIO could run into the memlock limit and fail to run. However, we essentially had the same behavior already in commit 17839856fd58 ("gup: document and work around "COW can break either way" issue") which got merged into some enterprise distros, and there were not any such complaints. So most probably, we're fine.
--- include/linux/mm.h | 27 ++++++++++++++++++++++++--- mm/gup.c | 10 +++++----- mm/huge_memory.c | 2 +- mm/hugetlb.c | 7 ++++--- 4 files changed, 34 insertions(+), 12 deletions(-)
include/linux/mm.h +24 -3
@@ -3002,8 +3002,12 @@ static inline int vm_fault_to_errno(vm_fault_t vm_fault, int foll_flags)* Must be called with the (sub)page that's actually referenced via the * page table entry, which might not necessarily be the head page for a * PTE-mapped THP. +* +* If the vma is NULL, we're coming from the GUP-fast path and might have +* to fallback to the slow path just to lookup the vma. */ -static inline bool gup_must_unshare (unsigned int flags,struct page *page) +static inline bool gup_must_unshare (struct vm_area_struct *vma, +unsigned int flags,struct page *page) {/* * FOLL_WRITE is implicitly handled correctly as the page table entry
@@ -3016,8 +3020,25 @@ static inline bool gup_must_unshare(unsigned int flags, struct page *page)* Note: PageAnon(page) is stable until the page is actually getting * freed. */ -if (!PageAnon (page)) -return false; +if (!PageAnon (page)) { +/* +* We only care about R/O long-term pining: R/O short-term +* pinning does not have the semantics to observe successive +* changes through the process page tables. +*/ +if (!(flags &FOLL_LONGTERM )) +return false; + +/* We really need the vma ... */ +if (!vma) +return true; + +/* +* ... because we only care about writable private ("COW") +* mappings where we have to break COW early. +*/ +return is_cow_mapping (vma->vm_flags); + }/* Paired with a memory barrier in page_try_share_anon_rmap(). */ if (IS_ENABLED (CONFIG_HAVE_FAST_GUP ))
mm/gup.c +5 -5
@@ -578,7 +578,7 @@ static struct page *follow_page_pte(struct vm_area_struct *vma, } } -if (!pte_write (pte) &&gup_must_unshare (flags, page)) { +if (!pte_write (pte) &&gup_must_unshare (vma, flags, page)) { page =ERR_PTR (-EMLINK ); goto out; }
@@ -2338,7 +2338,7 @@ static int gup_pte_range(pmd_t pmd, pmd_t *pmdp, unsigned long addr, goto pte_unmap; } -if (!pte_write (pte) &&gup_must_unshare (flags, page)) { +if (!pte_write (pte) &&gup_must_unshare (NULL , flags, page)) {gup_put_folio (folio,1 , flags); goto pte_unmap; }
@@ -2506,7 +2506,7 @@ static int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr,return 0 ; } -if (!pte_write (pte) &&gup_must_unshare (flags, &folio->page)) { +if (!pte_write (pte) &&gup_must_unshare (NULL , flags, &folio->page)) {gup_put_folio (folio, refs, flags);return 0 ; }
@@ -2572,7 +2572,7 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr,return 0 ; } -if (!pmd_write (orig) &&gup_must_unshare (flags, &folio->page)) { +if (!pmd_write (orig) &&gup_must_unshare (NULL , flags, &folio->page)) {gup_put_folio (folio, refs, flags);return 0 ; }
@@ -2612,7 +2612,7 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned long addr,return 0 ; } -if (!pud_write (orig) &&gup_must_unshare (flags, &folio->page)) { +if (!pud_write (orig) &&gup_must_unshare (NULL , flags, &folio->page)) {gup_put_folio (folio, refs, flags);return 0 ; }
mm/huge_memory.c +1 -1
@@ -1404,7 +1404,7 @@ struct page *follow_trans_huge_pmd(struct vm_area_struct *vma,if (pmd_protnone (*pmd) && !gup_can_follow_protnone (flags))return NULL ; -if (!pmd_write (*pmd) &&gup_must_unshare (flags, page)) +if (!pmd_write (*pmd) &&gup_must_unshare (vma, flags, page))return ERR_PTR (-EMLINK ); VM_BUG_ON_PAGE((flags & FOLL_PIN) && PageAnon(page) &&
mm/hugetlb.c +4 -3
@@ -6197,7 +6197,8 @@ static void record_subpages_vmas(struct page *page, struct vm_area_struct *vma, } } -static inline bool __follow_hugetlb_must_fault (unsigned int flags,pte_t *pte, +static inline bool __follow_hugetlb_must_fault (struct vm_area_struct *vma, +unsigned int flags,pte_t *pte,bool *unshare) {pte_t pteval =huge_ptep_get (pte);
@@ -6209,7 +6210,7 @@ static inline bool __follow_hugetlb_must_fault(unsigned int flags, pte_t *pte,return false;if (flags &FOLL_WRITE )return true; -if (gup_must_unshare (flags,pte_page (pteval))) { +if (gup_must_unshare (vma, flags,pte_page (pteval))) { *unshare = true;return true; }
@@ -6338,7 +6339,7 @@ long follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma,* directly from any kind of swap entries. */ if (absent || -__follow_hugetlb_must_fault (flags, pte, &unshare)) { +__follow_hugetlb_must_fault (vma, flags, pte, &unshare)) {vm_fault_t ret;unsigned int fault_flags =0 ;
Signature · 1 line
2.38.1
RFC PATCH 10/19 RDMA/umem: remove FOLL_FORCE usage
In reply to David HildenbrandGUP now supports reliable R/O long-term pinning in COW mappings, such that we break COW early. MAP_SHARED VMAs only use the shared zeropage so far in one corner case (DAXFS file with holes), which can be ignored because GUP does not support long-term pinning in fsdax (see check_vma_flags()).
Consequently, FOLL_FORCE | FOLL_WRITE | FOLL_LONGTERM is no longer required for reliable R/O long-term pinning: FOLL_LONGTERM is sufficient. So stop using FOLL_FORCE, which is really only for debugger access.
--- drivers/infiniband/core/umem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/infiniband/core/umem.c +4 -4
@@ -156,7 +156,7 @@ struct ib_umem *ib_umem_get(struct ib_device *device, unsigned long addr,struct mm_struct *mm;unsigned long npages;int pinned, ret; -unsigned int gup_flags =FOLL_WRITE ; +unsigned int gup_flags =FOLL_LONGTERM ;/* * If the combination of the addr and size requested for this memory
@@ -210,8 +210,8 @@ struct ib_umem *ib_umem_get(struct ib_device *device, unsigned long addr, cur_base = addr &PAGE_MASK ; -if (!umem->writable) - gup_flags |=FOLL_FORCE ; +if (umem->writable) + gup_flags |=FOLL_WRITE ;while (npages) {cond_resched ();
@@ -219,7 +219,7 @@ struct ib_umem *ib_umem_get(struct ib_device *device, unsigned long addr, min_t(unsigned long, npages, PAGE_SIZE / sizeof(struct page *)), - gup_flags | FOLL_LONGTERM, page_list); + gup_flags, page_list);if (pinned <0 ) { ret = pinned; goto umem_release;
Signature · 1 line
2.38.1
Re: [PATCH RFC 10/19] RDMA/umem: remove FOLL_FORCE usage
Quoted 10 lines · David Hildenbrand
GUP now supports reliable R/O long-term pinning in COW mappings, such that we break COW early.
MAP_SHAREDVMAs only use the shared zeropage so far in one corner case (DAXFS file with holes), which can be ignored because GUP does not support long-term pinning in fsdax (seecheck_vma_flags()).Consequently,
FOLL_FORCE|FOLL_WRITE|FOLL_LONGTERMis no longer required for reliable R/O long-term pinning:FOLL_LONGTERMis sufficient. So stop usingFOLL_FORCE, which is really only for debugger access.
Quoted 6 lines
Cc Jason Gunthorpe <[email protected]>Cc Leon Romanovsky <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- drivers/infiniband/core/umem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Thanks,
RFC PATCH 11/19 RDMA/usnic: remove FOLL_FORCE usage
In reply to David HildenbrandGUP now supports reliable R/O long-term pinning in COW mappings, such that we break COW early. MAP_SHARED VMAs only use the shared zeropage so far in one corner case (DAXFS file with holes), which can be ignored because GUP does not support long-term pinning in fsdax (see check_vma_flags()).
Consequently, FOLL_FORCE | FOLL_WRITE | FOLL_LONGTERM is no longer required for reliable R/O long-term pinning: FOLL_LONGTERM is sufficient. So stop using FOLL_FORCE, which is really only for debugger access.
--- drivers/infiniband/hw/usnic/usnic_uiom.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/infiniband/hw/usnic/usnic_uiom.c +4 -5
@@ -85,6 +85,7 @@ static int usnic_uiom_get_pages(unsigned long addr, size_t size, int writable, int dmasync, struct usnic_uiom_reg *uiomr) { struct list_head *chunk_list = &uiomr->chunk_list; +unsigned int gup_flags =FOLL_LONGTERM ;struct page **page_list;struct scatterlist *sg;struct usnic_uiom_chunk *chunk;
@@ -96,7 +97,6 @@ static int usnic_uiom_get_pages(unsigned long addr, size_t size, int writable,int off;int i;dma_addr_t pa; -unsigned int gup_flags;struct mm_struct *mm;/*
@@ -131,8 +131,8 @@ static int usnic_uiom_get_pages(unsigned long addr, size_t size, int writable, goto out; } - gup_flags =FOLL_WRITE ; - gup_flags |= (writable) ?0 :FOLL_FORCE ; +if (writable) + gup_flags |=FOLL_WRITE ; cur_base = addr &PAGE_MASK ; ret =0 ;
@@ -140,8 +140,7 @@ static int usnic_uiom_get_pages(unsigned long addr, size_t size, int writable, ret =pin_user_pages (cur_base, min_t(unsigned long, npages,PAGE_SIZE /sizeof (struct page *)), - gup_flags |FOLL_LONGTERM , - page_list,NULL ); + gup_flags, page_list,NULL );if (ret <0 ) goto out;
Signature · 1 line
2.38.1
RFC PATCH 12/19 RDMA/siw: remove FOLL_FORCE usage
In reply to David HildenbrandGUP now supports reliable R/O long-term pinning in COW mappings, such that we break COW early. MAP_SHARED VMAs only use the shared zeropage so far in one corner case (DAXFS file with holes), which can be ignored because GUP does not support long-term pinning in fsdax (see check_vma_flags()).
Consequently, FOLL_FORCE | FOLL_WRITE | FOLL_LONGTERM is no longer required for reliable R/O long-term pinning: FOLL_LONGTERM is sufficient. So stop using FOLL_FORCE, which is really only for debugger access.
--- drivers/infiniband/sw/siw/siw_mem.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/infiniband/sw/siw/siw_mem.c +4 -5
@@ -368,7 +368,7 @@ struct siw_umem *siw_umem_get(u64 start, u64 len, bool writable)struct mm_struct *mm_s;u64 first_page_va;unsigned long mlock_limit; -unsigned int foll_flags =FOLL_WRITE ; +unsigned int foll_flags =FOLL_LONGTERM ;int num_pages, num_chunks, i, rv =0 ;if (!can_do_mlock ())
@@ -391,8 +391,8 @@ struct siw_umem *siw_umem_get(u64 start, u64 len, bool writable)mmgrab (mm_s); -if (!writable) - foll_flags |=FOLL_FORCE ; +if (writable) + foll_flags |=FOLL_WRITE ;mmap_read_lock (mm_s);
@@ -423,8 +423,7 @@ struct siw_umem *siw_umem_get(u64 start, u64 len, bool writable)while (nents) {struct page **plist = &umem->page_chunk[i].plist[got]; - rv =pin_user_pages (first_page_va, nents, - foll_flags |FOLL_LONGTERM , + rv =pin_user_pages (first_page_va, nents, foll_flags, plist,NULL );if (rv <0 ) goto out_sem_up;
Signature · 1 line
2.38.1
RFC PATCH 13/19 media: videobuf-dma-sg: remove FOLL_FORCE usage
In reply to David HildenbrandGUP now supports reliable R/O long-term pinning in COW mappings, such that we break COW early. MAP_SHARED VMAs only use the shared zeropage so far in one corner case (DAXFS file with holes), which can be ignored because GUP does not support long-term pinning in fsdax (see check_vma_flags()).
Consequently, FOLL_FORCE | FOLL_WRITE | FOLL_LONGTERM is no longer required for reliable R/O long-term pinning: FOLL_LONGTERM is sufficient. So stop using FOLL_FORCE, which is really only for debugger access.
--- drivers/media/v4l2-core/videobuf-dma-sg.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/media/v4l2-core/videobuf-dma-sg.c +5 -9
@@ -151,17 +151,16 @@ static void videobuf_dma_init(struct videobuf_dmabuf *dma)static int videobuf_dma_init_user_locked (struct videobuf_dmabuf *dma,int direction,unsigned long data,unsigned long size) { +unsigned int gup_flags =FOLL_LONGTERM ;unsigned long first, last; -int err, rw =0 ; -unsigned int flags =FOLL_FORCE ; +int err; dma->direction = direction;switch (dma->direction) {case DMA_FROM_DEVICE : - rw =READ ; + gup_flags |=FOLL_WRITE ;break ;case DMA_TO_DEVICE : - rw =WRITE ;break ;default :BUG ();
@@ -177,14 +176,11 @@ static int videobuf_dma_init_user_locked(struct videobuf_dmabuf *dma,if (NULL == dma->pages)return -ENOMEM ; -if (rw ==READ ) - flags |=FOLL_WRITE ; -dprintk (1 ,"init user [0x%lx+0x%lx => %lu pages]\n" , data, size, dma->nr_pages); - err =pin_user_pages (data &PAGE_MASK , dma->nr_pages, - flags |FOLL_LONGTERM , dma->pages,NULL ); + err =pin_user_pages (data &PAGE_MASK , dma->nr_pages, gup_flags, + dma->pages,NULL );if (err != dma->nr_pages) { dma->nr_pages = (err >=0 ) ? err :0 ;
Signature · 1 line
2.38.1
RFC PATCH 14/19 drm/etnaviv: remove FOLL_FORCE usage
In reply to David HildenbrandGUP now supports reliable R/O long-term pinning in COW mappings, such that we break COW early. MAP_SHARED VMAs only use the shared zeropage so far in one corner case (DAXFS file with holes), which can be ignored because GUP does not support long-term pinning in fsdax (see check_vma_flags()).
commit cd5297b0855f ("drm/etnaviv: Use FOLL_FORCE for userptr") documents that FOLL_FORCE | FOLL_WRITE was really only used for reliable R/O pinning.
Consequently, FOLL_FORCE | FOLL_WRITE | FOLL_LONGTERM is no longer required for reliable R/O long-term pinning: FOLL_LONGTERM is sufficient. So stop using FOLL_FORCE, which is really only for debugger access.
--- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_gem.c +5 -3
@@ -638,6 +638,7 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj)struct page **pvec =NULL ;struct etnaviv_gem_userptr *userptr = &etnaviv_obj->userptr;int ret, pinned =0 , npages = etnaviv_obj->base.size >>PAGE_SHIFT ; +unsigned int gup_flags =FOLL_LONGTERM ;might_lock_read (¤t->mm->mmap_lock);
@@ -648,14 +649,15 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj)if (!pvec)return -ENOMEM ; +if (!userptr->ro) + gup_flags |=FOLL_WRITE ; + do { unsigned num_pages = npages - pinned; uint64_t ptr = userptr->ptr + pinned * PAGE_SIZE; struct page **pages = pvec + pinned; - ret = pin_user_pages_fast(ptr, num_pages, - FOLL_WRITE | FOLL_FORCE | FOLL_LONGTERM, - pages); + ret = pin_user_pages_fast(ptr, num_pages, gup_flags, pages); if (ret < 0) { unpin_user_pages(pvec, pinned); kvfree(pvec);
Signature · 1 line
2.38.1
RFC PATCH 15/19 media: pci/ivtv: remove FOLL_FORCE usage
In reply to David HildenbrandFOLL_FORCE is really only for debugger access. R/O pinning a page is supposed to fail if the VMA misses proper access permissions (no VM_READ).
Let's just remove FOLL_FORCE usage here; there would have to be a pretty good reason to allow arbitrary drivers to R/O pin pages in a PROT_NONE VMA. Most probably, FOLL_FORCE usage is just some legacy leftover.
--- drivers/media/pci/ivtv/ivtv-udma.c | 2 +- drivers/media/pci/ivtv/ivtv-yuv.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/media/pci/ivtv/ivtv-udma.c +1 -1
@@ -115,7 +115,7 @@ int ivtv_udma_setup(struct ivtv *itv, unsigned long ivtv_dest_addr,/* Pin user pages for DMA Xfer */ err =pin_user_pages_unlocked (user_dma.uaddr, user_dma.page_count, - dma->map,FOLL_FORCE ); + dma->map,0 );if (user_dma.page_count != err) { IVTV_DEBUG_WARN("failed to map user pages, returned %d instead of %d\n",
drivers/media/pci/ivtv/ivtv-yuv.c +2 -3
@@ -63,12 +63,11 @@ static int ivtv_yuv_prep_user_dma(struct ivtv *itv, struct ivtv_user_dma *dma,/* Pin user pages for DMA Xfer */ y_pages =pin_user_pages_unlocked (y_dma.uaddr, - y_dma.page_count, &dma->map[0 ],FOLL_FORCE ); + y_dma.page_count, &dma->map[0 ],0 ); uv_pages =0 ;/* silence gcc. value is set and consumed only if: */ if (y_pages == y_dma.page_count) { uv_pages =pin_user_pages_unlocked (uv_dma.uaddr, - uv_dma.page_count, &dma->map[y_pages], -FOLL_FORCE ); + uv_dma.page_count, &dma->map[y_pages],0 ); }if (y_pages != y_dma.page_count || uv_pages != uv_dma.page_count) {
Signature · 1 line
2.38.1
RFC PATCH 16/19 mm/frame-vector: remove FOLL_FORCE usage
In reply to David HildenbrandFOLL_FORCE is really only for debugger access. According to commit 707947247e95 ("media: videobuf2-vmalloc: get_userptr: buffers are always writable"), the pinned pages are always writable.
FOLL_FORCE in this case seems to be a legacy leftover. Let's just remove it.
--- drivers/media/common/videobuf2/frame_vector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/common/videobuf2/frame_vector.c +1 -1
@@ -50,7 +50,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, start =untagged_addr (start); ret =pin_user_pages_fast (start, nr_frames, -FOLL_FORCE |FOLL_WRITE |FOLL_LONGTERM , +FOLL_WRITE |FOLL_LONGTERM , (struct page **)(vec->ptrs));if (ret >0 ) { vec->got_ref = true;
Signature · 1 line
2.38.1
Tomasz Figa
maintainerRe: [PATCH RFC 16/19] mm/frame-vector: remove FOLL_FORCE usage
Hi David,
Quoted 4 lines · David Hildenbrand
FOLL_FORCEis really only for debugger access. According to commit707947247e95("media: videobuf2-vmalloc:get_userptr: buffers are always writable"), the pinned pages are always writable.
Actually that patch is only a workaround to temporarily disable support for read-only pages as they seemed to suffer from some corruption issues in the retrieved user pages. We expect to support read-only pages as hardware input after. That said, FOLL_FORCE doesn't sound like the right thing even in that case, but I don't know the background behind it being added here in the first place. +Hans Verkuil +Marek Szyprowski do you happen to remember anything about it?
Best regards,
Tomasz
Quoted 28 lines
FOLL_FORCEin this case seems to be a legacy leftover. Let's just remove it.Cc Tomasz Figa <[email protected]>Cc Marek Szyprowski <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- drivers/media/common/videobuf2/frame_vector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/media/common/videobuf2/frame_vector.c +1
-2@@ -50,7 +50,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, start =untagged_addr (start); ret =pin_user_pages_fast (start, nr_frames, -FOLL_FORCE |FOLL_WRITE |FOLL_LONGTERM , +FOLL_WRITE |FOLL_LONGTERM , (struct page **)(vec->ptrs));if (ret >0 ) { vec->got_ref = true; --2.38.1
Re: [PATCH RFC 16/19] mm/frame-vector: remove FOLL_FORCE usage
Quoted 1 line · Tomasz Figa
Hi David,
Hi Tomasz,
thanks for looking into this!
Quoted 7 lines · David Hildenbrand
Quoted 4 lines
FOLL_FORCEis really only for debugger access. According to commit707947247e95("media: videobuf2-vmalloc:get_userptr: buffers are always writable"), the pinned pages are always writable.
As reference, the cover letter of the series:
https://lkml.kernel.org/r/[email protected]
Quoted 7 lines
Actually that patch is only a workaround to temporarily disable support for read-only pages as they seemed to suffer from some corruption issues in the retrieved user pages. We expect to support read-only pages as hardware input after. That said,
FOLL_FORCEdoesn't sound like the right thing even in that case, but I don't know the background behind it being added here in the first place. +Hans Verkuil +Marek Szyprowski do you happen to remember anything about it?
Maybe I mis-interpreted 707947247e95; re-reading it again, I am not quite sure what the actual problem is and how it relates to GUP FOLL_WRITE handling. FOLL_FORCE already was in place before 707947247e95 and should be removed.
What I understood is "Just always call vb2_create_framevec() with FOLL_WRITE to always allow writing to the buffers.".
If the pinned page is never written to via the obtained GUP reference:
* FOLL_WRITE should not be set
* FOLL_FORCE should not be set
* We should not dirty the page when unpinning
If the pinned page may be written to via the obtained GUP reference:
* FOLL_WRITE should be set
* FOLL_FORCE should not be set
* We should dirty the page when unpinning
If the function is called for both, we should think about doing it conditional based on a "write" variable, like pre-707947247e95 did.
@Hans, any insight?
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH RFC 16/19] mm/frame-vector: remove FOLL_FORCE usage
In reply to Tomasz FigaHi Tomasz, David,
Quoted 8 lines · Tomasz Figa
Hi David,
Quoted 4 lines · David Hildenbrand
FOLL_FORCEis really only for debugger access. According to commit707947247e95("media: videobuf2-vmalloc:get_userptr: buffers are always writable"), the pinned pages are always writable.
Quoted 7 lines
Actually that patch is only a workaround to temporarily disable support for read-only pages as they seemed to suffer from some corruption issues in the retrieved user pages. We expect to support read-only pages as hardware input after. That said,
FOLL_FORCEdoesn't sound like the right thing even in that case, but I don't know the background behind it being added here in the first place. +Hans Verkuil +Marek Szyprowski do you happen to remember anything about it?
I tracked the use of 'force' all the way back to the first git commit (2.6.12-rc1) in the very old video-buf.c. So it is very, very old and the reason is lost in the mists of time.
I'm not sure if the 'force' argument of get_user_pages() at that time even meant the same as FOLL_FORCE today. From what I can tell it has just been faithfully used ever since, but I have my doubt that anyone understands the reason behind it since it was never explained.
Looking at this old LWN article https://lwn.net/Articles/28548/ suggests that it might be related to calling get_user_pages for write buffers (non-zero write argument) where you also want to be able to read from the buffer. That is certainly something that some drivers need to do post-capture fixups.
But 'force' was also always set for read buffers, and I don't know if that was something that was actually needed, or just laziness.
I assume that removing FOLL_FORCE from 'FOLL_FORCE|FOLL_WRITE' will still allow drivers to read from the buffer?
Regards,
Hans
Quoted 32 lines
Best regards,
TomaszQuoted 28 lines
FOLL_FORCEin this case seems to be a legacy leftover. Let's just remove it.Cc Tomasz Figa <[email protected]>Cc Marek Szyprowski <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- drivers/media/common/videobuf2/frame_vector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/media/common/videobuf2/frame_vector.c +1
-2@@ -50,7 +50,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, start =untagged_addr (start); ret =pin_user_pages_fast (start, nr_frames, -FOLL_FORCE |FOLL_WRITE |FOLL_LONGTERM , +FOLL_WRITE |FOLL_LONGTERM , (struct page **)(vec->ptrs));if (ret >0 ) { vec->got_ref = true; --2.38.1
Re: [PATCH RFC 16/19] mm/frame-vector: remove FOLL_FORCE usage
Quoted 34 lines · Hans Verkuil
Hi Tomasz, David,
Quoted 8 lines · Tomasz Figa
Hi David,
Quoted 4 lines · David Hildenbrand
FOLL_FORCEis really only for debugger access. According to commit707947247e95("media: videobuf2-vmalloc:get_userptr: buffers are always writable"), the pinned pages are always writable.Quoted 7 lines
Actually that patch is only a workaround to temporarily disable support for read-only pages as they seemed to suffer from some corruption issues in the retrieved user pages. We expect to support read-only pages as hardware input after. That said,
FOLL_FORCEdoesn't sound like the right thing even in that case, but I don't know the background behind it being added here in the first place. +Hans Verkuil +Marek Szyprowski do you happen to remember anything about it?I tracked the use of 'force' all the way back to the first git commit (2.6.12-rc1) in the very old
video-buf.c. So it is very, very old and the reason is lost in the mists of time.I'm not sure if the 'force' argument of
get_user_pages()at that time even meant the same asFOLL_FORCEtoday. From what I can tell it has just been faithfully used ever since, but I have my doubt that anyone understands the reason behind it since it was never explained.Looking at this old LWN article https://lwn.net/Articles/28548/ suggests that it might be related to calling
get_user_pagesfor write buffers (non-zero write argument) where you also want to be able to read from the buffer. That is certainly something that some drivers need to do post-capture fixups.
Quoted 5 lines
But 'force' was also always set for read buffers, and I don't know if that was something that was actually needed, or just laziness.
I assume that removing
FOLL_FORCEfrom 'FOLL_FORCE|FOLL_WRITE' will still allow drivers to read from the buffer?
Yes. The only problematic corner case I can imagine is if someone has a VMA without write permissions (no PROT_WRITE/VM_WRITE) and wants to pin user space pages as a read buffer. We'd specify now FOLL_WRITE without FOLL_FORCE and GUP would reject that: write access without write permissions is invalid.
There would be no way around "fixing" this implementation to not specify FOLL_WRITE when only reading from user-space pages. Not sure what the implications are regarding that corruption that was mentioned in 707947247e95.
Having said that, I assume such a scenario is unlikely -- but you might know better how user space usually uses this interface. There would be three options:
1) Leave the FOLL_FORCE hack in for now, which I *really* want to avoid.
2) Remove FOLL_FORCE and see if anybody even notices (this patch) and leave the implementation as is for now.
3) Remove FOLL_FORCE and fixup the implementation to only specify FOLL_WRITE if the pages will actually get written to.
3) would most probably ideal, however, I am no expert on that code and can't do it (707947247e95 confuses me). So naive me would go with 2) first.
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH RFC 16/19] mm/frame-vector: remove FOLL_FORCE usage
Quoted 38 lines · David Hildenbrand
Quoted 37 lines · Hans Verkuil
Hi Tomasz, David,
Quoted 8 lines · Tomasz Figa
Hi David,
Quoted 4 lines · David Hildenbrand
FOLL_FORCEis really only for debugger access. According to commit707947247e95("media: videobuf2-vmalloc:get_userptr: buffers are always writable"), the pinned pages are always writable.Quoted 7 lines
Actually that patch is only a workaround to temporarily disable support for read-only pages as they seemed to suffer from some corruption issues in the retrieved user pages. We expect to support read-only pages as hardware input after. That said,
FOLL_FORCEdoesn't sound like the right thing even in that case, but I don't know the background behind it being added here in the first place. +Hans Verkuil +Marek Szyprowski do you happen to remember anything about it?I tracked the use of 'force' all the way back to the first git commit (2.6.12-rc1) in the very old
video-buf.c. So it is very, very old and the reason is lost in the mists of time.I'm not sure if the 'force' argument of
get_user_pages()at that time even meant the same asFOLL_FORCEtoday. From what I can tell it has just been faithfully used ever since, but I have my doubt that anyone understands the reason behind it since it was never explained.Looking at this old LWN article https://lwn.net/Articles/28548/ suggests that it might be related to calling
get_user_pagesfor write buffers (non-zero write argument) where you also want to be able to read from the buffer. That is certainly something that some drivers need to do post-capture fixups.But 'force' was also always set for read buffers, and I don't know if that was something that was actually needed, or just laziness.
Quoted 8 lines
Quoted 2 lines
I assume that removing
FOLL_FORCEfrom 'FOLL_FORCE|FOLL_WRITE' will still allow drivers to read from the buffer?Yes. The only problematic corner case I can imagine is if someone has a VMA without write permissions (no PROT_WRITE/VM_WRITE) and wants to pin user space pages as a read buffer. We'd specify now
FOLL_WRITEwithoutFOLL_FORCEand GUP would reject that: write access without write permissions is invalid.
I do not believe this will be an issue.
Quoted 5 lines
There would be no way around "fixing" this implementation to not specify
FOLL_WRITEwhen only reading from user-space pages. Not sure what the implications are regarding that corruption that was mentioned in707947247e95.
Before 707947247e95 the FOLL_WRITE flag was only set for write buffers (i.e. video capture, DMA_FROM_DEVICE), not for read buffers (video output, DMA_TO_DEVICE). In the video output case there should never be any need for drivers to write to the buffer to the best of my knowledge.
But I have had some complaints about that commit that it causes problems in some scenarios, and it has been on my todo list for quite some time now to dig deeper into this. I probably should prioritize this for this or next week.
Quoted 5 lines
Having said that, I assume such a scenario is unlikely -- but you might know better how user space usually uses this interface. There would be three options:
Quoted 9 lines
1) Leave the
FOLL_FORCEhack in for now, which I *really* want to avoid.
2) RemoveFOLL_FORCEand see if anybody even notices (this patch) and leave the implementation as is for now.
3) RemoveFOLL_FORCEand fixup the implementation to only specifyFOLL_WRITEif the pages will actually get written to.3) would most probably ideal, however, I am no expert on that code and can't do it (
707947247e95confuses me). So naive me would go with 2) first.
Option 3 would be best. And 707947247e95 confuses me as well, and I actually wrote it :-) I am wondering whether it was addressed at the right level, but as I said, I need to dig a bit deeper into this.
Regards,
Hans
Re: [PATCH RFC 16/19] mm/frame-vector: remove FOLL_FORCE usage
Quoted 77 lines · Hans Verkuil
Quoted 38 lines · David Hildenbrand
Quoted 37 lines · Hans Verkuil
Hi Tomasz, David,
Quoted 8 lines · Tomasz Figa
Hi David,
Quoted 4 lines · David Hildenbrand
FOLL_FORCEis really only for debugger access. According to commit707947247e95("media: videobuf2-vmalloc:get_userptr: buffers are always writable"), the pinned pages are always writable.Quoted 7 lines
Actually that patch is only a workaround to temporarily disable support for read-only pages as they seemed to suffer from some corruption issues in the retrieved user pages. We expect to support read-only pages as hardware input after. That said,
FOLL_FORCEdoesn't sound like the right thing even in that case, but I don't know the background behind it being added here in the first place. +Hans Verkuil +Marek Szyprowski do you happen to remember anything about it?I tracked the use of 'force' all the way back to the first git commit (2.6.12-rc1) in the very old
video-buf.c. So it is very, very old and the reason is lost in the mists of time.I'm not sure if the 'force' argument of
get_user_pages()at that time even meant the same asFOLL_FORCEtoday. From what I can tell it has just been faithfully used ever since, but I have my doubt that anyone understands the reason behind it since it was never explained.Looking at this old LWN article https://lwn.net/Articles/28548/ suggests that it might be related to calling
get_user_pagesfor write buffers (non-zero write argument) where you also want to be able to read from the buffer. That is certainly something that some drivers need to do post-capture fixups.But 'force' was also always set for read buffers, and I don't know if that was something that was actually needed, or just laziness.
Quoted 8 lines
Quoted 2 lines
I assume that removing
FOLL_FORCEfrom 'FOLL_FORCE|FOLL_WRITE' will still allow drivers to read from the buffer?Yes. The only problematic corner case I can imagine is if someone has a VMA without write permissions (no PROT_WRITE/VM_WRITE) and wants to pin user space pages as a read buffer. We'd specify now
FOLL_WRITEwithoutFOLL_FORCEand GUP would reject that: write access without write permissions is invalid.I do not believe this will be an issue.
Quoted 5 lines
There would be no way around "fixing" this implementation to not specify
FOLL_WRITEwhen only reading from user-space pages. Not sure what the implications are regarding that corruption that was mentioned in707947247e95.Before
707947247e95theFOLL_WRITEflag was only set for write buffers (i.e. video capture,DMA_FROM_DEVICE), not for read buffers (video output,DMA_TO_DEVICE). In the video output case there should never be any need for drivers to write to the buffer to the best of my knowledge.But I have had some complaints about that commit that it causes problems in some scenarios, and it has been on my todo list for quite some time now to dig deeper into this. I probably should prioritize this for this or next week.
Quoted 11 lines
Having said that, I assume such a scenario is unlikely -- but you might know better how user space usually uses this interface. There would be three options:
1) Leave the
FOLL_FORCEhack in for now, which I *really* want to avoid.
2) RemoveFOLL_FORCEand see if anybody even notices (this patch) and leave the implementation as is for now.
3) RemoveFOLL_FORCEand fixup the implementation to only specifyFOLL_WRITEif the pages will actually get written to.
Quoted 7 lines
Quoted 3 lines
3) would most probably ideal, however, I am no expert on that code and can't do it (
707947247e95confuses me). So naive me would go with 2) first.Option 3 would be best. And
707947247e95confuses me as well, and I actually wrote it :-) I am wondering whether it was addressed at the right level, but as I said, I need to dig a bit deeper into this.
Cool, let me know if I can help!
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH RFC 16/19] mm/frame-vector: remove FOLL_FORCE usage
In reply to Hans VerkuilQuoted 4 lines · Hans Verkuil
I tracked the use of 'force' all the way back to the first git commit (2.6.12-rc1) in the very old
video-buf.c. So it is very, very old and the reason is lost in the mists of time.
Well, not entirely.
For archaeology reasons, I went back to the old BK history, which exists as a git conversion in
https://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git/
and there you can actually find it.
Not with a lot of explanations, though - it's commit b7649ef789 ("[PATCH] videobuf update"):
This updates the video-buf.c module (helper module for video buffer management). Some memory management fixes, also some adaptions to the final v4l2 api.
but it went from
err = get_user_pages(current,current->mm,
- data, dma->nr_pages,
- rw == READ, 0, /* don't force */
+ data & PAGE_MASK, dma->nr_pages,
+ rw == READ, 1, /* force */
dma->pages, NULL);in that commit.
So it goes back to October 2002.
Quoted 2 lines
Looking at this old LWN article https://lwn.net/Articles/28548/ suggests that it might be related to calling
get_user_pagesfor write buffers
The timing roughly matches.
Quoted 2 lines
I assume that removing
FOLL_FORCEfrom 'FOLL_FORCE|FOLL_WRITE' will still allow drivers to read from the buffer?
The issue with some of the driver hacks has been that
- they only want to read, and the buffer may be read-only
- they then used FOLL_WRITE despite that, because they want to break
COW (due to the issue that David is now fixing with his series)
- but that means that the VM layer says "nope, you can't write to
this read-only user mapping"
- ... and then they use FOLL_FORCE to say "yes, I can".
iOW, the FOLL_FORCE may be entirely due to an (incorrect, but historically needed) FOLL_WRITE.
Linus
RFC PATCH 17/19 drm/exynos: remove FOLL_FORCE usage
In reply to David HildenbrandFOLL_FORCE is really only for debugger access. As we unpin the pinned pages using unpin_user_pages_dirty_lock(true), the assumption is that all these pages are writable.
FOLL_FORCE in this case seems to be a legacy leftover. Let's just remove it.
--- drivers/gpu/drm/exynos/exynos_drm_g2d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/exynos/exynos_drm_g2d.c +1 -1
@@ -477,7 +477,7 @@ static dma_addr_t *g2d_userptr_get_dma_addr(struct g2d_data *g2d, } ret =pin_user_pages_fast (start, npages, -FOLL_FORCE |FOLL_WRITE |FOLL_LONGTERM , +FOLL_WRITE |FOLL_LONGTERM , g2d_userptr->pages);if (ret != npages) { DRM_DEV_ERROR(g2d->dev,
Signature · 1 line
2.38.1
RFC PATCH 18/19 RDMA/hw/qib/qib_user_pages: remove FOLL_FORCE usage
In reply to David HildenbrandFOLL_FORCE is really only for debugger access. As we unpin the pinned pages using unpin_user_pages_dirty_lock(true), the assumption is that all these pages are writable.
FOLL_FORCE in this case seems to be a legacy leftover. Let's just remove it.
--- drivers/infiniband/hw/qib/qib_user_pages.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/qib/qib_user_pages.c +1 -1
@@ -110,7 +110,7 @@ int qib_get_user_pages(unsigned long start_page, size_t num_pages,for (got =0 ; got < num_pages; got += ret) { ret =pin_user_pages (start_page + got *PAGE_SIZE , num_pages - got, -FOLL_LONGTERM |FOLL_WRITE |FOLL_FORCE , +FOLL_LONGTERM |FOLL_WRITE , p + got,NULL );if (ret <0 ) {mmap_read_unlock (current->mm);
Signature · 1 line
2.38.1
RFC PATCH 19/19 habanalabs: remove FOLL_FORCE usage
In reply to David HildenbrandFOLL_FORCE is really only for debugger access. As we unpin the pinned pages using unpin_user_pages_dirty_lock(true), the assumption is that all these pages are writable.
FOLL_FORCE in this case seems to be due to copy-and-past from other drivers. Let's just remove it.
--- drivers/misc/habanalabs/common/memory.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/misc/habanalabs/common/memory.c +1 -2
@@ -2312,8 +2312,7 @@ static int get_user_memory(struct hl_device *hdev, u64 addr, u64 size,if (!userptr->pages)return -ENOMEM ; - rc =pin_user_pages_fast (start, npages, -FOLL_FORCE |FOLL_WRITE |FOLL_LONGTERM , + rc =pin_user_pages_fast (start, npages,FOLL_WRITE |FOLL_LONGTERM , userptr->pages);if (rc != npages) {
Signature · 1 line
2.38.1
Re: [PATCH RFC 19/19] habanalabs: remove FOLL_FORCE usage
Quoted 31 lines · David Hildenbrand
FOLL_FORCEis really only for debugger access. As we unpin the pinned pages usingunpin_user_pages_dirty_lock(true), the assumption is that all these pages are writable.
FOLL_FORCEin this case seems to be due to copy-and-past from other drivers. Let's just remove it.Cc Oded Gabbay <[email protected]>Cc Arnd Bergmann <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- drivers/misc/habanalabs/common/memory.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/misc/habanalabs/common/memory.c +1
-3@@ -2312,8 +2312,7 @@ static int get_user_memory(struct hl_device *hdev, u64 addr, u64 size,if (!userptr->pages)return -ENOMEM ; - rc =pin_user_pages_fast (start, npages, -FOLL_FORCE |FOLL_WRITE |FOLL_LONGTERM , + rc =pin_user_pages_fast (start, npages,FOLL_WRITE |FOLL_LONGTERM , userptr->pages);if (rc != npages) { --
Quoted 3 lines
2.38.1
Thanks,
Oded
Quoted 4 lines · David Hildenbrand
So instead, make R/O long-term pinning work as expected, by breaking COW in a COW mapping early, such that we can remove any
FOLL_FORCEusage from drivers.
Nothing makes me unhappy from a quick scan through these patches.
And I'd really love to just have this long saga ended, and FOLL_FORCE finally relegated to purely ptrace accesses.
So an enthusiastic Ack from me.
Linus
Quoted 6 lines · Linus Torvalds
Quoted 4 lines · David Hildenbrand
So instead, make R/O long-term pinning work as expected, by breaking COW in a COW mapping early, such that we can remove any
FOLL_FORCEusage from drivers.
Quoted 6 lines
Nothing makes me unhappy from a quick scan through these patches.
And I'd really love to just have this long saga ended, and
FOLL_FORCEfinally relegated to purely ptrace accesses.So an enthusiastic Ack from me.
Thanks Linus! My hope is that we can remove it from all drivers and not have to leave it in for some corner cases; so far it looks promising.
Signature · 3 lines
Thanks, David / dhildenb
Quoted 2 lines · Linus Torvalds
And I'd really love to just have this long saga ended, and
FOLL_FORCEfinally relegated to purely ptrace accesses.
At that point we should also rename it to FOLL_PTRACE to make that very clear, and also break anything in-flight accidentally readding it, which I'd otherwise expect to happen.
Quoted 7 lines · Christoph Hellwig
Quoted 2 lines · Linus Torvalds
And I'd really love to just have this long saga ended, and
FOLL_FORCEfinally relegated to purely ptrace accesses.At that point we should also rename it to
FOLL_PTRACEto make that very clear, and also break anything in-flight accidentally readding it, which I'd otherwise expect to happen.
Good idea; I'll include a patch in v1.
Signature · 3 lines
Thanks, David / dhildenb