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 0C3DBC25B10 for ; Mon, 13 May 2024 05:08:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A79C46B0256; Mon, 13 May 2024 01:08:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A032A6B025A; Mon, 13 May 2024 01:08:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8053B6B025B; Mon, 13 May 2024 01:08:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 5E41A6B025A for ; Mon, 13 May 2024 01:08:45 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1A00240CA4 for ; Mon, 13 May 2024 05:08:45 +0000 (UTC) X-FDA: 82112192610.09.BE12B9D Received: from out30-113.freemail.mail.aliyun.com (out30-113.freemail.mail.aliyun.com [115.124.30.113]) by imf17.hostedemail.com (Postfix) with ESMTP id 0AF904001F for ; Mon, 13 May 2024 05:08:42 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=lg+Y0ddk; spf=pass (imf17.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.113 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=1715576923; 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:in-reply-to:references:references:dkim-signature; bh=e+vn44n5PSOyoo2A5G9/u00K/6MLWmZWHwZJ5wJKuyA=; b=ofshQyNqawBr1F/btkh75oBgZFr2xzdjiCBM0/8vC7pZq72sPc7W8vQsEI7tjwB9zKiQMh DLeF6lCbiTGK3ukCTz39WPsT3mD7tcqia6FAVQTWRgnmSpwo64aKA8HIdDbvFdMV1hTIcm H0N8NYtAFJcu7WmY6ek87oEWQh3YJT4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715576923; a=rsa-sha256; cv=none; b=padjI+uBHssMfdwaewalaHYXKaapOJ3jVbtVAu1l/BooVE+heDx5sOZy4JvGkvTeuOKwZk KdkwQfpPqsuSa+l3PCA/rD2z+dzTSlYCI83B0cgAhGRFwOxZ6tG3DFO9YuQjnRCTMG1+lu h4GqtnZ+0dfszt2QQNcq+612Dv7jYEc= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=lg+Y0ddk; spf=pass (imf17.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.113 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=1715576917; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=e+vn44n5PSOyoo2A5G9/u00K/6MLWmZWHwZJ5wJKuyA=; b=lg+Y0ddkG8Alh4kcZDazfKT8Hf1BsIAYQucMQUcQ/bM2inKgmnBorCpwKP/1YfEIBgFk9SWKudqpxLVgFXVJDA7Qu/pn87NeGqxJh2MhrLSLfO/hlC45Pl/uYQm/1Hru3J2ZW5auo4DQgUXSdFFjP4xecaJYnyvlYWf4g8aM5AA= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R101e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033037067111;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=14;SR=0;TI=SMTPD_---0W6HFTBL_1715576915; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W6HFTBL_1715576915) by smtp.aliyun-inc.com; Mon, 13 May 2024 13:08:36 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, ioworker0@gmail.com, wangkefeng.wang@huawei.com, ying.huang@intel.com, 21cnbao@gmail.com, ryan.roberts@arm.com, shy828301@gmail.com, ziy@nvidia.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/7] mm: shmem: add an 'order' parameter for shmem_alloc_hugefolio() Date: Mon, 13 May 2024 13:08:12 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 0AF904001F X-Rspam-User: X-Stat-Signature: f3ycg876yhzorsduj95j8idudpt8uq55 X-HE-Tag: 1715576922-205016 X-HE-Meta: U2FsdGVkX19Fy8scKfsx29KnHnezoBO2oBqtWhFmWatNBYTdsWOsvtVjxTKXQImTv4L2mK/cIkMboihWwrkKCR7FdOvwSgZMRTaZ1ORSuzwkwaWFGBLJ/qFzJoRkO329UTniwxtC4TUi1/kek8mVVo+kqniFoeqFgstgf3DoF6Vjt6V+Xsz3RKOmcsZErv5jvu0ip2mMsVIuL6uHSh1HlFXwbdkBEMbotQAbHSvIocyP2Y0Aknqs5MyYXAKLBbWWq6l1fMxk6LIuFFH/zr/jPJoPVARXYg3Qz6MrY2D1cot88omZK/YEfMX65qP4c0P6ZmuijSW2AC3I112IpzRF4mR0JjxNwV6L4/GztkUVX0P6RiKE4wY8wW0fbVQLN07cZ05rIS4EMKYW8vJ2J9ddSQYR2feMSsnCJdst3C1ze2OtYrWcuFAmJUVSyK11Wt2XoIo5jnoL9i8m5k+gmmlOc9qMqXcZAXuxzZjo5XgvjPBaWdLXL/Vd1BV+8H4WD2GszuPK6rfJqIhH4m9YABqeB3rTo+PBcaSv7xZoLp2O1W4LU4hn5osKyfoEp0+WiGBMCTmyeBC/DzSaAGobSyJX1IlxTUi+a89zJ1bWJ3fMb/zzeT8zY30ZwYrCsSXEAStzbcJsZWQtdW9I4UVGP6ZGQlwB5mqmOy3k23LXDXflHckpbWaVjzjhkPHCBBvwy6qGeBgSHf8QBmEfcJ38ai8YBcilh3ylnxFPZPjaqj1icho1clUuavs/UOzYlBCxFMrnNGwEh8A2XhdvgvVYblhUBPC50kvrU2Intj6vgyRIrpsnqsIfc6JaFKqysI5cI2JDxyvRUs6I9KCvMwqhc86ESMbwXPNr4RoAJDitPWqQkWK7wcZcAObD2CGciJG2Iw99S61DwYB8YUxNItYLnBK6Qp93bDRzm8QE39gaxqj3UP4Uun2nagjZLByB+kIhF4OvaLAHgrhIN3DWFGsWrSu sSNAsELU jbhPnVfQCvdBE8MBSBBvsrrkh6q0Pv9EU6ZLY86aRNhdeg0yBMnyVepvesNRutUfeiNd3w3ELdB015aI+dNAtDinObmCgTC8D93mRpvq1ZyLYHbNDeXmQqbA0W2r+24CFtbadktZvqhTrjK2LhGVNDSnxmaplhznBVvjiQkIogImJ7GnD5Mx2zoaeYl/3utkauX6PO+5D6j0XSYLbET8CK3QPKC/fIAdF16GwSqYbQflRjmAHeHMUVS5PE1LEJKlkBGISLT67Z5sWwBxQsS8NMtygSYs2URvNL5+/ 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: Add a new parameter to specify the huge page order for shmem_alloc_hugefolio(), as a preparation to supoort mTHP. Signed-off-by: Baolin Wang --- mm/shmem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index fa2a0ed97507..e4483c4596a8 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1604,14 +1604,14 @@ static gfp_t limit_gfp_mask(gfp_t huge_gfp, gfp_t limit_gfp) } static struct folio *shmem_alloc_hugefolio(gfp_t gfp, - struct shmem_inode_info *info, pgoff_t index) + struct shmem_inode_info *info, pgoff_t index, int order) { struct mempolicy *mpol; pgoff_t ilx; struct page *page; - mpol = shmem_get_pgoff_policy(info, index, HPAGE_PMD_ORDER, &ilx); - page = alloc_pages_mpol(gfp, HPAGE_PMD_ORDER, mpol, ilx, numa_node_id()); + mpol = shmem_get_pgoff_policy(info, index, order, &ilx); + page = alloc_pages_mpol(gfp, order, mpol, ilx, numa_node_id()); mpol_cond_put(mpol); return page_rmappable_folio(page); @@ -1660,7 +1660,7 @@ static struct folio *shmem_alloc_and_add_folio(gfp_t gfp, index + HPAGE_PMD_NR - 1, XA_PRESENT)) return ERR_PTR(-E2BIG); - folio = shmem_alloc_hugefolio(gfp, info, index); + folio = shmem_alloc_hugefolio(gfp, info, index, HPAGE_PMD_ORDER); if (!folio) count_vm_event(THP_FILE_FALLBACK); } else { -- 2.39.3