[10/15] mm/shmem: fix build without THP

Message ID	20200421011407.urMuIwZHA%akpm@linux-foundation.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=lzY1=6F=kvack.org=owner-linux-mm@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 708D4208E4 Date: Mon, 20 Apr 2020 18:14:07 -0700 From: Andrew Morton <akpm@linux-foundation.org> To: akpm@linux-foundation.org, hughd@google.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, rdunlap@infradead.org, torvalds@linux-foundation.org Subject: [patch 10/15] mm/shmem: fix build without THP Message-ID: <20200421011407.urMuIwZHA%akpm@linux-foundation.org> In-Reply-To: <20200420181310.c18b3c0aa4dc5b3e5ec1be10@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	[01/15] sh: fix build error in mm/init.c \| expand [01/15] sh: fix build error in mm/init.c [02/15] slub: avoid redzone when choosing freepointer location [03/15] mm/userfaultfd: disable userfaultfd-wp on x86_32 [04/15] MAINTAINERS: add an entry for kfifo [05/15] mm/hugetlb: fix a addressing exception caused by huge_pte_offset [06/15] mm, gup: return EINTR when gup is interrupted by fatal signals [07/15] checkpatch: fix a typo in the regex for $allocFunctions [08/15] tools/build: tweak unused value workaround [09/15] mm/ksm: fix NULL pointer dereference when KSM zero page is enabled [10/15] mm/shmem: fix build without THP [11/15] vmalloc: fix remap_vmalloc_range() bounds checks [12/15] shmem: fix possible deadlocks on shmlock_user_lock [13/15] mm: shmem: disable interrupt when acquiring info->lock in userfaultfd_copy path [14/15] coredump: fix null pointer dereference on coredump [15/15] tools/vm: fix cross-compile build

Message ID

20200421011407.urMuIwZHA%akpm@linux-foundation.org (mailing list archive)

State

New, archived

Headers

DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 708D4208E4
Date: Mon, 20 Apr 2020 18:14:07 -0700
From: Andrew Morton <akpm@linux-foundation.org>
To: akpm@linux-foundation.org, hughd@google.com, linux-mm@kvack.org,
 mm-commits@vger.kernel.org, rdunlap@infradead.org,
 torvalds@linux-foundation.org
Subject: [patch 10/15] mm/shmem: fix build without THP
Message-ID: <20200421011407.urMuIwZHA%akpm@linux-foundation.org>
In-Reply-To: <20200420181310.c18b3c0aa4dc5b3e5ec1be10@linux-foundation.org>
User-Agent: s-nail v14.8.16
Sender: owner-linux-mm@kvack.org
Precedence: bulk

Series

[01/15] sh: fix build error in mm/init.c | expand

Commit Message

Andrew Morton April 21, 2020, 1:14 a.m. UTC

From: Hugh Dickins <hughd@google.com>
Subject: mm/shmem: fix build without THP

Some optimizers don't notice that shmem_punch_compound() is always true
(PageTransCompound() being false) without CONFIG_TRANSPARENT_HUGEPAGE==y:
use IS_ENABLED to help them to avoid the BUILD_BUG inside HPAGE_PMD_NR.

Link: http://lkml.kernel.org/r/alpine.LSU.2.11.2004142339170.10035@eggly.anvils
Fixes: 71725ed10c40 ("mm: huge tmpfs: try to split_huge_page() when punching hole")
Signed-off-by: Hugh Dickins <hughd@google.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/shmem.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/mm/shmem.c~mm-shmem-fix-build-without-thp
+++ a/mm/shmem.c
@@ -952,7 +952,7 @@  static void shmem_undo_range(struct inod
 				VM_BUG_ON_PAGE(PageWriteback(page), page);
 				if (shmem_punch_compound(page, start, end))
 					truncate_inode_page(mapping, page);
-				else {
+				else if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) {
 					/* Wipe the page and don't get stuck */
 					clear_highpage(page);
 					flush_dcache_page(page);

[10/15] mm/shmem: fix build without THP

Commit Message

Patch