Received-SPF: pass (google.com: domain of linux-kernel+bounces-210052-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Andrew Bresticker <abrestic@rivosinc.com>
To: Andrew Morton <akpm@linux-foundation.org>,
	David Hildenbrand <david@redhat.com>
Cc: linux-mm@kvack.org,
	linux-kernel@vger.kernel.org,
	Andrew Bresticker <abrestic@rivosinc.com>
Subject: [PATCH] mm/memory: Pass head page to do_set_pmd()
Date: Tue, 11 Jun 2024 07:18:49 -0700
Message-Id: <20240611141849.2788693-1-abrestic@rivosinc.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

The requirement that the head page be passed to do_set_pmd() was added
in commit ef37b2ea08ac ("mm/memory: page_add_file_rmap() ->
folio_add_file_rmap_[pte|pmd]()") and prevents pmd-mapping in the
finish_fault() path if vmf->page is anything but the head page for an
otherwise suitable vma and pmd-sized page. Have finish_fault() pass in
the head page instead.

Fixes: ef37b2ea08ac ("mm/memory: page_add_file_rmap() -> folio_add_file_rmap_[pte|pmd]()")
Signed-off-by: Andrew Bresticker <abrestic@rivosinc.com>
---
 mm/memory.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/memory.c b/mm/memory.c
index 0f47a533014e..f13b953b507c 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4764,7 +4764,7 @@ vm_fault_t finish_fault(struct vm_fault *vmf)
 
 	if (pmd_none(*vmf->pmd)) {
 		if (PageTransCompound(page)) {
-			ret = do_set_pmd(vmf, page);
+			ret = do_set_pmd(vmf, compound_head(page));
 			if (ret != VM_FAULT_FALLBACK)
 				return ret;
 		}
-- 
2.34.1