diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-29 09:01:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-29 09:01:01 -0800 |
| commit | f55e1014f9e567d830eb3a7f57d879a34872af4b (patch) | |
| tree | 7d3b834a71f6fbaec70bb4a5700424be15e9e1d3 /mm/memory.c | |
| parent | 43570f0383d6d5879ae585e6c3cf027ba321546f (diff) | |
| download | linux-f55e1014f9e567d830eb3a7f57d879a34872af4b.tar.gz linux-f55e1014f9e567d830eb3a7f57d879a34872af4b.tar.bz2 linux-f55e1014f9e567d830eb3a7f57d879a34872af4b.zip | |
Revert "mm, thp: Do not make pmd/pud dirty without a reason"
This reverts commit 152e93af3cfe2d29d8136cc0a02a8612507136ee.
It was a nice cleanup in theory, but as Nicolai Stange points out, we do
need to make the page dirty for the copy-on-write case even when we
didn't end up making it writable, since the dirty bit is what we use to
check that we've gone through a COW cycle.
Reported-by: Michal Hocko <mhocko@kernel.org>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index b10c1d26f675..85e7a87da79f 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3335,7 +3335,7 @@ static int do_set_pmd(struct vm_fault *vmf, struct page *page) entry = mk_huge_pmd(page, vma->vm_page_prot); if (write) - entry = maybe_pmd_mkwrite(entry, vma, true); + entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma); add_mm_counter(vma->vm_mm, MM_FILEPAGES, HPAGE_PMD_NR); page_add_file_rmap(page, true); |