userfaultfd/shmem: fix minor fault page leak
Subsystems (4)
PATCH 1/1 userfaultfd/shmem: fix minor fault page leak
This fix is analogous to Peter Xu's fix for hugetlb [0]. If we don't put_page() after getting the page out of the page cache, we leak the reference.
The fix can be verified by checking /proc/meminfo and running the userfaultfd selftest in shmem mode. Without the fix, we see MemFree / MemAvailable steadily decreasing with each run of the test. With the fix, memory is correctly freed after the test program exits.
--- mm/shmem.c | 1 + 1 file changed, 1 insertion(+)
mm/shmem.c +1 -0
@@ -1831,6 +1831,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,if (page && vma &&userfaultfd_minor (vma)) {unlock_page (page); +put_page (page); *fault_type =handle_userfault (vmf,VM_UFFD_MINOR );return 0 ; }
Signature · 1 line
2.31.0.rc2.261.g7f71774620-goog
Quoted 11 lines · Axel Rasmussen
This fix is analogous to Peter Xu's fix for hugetlb [0]. If we don't
put_page()after getting the page out of the page cache, we leak the reference.The fix can be verified by checking
/proc/meminfoand running the userfaultfd selftest in shmem mode. Without the fix, we see MemFree / MemAvailable steadily decreasing with each run of the test. With the fix, memory is correctly freed after the test program exits.Fixes 00da60b9d0a0 ("userfaultfd: support minor fault handling for shmem")Signed-off-by Axel Rasmussen <[email protected]>
Signature · 1 line
Peter Xu
Andrew Morton
maintainerQuoted 10 lines · On Mon, 22 Mar 2021 13:48:35 -0700 Axel Rasmussen <[email protected]>…
This fix is analogous to Peter Xu's fix for hugetlb [0]. If we don't
put_page()after getting the page out of the page cache, we leak the reference.The fix can be verified by checking
/proc/meminfoand running the userfaultfd selftest in shmem mode. Without the fix, we see MemFree / MemAvailable steadily decreasing with each run of the test. With the fix, memory is correctly freed after the test program exits.Fixes 00da60b9d0a0 ("userfaultfd: support minor fault handling for shmem")
Confused. The affected code:
mm/shmem.c static int shmem_getpage_gfp(struct inode *inode, pgoff_t index, · line 1837
Quoted 10 lines
mm/shmem.c +1
-0@@ -1831,6 +1831,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,if (page && vma &&userfaultfd_minor (vma)) {unlock_page (page); +put_page (page); *fault_type =handle_userfault (vmf,VM_UFFD_MINOR );return 0 ; }
Is added by Peter's "page && vma && userfaultfd_minor". I assume that "Fixes:" is incorrect?
Hi, Andrew,
Quoted 19 lines · Andrew Morton
Quoted 10 lines · On Mon, 22 Mar 2021 13:48:35 -0700 Axel Rasmussen <[email protected]>…
This fix is analogous to Peter Xu's fix for hugetlb [0]. If we don't
put_page()after getting the page out of the page cache, we leak the reference.The fix can be verified by checking
/proc/meminfoand running the userfaultfd selftest in shmem mode. Without the fix, we see MemFree / MemAvailable steadily decreasing with each run of the test. With the fix, memory is correctly freed after the test program exits.Fixes 00da60b9d0a0 ("userfaultfd: support minor fault handling for shmem")Confused. The affected code:
Quoted 4 lines
mm/shmem.c +0
-0@@ -1831,6 +1831,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,
Quoted 10 lines
mm/shmem.c static int shmem_getpage_gfp(struct inode *inode, pgoff_t index, · line 1837
Quoted 6 lines
mm/shmem.c +1
-0if (page && vma &&userfaultfd_minor (vma)) {unlock_page (page); +put_page (page); *fault_type =handle_userfault (vmf,VM_UFFD_MINOR );return 0 ; }Is added by Peter's "page && vma &&
userfaultfd_minor". I assume that "Fixes:" is incorrect?
It seems to me the commit is correct as pointed to in "Fixes", but I do have a different commit ID here:
commit 63c826b1372c4930f89b8a55092699fa7f0d6f4e
Author: Axel Rasmussen <[email protected]>
Date: Thu Mar 18 10:20:43 2021 -0400
userfaultfd: support minor fault handling for shmem
Axel, did you fetched the commit ID from your local tree, perhaps? Since I should have fetched from hnaz/linux-mm and I can see Andrew's sign-off too.
Thanks,
Signature · 1 line
Peter Xu
Quoted 43 lines · Peter Xu
Hi, Andrew,
Quoted 19 lines · Andrew Morton
Quoted 10 lines · On Mon, 22 Mar 2021 13:48:35 -0700 Axel Rasmussen <[email protected]>…
This fix is analogous to Peter Xu's fix for hugetlb [0]. If we don't
put_page()after getting the page out of the page cache, we leak the reference.The fix can be verified by checking
/proc/meminfoand running the userfaultfd selftest in shmem mode. Without the fix, we see MemFree / MemAvailable steadily decreasing with each run of the test. With the fix, memory is correctly freed after the test program exits.Fixes 00da60b9d0a0 ("userfaultfd: support minor fault handling for shmem")Confused. The affected code:
Quoted 4 lines
mm/shmem.c +0
-0@@ -1831,6 +1831,7 @@ static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,Quoted 10 lines
mm/shmem.c static int shmem_getpage_gfp(struct inode *inode, pgoff_t index, · line 1837
Quoted 6 lines
mm/shmem.c +1
-0if (page && vma &&userfaultfd_minor (vma)) {unlock_page (page); +put_page (page); *fault_type =handle_userfault (vmf,VM_UFFD_MINOR );return 0 ; }Is added by Peter's "page && vma &&
userfaultfd_minor". I assume that "Fixes:" is incorrect?It seems to me the commit is correct as pointed to in "Fixes", but I do have a different commit ID here:
commit
63c826b1372c4930f89b8a55092699fa7f0d6f4e
Author: Axel Rasmussen <[email protected]>
Date: Thu Mar 18 10:20:43 2021 -0400userfaultfd: support minor fault handling for shmem
Quoted 8 lines
Axel, did you fetched the commit ID from your local tree, perhaps? Since I should have fetched from hnaz/linux-mm and I can see Andrew's sign-off too.
Thanks,
--
Peter Xu
Ah, this is the SHA I see when I "git log --grep linux-next/akpm" (where my repo's linux-next remote is [1]):
commit 00da60b9d0a03818c36a2fe862578309c27006ad
Author: Axel Rasmussen <[email protected]> Date: Thu Mar 18 17:01:51 2021 +1100
userfaultfd: support minor fault handling for shmem
This is the commit that this new patch fixes. I'll admit I'm a bit unsure which tree the "Fixes:" tag is meant to refer to before the commits make it into Linus' tree, if I should look up the commit another way just let me know. :) And, sorry for the confusion.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git