The patch titled
Subject: khugepaged: fix double unlock in collapse_file()
has been added to the -mm tree. Its filename is
mmthp-add-read-only-thp-support-for-non-shmem-fs-fix-2.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mmthp-add-read-only-thp-support-for-non-shmem-fs-fix-2.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mmthp-add-read-only-thp-support-for-non-shmem-fs-fix-2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Song Liu <songliubraving@xxxxxx>
Subject: khugepaged: fix double unlock in collapse_file()
In collapse_file, when try_to_release_page() fails, we need to goto
out_unlock, because we already called xas_unlock_irq().
Link: http://lkml.kernel.org/r/B960CBFA-8EFC-4DA4-ABC5-1977FFF2CA57@xxxxxx
Fixes: 89e1c65c0db7 ("mm,thp: add read-only THP support for (non-shmem) FS")
Signed-off-by: Song Liu <songliubraving@xxxxxx>
Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/khugepaged.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/mm/khugepaged.c~mmthp-add-read-only-thp-support-for-non-shmem-fs-fix-2
+++ a/mm/khugepaged.c
@@ -1472,7 +1472,7 @@ static void collapse_file(struct mm_stru
if (page_has_private(page) &&
!try_to_release_page(page, GFP_KERNEL)) {
result = SCAN_PAGE_HAS_PRIVATE;
- break;
+ goto out_unlock;
}
if (page_mapped(page))
_
Patches currently in -mm which might be from songliubraving@xxxxxx are
filemap-check-compound_headpage-mapping-in-filemap_fault.patch
filemap-check-compound_headpage-mapping-in-pagecache_get_page.patch
filemap-update-offset-check-in-filemap_fault.patch
mmthp-stats-for-file-backed-thp.patch
khugepaged-rename-collapse_shmem-and-khugepaged_scan_shmem.patch
mmthp-add-read-only-thp-support-for-non-shmem-fs.patch
mmthp-add-read-only-thp-support-for-non-shmem-fs-fix.patch
mmthp-add-read-only-thp-support-for-non-shmem-fs-fix-2.patch
mmthp-avoid-writes-to-file-with-thp-in-pagecache.patch
