From patchwork Thu Oct 10 09:58:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13829875 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 9E1F7CF11C3 for ; Thu, 10 Oct 2024 09:58:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 128426B0083; Thu, 10 Oct 2024 05:58:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C0F76B0088; Thu, 10 Oct 2024 05:58:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D343B6B0085; Thu, 10 Oct 2024 05:58:25 -0400 (EDT) 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 AA8816B0083 for ; Thu, 10 Oct 2024 05:58:25 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 5146CA0A5E for ; Thu, 10 Oct 2024 09:58:19 +0000 (UTC) X-FDA: 82657242570.24.A61545D Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) by imf07.hostedemail.com (Postfix) with ESMTP id 802C340010 for ; Thu, 10 Oct 2024 09:58:21 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=Xy+jETAc; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf07.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.99 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728554202; a=rsa-sha256; cv=none; b=GbYLAPhEEwnaQJQel4AURmKldr2a46na9ADNowoF0rqsZCJsokVA6Y4qBptAuDlWwxyhJM wqwF9cgk6zBa41NjWFXcRmYjysTFxjNoSNLGwsDTmJ0aOzUcAgOskz3nxiROr6r4HIi7tf Ub6jvlvdS0E30hS1QO0Lu1NOIFbP634= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=Xy+jETAc; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf07.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.99 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=1728554202; 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=GjeDj7oC1iiZ/gkwEo4XJZE2Kubqr3JwCuLq6Y0HOAU=; b=DzPvgDLNAGSo9K1CE5RZ3zEeWgjJmw8yo5cK1imQUK9xKEqFP4WWnn2apBATrALqJLVOfa 9yo1wB2QWvIGiJgpsbMLhUW+RejLU283t5Qc+mHyvABrGgG111GLzr42DrDxKneLmjslGN I5fimtRexI4EvVRp+1OrTPa0JtnoceA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1728554300; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=GjeDj7oC1iiZ/gkwEo4XJZE2Kubqr3JwCuLq6Y0HOAU=; b=Xy+jETAcI31K/++s8bwE1Q96Nr06WGfscMPMiMRzKj5dO9zg2qeAWkOqhF2frMQYp1zojA9Pavh/WBGSZ+jrDwA0siqKNCxghp5D0iFByplhyIK3J3j8Cl9Mh0dSdFKEHOnft+Ng6fEHgYsOm/sQlLr3JC4gcSq416/OjWHk1kc= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WGm1Wg-_1728554298 cluster:ay36) by smtp.aliyun-inc.com; Thu, 10 Oct 2024 17:58:19 +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: [RFC PATCH v3 1/4] mm: factor out the order calculation into a new helper Date: Thu, 10 Oct 2024 17:58:11 +0800 Message-Id: <382e820c4805dcac80723d8f1707088dbcea2e85.1728548374.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 802C340010 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: aejjbsu6k1hykjyuqnoxikpg736mioa5 X-HE-Tag: 1728554301-562202 X-HE-Meta: U2FsdGVkX193zkD9aS5pJTpF4yFtP0chlBZW+v9MVASKrYXeIK8Lxf5rUu+sHMJzPvDy8n9+qHn/Dh2PwMHPFsANci1c+8ZO/XB1wis+KZS/WX7W+52PYRdI9D9CdOCcnAeu7Prbrr0dokjwf8Dh4KF64gzI3BvIOcmXYBlbUnctln/2QRsgjtZUK/54URsM0T8hcQXVIbGHP4rmoQUg363cOk7Q5oi4ghBJluym5+mpACD3M4LxyVEI+Dg8hodbjoaDbYZakXEZ+xjac9bhZhWHFzzFXXF0oacuKbANZ4UDyQ4jMuw2D/IPCCQuoPusfmsSDyvlDdo71F3bM/S4c9G84WWC4VjmMPtfKbzyl3oak53X7n5CCMdSMGYmqeEAyIUNmho4SkXi1rbLugu5y6ldfBjBBTDbLneZZXiF+1udonl4mSyxrERiGsO/BN5T3XYIP0y9j5p7RIdwlONmTVCAFtVn/W6qQb+iH/jmv3LXEYx9EJwgP8xkjUO7z8yhmGK9f0ePjdgLlnnBaIcKreLiAilReo8qiVF7ps0KYAtwacKFHf0idaFzY3HyKszrNXTsJ8V1R4KFGl4sPF1wWBxebJLyS/ws23z9q1F9V5KWNxOMXJ/WMEnbLXlg9QtTmN2zCwtWFlI8Zc4Bdr+OJpl+sxSSfn+zyJB/nY733eL+lo2i8BtGEjydwqVylJsfA+VtUTH153+emLVK1DTlcCEjn47+Ot03ezpC8lu26+G4PWEVQ7lniboDkMTy/JMpyZTbUwbRdkA2hmo4yLMDRIr/IxOfSrBhO6y0XsfTp/cyd0sxDXGz4j0MOEJQYxgkvn2V1VigSNAkQ61QhXSQ4HwvmCrU+yRU9cvSljwwf9iZAP/Qc2npZO4l0v3GbxhlOkoOTkhSDXID6p9rfliJOCc6LByM5fZMYoq8u3kUoIAXF3W1tZkVR2hVies4iOuzDybRFZ0YDttC/TbbwWy ky/h4HRd coGvXKiLwJCl+v6I2mq9BrvnDBkDu7NFHnchFjndBdtTB9k0JFdizlgPMTkxp7x6QlSQlbgV0vT25DUX1zuphpLvHLXGPNein8mwKNG919+saoZ1zFC+dz4DV7J/sF4iQ3wjZT8pTBmhKLAmjahczM69DpoJziYlCSsDlSr4xFN7p41map0goY10qtK9qqLvi6b3UBuDKTcocuaed6Sev0frZxHz0T0mPlvP8CgZXs/23nCKcrUWbTkfZayMuw9cI0+M90c+bwb7ylJQOpSeJU12gELDa4s94x+WW 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 --- 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 Thu Oct 10 09:58:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13829877 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 7424CCF11C5 for ; Thu, 10 Oct 2024 09:58:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6F5966B0089; Thu, 10 Oct 2024 05:58:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 67E036B008C; Thu, 10 Oct 2024 05:58:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4CFD26B0092; Thu, 10 Oct 2024 05:58:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 2AB336B0089 for ; Thu, 10 Oct 2024 05:58:28 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 12DE180CFD for ; Thu, 10 Oct 2024 09:58:25 +0000 (UTC) X-FDA: 82657242654.09.1043BD8 Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) by imf21.hostedemail.com (Postfix) with ESMTP id EC5F81C0014 for ; Thu, 10 Oct 2024 09:58:22 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=liuRLKXC; spf=pass (imf21.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=1728554236; 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=UsgmxRS9TKs/0ogcQ76wiAy1j6N7MLMM/FjqAS25YQo=; b=UW1EhzM73nvnU5cvBMFg6LRZBnxFpBwgaApia6z19aULkl/akO1VRMeLEuP27/sJyuLcjc 1m4eeNXDcZltG3kFjwGR5DE3a6bc1o8NoIwhhrd7LETX8FdqaxbT8yQixbHo5h5BPe8CEB SWQEJo2Py+BOdXp2Pel5FDfWyAgW3pk= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=liuRLKXC; spf=pass (imf21.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728554236; a=rsa-sha256; cv=none; b=dmOfrK7xdym2iqrGnpuwZkUOvqcXzX0BylbuslyzQ2cmAgWGcj1g8qiNCLX2WEPtLnH/WK cREHim+oqjk29KPhOFERAFmF/1mvTmy/+yquZ0shp3JtTOOmnNg4a79cV6nmI9Msd4u9k9 oQ3fDCPoq/0UGr17znaD375u35k/dlY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1728554301; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=UsgmxRS9TKs/0ogcQ76wiAy1j6N7MLMM/FjqAS25YQo=; b=liuRLKXCh3Z8VQnKAEfRp8eTtKweIxMqov8MQ5rrJWv7TfXTalyE5xxey29UzYimsMr+eh+44lKG5gfG3uLJqN6V5l3fEcuUW5wviI0GKw8+VQV/hGTZkN5IEwhRnEWls/AF18Kw5vFo0/gU3Ki7/VQ4WN6vgfG5R2Qla/AR28w= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WGlzQXz_1728554299 cluster:ay36) by smtp.aliyun-inc.com; Thu, 10 Oct 2024 17:58:20 +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: [RFC PATCH v3 2/4] mm: shmem: change shmem_huge_global_enabled() to return huge order bitmap Date: Thu, 10 Oct 2024 17:58:12 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: EC5F81C0014 X-Stat-Signature: dnzrgntk583qfhfr1uxm63bqo3funu1j X-HE-Tag: 1728554302-903780 X-HE-Meta: U2FsdGVkX187AJaVQW5/L7mU94WrZIY7AU7lF6jKJkGrPXVvS23jWAYpwlmg/8heroIZfOHZq41wn3dNroP1WCGWn8mDsnn5aeUlyd4mKQdlYFZc1qntcAm9xiDP+R5vEpD8xmAYdb2wvG9OfWWXfKMPivoOoyD1NyizQkxY9bYfvgFhhluR0zm/TwqBGRkS+0RuqoaDNHuV4wgOY05u3BfoYgyhuks50dhuVDCF5TW+jT8ZXPxqAJ7AWjfwDgMR1WyhEXB/suvd8TLCUW8GwXvp4x2DiOdxpbMEqdK1YJecbVzjdNs1MTjTUZOFNLg7Ln+4e/fGJanKWMwfA6RibNEjD9E7Wy9a3V2Aj6Bb480jmZmUNwAcBPkM51eoM06XjUMs1bd8YTABnta1fhRfmqZXl55JTTHIZbb1voHntfcwZQb2hm/O+VEdGff2ykXUUx8Is+PGtvih4945nimZ5r49at903IbxN3KfFWuI3IUvZh4VO41NbPP44hrtiZ76JSOgfB1gF+QEZzXIt+slvZCPKnFImipPElGJ9G5jbcssQHIeOrFSbdcPnsbyLlIK1xMVJoRqvLfMd4t3nbiZohnckJwUG52WxxyrhXSjDJVnMx7iBkbTCW0FUEFA+mFQghYBxIDE+Q/K3aLTgTw4MKZc0NLiHLwIg5+anA/Z5Dy48+pG95D3DR9yAluZ/YV+YucKBTuEkLzzPR/gjQrlpmxWCVdbemufxmHuOpFjyYmvOBnNYGycBXiEFUKZt9IuFt2GQMwnYlck9Zcp+A/RvGCo9enmpnnxn5j/bTV3D9dlE7XvHzgxazBfh/fkIu3188cED2Mzjpv1VeNOMV8PZeBGKxDSeao42t7NtsDo6ofqvs2HEcLtmdm+VeF158DjQ12AUwd7PCRLGzMyTGS/9N0fSN2FNR+UK0WDjigc4Zia1VFhynEkSnD6HNnVTdDcpn0OiHB71Y0CsUGI8bW 7jp5RBVx i0ST3m+fPL7Jj4KA7R1JwOguKGMw24ldFVLk0qRw9z39PU3JFf3RRJOex7NSsBUaiXFSoEGJD8KQ83KhfMvWtKaZGVPU8c4x6jGHwg2Q+jMD1BXg/XeNEKShNTgPsWX5ADT9kSZdYLrZKi3Vtufo8J9cYiCIzb5zjz2i1Mzb1YszZXmyuzUB8xhZYcIZM3G6du+nKin92Ebj+cYdjackLb/X/5nXRBjMBOOC9a5X4IzWXsTK1NhdiOKogzVF+LA3+6hSe8B1VWScbFEVcNfxTRZKQsw== 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 adding a new huge option to support various huge orders allocation in the following patch. No functional changes. Signed-off-by: Baolin Wang --- mm/shmem.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 0613421e09e7..f04935722457 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -548,48 +548,48 @@ 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, - struct vm_area_struct *vma, - 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, + struct vm_area_struct *vma, + unsigned long vm_flags) { struct mm_struct *mm = vma ? vma->vm_mm : NULL; loff_t i_size; if (!S_ISREG(inode->i_mode)) - return false; + return 0; if (mm && ((vm_flags & VM_NOHUGEPAGE) || test_bit(MMF_DISABLE_THP, &mm->flags))) - 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 (mm && (vm_flags & VM_HUGEPAGE)) - return true; + return BIT(HPAGE_PMD_ORDER); fallthrough; default: - return false; + return 0; } } -static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, +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) { if (HPAGE_PMD_ORDER > MAX_PAGECACHE_ORDER) - return false; + return 0; return __shmem_huge_global_enabled(inode, index, write_end, shmem_huge_force, vma, vm_flags); @@ -771,11 +771,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, +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 false; + return 0; } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ @@ -1170,7 +1170,8 @@ 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, NULL, 0)) + if (shmem_huge_global_enabled(inode, 0, 0, false, NULL, 0) == + BIT(HPAGE_PMD_ORDER)) stat->blksize = HPAGE_PMD_SIZE; if (request_mask & STATX_BTIME) { @@ -1679,7 +1680,7 @@ 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_order; loff_t i_size; int order; @@ -1691,14 +1692,14 @@ unsigned long shmem_allowable_huge_orders(struct inode *inode, if (transparent_hugepage_flags & (1 << TRANSPARENT_HUGEPAGE_UNSUPPORTED)) return 0; - global_huge = shmem_huge_global_enabled(inode, index, write_end, + global_order = shmem_huge_global_enabled(inode, index, write_end, shmem_huge_force, vma, 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_order; } /* @@ -1731,7 +1732,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_order > 0) mask |= READ_ONCE(huge_shmem_orders_inherit); return THP_ORDERS_ALL_FILE_DEFAULT & mask; From patchwork Thu Oct 10 09:58:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13829876 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 AAE82CF11C4 for ; Thu, 10 Oct 2024 09:58:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C98676B0085; Thu, 10 Oct 2024 05:58:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C22696B0088; Thu, 10 Oct 2024 05:58:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A277C6B0089; Thu, 10 Oct 2024 05:58:26 -0400 (EDT) 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 7821C6B0085 for ; Thu, 10 Oct 2024 05:58:26 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 025DC160C8D for ; Thu, 10 Oct 2024 09:58:22 +0000 (UTC) X-FDA: 82657242612.13.1042E11 Received: from out30-113.freemail.mail.aliyun.com (out30-113.freemail.mail.aliyun.com [115.124.30.113]) by imf20.hostedemail.com (Postfix) with ESMTP id 309961C000B for ; Thu, 10 Oct 2024 09:58:22 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=MJOTpeqd; 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.113 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=1728554153; 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=0/z9eme036ELYbZ0x9xP/AM4BDPvXGK6kIU0Y8j+uE0=; b=Ei8twEKJQk+lAhxNvR5T7hKxBnngYuad797Svp5PvaTP/tJX9PEwToF90dISBNkl1U8p1N d1E82NuLNaNB23FbU/PTCnb8sbKzpCGP/ZN3wjGN7CYjTHw9XEd9yNk+FZJ93BNgUSaeqp V+lhoULlVjDnTeDCQZGNtXZxA6zVCFk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728554153; a=rsa-sha256; cv=none; b=Oc6/Nm5Gs4CuQCC0ZedJM7Ns327iafuNFuS+5+uFdAwpuYt+VqgwNYfhHqjLecznBIcRDh aI1I14b1l6DyALdT+sIzZl6FlPKA4ZJ1NRHPK7eHGEn0sHubHSq91q1hNmERnKt8rB7V9Q NYSjRv7KpxwNs8SZUJGFcqY996AVxs4= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=MJOTpeqd; 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.113 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1728554301; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=0/z9eme036ELYbZ0x9xP/AM4BDPvXGK6kIU0Y8j+uE0=; b=MJOTpeqdUIM1gHVYFhoTu1LGb/DBkio11X/zqrYHztptKTVtt8qDSIIL1mo02PnzAL8nqZ3ELKhu7XrROgG/xjvoTwZ5+ySXagzRDEnOYoGi4QNBpxAwuPpxiTM75OyyQ8ppyUCMsCPKQ7LgrV+0C/rMrnSh7VXtNbIlKAxFyfg= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WGm.dgu_1728554300 cluster:ay36) by smtp.aliyun-inc.com; Thu, 10 Oct 2024 17:58:21 +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: [RFC PATCH v3 3/4] mm: shmem: add large folio support to the write and fallocate paths for tmpfs Date: Thu, 10 Oct 2024 17:58:13 +0800 Message-Id: <252c5999f8789d4f511e8e1466414238990f7e18.1728548374.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: rspam07 X-Rspamd-Queue-Id: 309961C000B X-Stat-Signature: qeojqs18hsg9rfsbo99m7ggcpaymu5mf X-Rspam-User: X-HE-Tag: 1728554302-319305 X-HE-Meta: U2FsdGVkX19XamZqtHQyhvjjG2rl0TezbjoqhxMLTT4RaPB2HzBhF8Ibe+i/HPV25zLSBJxjKiCYy4bJgh+iVok54cSvA8xO2oVxKxx4F7P754Qj5NcL7DP5Q/AycWRhjVaNMRMsJkWZnH5X6PEua1+bcz6+GhtEfip2SgC+VkPVYEVlzQNSiPvOw8Yr/ruYWOVQnsrmA7Jc3qxjGQlaznClKjc7UoFzxuk8ywMSkCf+gd4vAxsaBbNIvtvdpnDCwWn9vk9mQaU+Q8miLENLYlN5bn8or+mjrOyK5YnMorTeWpHMKxlyRWt5fxTIpZSSQFibwc3i9wicImYmWsFn8AUG3eug0mV9W2XsGZIhO3+myTtlxhihQ2ikMlymQGrcCaejB0yS1HZdg1A0RMFRXpB5r8cM5mWChRv7o6oHkSyiXkR4mWQaBaJn5xmevwzYoIJtLpk7y+OETKzkhZddmSoROMCtiiP3F3tzyO+o4D1K6guE8KaOzKG83TshEPeJZ7UD5GF1nPp6foZoaPAYB3vkyCnrHlG0KSNHUMPDeKdKDbxDon90jYWxmdPENgR7OQpA14F5NNSpES54FNmfLzMsXlrRQcZIaUrj1/sa70XOiPrtjO/jNyoyoG8lArETwe3It5gJF6SZ/tAMoCbAt6sbKny04dYs1gBiK1XHpDztV1JbUFJVnrXrxZ2g4aF1SEvzShVEGS0F8c5UZhn6bjlc4/njhDE+A0Jw2IQkaLmer+lNae9+kQI8Kd5ffxXjw7NCPqmWLxpv1ip0kRalVGA4uotu8RN2hboBsvBk61WRmEPTnhfbrQ1uABKTuTx4IDr8pR4TbxT6Rspwl0zQ25XzZfa1Q34TxQ7v5y+dvs8kcrSMceiZq4wF/oNrE78Box7hUVAhDtc9L7Pxs1a5QPrLKUJpK912QSH0PlksV4rwTueMscbBC4maievHLqHJufKX0jxrcF6mbl5g3P5 CTkde77r STZhhcz06L6dlCpdKmooIHVwwFG2N5PJO2COi/hXLVoj+2ESiNPOnzoY8GuCstJ3hli7QzncaIdcs4e2XyTs+MjpXgY8okm1MI0HRtOzUFn65NUkwTDlC/KlB3i3c+SWsOxZ1022I0WB8UueMGooYeitdKCDFePSCq8yhnmEhRbXAJRkZ+rq3uMA31HpPmVkFkx4AyKcOB6yhCeIrxqzUDQmQiOKFKd+ftorvrX2jUJefXsr8SgYIXA0AS7Ei5yIPi3g8 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_order() to get a hint for the order of the folio based on the file size which takes care of the mapping requirements. Considering that tmpfs already has the 'huge=' option to control the huge pages allocation, it is necessary to maintain compatibility with the 'huge=' option, as well as considering the 'deny' and 'force' option controlled by '/sys/kernel/mm/transparent_hugepage/shmem_enabled'. Add a new huge option 'write_size' to support large folio allocation based on the write size for tmpfs write and fallocate paths. So the huge pages allocation strategy for tmpfs is that, if the 'huge=' option (huge=always/within_size/advise) is enabled or the 'shmem_enabled' option is 'force', it need just allow PMD sized THP to keep backward compatibility for tmpfs. While 'huge=' option is disabled (huge=never) or the 'shmem_enabled' option is 'deny', it will still disable any large folio allocations. Only when the 'huge=' option is 'write_size', it will allow allocating large folios based on the write size. Co-developed-by: Daniel Gomez Signed-off-by: Daniel Gomez Signed-off-by: Baolin Wang --- mm/shmem.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 7 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index f04935722457..66f1cf5b1645 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -523,12 +523,15 @@ static bool shmem_confirm_swap(struct address_space *mapping, * also respect fadvise()/madvise() hints; * SHMEM_HUGE_ADVISE: * only allocate huge pages if requested with fadvise()/madvise(); + * SHMEM_HUGE_WRITE_SIZE: + * only allocate huge pages based on the write size. */ #define SHMEM_HUGE_NEVER 0 #define SHMEM_HUGE_ALWAYS 1 #define SHMEM_HUGE_WITHIN_SIZE 2 #define SHMEM_HUGE_ADVISE 3 +#define SHMEM_HUGE_WRITE_SIZE 4 /* * Special values. @@ -548,12 +551,46 @@ static bool shmem_confirm_swap(struct address_space *mapping, static int shmem_huge __read_mostly = SHMEM_HUGE_NEVER; +/** + * shmem_mapping_size_order - Get maximum folio order for the given file size. + * @mapping: Target address_space. + * @index: The page index. + * @size: The suggested size of the folio to create. + * + * This returns a high order 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 order. + */ +static inline unsigned int +shmem_mapping_size_order(struct address_space *mapping, pgoff_t index, size_t size) +{ + unsigned int order; + + if (!mapping_large_folio_support(mapping)) + return 0; + + 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); + + return min_t(size_t, order, MAX_PAGECACHE_ORDER); +} + 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) { struct mm_struct *mm = vma ? vma->vm_mm : NULL; + unsigned int order; + size_t len; loff_t i_size; if (!S_ISREG(inode->i_mode)) @@ -568,6 +605,17 @@ static unsigned int __shmem_huge_global_enabled(struct inode *inode, pgoff_t ind switch (SHMEM_SB(inode->i_sb)->huge) { case SHMEM_HUGE_ALWAYS: return BIT(HPAGE_PMD_ORDER); + /* + * If the huge option is SHMEM_HUGE_WRITE_SIZE, it will allow + * getting a highest order hint based on the size of write and + * fallocate paths, then will try each allowable huge orders. + */ + case SHMEM_HUGE_WRITE_SIZE: + if (!write_end) + return 0; + len = write_end - (index << PAGE_SHIFT); + order = shmem_mapping_size_order(inode->i_mapping, index, len); + return order > 0 ? BIT(order + 1) - 1 : 0; case SHMEM_HUGE_WITHIN_SIZE: index = round_up(index + 1, HPAGE_PMD_NR); i_size = max(write_end, i_size_read(inode)); @@ -624,6 +672,8 @@ static const char *shmem_format_huge(int huge) return "always"; case SHMEM_HUGE_WITHIN_SIZE: return "within_size"; + case SHMEM_HUGE_WRITE_SIZE: + return "write_size"; case SHMEM_HUGE_ADVISE: return "advise"; case SHMEM_HUGE_DENY: @@ -1694,13 +1744,9 @@ unsigned long shmem_allowable_huge_orders(struct inode *inode, global_order = shmem_huge_global_enabled(inode, index, write_end, shmem_huge_force, vma, 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. - */ + /* Tmpfs huge pages allocation? */ + if (!vma || !vma_is_anon_shmem(vma)) return global_order; - } /* * Following the 'deny' semantics of the top level, force the huge @@ -2851,7 +2897,8 @@ static struct inode *__shmem_get_inode(struct mnt_idmap *idmap, cache_no_acl(inode); if (sbinfo->noswap) mapping_set_unevictable(inode->i_mapping); - mapping_set_large_folios(inode->i_mapping); + if (sbinfo->huge) + mapping_set_large_folios(inode->i_mapping); switch (mode & S_IFMT) { default: @@ -4224,6 +4271,7 @@ static const struct constant_table shmem_param_enums_huge[] = { {"always", SHMEM_HUGE_ALWAYS }, {"within_size", SHMEM_HUGE_WITHIN_SIZE }, {"advise", SHMEM_HUGE_ADVISE }, + {"write_size", SHMEM_HUGE_WRITE_SIZE }, {} }; From patchwork Thu Oct 10 09:58:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13829878 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 29DB6CF11C4 for ; Thu, 10 Oct 2024 09:58:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BD6F46B0093; Thu, 10 Oct 2024 05:58:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B6BF06B0095; Thu, 10 Oct 2024 05:58:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9D84A6B0096; Thu, 10 Oct 2024 05:58: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 74E946B0093 for ; Thu, 10 Oct 2024 05:58:31 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C0157160D2F for ; Thu, 10 Oct 2024 09:58:27 +0000 (UTC) X-FDA: 82657242822.01.914B07C Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) by imf15.hostedemail.com (Postfix) with ESMTP id 08E80A000B for ; Thu, 10 Oct 2024 09:58:27 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=ydRL6U1n; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf15.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.119 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728554265; a=rsa-sha256; cv=none; b=Cv2Oq7EhmCq74etbuwt1nYHoFruCNxzU9BNVYAye/9+tbbh02pfJCiYePi6V4SegB0c3A+ IXTqkiVyl+ScspQL11zxgJGqi5yEWca33RBXgaIDW+mx3COzX7EVDQ8NdFqNEmcAp7GFF2 yHTORLOOq3eX1QotbHGx+SpywNBwGiY= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=ydRL6U1n; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf15.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.119 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=1728554265; 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=TAqUYxnDAtyT0H6gtJz0ppazair4o9uzMNjBuGwGaBM=; b=uztkDEtd9wI4/QHVDPZlfgzbklGLlQXrtUnQTX5IPThgwsm5k33GLrqUDRMDDlvLfSd2oz E98/fam6/NMgnXNzBAVs+bRQZJnj3VRy3IxjAbyaghsLLuUxTKpbYr64auDzqeiY0gn1Jk Yh3RbHBmpYo1FFoFmrKydpCCAWc9YTc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1728554304; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=TAqUYxnDAtyT0H6gtJz0ppazair4o9uzMNjBuGwGaBM=; b=ydRL6U1nY2azVkkVYc6BLmhUr6hJMYXBnJKiCq4oFUMBGLBhUd1y3M9+ChPUW6uQfrFmzqNbHXGWevNtT7db2baLh9KV9smzOukwH9FChhbiaQBFMi9LUYNenRsE5C3GgoLEHiqGaR2XoA1rY/j7rw0GFGtuS4E0AGJy9iB+a+o= Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WGlzQYu_1728554301 cluster:ay36) by smtp.aliyun-inc.com; Thu, 10 Oct 2024 17:58:22 +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: [RFC PATCH v3 4/4] docs: tmpfs: add documention for 'write_size' huge option Date: Thu, 10 Oct 2024 17:58:14 +0800 Message-Id: <556e9944f0328ccb0025e8582894ae01efd98842.1728548374.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-Queue-Id: 08E80A000B X-Rspamd-Server: rspam01 X-Stat-Signature: 9smo9jznmw5icimry8rhd9785uequb1d X-HE-Tag: 1728554307-539017 X-HE-Meta: U2FsdGVkX198vq5oe4QSvxwYPJ1bdg2I9WT3EPHMKImdREAbJBE4CodgrR1Oe3OGpXI8bq/Zuyn79Sa8eTq+rLjOpwlxPwYFRlSiZbY1bSFqyvSifG1InKKG1DWWFt7U+Z/ZiwLq+/rw87C2UAKoo43mDXD0vDcbFsRbwbA3q6XBYrGud4xxusi7dbsN7l/1tXs3hd72vnWl2Oqh3qi/zao25fXBUYu2YdMVatpBRtFPDlCzzvTDNzFURtXsXQrHEd8Maa7F/gzYHIuIHMFGmSk/7IeWC/9Rl46FgIhFRyDL8MjZzeERnEc/XhViCw9v/T5yCcwg4UYJmF/s5UE1zlgjuDBIax3d90jKW8Odn1SqOWWDk5LuYWCpP6xM8pvYy/dB6yHpIsrIPNwcVVcyQnzHcYdxmWd+s6vmZCKq4Ca+tJLH7/cmrcQRtDf9hbZ2QUoUD2R/6pGkJnJ5zfK7XRsAsU4/MSbzVHMHakLP7fs4SiH3exixNbFIoNI5NFfTmzqNFoCSVq7PiyJO8I/+I7VF/Hxgpo0RNpdaX+B5x8Wf3b8QKZBilwMzR93DgYEfz8X6pi94KCHOESjiL6+4rFMaUHYNSSWjCunrHd2/ejeMuz5F8gbtYHQXFq9azInfWB85a5PfRIwpjC/9eb2+zOED+jIg6n9/UIvAxwae4O9bsflVOrcz1TWfMfHKPuoudFZSrH5iyIQM/rfl+xvDRePO/81b1xAzJdY7AnG8IuwXS2RUfnBcnMxAyvOU3iRZhbj3IJuadZDklldlOroRrho/sugiaw9DTpZcbD45/hcAidrX0WC0aKVElzcglO86QEOKvKbJepRJORUebDSAdEwfmLrDW9OO96ht88Re7A8mfgCTsXc0EprWcGSCo4xrjTwqHM6cgDYtCWfwBxSoEpjCYXzeTkV/HD5wjJPHKrh2YXu3C+FM+zW83aPaRpRhH1UKJYnI2GsTF7+no2I 9oW1ky4s JvfkPwgNsNT/Tj6HbVmOqm3CD/G3TFbEDO1mRDhRAubJpmbNVfinCeV53yGjD3pSNOY7cm5eQ77K99bvpfqdT8WvhWiWzOx26BwY2sdJEtNbSJVshGOt0YK8ygZ+/2UbCj+iGsRTQlUeATD2+mWL7QCqyu2VQhJn4EDfK+crZyEje+EWZcPaUqy7izWGoX+KUxfZVzGuLl8Szbomlc2wX9S3KsZlcZJiydsqAIWumaIq56wBs6Gpupx9A71ycXLDhel1nHmkzC+oh9R79QgDzNCQ9lg== 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 documention for 'write_size' huge option, as well as making previous huge options more clear. Signed-off-by: Baolin Wang --- Documentation/filesystems/tmpfs.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/filesystems/tmpfs.rst b/Documentation/filesystems/tmpfs.rst index 56a26c843dbe..be998ff47018 100644 --- a/Documentation/filesystems/tmpfs.rst +++ b/Documentation/filesystems/tmpfs.rst @@ -115,10 +115,11 @@ The mount options for this are: ================ ============================================================== huge=never Do not allocate huge pages. This is the default. -huge=always Attempt to allocate huge page every time a new page is needed. -huge=within_size Only allocate huge page if it will be fully within i_size. +huge=always Attempt to allocate PMD sized huge page every time a new page is needed. +huge=within_size Only allocate PMD sized huge page if it will be fully within i_size. Also respect madvise(2) hints. -huge=advise Only allocate huge page if requested with madvise(2). +huge=advise Only allocate PMD sized huge page if requested with madvise(2). +huge=write_size Can allocate various sized huge page based on the write size. ================ ============================================================== See also Documentation/admin-guide/mm/transhuge.rst, which describes the