From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C586C3ABC3 for ; Fri, 9 May 2025 13:01:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5ECAC280033; Fri, 9 May 2025 09:01:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5856D280034; Fri, 9 May 2025 09:01:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4178C280033; Fri, 9 May 2025 09:01:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 1B46C280031 for ; Fri, 9 May 2025 09:01:31 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 0561F5648B for ; Fri, 9 May 2025 13:01:33 +0000 (UTC) X-FDA: 83423380866.30.1FED824 Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) by imf23.hostedemail.com (Postfix) with ESMTP id A965B14001A for ; Fri, 9 May 2025 13:01:27 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=UjMctVcB; spf=pass (imf23.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.110 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746795691; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=eYlzvPF45byGGPG+Qp6SHyvqWNpVUZdss7sZzlobEso=; b=n/ohLFq2QVlt91hqhDgBhkvHjA8hH4HM8aokXGJkg6LBTIaVYYspVtrLDD/cFTgPHNbZHl QodErUKjQ7iWvueIw02Q7sCUUwpsdT2LOkYvlxlmKH8uV23/6lhWmZiGNriKCL+PexV9hI Hsr+4VgePT/U1M+SuS2dkPKhGAhGh7Y= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746795691; a=rsa-sha256; cv=none; b=zLFDdvtzNiFTDe35UrYIPrMsGniPjs4G1QS4thP97DNarBNumOtB+zuU8TO8ydATfD+GUj J0g/zO/LiMXKHMrCs0PXm4PXtt/YMuOKu0jKADDegP43C6QJMuBGhv14tixaMoI/j9J85S Oz/gy/9/jobVij4upHzVKKkFzrKQT7c= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=UjMctVcB; spf=pass (imf23.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.110 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1746795680; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=eYlzvPF45byGGPG+Qp6SHyvqWNpVUZdss7sZzlobEso=; b=UjMctVcBoVif07EYy5DX1GfTBQRXsAXdXOBbHElUqkLUM1qcmb9rhDq4J72NTYWl4mAnJBtH+veENGuvH6f0ds+0rdWNQjqgmNnbMv006OuJXdIZwsO0tfApkmUAk1dSBwPKXxOEtfU5xP45WwEbNkkhn5vw8qlufT3oSFXz9Xo= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0Wa3g8b9_1746795679 cluster:ay36) by smtp.aliyun-inc.com; Fri, 09 May 2025 21:01:19 +0800 From: Baolin Wang To: akpm@linux-foundation.org, willy@infradead.org, david@redhat.com Cc: hannes@cmpxchg.org, lorenzo.stoakes@oracle.com, Liam.Howlett@oracle.com, npache@redhat.com, ryan.roberts@arm.com, dev.jain@arm.com, ziy@nvidia.com, vbabka@suse.cz, rppt@kernel.org, surenb@google.com, mhocko@suse.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] mm: khugepaged: convert set_huge_pmd() to take a folio Date: Fri, 9 May 2025 21:01:03 +0800 Message-ID: X-Mailer: git-send-email 2.43.5 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: rfkjrrceatkmchm459brkwmi551yqkcm X-Rspamd-Queue-Id: A965B14001A X-Rspam-User: X-Rspamd-Server: rspam02 X-HE-Tag: 1746795687-508437 X-HE-Meta: U2FsdGVkX19AUrySWJPQwFrBooA43BP4vjvi6rlDjWEj6JLJoeszn4bJgq1/Pwv8e7eOjSNBHr+kDUAGg8iX05vE0qB8ElAkf3OsigjDPPTh9XBsgA0pGy+ACe6SxF8yBXZ587bYKbpaOIzNgn0jtyOdS9SJFakhrOhmgRdwhcU117Yf9IAw1e93Z99VhZfnQ+Puko7cvKnbQD0fEMV7LIfwckU2eorliMY5MgPgtVIelInv5LPKHheb9TgdS4I/N/KYFPY5skCpM65H/vcZVULs2uNLtL6/r8pQamfY0ffZ5Div4JI6JTDlroPEOmVSkV3lcCxZgza4VtgK54Ize+ecYEOUFg/EdisVXOBXOG/wL9W3HgOzJBPHO56OyLu7JvvbUO0XdNHHjpSB46Jmshc0qfVzNzslYpXDobsdlw5yZGdWwyP/FV3+j7jFDhggTUaNYNDA8Rr1ycuRoecJVqctcqz1Ec2aZ1Z89ywhqdpgGiM/XbSygn1ccph+CXWuX7P7uqgQynAOkUIU6xkB2qc3Zpmb8HvbZcuDIC/B3fARv16UvrIV8LfIGyEXjljH0D6JlXqbucjmqO5Qd7q+6qxnY0DgMrPyM/MvjM2O/njdjwkpv8PzX39LFAAkm3CrwD9ftbuNLY5Ducozcff2WDSo0I3eRYI0UKU8q5P5ceK3KtlbJGlHOPBaGoDhUclorqvbsLNUT70tC1+b+1lZp8VpKAD2kLTI12RexCBZKOndjSwNrOtbIM1SANZCHRFbMhKADz42cTtWILrXkQeUdyMlMAENj5bK3AmXzk6OqRFyjaUl+N8kB6XHMQrOa5WA8xaaIhiwAY1YELZCHEo/sebzkf1k2x7SVCDa1TZE0T8dwlW3K+UdlxAvj294sTTz5a8OkSAF4lSEMKmXzGmZUUjkag5k5q0s/t2In7BNjNNIP/MhWXWUIkjYcJeEGzyAqrJqn8+8/jG6ng5DNnu 2pg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: We've already gotten the stable locked folio in collapse_pte_mapped_thp(), so just use folio for set_huge_pmd() to set the PMD entry, which is more straightforward. Moreover, we will check the folio size in do_set_pmd(), so we can remove the unnecessary VM_BUG_ON() in set_huge_pmd(). While we are at it, we can also remove the PageTransHuge(), as it currently has no callers. Signed-off-by: Baolin Wang --- Changes from v1: - Remove the unnecessary VM_BUG_ON(). - Remove the PageTransHuge(). --- include/linux/page-flags.h | 15 --------------- mm/khugepaged.c | 9 ++++----- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 37b11f15dbd9..1c1d49554c71 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -907,20 +907,6 @@ FOLIO_FLAG_FALSE(partially_mapped) #define PG_head_mask ((1UL << PG_head)) #ifdef CONFIG_TRANSPARENT_HUGEPAGE -/* - * PageHuge() only returns true for hugetlbfs pages, but not for - * normal or transparent huge pages. - * - * PageTransHuge() returns true for both transparent huge and - * hugetlbfs pages, but not normal pages. PageTransHuge() can only be - * called only in the core VM paths where hugetlbfs pages can't exist. - */ -static inline int PageTransHuge(const struct page *page) -{ - VM_BUG_ON_PAGE(PageTail(page), page); - return PageHead(page); -} - /* * PageTransCompound returns true for both transparent huge pages * and hugetlbfs pages, so it should only be called when it's known @@ -931,7 +917,6 @@ static inline int PageTransCompound(const struct page *page) return PageCompound(page); } #else -TESTPAGEFLAG_FALSE(TransHuge, transhuge) TESTPAGEFLAG_FALSE(TransCompound, transcompound) #endif diff --git a/mm/khugepaged.c b/mm/khugepaged.c index b04b6a770afe..aca66e7f4fd9 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1467,7 +1467,7 @@ static void collect_mm_slot(struct khugepaged_mm_slot *mm_slot) #ifdef CONFIG_SHMEM /* hpage must be locked, and mmap_lock must be held */ static int set_huge_pmd(struct vm_area_struct *vma, unsigned long addr, - pmd_t *pmdp, struct page *hpage) + pmd_t *pmdp, struct folio *folio) { struct vm_fault vmf = { .vma = vma, @@ -1476,13 +1476,12 @@ static int set_huge_pmd(struct vm_area_struct *vma, unsigned long addr, .pmd = pmdp, }; - VM_BUG_ON(!PageTransHuge(hpage)); mmap_assert_locked(vma->vm_mm); - if (do_set_pmd(&vmf, hpage)) + if (do_set_pmd(&vmf, &folio->page)) return SCAN_FAIL; - get_page(hpage); + folio_get(folio); return SCAN_SUCCEED; } @@ -1689,7 +1688,7 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, maybe_install_pmd: /* step 5: install pmd entry */ result = install_pmd - ? set_huge_pmd(vma, haddr, pmd, &folio->page) + ? set_huge_pmd(vma, haddr, pmd, folio) : SCAN_SUCCEED; goto drop_folio; abort: -- 2.43.5