From patchwork Tue Nov 12 07:45:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13871826 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 A8288D41D5F for ; Tue, 12 Nov 2024 07:46:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BF3F06B00DC; Tue, 12 Nov 2024 02:46:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BA3676B00E1; Tue, 12 Nov 2024 02:46:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A6A5A6B00E3; Tue, 12 Nov 2024 02:46:02 -0500 (EST) 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 831BD6B00E1 for ; Tue, 12 Nov 2024 02:46:02 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1F43240D61 for ; Tue, 12 Nov 2024 07:46:02 +0000 (UTC) X-FDA: 82776658482.18.27AF650 Received: from out30-112.freemail.mail.aliyun.com (out30-112.freemail.mail.aliyun.com [115.124.30.112]) by imf03.hostedemail.com (Postfix) with ESMTP id 0D6B720004 for ; Tue, 12 Nov 2024 07:45:40 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=wYjKhkeq; spf=pass (imf03.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.112 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=1731397472; 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=1SJuihJYAFsIthe48Yp7PlQqFbbRscF0mbHdHErE/Xs=; b=7sZJeEu89V+qhbHeYJ8fboGhX7cGHXe7LR7Ruj8qaKbcNZz15AYnucnHAC8owOE7j7tZxC lnL0H4SlX3eD8bslwE0fYAY9m+Jo7HeUPIl2lutJ6fWG0G+q0z01WxMRQQ1GXu4JcCHpmO 7D+8BULB4tEgDJweLz2cJ7bmqlHZQdI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731397473; a=rsa-sha256; cv=none; b=d17UI8/DmcM/ZUgcHx48CPRHTyvvXa1ebQEV4h6FS377c6MULF1NAe0zMA6B392pllykS0 rN0ws0JIjDc5m0lODhJdZSvSFWZ9haFGn3XjHC6iF9hdCgWdQY7r1e5ifhEiAUVgzQyioM swg/pEQ9G9CqY39XEvNakP8qlhnNOz8= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=wYjKhkeq; spf=pass (imf03.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.112 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=1731397557; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=1SJuihJYAFsIthe48Yp7PlQqFbbRscF0mbHdHErE/Xs=; b=wYjKhkeq8/+I1kjCLIVs9e/KnVLWp+PFKid+1SqkOdru0vsvHQdI2XOSxJaf/rG3AjwVbw05Iq4LZfIIY2NAdZHt/U8Gn63pbKFwkHTtghmgATm7oPg/toqZX4w6JbwSgbd21mkiIJOxkVAs+rANKHyDzJDuA+0sTKzm92eQqWo= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WJGDWme_1731397555 cluster:ay36) by smtp.aliyun-inc.com; Tue, 12 Nov 2024 15:45:55 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, 21cnbao@gmail.com, ryan.roberts@arm.com, ioworker0@gmail.com, da.gomez@samsung.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/5] mm: factor out the order calculation into a new helper Date: Tue, 12 Nov 2024 15:45:48 +0800 Message-Id: <582997bd09b17a292124ea47dabc2ea5642daade.1731397290.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam10 X-Stat-Signature: u7h316d93eazjt6cyrh13jnxngd9kdne X-Rspamd-Queue-Id: 0D6B720004 X-Rspam-User: X-HE-Tag: 1731397540-806025 X-HE-Meta: U2FsdGVkX1+cBQye1WIi+xMNehklLbEY4hGG2J32H2M3pMF0SkzVSESfwx6ESGE7iGoRSoee/ShRn3wueIvGHfShm5NqgYghUc498ob73ZwSVXrECkOT7ikS0Hd0tZmbuUn/N+LvC80OJFS/1CAdlgiBWxWsCzdH1nzt2YH2wJz81JmjdEYsnxn82HRi/n0Eg55a1jcUzkObnmnfG0QUQUjJLfauad9QMt1INjclYt2XrhqSluyaqrhV3eSdByueDQTICURcR5Da+ueoesWAIM8MYDnyCvqIvbXHWEefYXUkBL0/0Yo8auHXq81IjPiVArViW0ds4TI5fJLv6t41YOvgjEjYgAR/nrGvXTb7TLdWpizWaCuOMz9NuE6m+hkWAAD7NUQuB+5KiJWLtggYnofaVxSne1IA2jYJOei0YcC9T0ojBczwjxn9n6LV2BXpSSI617UodjBMJP836d5ntCdNqE0ZM3+8KEBSMYjgsT5ETmL/QheMtNJFPWDXwMnUhCmEAKXEpjc7tmTS5p8znIOnH0ujFgUJ/AjacyilwTzoTboy11JEt3V5SL4G79+O0BT734FHjdWewf/dNYvg4A8TUc8Vx6V/V/P0ZMeRMwtKnd12M/xpteujWP0t4w8LMUSsqnAROgkPMLiUvdMFm//pt2BMy7/d0cgEJgYbOehBJfpwq4bZ2sIrUxKYY4LIKF01iW0bJ1hT7DvCUu2TNM/cq8ZfbPHjxzSg4SulvMO/c1vQz2WkrQl3Tb3bz/UYaZNYjvvTPoAYi3baK85wCn+qPwbGQykn/qsvM0HlgKMKtFTNnz7PK875jmsFT/CQ0eRhEy/WeOVaDioLZtQ/MP8WDO2KBDkn4W2h2gahWTSXCFPtYsj6SwEaJe6uWTQyeAzHsv25DQnf964M0Z+uck943HXva1SBaH38uAU3kFTPbjiGpSzJB3RMqIqkCJhTtshzasPOqB+TzVjV4sb NkQ3W5D4 1oa9S6gysn/xN+kMpQtu9x6SJltLxxsyGp5/F5o60Ul066KZxmpdCGwqfdOojehDc37cLEKn9EvBxduXH8KAyZ3FTTfzpaS7xxbWPsCB+ohkWqlBLxBalrNIavgk2Nf3GWfEEjma9p6ygsejyY25G9vS83niCuBrj8Lw73kgK34P2yFRhcEvBQ4W3EI1bu9PhcxC/H8ljE9ktDtWL1P/pmpptW5XlW1CQkcAxR0UbSjql5Riy7c6L5bDa6ZIWkixnPErrKw1dZ2o620L8QJXNAhqZxjpzjMBkIa11elCI7FBVkK4pPJL8bQtpR8QZUHzYNSy9z66sJFa9ohE= 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: Factor out the order calculation into a new helper, which can be reused by shmem in the following patch. Suggested-by: Matthew Wilcox Signed-off-by: Baolin Wang Reviewed-by: Barry Song Reviewed-by: David Hildenbrand Reviewed-by: Daniel Gomez --- include/linux/pagemap.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index bcf0865a38ae..d796c8a33647 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -727,6 +727,16 @@ typedef unsigned int __bitwise fgf_t; #define FGP_WRITEBEGIN (FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE) +static inline unsigned int filemap_get_order(size_t size) +{ + unsigned int shift = ilog2(size); + + if (shift <= PAGE_SHIFT) + return 0; + + return shift - PAGE_SHIFT; +} + /** * fgf_set_order - Encode a length in the fgf_t flags. * @size: The suggested size of the folio to create. @@ -740,11 +750,11 @@ typedef unsigned int __bitwise fgf_t; */ static inline fgf_t fgf_set_order(size_t size) { - unsigned int shift = ilog2(size); + unsigned int order = filemap_get_order(size); - if (shift <= PAGE_SHIFT) + if (!order) return 0; - return (__force fgf_t)((shift - PAGE_SHIFT) << 26); + return (__force fgf_t)(order << 26); } void *filemap_get_entry(struct address_space *mapping, pgoff_t index); From patchwork Tue Nov 12 07:45:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13871827 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 2ED96D41D66 for ; Tue, 12 Nov 2024 07:46:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C69BB6B00E1; Tue, 12 Nov 2024 02:46:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BF1836B00E3; Tue, 12 Nov 2024 02:46:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A6B0B6B00E7; Tue, 12 Nov 2024 02:46:03 -0500 (EST) 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 877926B00E1 for ; Tue, 12 Nov 2024 02:46:03 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3AC08161110 for ; Tue, 12 Nov 2024 07:46:03 +0000 (UTC) X-FDA: 82776657516.19.FDD63FA Received: from out30-97.freemail.mail.aliyun.com (out30-97.freemail.mail.aliyun.com [115.124.30.97]) by imf03.hostedemail.com (Postfix) with ESMTP id 292512000C for ; Tue, 12 Nov 2024 07:45:41 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=MLzIlkAI; spf=pass (imf03.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.97 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=1731397328; 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=qou3qX2PAau4l6WamHoD3ilZA9HxOfUZL7Pa/oatbLM=; b=d64LURdAmwRUQYGHMPqTaj5g+nBmayRx/hJwore89B6fyr4pxsdkk2/g/myGUA2BCHIcyl 9P7ivNkuQpHx+Hhyp2R2YNm8LbduZehlg1swNA8gBcIa+4enwnyVtuOW1DBYTuywM+KDX4 Gf+zKtxmoJooAZOEvJpPbTpjSv024wE= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=MLzIlkAI; spf=pass (imf03.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.97 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=1731397328; a=rsa-sha256; cv=none; b=1aj+f2I/uceXJDrTJ/Vd98ksETtxNBtzrFW0rTUFYtQuR7smY6XE84YPZ0iovi1B48fhAX ta7hZNC74X0jMKqPVkLZSirvycZbzxsi/kXi5frJkty3rylDJgwrgHFOV3nWV+ZOXbNMqR 1MB/218HK5x+sCcC1Iwi4lcnQnhqOig= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1731397558; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=qou3qX2PAau4l6WamHoD3ilZA9HxOfUZL7Pa/oatbLM=; b=MLzIlkAIRVM3Pg/F0BKbIPGMCk/ZC5/YkSYTQZ1w450AVs+9Lof/+a1wdSFCm/uMvBl5floqLX7D0Y7GFGrEJZVURXd/IxKS3u+YaqCMajXq5cY+mzgLSdSen4nWe4VZKzm6IxqjAKflzIQqwa51na5nRC6G3KifPiQnNjFhwrY= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WJG9pLG_1731397556 cluster:ay36) by smtp.aliyun-inc.com; Tue, 12 Nov 2024 15:45:57 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, 21cnbao@gmail.com, ryan.roberts@arm.com, ioworker0@gmail.com, da.gomez@samsung.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/5] mm: shmem: change shmem_huge_global_enabled() to return huge order bitmap Date: Tue, 12 Nov 2024 15:45:49 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 292512000C X-Stat-Signature: 1b653xwntrwzt98pg4a5y8797hgz59by X-Rspam-User: X-HE-Tag: 1731397541-201926 X-HE-Meta: U2FsdGVkX1+z27S7r9m/PX/e5qUrXB0IPLQXRUP5a8j26BVGTxRTo18KgvCVF/jsfVx1IxAhkLASYy3KbnjNydrJ6Ae80uGDOiKuoiln13FvM+jAq+y9B7JCrpXiLflFfVS9vFKxG362wECCppSAPNvxcjQeMlAtUF/drcITXRRHtizfITasa3AQuQRX+zqY4jYKfKNkqd1Ns79Vll3G4CgDXJsxCOGWIiGDkgsHG/YrNx9+PoeYc1ByTN3nADAi3818t3WPxMQ1rB0db3GWCVMn6UrQIjTr4G3eiQHcvOcDPdDlW/VkuV8BgA18fSynI55MH2QFQr0x07AxY+ZtHLnrKvvF9wJa2C3L5vLL/tJ+rEmFVQQ7qQN6Ya+rlAH5Re0Gtg7FhxyvzmUYf4CGnGF5/qLqKjWb1IQaux0oFAdRFCqIEfursrjNE6UAr5/XT7eIGy+hJ6oyD66FE9pGfwmEWXbSAyztqObkXefQv54VmsMyqiFI1JwU6u8MPLu+nC9BqAb8WKEzY/HG6u58cGRmlR4DHpuxT1QBxwDkch5ifhc3V7RuLZ4VSX8OJLve7MIfb7n68l1zWl9peBn0kXj90f58QD4INxpTQLINvMjxcHGyTCe1oigFcvpRtIDf99IaZ3hRLrQD43iMkLZg0szahfG1lB+LnPyQMewGlo24rQvZLk65RWXy1l/2ByyM55JpZEauTBcDiecBm8ZncrbYa9+BhOs9overrjYK8oiydztqBAPwsXSkenCdZv2Xbs0/TnpSmVbETvUnGLlkyRCB7WEXvQ+EPzkdcvXl+g/4bReSBwOoQ0vrSXRKIgrr0hxmL2Jnr5gCFJb76uEXod3zdj4NcevviaJWt6qATk7IYgpO3/39d50wVHvbhp+dNSv7lCSICK8XCzsXRJweZKCH2KniW2KVJTOH9v3o0Fxr91otmGDZWhvVJYXKfFVl5lb7EPhTlNs+gZZKL+m mu/1504h E7koO2O2CCT9SjidiZdQCjSl0UCi1u+NcvDra3JuZHb2rc0R3/RMRPRfjw6U7rqBKAxPE7Ap54qoUTkoOZZEKJzs6IrJaHnVvHZGn/K0gEwPf+qcP6e9KT3sQRCqDEkramB7SOOLlrDi1NRVzumQFlD05sO/CUjWv99KqeoSlHQMjL06MV+UK3yMV88cEu5b7EE34trCZkqk2rVzaf888lScCmejBsKnbSe8vgu4WgUO3rc0q8wN/sDLttSbKuvJJdIv+FRnjePP61RY9iwNOsU4aCQ== 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: Change the shmem_huge_global_enabled() to return the suitable huge order bitmap, and return 0 if huge pages are not allowed. This is a preparation for supporting various huge orders allocation of tmpfs in the following patches. No functional changes. Signed-off-by: Baolin Wang Acked-by: David Hildenbrand --- mm/shmem.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 579e58cb3262..86b2e417dc6f 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -549,37 +549,37 @@ static bool shmem_confirm_swap(struct address_space *mapping, static int shmem_huge __read_mostly = SHMEM_HUGE_NEVER; -static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, - loff_t write_end, bool shmem_huge_force, - unsigned long vm_flags) +static unsigned int shmem_huge_global_enabled(struct inode *inode, pgoff_t index, + loff_t write_end, bool shmem_huge_force, + unsigned long vm_flags) { loff_t i_size; if (HPAGE_PMD_ORDER > MAX_PAGECACHE_ORDER) - return false; + return 0; if (!S_ISREG(inode->i_mode)) - return false; + return 0; if (shmem_huge == SHMEM_HUGE_DENY) - return false; + return 0; if (shmem_huge_force || shmem_huge == SHMEM_HUGE_FORCE) - return true; + return BIT(HPAGE_PMD_ORDER); switch (SHMEM_SB(inode->i_sb)->huge) { case SHMEM_HUGE_ALWAYS: - return true; + return BIT(HPAGE_PMD_ORDER); case SHMEM_HUGE_WITHIN_SIZE: index = round_up(index + 1, HPAGE_PMD_NR); i_size = max(write_end, i_size_read(inode)); i_size = round_up(i_size, PAGE_SIZE); if (i_size >> PAGE_SHIFT >= index) - return true; + return BIT(HPAGE_PMD_ORDER); fallthrough; case SHMEM_HUGE_ADVISE: if (vm_flags & VM_HUGEPAGE) - return true; + return BIT(HPAGE_PMD_ORDER); fallthrough; default: - return false; + return 0; } } @@ -774,11 +774,11 @@ static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo, return 0; } -static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, - loff_t write_end, bool shmem_huge_force, - unsigned long vm_flags) +static unsigned int shmem_huge_global_enabled(struct inode *inode, pgoff_t index, + loff_t write_end, bool shmem_huge_force, + unsigned long vm_flags) { - return false; + return 0; } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ @@ -1682,21 +1682,21 @@ unsigned long shmem_allowable_huge_orders(struct inode *inode, unsigned long mask = READ_ONCE(huge_shmem_orders_always); unsigned long within_size_orders = READ_ONCE(huge_shmem_orders_within_size); unsigned long vm_flags = vma ? vma->vm_flags : 0; - bool global_huge; + unsigned int global_orders; loff_t i_size; int order; if (thp_disabled_by_hw() || (vma && vma_thp_disabled(vma, vm_flags))) return 0; - global_huge = shmem_huge_global_enabled(inode, index, write_end, - shmem_huge_force, vm_flags); + global_orders = shmem_huge_global_enabled(inode, index, write_end, + shmem_huge_force, vm_flags); if (!vma || !vma_is_anon_shmem(vma)) { /* * For tmpfs, we now only support PMD sized THP if huge page * is enabled, otherwise fallback to order 0. */ - return global_huge ? BIT(HPAGE_PMD_ORDER) : 0; + return global_orders; } /* @@ -1729,7 +1729,7 @@ unsigned long shmem_allowable_huge_orders(struct inode *inode, if (vm_flags & VM_HUGEPAGE) mask |= READ_ONCE(huge_shmem_orders_madvise); - if (global_huge) + if (global_orders > 0) mask |= READ_ONCE(huge_shmem_orders_inherit); return THP_ORDERS_ALL_FILE_DEFAULT & mask; From patchwork Tue Nov 12 07:45:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13871828 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 C4BCDD41D65 for ; Tue, 12 Nov 2024 07:46:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 25A3E6B00E3; Tue, 12 Nov 2024 02:46:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 207926B00E8; Tue, 12 Nov 2024 02:46:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F27126B00E7; Tue, 12 Nov 2024 02:46:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id BF4546B00E8 for ; Tue, 12 Nov 2024 02:46:03 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 56E95A1937 for ; Tue, 12 Nov 2024 07:46:03 +0000 (UTC) X-FDA: 82776658650.11.A342084 Received: from out30-100.freemail.mail.aliyun.com (out30-100.freemail.mail.aliyun.com [115.124.30.100]) by imf20.hostedemail.com (Postfix) with ESMTP id AECD61C0011 for ; Tue, 12 Nov 2024 07:45:09 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=tovnE0l6; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf20.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.100 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731397386; 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=BLfs2hBKLS+Nhpnosu4xyvw0VZRH7d3h79ZeLMJQj1Q=; b=LD+FWkRSoTEh4MsFLO+JqgWmgUVnI350M7/QNGkGvq0S9x5EBEIgON3Cn7IUvdRuhSdd01 3DmxtphzKOiCm8pNyFitdu8UffxH2vO1Hftr+qfWhoUK7Sujt/CqtIXmbVA/8sE9eZG0sQ HCwhrnMsbrhewcMAIRr6QkwGOVkG8cI= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=tovnE0l6; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf20.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.100 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731397386; a=rsa-sha256; cv=none; b=06pADj/H3phkn2Z2rIqX2dtjy/xDduAHxe5VA5Z/NYM8U3tfkbz96cTpTaFs3sLkDYpz7r ThpFYDHqoJ1TkdxsER6aEtlhIIJ+UwS1UxMvLNkxJKuNeAm8biDbrK6UQ0v35TS+H6Dv+G vp/hlOuMb+JTYzSuKlRJC7kigcxtXjk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1731397558; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=BLfs2hBKLS+Nhpnosu4xyvw0VZRH7d3h79ZeLMJQj1Q=; b=tovnE0l6p0cGG5l1vkBzQAW6gPJrlwozDrE92Ptbk1GKynUMvg/okpHO2sncEkpRaS5BufPw29va7AQ76Ve2wmIBAalz0b+DSJbHg7pn5OBSpDB0sRnIGSKyJATXRbfjS6svf5HOPb1Gg0Rmh6rzHmefQWV4heX9g+UZ8Jos6o4= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WJG9pLm_1731397557 cluster:ay36) by smtp.aliyun-inc.com; Tue, 12 Nov 2024 15:45:58 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, 21cnbao@gmail.com, ryan.roberts@arm.com, ioworker0@gmail.com, da.gomez@samsung.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] mm: shmem: add large folio support for tmpfs Date: Tue, 12 Nov 2024 15:45:50 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: AECD61C0011 X-Stat-Signature: wb6p1bxwa3qj58dpdc3wseeeqr6mrh8d X-Rspam-User: X-HE-Tag: 1731397509-269176 X-HE-Meta: U2FsdGVkX1+JdZi1BPP86troi1fF2wIBXxWLJzbLcsKM8Ny6EIUXSLs4GWlrQFCyLUJLvWhlyh5kJtpPHz97+nhCLjNkR7PBxJ06O/Q+YdEB1wcPoVvbrRUXd5ek4cw6C5lAYSADeQ93fY3BYnGrOVJz1t7qcNBmlD6z/rXugRD4MJzwFLsH+wp107jW0rv1ND6YDIUxUaYTvQ5dCP/XnZNpx144EVTIV6vbmlrxwoy0mEY8K+Fb4+MPjP2tK00MUyklFMtNIuc3yVSmS+25syQAQ79Ech7CxSJvdR+a4ux0q1rcGsjUbXIL2sRt3dKKpj3tLUhMKEyvzc7hulc01TWkgfk4SmYiw1q7g4vJQ7mfegDjP8hpcL8MBuhHB2R2hAeJsi05b3cqV9F0wNnjDbLatLF5g4YdrjGP9aGkh8lVRhhJh/fv3GCB4KYSbt4Au4qji08nRJj3owSzQEsGV9xFSyLSjQqKP5QUWprunBLc6GrBM5qW7mc+Nf+PDLHL4IwhEY1T1rRtKOb6rv67OoJKWCKIPKoengvOcZ/q2kHApQXZ8llSDC8h6VBsOeNyYYV3UibZsd/kk91IB0Jd4vu3fKOU5Zm6hvQLSgyzfssjDOgjfQITzo0vtP0GVWXwXJ9wWQpXnTBElbtcYH48tdHxCwK59r56DFpo7Y2sQ4A+zdfwO4iWNojlA6EFyL+un9jZWWuoOw6jzSiLmGNWFvd4JM7qFJtVj3iRqkIh2kL1Lyj4XmyyOWsGpSDZcbngVF6XozbC8VL4j+H3eaP++5O+lshACkOv3ALIAE/PAz0O1WTHGCIV/HakRtQ0fXoCGhkr+tyoZ1Xvk3HK5dnK258QtoFRn2xh8q4VHHprZFjjB8iCz8appf6H6e9ac33jqKR9QbjlAD8WroSn0PQ3iZ3ALfhyNaE7rk0468PSFyg581gPtqbCBlKftXPRPF8lIhb1LDe+YA0j60r8JR5 Loq6VPUe 6M30VdaeNizhrlvFRWDUBHGGUNLex8ig2UcbcuYsKyIelOuyMtll4PvVvdVFaYjLBTk1qGHKFv8kRfS7uFPqD4Y1+5QWRpMiV2W7lbp3TyPUu3O5MTxbVclv4BWXDJJGLo+vQhdGwfcdp+CTMR/ip21cQJvDCW4zm0bGcol7iCfXqaP7OxLRq3bu3QHm8J8O2KwsOmZGYbBLlNTmEX79zxitYXvIeNNp7qF+QkHeZFbG5JOWhUCiIL8J87tNIeXOmqO5c 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 large folio support for tmpfs write and fallocate paths matching the same high order preference mechanism used in the iomap buffered IO path as used in __filemap_get_folio(). Add shmem_mapping_size_orders() to get a hint for the orders of the folio based on the file size which takes care of the mapping requirements. Traditionally, tmpfs only supported PMD-sized huge folios. However nowadays with other file systems supporting any sized large folios, and extending anonymous to support mTHP, we should not restrict tmpfs to allocating only PMD-sized huge folios, making it more special. Instead, we should allow tmpfs can allocate any sized large folios. Considering that tmpfs already has the 'huge=' option to control the huge folios allocation, we can extend the 'huge=' option to allow any sized huge folios. The semantics of the 'huge=' mount option are: huge=never: no any sized huge folios huge=always: any sized huge folios huge=within_size: like 'always' but respect the i_size huge=advise: like 'always' if requested with fadvise()/madvise() Note: for tmpfs mmap() faults, due to the lack of a write size hint, still allocate the PMD-sized huge folios if huge=always/within_size/advise is set. Moreover, the 'deny' and 'force' testing options controlled by '/sys/kernel/mm/transparent_hugepage/shmem_enabled', still retain the same semantics. The 'deny' can disable any sized large folios for tmpfs, while the 'force' can enable PMD sized large folios for tmpfs. Co-developed-by: Daniel Gomez Signed-off-by: Daniel Gomez Signed-off-by: Baolin Wang --- mm/shmem.c | 91 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 77 insertions(+), 14 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 86b2e417dc6f..a3203cf8860f 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -549,10 +549,50 @@ static bool shmem_confirm_swap(struct address_space *mapping, static int shmem_huge __read_mostly = SHMEM_HUGE_NEVER; +/** + * shmem_mapping_size_orders - Get allowable folio orders for the given file size. + * @mapping: Target address_space. + * @index: The page index. + * @write_end: end of a write, could extend inode size. + * + * This returns huge orders for folios (when supported) based on the file size + * which the mapping currently allows at the given index. The index is relevant + * due to alignment considerations the mapping might have. The returned order + * may be less than the size passed. + * + * Return: The orders. + */ +static inline unsigned int +shmem_mapping_size_orders(struct address_space *mapping, pgoff_t index, loff_t write_end) +{ + unsigned int order; + size_t size; + + if (!mapping_large_folio_support(mapping) || !write_end) + return 0; + + /* Calculate the write size based on the write_end */ + size = write_end - (index << PAGE_SHIFT); + order = filemap_get_order(size); + if (!order) + return 0; + + /* If we're not aligned, allocate a smaller folio */ + if (index & ((1UL << order) - 1)) + order = __ffs(index); + + order = min_t(size_t, order, MAX_PAGECACHE_ORDER); + return order > 0 ? BIT(order + 1) - 1 : 0; +} + static unsigned int shmem_huge_global_enabled(struct inode *inode, pgoff_t index, loff_t write_end, bool shmem_huge_force, + struct vm_area_struct *vma, unsigned long vm_flags) { + unsigned long within_size_orders; + unsigned int order; + pgoff_t aligned_index; loff_t i_size; if (HPAGE_PMD_ORDER > MAX_PAGECACHE_ORDER) @@ -564,15 +604,41 @@ static unsigned int shmem_huge_global_enabled(struct inode *inode, pgoff_t index if (shmem_huge_force || shmem_huge == SHMEM_HUGE_FORCE) return BIT(HPAGE_PMD_ORDER); + /* + * The huge order allocation for anon shmem is controlled through + * the mTHP interface, so we still use PMD-sized huge order to + * check whether global control is enabled. + * + * For tmpfs mmap()'s huge order, we still use PMD-sized order to + * allocate huge pages due to lack of a write size hint. + * + * Otherwise, tmpfs will allow getting a highest order hint based on + * the size of write and fallocate paths, then will try each allowable + * huge orders. + */ switch (SHMEM_SB(inode->i_sb)->huge) { case SHMEM_HUGE_ALWAYS: - return BIT(HPAGE_PMD_ORDER); - case SHMEM_HUGE_WITHIN_SIZE: - index = round_up(index + 1, HPAGE_PMD_NR); - i_size = max(write_end, i_size_read(inode)); - i_size = round_up(i_size, PAGE_SIZE); - if (i_size >> PAGE_SHIFT >= index) + if (vma) return BIT(HPAGE_PMD_ORDER); + + return shmem_mapping_size_orders(inode->i_mapping, index, write_end); + case SHMEM_HUGE_WITHIN_SIZE: + if (vma) + within_size_orders = BIT(HPAGE_PMD_ORDER); + else + within_size_orders = shmem_mapping_size_orders(inode->i_mapping, + index, write_end); + + order = highest_order(within_size_orders); + while (within_size_orders) { + aligned_index = round_up(index + 1, 1 << order); + i_size = max(write_end, i_size_read(inode)); + i_size = round_up(i_size, PAGE_SIZE); + if (i_size >> PAGE_SHIFT >= aligned_index) + return within_size_orders; + + order = next_order(&within_size_orders, order); + } fallthrough; case SHMEM_HUGE_ADVISE: if (vm_flags & VM_HUGEPAGE) @@ -776,6 +842,7 @@ static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo, static unsigned int shmem_huge_global_enabled(struct inode *inode, pgoff_t index, loff_t write_end, bool shmem_huge_force, + struct vm_area_struct *vma, unsigned long vm_flags) { return 0; @@ -1173,7 +1240,7 @@ static int shmem_getattr(struct mnt_idmap *idmap, generic_fillattr(idmap, request_mask, inode, stat); inode_unlock_shared(inode); - if (shmem_huge_global_enabled(inode, 0, 0, false, 0)) + if (shmem_huge_global_enabled(inode, 0, 0, false, NULL, 0)) stat->blksize = HPAGE_PMD_SIZE; if (request_mask & STATX_BTIME) { @@ -1690,14 +1757,10 @@ unsigned long shmem_allowable_huge_orders(struct inode *inode, return 0; global_orders = shmem_huge_global_enabled(inode, index, write_end, - shmem_huge_force, vm_flags); - if (!vma || !vma_is_anon_shmem(vma)) { - /* - * For tmpfs, we now only support PMD sized THP if huge page - * is enabled, otherwise fallback to order 0. - */ + shmem_huge_force, vma, vm_flags); + /* Tmpfs huge pages allocation */ + if (!vma || !vma_is_anon_shmem(vma)) return global_orders; - } /* * Following the 'deny' semantics of the top level, force the huge From patchwork Tue Nov 12 07:45:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13871829 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 BC7D0D41D65 for ; Tue, 12 Nov 2024 07:46:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8C26D6B00E7; Tue, 12 Nov 2024 02:46:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 871E96B00E8; Tue, 12 Nov 2024 02:46:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 712836B00EE; Tue, 12 Nov 2024 02:46:05 -0500 (EST) 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 456C96B00E7 for ; Tue, 12 Nov 2024 02:46:05 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E3F8EC049A for ; Tue, 12 Nov 2024 07:46:04 +0000 (UTC) X-FDA: 82776656592.20.0DBD1BC Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by imf28.hostedemail.com (Postfix) with ESMTP id A2C09C0011 for ; Tue, 12 Nov 2024 07:45:20 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=RijQOClj; spf=pass (imf28.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=1731397421; 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=mOCJluRojGIhiFhKxbeJdF6tM55rkRyZI48QBIuEF6A=; b=vCj77djPxo2A5sXamYEpoJon69nBiFCWP9RnX+RYl0wAz9LZsNCAPEaZDJa8Wy7W/iUmYI NgUyvzU354s1Zx7ccrplyHk5RNwZnLzFS03+D8r0K6vl4izncnZ8h3xhTJrAwVoGAHA5aV bZnrnKlYx0+gpiPEXk/MDSPiHC2uoMU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731397421; a=rsa-sha256; cv=none; b=IKxLAKb255wIP6hTE1FHPnQZOaQ0CGJBheBFHO0NGZp4t0SDjo/mszO8tDFOxoNvb9sbCi VOM5acHSlAtLJ1u1F/5MI9LpjZeHC1V7zIVenX0wqJfSHVz397KpRBYfWktTpY70H/idUE uLIrUrkwvSfmE/Yl6bDbvSMlTI6bZEM= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=RijQOClj; spf=pass (imf28.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1731397560; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=mOCJluRojGIhiFhKxbeJdF6tM55rkRyZI48QBIuEF6A=; b=RijQOClj4iHpEULXd41QvhBbOxNvwNxshECWy3k7mFeJJNypwLek3QpQxu3YaEbKNrl2mSnz2K9+qtZebhihidTeHx80o3DBka3B11Xl2k1fXSTUIxXqVIWVdVeBen56HkLntucPpsdHcZmvlYAdBiF4tHVuIRRLx6fUpB+zSnQ= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WJGC0DF_1731397558 cluster:ay36) by smtp.aliyun-inc.com; Tue, 12 Nov 2024 15:45:59 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, 21cnbao@gmail.com, ryan.roberts@arm.com, ioworker0@gmail.com, da.gomez@samsung.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/5] mm: shmem: add a kernel command line to change the default huge policy for tmpfs Date: Tue, 12 Nov 2024 15:45:51 +0800 Message-Id: <64091a3d5a8c5edb0461fae203cfcf6f302a19ce.1731397290.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: A2C09C0011 X-Stat-Signature: ctdutxmmgtpwenmif4jg9wpor4bzaj99 X-HE-Tag: 1731397520-706037 X-HE-Meta: U2FsdGVkX18SIk86YfcVSyp9QLRYkJPbGI8R5QUnnVTLz4XjCNlfg51R4aAxV9Miv3IkUy7JUew2onE3XwWzdZb1PwhGxN+TVkattqzqxrzgVQZYtKebs0zRzaF5o4rSS52EBEN60lWsU0uzqjC/pmUK8o0k52NP4OnxxPaQehMvj/tiJbi7O2VejmrPVhOdn0gH4tpj5R+kP2OMVOwdfeXdLeStvizEQjnNcQmsDY4oKU3hxtcNwLdcnDgi2YKGXCbyJISjYmQhduA5cREuxhc6VoZEwzXur6aQKeQxr3FIeWG5oT8sKSnjjdWnOnJKv/WoWAfX3FvH1MG1be3CsT8OxPOyvWlKT+IIaibSpJQnoRzqXJJ9gMxCdK5xro3KZTbGGd4gkmu4TZNJIbsNWeZ1nubXZbrfd43uoaw3MCR2/pEaHp2hiyKmLlpXkE2Vut5RCGBOKNweJLn/0CLoOzNkyfjMlF7ntTIz9uJIxElcWugsKL43Jnx54UO00QNZDxNmI8E77yDt1jDnjwUykjRKWnTJL3KlSkfQJArnYzcbyKlKdlNCqpmWO1vU3MixiJhoYq6ipdcaf7SdEEAyobwEDRUdDRqEwwQYJvCyn6jwydjZm19Bk84BVJuLIZ4xJkotg8KJ0NNdaQRnrNsTMdYb4mGIiXDNaWyrdRKdgtmBW1vq/y+JbYZr9A6OtKxY/C3HatZvB6l3/ZdfQRbZXHowXZh8GfKBzRMgwzX300ao76abnuB1li5cPilG/jeAYaa3IV79cdk41QpMTo/I3zIHOcRSPE/wbOVKB9sUryXa8IgueHvCzRu2O5P/y9H04Qt/5yinRhipy3pXZnp9wk6NdXuFiRSP2icv3aN4SJnxa4O0sl1O8TkM68lVltVrA4BZGuZdiIRXP/87TBeVqgseoT874qeTrOmlvJuJpdhHXhszsKCpNDTq2Xsfp+vTHFQWFAAPd5vxo5Nn0RR iUF6meHd 5lO1DRQjUBLkrMmd7Ke1o0OtUM28SPPIPgF2rPknPka1hI+orGaLX7JEFkj4rpa/rnbFSSRjLZzFYYl8+slefECoF1e11g3eDiwcln/rL2DdeuyvvDIBBkreKZYGI3AT+Fag7nZSn+zDqakmS5sJatMMnbH9GTAVTjMOgeXlSTQlyHJ0vPRrblK2dnSNYuI7OfSB7s5iZDSs/1N/Dr+KJ3d5BCUxBKpOlQ8QppsyuMZgQqWOVoutxrvGDndiq9xu3SEW6 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: Now the tmpfs can allow to allocate any sized large folios, and the default huge policy is still 'never'. Thus adding a new command line to change the default huge policy will be helpful to use the large folios for tmpfs, which is similar to the 'transparent_hugepage_shmem' cmdline for shmem. Signed-off-by: Baolin Wang --- .../admin-guide/kernel-parameters.txt | 7 ++++++ Documentation/admin-guide/mm/transhuge.rst | 6 +++++ mm/shmem.c | 23 ++++++++++++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index b48d744d99b0..007e6cfada3e 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6943,6 +6943,13 @@ See Documentation/admin-guide/mm/transhuge.rst for more details. + transparent_hugepage_tmpfs= [KNL] + Format: [always|within_size|advise|never] + Can be used to control the default hugepage allocation policy + for the tmpfs mount. + See Documentation/admin-guide/mm/transhuge.rst + for more details. + trusted.source= [KEYS] Format: This parameter identifies the trust source as a backend diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentation/admin-guide/mm/transhuge.rst index 5034915f4e8e..9ae775eaacbe 100644 --- a/Documentation/admin-guide/mm/transhuge.rst +++ b/Documentation/admin-guide/mm/transhuge.rst @@ -332,6 +332,12 @@ allocation policy for the internal shmem mount by using the kernel parameter seven valid policies for shmem (``always``, ``within_size``, ``advise``, ``never``, ``deny``, and ``force``). +Similarly to ``transparent_hugepage_shmem``, you can control the default +hugepage allocation policy for the tmpfs mount by using the kernel parameter +``transparent_hugepage_tmpfs=``, where ```` is one of the +four valid policies for tmpfs (``always``, ``within_size``, ``advise``, +``never``). The tmpfs mount default policy is ``never``. + In the same manner as ``thp_anon`` controls each supported anonymous THP size, ``thp_shmem`` controls each supported shmem THP size. ``thp_shmem`` has the same format as ``thp_anon``, but also supports the policy diff --git a/mm/shmem.c b/mm/shmem.c index a3203cf8860f..021760e91cea 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -548,6 +548,7 @@ static bool shmem_confirm_swap(struct address_space *mapping, /* ifdef here to avoid bloating shmem.o when not necessary */ static int shmem_huge __read_mostly = SHMEM_HUGE_NEVER; +static int tmpfs_huge __read_mostly = SHMEM_HUGE_NEVER; /** * shmem_mapping_size_orders - Get allowable folio orders for the given file size. @@ -4780,7 +4781,12 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) sbinfo->gid = ctx->gid; sbinfo->full_inums = ctx->full_inums; sbinfo->mode = ctx->mode; - sbinfo->huge = ctx->huge; +#ifdef CONFIG_TRANSPARENT_HUGEPAGE + if (ctx->seen & SHMEM_SEEN_HUGE) + sbinfo->huge = ctx->huge; + else + sbinfo->huge = tmpfs_huge; +#endif sbinfo->mpol = ctx->mpol; ctx->mpol = NULL; @@ -5259,6 +5265,21 @@ static int __init setup_transparent_hugepage_shmem(char *str) } __setup("transparent_hugepage_shmem=", setup_transparent_hugepage_shmem); +static int __init setup_transparent_hugepage_tmpfs(char *str) +{ + int huge; + + huge = shmem_parse_huge(str); + if (huge < 0) { + pr_warn("transparent_hugepage_tmpfs= cannot parse, ignored\n"); + return huge; + } + + tmpfs_huge = huge; + return 1; +} +__setup("transparent_hugepage_tmpfs=", setup_transparent_hugepage_tmpfs); + static char str_dup[PAGE_SIZE] __initdata; static int __init setup_thp_shmem(char *str) { From patchwork Tue Nov 12 07:45:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13871830 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 AE847D41D5F for ; Tue, 12 Nov 2024 07:46:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D2D4F6B00E8; Tue, 12 Nov 2024 02:46:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C925A6B00E9; Tue, 12 Nov 2024 02:46:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B0A116B00EA; Tue, 12 Nov 2024 02:46:06 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 8A08A6B00E8 for ; Tue, 12 Nov 2024 02:46:06 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 1BB2D80D6C for ; Tue, 12 Nov 2024 07:46:06 +0000 (UTC) X-FDA: 82776658188.21.73558FA Received: from out30-111.freemail.mail.aliyun.com (out30-111.freemail.mail.aliyun.com [115.124.30.111]) by imf23.hostedemail.com (Postfix) with ESMTP id BD317140017 for ; Tue, 12 Nov 2024 07:45:36 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=J9x9ZEkl; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf23.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.111 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731397502; a=rsa-sha256; cv=none; b=nkcCibTHfaGEhcM03cWqrIn1bRuQPkk1GB2S4bT/qYaS5MIVlrSx00wsuUqCBw7ZVxxcs4 cFrxR+3trxSrh+oGxdvaJJBylAoM424jAkQfSVNgakBDgzAOr01CUstgYYWDRleDKNDUto b8aeY9+68e9pBiHu8ua8dh7wBjdcP6Y= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=J9x9ZEkl; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf23.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.111 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731397502; 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=QrGwmL/EZQwRk4LD22fvlkOHU0IkeaUKNMscFX8f1w0=; b=F7RSElNStSzeSU54ElTH3ACpCiEnksUrkXnJ7D1amtv2VTIYFwMtmLVe2UmLykQDHGgzlx gVovQsrKuWEuplvw8I01s8WgMEiobbSTH5i9fP+AarrbdLGkKldjDF/TzvQXo8dC4ABy2+ IZiBGtI0++Wt4FR+hcwimTz3TUYm31k= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1731397561; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=QrGwmL/EZQwRk4LD22fvlkOHU0IkeaUKNMscFX8f1w0=; b=J9x9ZEkl3hPePvX8j2T0pRH26LEcJiMJGaWm69ms2kPBJ+jT4UZbNuz2FpWo47vp69QNXKk9J0WiinF9VRQuqUDJIjIo83SB0yz2x5kW14K1F8HVYp9bJiYyg+fehjcgILKjO+L3sGtAsKrX5Q8gTZPGIKqAG9vi+F6ewaER2Bo= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WJGDWo8_1731397559 cluster:ay36) by smtp.aliyun-inc.com; Tue, 12 Nov 2024 15:46:00 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, 21cnbao@gmail.com, ryan.roberts@arm.com, ioworker0@gmail.com, da.gomez@samsung.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/5] docs: tmpfs: update the huge folios policy for tmpfs and shmem Date: Tue, 12 Nov 2024 15:45:52 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: BD317140017 X-Rspamd-Server: rspam01 X-Stat-Signature: wkbgn7byt8j7mk3seqa19qsjjxqqfegy X-HE-Tag: 1731397536-782738 X-HE-Meta: U2FsdGVkX1+/r2cHlONpRX69z7zGoWI4c+hhPD3uanr9p/B8u6mHLnu363Z+2S4OKF42ew4HoOosxxRNKBBQM5pmM8lfm6SqeQx1sbX7afog12HQ70P82CJjLerD1B7K+RLISDICB77zl6t3u+vUgGKL4flgh7c5Lw0MeGi0b70r1lRGkQBDIELdWuZ+mLikWsW/6KS6kac8gFcbQwI9Cm+9KPwGNExx4CYD0E0qOFV5TYRF0l0mj7FIcHT5yaBbRVbPpr3wLX+2wtf/QweRUJuJrTtSAl/7mkN5AZKeVPy3/1eooVpDm9oWtaU/cQgrX2FwC/6/U+4HRPs6qxBsi/TAyUhUwp3Y0S8kElOvV7BZZ3ghBKrTolA8ZtLi+DuHtYFDAyGnci08zma+mvaiRsK+hoLT9/m/QdJSVsiK6V7B676mNz+trRTUZV1PA1a8L3wO22S6rE/lbDsyOa3th0DgTRtBzYAXv7YyZ4qu2IyO84zOTtPhACaMKb6d0lk33VbQ7WJDPGQLmcIaICH35sjBCyE4FhRlRwZwhO8R4iMVHEVMYndLtbP7KIYrSlVKTFZWTx5SI8x00B9gMgxYxR7RC90hLzsL+aAA0Nte31ZxKlYV6Va8nUKMirE3EJag0L4wrQpX14BsEvUaL/4sPIuS/iOUEEiEYLz7sF3n6c1od2ErSvpvfN0K/P6r3asYBPWFBFeuJy7OQ060cziczMR/wRC3EPWu3Xg3xCJMNDuyxiXk+bNiACWaN2rJO5Eo3phAJGxo/vulP6foudSDFviIweBjhKNWpcBOL0LXTx4VZkGj/FXiPGI1s7NFzeu3NFVffnRXQ6UBMAN8A3SQ+In2iRyLu5ZEzNAYvuvn2efmbQxXzSkNyTUV7Kw2e1LOC3iTeY6PgYN2ikKjorDa7ARlUT7HDkhbKI0RzwUfcwbF1yrUpFT9U9/RCdo1E3tNRpSiRA0R2IDVy8dAVBN QHpWCR+Y 6W1kvoTCg269SmBKCY9wtJXDuE2XAPFDgHUZEpzILKtM/0EYbkyToSObqAcjme0T77yrx08OReFpv01Ecng07/DXAJS0GT7HqEhJU8VqayOxPv7+04LWU0DDouEhmfhMn9KtgAP89nD096D+K/c9S/FduQAr3tDaSXiIx+o4cYt67fKvG65lDOpilEQah05qNugjO/Vp+2zt4Kfw8/bImTEHsW9TFdwkhqvjQvdHU9AGGcfx+pixn8GtpeqO9C3Ag1AVy 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: From: David Hildenbrand Update the huge folios policy for tmpfs and shmem. Signed-off-by: David Hildenbrand Signed-off-by: Baolin Wang --- Documentation/admin-guide/mm/transhuge.rst | 58 +++++++++++++++------- 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentation/admin-guide/mm/transhuge.rst index 9ae775eaacbe..ba6edff728ed 100644 --- a/Documentation/admin-guide/mm/transhuge.rst +++ b/Documentation/admin-guide/mm/transhuge.rst @@ -358,8 +358,21 @@ default to ``never``. Hugepages in tmpfs/shmem ======================== -You can control hugepage allocation policy in tmpfs with mount option -``huge=``. It can have following values: +Traditionally, tmpfs only supported a single huge page size ("PMD"). Today, +it also supports smaller sizes just like anonymous memory, often referred +to as "multi-size THP" (mTHP). Huge pages of any size are commonly +represented in the kernel as "large folios". + +While there is fine control over the huge page sizes to use for the internal +shmem mount (see below), ordinary tmpfs mounts will make use of all available +huge page sizes without any control over the exact sizes, behaving more like +other file systems. + +tmpfs mounts +------------ + +The THP allocation policy for tmpfs mounts can be adjusted using the mount +option: ``huge=``. It can have following values: always Attempt to allocate huge pages every time we need a new page; @@ -374,19 +387,19 @@ within_size advise Only allocate huge pages if requested with fadvise()/madvise(); -The default policy is ``never``. +Remember, that the kernel may use huge pages of all available sizes, and +that no fine control as for the internal tmpfs mount is available. + +The default policy in the past was ``never``, but it can now be adjusted +using the kernel parameter ``transparent_hugepage_tmpfs=``. ``mount -o remount,huge= /mountpoint`` works fine after mount: remounting ``huge=never`` will not attempt to break up huge pages at all, just stop more from being allocated. -There's also sysfs knob to control hugepage allocation policy for internal -shmem mount: /sys/kernel/mm/transparent_hugepage/shmem_enabled. The mount -is used for SysV SHM, memfds, shared anonymous mmaps (of /dev/zero or -MAP_ANONYMOUS), GPU drivers' DRM objects, Ashmem. - -In addition to policies listed above, shmem_enabled allows two further -values: +In addition to policies listed above, the sysfs knob +/sys/kernel/mm/transparent_hugepage/shmem_enabled will affect the +allocation policy of tmpfs mounts, when set to the following values: deny For use in emergencies, to force the huge option off from @@ -394,13 +407,24 @@ deny force Force the huge option on for all - very useful for testing; -Shmem can also use "multi-size THP" (mTHP) by adding a new sysfs knob to -control mTHP allocation: -'/sys/kernel/mm/transparent_hugepage/hugepages-kB/shmem_enabled', -and its value for each mTHP is essentially consistent with the global -setting. An 'inherit' option is added to ensure compatibility with these -global settings. Conversely, the options 'force' and 'deny' are dropped, -which are rather testing artifacts from the old ages. +shmem / internal tmpfs +---------------------- +The mount internal tmpfs mount is used for SysV SHM, memfds, shared anonymous +mmaps (of /dev/zero or MAP_ANONYMOUS), GPU drivers' DRM objects, Ashmem. + +To control the THP allocation policy for this internal tmpfs mount, the +sysfs knob /sys/kernel/mm/transparent_hugepage/shmem_enabled and the knobs +per THP size in +'/sys/kernel/mm/transparent_hugepage/hugepages-kB/shmem_enabled' +can be used. + +The global knob has the same semantics as the ``huge=`` mount options +for tmpfs mounts, except that the different huge page sizes can be controlled +individually, and will only use the setting of the global knob when the +per-size knob is set to 'inherit'. + +The options 'force' and 'deny' are dropped for the individual sizes, which +are rather testing artifacts from the old ages. always Attempt to allocate huge pages every time we need a new page;