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 83235C3ABCB for ; Mon, 12 May 2025 02:57:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D9836B00A4; Sun, 11 May 2025 22:57:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 53E8D6B00A6; Sun, 11 May 2025 22:57:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3B50F6B00A5; Sun, 11 May 2025 22:57:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 164C76B00A3 for ; Sun, 11 May 2025 22:57:25 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id E3C1680028 for ; Mon, 12 May 2025 02:57:25 +0000 (UTC) X-FDA: 83432744850.11.58E243E Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by imf09.hostedemail.com (Postfix) with ESMTP id 1661F140008 for ; Mon, 12 May 2025 02:57:22 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=C083NB9t; spf=pass (imf09.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.133 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747018644; a=rsa-sha256; cv=none; b=OM9eagDYU/huWbjnJSuzBG0CIvsAmI7Nf/ORhm9WSznS/s2L1s3YkAPQxKygJKEyebhTBt 4nl1p0d6QCaViOle4W69Hqp7qrfMpx7Xx7IUDYESyjBSd7CSPHNnqNYZJW+RKMchI84XhY M+EBkFjvBx2KqmePmamjMMFWmLliW/M= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=C083NB9t; spf=pass (imf09.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.133 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=1747018644; 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=PyJc3K6r4UwcpFe6wy9ZHDQCmkxdwkGl4rZwFtFT4DI=; b=RycEftMuMdDlF2gbOcKQm4dFp1Qa/pQ3+zU3EzxB87gsXnTL7QTeU+eAQKj12AHQVUEFZy LJxqlP/EYCtX5OOl7Vc6DNeNynMVEqaOx/i8+l4BFbJbQi02owiWS0kzmOIAiOhBPtKWns qquRPQY7ZfevcOMqsS+BBd14bYV2FD0= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1747018639; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=PyJc3K6r4UwcpFe6wy9ZHDQCmkxdwkGl4rZwFtFT4DI=; b=C083NB9t6WOjdNqPj7+M0hlEVD7UfW7IHae6BD8MBhuMPJ9RzGFFtsLo8vpIk5KtprBIoTOEYvB7cAzgRJDYeihhX08Hiwysx3ssrRHBhQT4LHyurVrSVsC38XBOY+ZDiclvFdokcqSe5QZ5TPZwW15hq7MXQheVUIC08sl72dw= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WaChNWA_1747018637 cluster:ay36) by smtp.aliyun-inc.com; Mon, 12 May 2025 10:57:18 +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 v3 1/2] mm: khugepaged: convert set_huge_pmd() to take a folio Date: Mon, 12 May 2025 10:57:11 +0800 Message-ID: <110c3e1ec5fe7854a0e2c95ffcbc985817180ed7.1747017104.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.43.5 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 1661F140008 X-Stat-Signature: 6knzkj8qfdar7mys8satr3dkge1x73gp X-HE-Tag: 1747018642-508695 X-HE-Meta: U2FsdGVkX1+RkNaDZwy4U3YyDimzwsU2dQnA7WGTgI4A1g0OWcvl/YuOKN77dxqPHJnKmmd1e+nPIoaruYC+rI97qQalpgHugz2cIU1+AhO193Jw2575KaOcORk+OVLqx6cZVLTBSLQ36yUHmoDtpmIibz0ciad/yZsT4eoR4pJrO6WZ+o9hDsOjhXyZiEE+FOhZV2thsMdDjLdJU3ZRHoqKamEMiigu1FoOmwP2CLQbxAa5y3aakcj0rzPl8ING0z7gujzugYVVtqjfduSNfCRhVPJK5blijjsMC5lphDwrzy/hn5vgeTNoKEHCvfRpCSCFhYLKmkHDw39SUhILGgtZTyRM4ihJEieHPFdLJUQKx5qngkBcMoy711AwaGYsU+BdUL/BtDebIj4A0+mDGK71ZcgV7QTSv/hk4SEcNzJvxLOlZ/2F6pqBqsV6D3N8pODv+3tPEz/veheuh6T1jYoHP4N3y78iWg5VjGh1QgfYjiTfaIMbfD0lBLyUSjBeLKW2GqAp80u3oEimP0cQpY+/IoZPBCj/7zcxxgxSO6ciLfg50Iuhr4BkBe7o+QF/J6YlJDbmrHtgn/B6LwSfv5lobW4bkzKVg/qWsauEedzzv/jrM6/rqq23eR4VjVr+yKQmpfHh8Cyb7c3/NDQSnCgakVF2IbYMuH6XAmWqUsCVbRXddACM377DMLkkC9PZfRQE7yrjtu8aYfIG/46KxnsIKd5TnW5lpRboY+TTFzqfp4DqG743/rgEcaco2a9hSKjZs+xyEuGNUxinPQ7XQqjfgioi1Xi6pzVMfUcNRRSxyWx+zc6S2U2+Fu/U2wWplE0ewuLMqP7mB7SNnUDAg6AaGs5qiu+Wh3DM3MVj9mMW4UQvl7V4FHEew5HM8gMX8r0TwQEHrnU0Mt+nt6gu46KJsrzpoLBOa7pfvCNlGG321sgisGFdFkqw1FG2MpKt4TpLW6D7YeGKLuXWfV3 ATmdlwRH d2gRGlzcYcVxDqufI9UFIwyay9zW7Jbtr0fbgigHODXpaNQnBibg9sDEH9OnZyc5h7yyxDiCqnZicmw1dY2lJAcfun1wYOr4dLBLSoaGL+35xAUy0hsEPFOUEEjYS64wj6KOBx0RPSMzDHiENOlRxGA9EhYLvIdfpenvWTONPRokyr4rS26KHnEZF5BkLDi8shwdCuXOr6Em6sbM70CBucCLQ/YMLhsecXhwWtH7cpUQm55G39DJygO2/SctATxuCMwOOT71L7XKk0mYswxyss8Hq4ZyysyDcQSRFQgXXdwykSH8= 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 Acked-by: David Hildenbrand --- Changes from v2: - Update the releated comments. - Pass the 'page' for set_huge_pmd(). - Add acked tag from David. Changes from v1: - Remove the unnecessary VM_BUG_ON(). - Remove the PageTransHuge(). --- include/linux/page-flags.h | 15 --------------- mm/khugepaged.c | 11 +++++------ 2 files changed, 5 insertions(+), 21 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..33daea8f667e 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1465,9 +1465,9 @@ static void collect_mm_slot(struct khugepaged_mm_slot *mm_slot) } #ifdef CONFIG_SHMEM -/* hpage must be locked, and mmap_lock must be held */ +/* folio 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 page *page) { 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, 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, &folio->page) : SCAN_SUCCEED; goto drop_folio; abort: -- 2.43.5