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 8E91EC433F5 for ; Wed, 4 May 2022 18:29:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 08CEE6B0073; Wed, 4 May 2022 14:29:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A22566B007E; Wed, 4 May 2022 14:29:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 73CF66B0080; Wed, 4 May 2022 14:29:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 3C2656B0078 for ; Wed, 4 May 2022 14:29:04 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 17BE1121185 for ; Wed, 4 May 2022 18:29:04 +0000 (UTC) X-FDA: 79428897408.15.C9CAED8 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf25.hostedemail.com (Postfix) with ESMTP id 22869A008D for ; Wed, 4 May 2022 18:28:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=dD+NEunQjgzAiwEXmgrvLtkYdrq9ejv5RT97UNQ3VFQ=; b=K1fFokJqNkEwu3c0GyY2fdttGK WCFJ7VdVgtcVwPVRtpo8BQXFgd5ED4awwV9oMAZPxj7Bm9pxq8w99qGDptaW8RAS5g/xiiovxWS/0 yeFlj2Q6isvb/OZqeDhE8xm2msAYi4guUmvtySpQEOETsfWEQKIrK7pLC2t6CdhFJO/nyxdF+Bh01 AE9qxMHsc3B4m5YqTyDU9iqjAM3rMBM1xJRhdsdF1XC5lzESTlM18vXgZHSTgB1EM4r3QgYrwSjyi 9VheBdxQoms+eiEiFMTAvh8F+ACllk+la66DDs5TgO7fhgWrPsUz6ehN8wfE+toS5goDt1Oc75flJ GCtmcEaw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nmJkD-00Gq5x-QI; Wed, 04 May 2022 18:29:01 +0000 From: "Matthew Wilcox (Oracle)" To: akpm@linuxfoundation.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH v2 02/26] mm/huge_memory: Convert do_huge_pmd_anonymous_page() to use vma_alloc_folio() Date: Wed, 4 May 2022 19:28:33 +0100 Message-Id: <20220504182857.4013401-3-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220504182857.4013401-1-willy@infradead.org> References: <20220504182857.4013401-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 22869A008D X-Stat-Signature: gqmp5b4bqo75577d4sixpif3ohxx6beh Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=K1fFokJq; dmarc=none; spf=none (imf25.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1651688929-324737 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: Remove the use of this old API, eliminating a call to prep_transhuge_page(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/huge_memory.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index c468fee595ff..caf0e7d27337 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -725,7 +725,7 @@ vm_fault_t do_huge_pmd_anonymous_page(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; gfp_t gfp; - struct page *page; + struct folio *folio; unsigned long haddr = vmf->address & HPAGE_PMD_MASK; if (!transhuge_vma_suitable(vma, haddr)) @@ -774,13 +774,12 @@ vm_fault_t do_huge_pmd_anonymous_page(struct vm_fault *vmf) return ret; } gfp = vma_thp_gfp_mask(vma); - page = alloc_hugepage_vma(gfp, vma, haddr, HPAGE_PMD_ORDER); - if (unlikely(!page)) { + folio = vma_alloc_folio(gfp, HPAGE_PMD_ORDER, vma, haddr, true); + if (unlikely(!folio)) { count_vm_event(THP_FAULT_FALLBACK); return VM_FAULT_FALLBACK; } - prep_transhuge_page(page); - return __do_huge_pmd_anonymous_page(vmf, page, gfp); + return __do_huge_pmd_anonymous_page(vmf, &folio->page, gfp); } static void insert_pfn_pmd(struct vm_area_struct *vma, unsigned long addr, -- 2.34.1