diff for duplicates of <20160618190951.GA11151@debian> diff --git a/a/1.txt b/N1/1.txt index 98b59b0..c8ddb2b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -111,3 +111,45 @@ http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=fc703 However, the above comment inconsistency still there. I've added a fix patch: + +>From 404438ff1b0617cbf7434cba0c5a08f79ccb8a5d Mon Sep 17 00:00:00 2001 +From: Ebru Akagunduz <ebru.akagunduz@gmail.com> +Date: Sat, 18 Jun 2016 21:07:22 +0300 +Subject: [PATCH] mm, thp: fix comment inconsistency for swapin readahead + functions + +Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com> +--- + mm/huge_memory.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/mm/huge_memory.c b/mm/huge_memory.c +index acd374e..f0d528e 100644 +--- a/mm/huge_memory.c ++++ b/mm/huge_memory.c +@@ -2436,9 +2436,10 @@ static bool __collapse_huge_page_swapin(struct mm_struct *mm, + /* do_swap_page returns VM_FAULT_RETRY with released mmap_sem */ + if (ret & VM_FAULT_RETRY) { + down_read(&mm->mmap_sem); +- /* vma is no longer available, don't continue to swapin */ +- if (hugepage_vma_revalidate(mm, address)) ++ if (hugepage_vma_revalidate(mm, address)) { ++ /* vma is no longer available, don't continue to swapin */ + return false; ++ } + } + if (ret & VM_FAULT_ERROR) { + trace_mm_collapse_huge_page_swapin(mm, swapped_in, 0); +@@ -2513,8 +2514,8 @@ static void collapse_huge_page(struct mm_struct *mm, + if (allocstall == curr_allocstall && swap != 0) { + /* + * __collapse_huge_page_swapin always returns with mmap_sem +- * locked. If it fails, release mmap_sem and jump directly +- * out. Continuing to collapse causes inconsistency. ++ * locked. If it fails, we release mmap_sem and jump out_nolock. ++ * Continuing to collapse causes inconsistency. + */ + if (!__collapse_huge_page_swapin(mm, vma, address, pmd)) { + mem_cgroup_cancel_charge(new_page, memcg, true); +-- +1.9.1 diff --git a/a/content_digest b/N1/content_digest index d0c7617..b272fe0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -122,6 +122,48 @@ "http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/commit/?id=fc7038a69cee6b817261f7cd805e9663fdc1075c\n" "\n" "However, the above comment inconsistency still there.\n" - I've added a fix patch: + "I've added a fix patch:\n" + "\n" + ">From 404438ff1b0617cbf7434cba0c5a08f79ccb8a5d Mon Sep 17 00:00:00 2001\n" + "From: Ebru Akagunduz <ebru.akagunduz@gmail.com>\n" + "Date: Sat, 18 Jun 2016 21:07:22 +0300\n" + "Subject: [PATCH] mm, thp: fix comment inconsistency for swapin readahead\n" + " functions\n" + "\n" + "Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>\n" + "---\n" + " mm/huge_memory.c | 9 +++++----\n" + " 1 file changed, 5 insertions(+), 4 deletions(-)\n" + "\n" + "diff --git a/mm/huge_memory.c b/mm/huge_memory.c\n" + "index acd374e..f0d528e 100644\n" + "--- a/mm/huge_memory.c\n" + "+++ b/mm/huge_memory.c\n" + "@@ -2436,9 +2436,10 @@ static bool __collapse_huge_page_swapin(struct mm_struct *mm,\n" + " \t\t/* do_swap_page returns VM_FAULT_RETRY with released mmap_sem */\n" + " \t\tif (ret & VM_FAULT_RETRY) {\n" + " \t\t\tdown_read(&mm->mmap_sem);\n" + "-\t\t\t/* vma is no longer available, don't continue to swapin */\n" + "-\t\t\tif (hugepage_vma_revalidate(mm, address))\n" + "+\t\t\tif (hugepage_vma_revalidate(mm, address)) {\n" + "+\t\t\t\t/* vma is no longer available, don't continue to swapin */\n" + " \t\t\t\treturn false;\n" + "+\t\t\t}\n" + " \t\t}\n" + " \t\tif (ret & VM_FAULT_ERROR) {\n" + " \t\t\ttrace_mm_collapse_huge_page_swapin(mm, swapped_in, 0);\n" + "@@ -2513,8 +2514,8 @@ static void collapse_huge_page(struct mm_struct *mm,\n" + " \tif (allocstall == curr_allocstall && swap != 0) {\n" + " \t\t/*\n" + " \t\t * __collapse_huge_page_swapin always returns with mmap_sem\n" + "-\t\t * locked. If it fails, release mmap_sem and jump directly\n" + "-\t\t * out. Continuing to collapse causes inconsistency.\n" + "+\t\t * locked. If it fails, we release mmap_sem and jump out_nolock.\n" + "+\t\t * Continuing to collapse causes inconsistency.\n" + " \t\t */\n" + " \t\tif (!__collapse_huge_page_swapin(mm, vma, address, pmd)) {\n" + " \t\t\tmem_cgroup_cancel_charge(new_page, memcg, true);\n" + "-- \n" + 1.9.1 -6f5d714aff64e10985c6a97280fef7e60da2bfdfd6703161cb7083c56c47f658 +e2d2fbca7018956d028eab80361b39d2f002653649bd1f524fa0183dfc1321c3
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.