From patchwork Sat Jul 13 13:24:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13732410 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 C54EEC3DA42 for ; Sat, 13 Jul 2024 13:24:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CCB816B007B; Sat, 13 Jul 2024 09:24:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BDF4C6B008A; Sat, 13 Jul 2024 09:24:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 79A126B007B; Sat, 13 Jul 2024 09:24:40 -0400 (EDT) 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 434B66B0089 for ; Sat, 13 Jul 2024 09:24:40 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id DC8EE40F3A for ; Sat, 13 Jul 2024 13:24:39 +0000 (UTC) X-FDA: 82334799078.01.D274F95 Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) by imf03.hostedemail.com (Postfix) with ESMTP id 8DEB620016 for ; Sat, 13 Jul 2024 13:24:34 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="hI/dD1bA"; spf=pass (imf03.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.119 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=1720877042; 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=Djj9GEjNq9Gnbpe2Z/mIcDmYI8xxQmETjEn+X/PnVoU=; b=sinsckyfDrmoitGcxiS3VkelD+HV4MU/yUGCp8rV5USnXJwU3fkuXGy75p0NW+SA2S+KKZ Xybz1TBQdWRcvMo9/DeAoqUD+EAv7EvAEtucyUSN1VomYKQMuHgwA2rocBrdImqLbcAohq MHiy3skXGg9nmf/kCbkc1qEWd2fP81c= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720877042; a=rsa-sha256; cv=none; b=oIrVqT7p92TJfApj5n8hzuOwxCtJo5l84n/Rq9pGPye+BtIB9kpSnV/U4UmGaQUYzpfLFB Aik+D29L65BbJQV+Nefj+smS1oL3OQPKHMVjE26AvQppBt+ICo2U56W2vwfbc6RyOmIyI1 kAHFz0rFEiwg/alybsAb6iJpfAaDMfw= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="hI/dD1bA"; spf=pass (imf03.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.119 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=1720877071; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Djj9GEjNq9Gnbpe2Z/mIcDmYI8xxQmETjEn+X/PnVoU=; b=hI/dD1bAmCsu7NU26ZIi5BEn65UvoiDvt6vLXlS54SdCJnY1jlLHy6C8Ap1ao2Qo5Dta936a910Tu94g5mFklZoLjYGHWHIawcBPVnWbY1ZajvGy3EI8hGSBArhN36+dIHtKHQpUHo2PK2yn1JBcIQGppgdqgd8lGSIx7jtH8hY= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R171e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033032014031;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0WAR0qHL_1720877068; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WAR0qHL_1720877068) by smtp.aliyun-inc.com; Sat, 13 Jul 2024 21:24:29 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, 21cnbao@gmail.com, ryan.roberts@arm.com, ziy@nvidia.com, ioworker0@gmail.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] mm: shmem: simplify the suitable huge orders validation for tmpfs Date: Sat, 13 Jul 2024 21:24:20 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: tfeprgrxbaza8dyfd37b9f4bdbct1x9h X-Rspamd-Queue-Id: 8DEB620016 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1720877074-980367 X-HE-Meta: U2FsdGVkX192jk0CQQThR1bJiX6bpYlrbdTWJ78hmbuUWLb4r/ikCfTCex7LZ2yPaFvqivJaYJDR9372onduWFqSQPUXms4KqGFQuAaFxvRtc3ya1rlyV6U4aY1PD/ZUHthZp6XytQH9BBPWkJuV9p32Sa5pEWSV+UJF+rR3YCR2/+VJcnxc1+XEgxiw3A+iCOetiRf7+2UV/ad+8wH3mkqhMVFM5pkcsvmr3/Tcl9wzyDZlk/D1uk2UyuIoIlzaCoBBs353MqRYdnCs8eH/eztMX6ZQOXLEmqqA+dtk9P8M9U1ygCdU1O+aC8vY7p4OSrfKYcQmIH7BERnjbNqAJEsnMyXI6fJDtkrfo7Ux+HZoB0FDA9TuxRcdcQNJKm8kZSjG9mJqnnC5sUPDCDcch8dyvAwxLBqjpf2zIpWr1+Z4Kq8noSymF1FIkDZMmIClQoutSXNLmyUWPSD+ILTOl56CbWDnyZnuVtQWugWiIywVFrMG67WRKs7JfWwf7C/khKg5x5hl3VJGnb5XHSc9/iG/icIdut2u5pI4qGxOMZi8yP47nwMxquAjUxuUVblx5fslhIaUmZjV+drCx0eBzLnQPSHEoQn2N//VxfbWTuNrlRyFPzLj87HSoIuvWi+HGfKuZDSPGbh37FELbN+EnYghTf11VkbsZE8ik4ouHO74eu1rGhHCsdaRSz2Vkk4pHdnMzs3zQP32LeOCs+ri7bI9WvZFXANyFrwlw2uECKQ1ydHSHYcFbYktXrr4uKQmtS2DVI2hPM3I8A3YM/kIrgOKWj/Qe8KVOyb0nugmbhN82JUJ9+3RZD8n7GJfmPZPDedG/eqV8743Y4DIo63c0QcYi10t8+89GtagzM0A+jy/NImCLZbMI3nczGImrP9xIvBUkdcDZi1uobzOvpaDfr2DWsLlSwy1Mtf2G/1oQXKK1hNgjwaDQ36GGeiLgHdD2CtMzuSeGabH+afOlQa p46R/m/o FXydWkS15v1S40JlikOm1YAaU14pYK3/lQXliBX+jhV23iGqJeKoVf7l/x5DzkvjQjbr5/wWazFQQo/wVDrzdg9aqinb5VNMop9SHPOc4WyXGPLZVRlbxc6KgNgJtl+AivY0xC3xCuE6+kf55/DjFK0a+1ceEdZbQUYJILGMOws4xkl80/JccWhOCB69hktoDby8AK23XtYF0AaQ= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000031, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Move the suitable huge orders validation into shmem_suitable_orders() for tmpfs, which can reuse some code to simplify the logic. In addition, we don't have special handling for the error code -E2BIG when checking for conflicts with PMD sized THP in the pagecache for tmpfs, instead, it will just fallback to order-0 allocations like this patch does, so this simplification will not add functional changes. Signed-off-by: Baolin Wang Reviewed-by: Ryan Roberts Acked-by: David Hildenbrand --- mm/shmem.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index f24dfbd387ba..db7e9808830f 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1685,19 +1685,29 @@ static unsigned long shmem_suitable_orders(struct inode *inode, struct vm_fault struct address_space *mapping, pgoff_t index, unsigned long orders) { - struct vm_area_struct *vma = vmf->vma; + struct vm_area_struct *vma = vmf ? vmf->vma : NULL; unsigned long pages; int order; - orders = thp_vma_suitable_orders(vma, vmf->address, orders); - if (!orders) - return 0; + if (vma) { + orders = thp_vma_suitable_orders(vma, vmf->address, orders); + if (!orders) + return 0; + } /* Find the highest order that can add into the page cache */ order = highest_order(orders); while (orders) { pages = 1UL << order; index = round_down(index, pages); + /* + * Check for conflict before waiting on a huge allocation. + * Conflict might be that a huge page has just been allocated + * and added to page cache by a racing thread, or that there + * is already at least one small page in the huge extent. + * Be careful to retry when appropriate, but not forever! + * Elsewhere -EEXIST would be the right code, but not here. + */ if (!xa_find(&mapping->i_pages, &index, index + pages - 1, XA_PRESENT)) break; @@ -1735,7 +1745,6 @@ static struct folio *shmem_alloc_and_add_folio(struct vm_fault *vmf, { struct address_space *mapping = inode->i_mapping; struct shmem_inode_info *info = SHMEM_I(inode); - struct vm_area_struct *vma = vmf ? vmf->vma : NULL; unsigned long suitable_orders = 0; struct folio *folio = NULL; long pages; @@ -1745,26 +1754,8 @@ static struct folio *shmem_alloc_and_add_folio(struct vm_fault *vmf, orders = 0; if (orders > 0) { - if (vma && vma_is_anon_shmem(vma)) { - suitable_orders = shmem_suitable_orders(inode, vmf, + suitable_orders = shmem_suitable_orders(inode, vmf, mapping, index, orders); - } else if (orders & BIT(HPAGE_PMD_ORDER)) { - pages = HPAGE_PMD_NR; - suitable_orders = BIT(HPAGE_PMD_ORDER); - index = round_down(index, HPAGE_PMD_NR); - - /* - * Check for conflict before waiting on a huge allocation. - * Conflict might be that a huge page has just been allocated - * and added to page cache by a racing thread, or that there - * is already at least one small page in the huge extent. - * Be careful to retry when appropriate, but not forever! - * Elsewhere -EEXIST would be the right code, but not here. - */ - if (xa_find(&mapping->i_pages, &index, - index + HPAGE_PMD_NR - 1, XA_PRESENT)) - return ERR_PTR(-E2BIG); - } order = highest_order(suitable_orders); while (suitable_orders) { From patchwork Sat Jul 13 13:24:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13732411 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 B37A2C3DA42 for ; Sat, 13 Jul 2024 13:24:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 004156B0088; Sat, 13 Jul 2024 09:24:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DAC036B008C; Sat, 13 Jul 2024 09:24:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9E3F86B0089; Sat, 13 Jul 2024 09:24:40 -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 4E2CC6B008A for ; Sat, 13 Jul 2024 09:24:40 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 0157080F05 for ; Sat, 13 Jul 2024 13:24:39 +0000 (UTC) X-FDA: 82334799120.23.C7AAB48 Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) by imf18.hostedemail.com (Postfix) with ESMTP id 172B91C0023 for ; Sat, 13 Jul 2024 13:24:35 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=h5PSJvOv; spf=pass (imf18.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.99 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=1720877031; 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=Tf+iCn9J1tf0mbYcwxtjryzLvO9qhkxHYDxVzJSYovE=; b=NVIt1KJEjjXVSiT1apB6oBFrIaX9vu+tybGKlzvnnBJVfsosfzuDh42lNfSHoPbENLhQqW p5AmckdJWIpJ3mt0sqE6KelTsMzFv+G7EfYv4QOuuUQEA34GgNzGOlJW1YDVhOZu+qBhFq nRJTd0sGYLTQ9F3ArVJ7AfWkHLwlcMk= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=h5PSJvOv; spf=pass (imf18.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.99 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=1720877031; a=rsa-sha256; cv=none; b=qMyRqbvNNWOBmaoJnx+SxdRWHjuX2+z1scFajf03eizqLkciEeBfgIZuX0Z7RBlXQ0gyR3 yuuk2lJ8QqYkvVEA07cwU/2nzGKkAHYGwo86WACWGXWZ54z99cXFTUeavrgEm1egokWmKR VJ7GPHqO4xjytf7T83hk9gwVbf+0vwM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1720877071; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Tf+iCn9J1tf0mbYcwxtjryzLvO9qhkxHYDxVzJSYovE=; b=h5PSJvOvFx7aRU9or2dU3jdHePS07eeCDhiFwCWyE/IEW3q/6OX3b+8leVCzOo5+JfOu9WZMzwdpNGY+zaU8TGTLnl09WaaFR3aaxeSYGDA9B2/7vRSEEDO2WGbO3ksUIizBzNtZNOWDYrgsG9ONnkIowD3Lb7z66lRTE66zBH0= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R121e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033037067113;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0WAR.kD7_1720877069; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WAR.kD7_1720877069) by smtp.aliyun-inc.com; Sat, 13 Jul 2024 21:24:30 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, 21cnbao@gmail.com, ryan.roberts@arm.com, ziy@nvidia.com, ioworker0@gmail.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] mm: shmem: rename shmem_is_huge() to shmem_huge_global_enabled() Date: Sat, 13 Jul 2024 21:24:21 +0800 Message-Id: <26dfca33f394b5cfa68e4dbda60bf5f54e41c534.1720755678.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: rspam06 X-Rspamd-Queue-Id: 172B91C0023 X-Stat-Signature: 4ztzd6teg4ubdgrqcntzue7f7axjupcz X-Rspam-User: X-HE-Tag: 1720877075-273517 X-HE-Meta: U2FsdGVkX197+3TVRkrH5QlG/srsIK5LNN5HcD8Yqy46Al/SvcKanp3s3V0uf6i/4zJWcROiiP0p5ltSGbs++mYVUleLpLMbb6ew4rjYohqdSkFojj3TqA9ek27o8c9wfEBActjmhC5/m7jrHWexKCgHlPUmKwvbdEbeTxQsBL5nOKW+ups9FAEKqVPmcfKQDYAGoWIBWQ7rYWigWZUSzpIhHqv0Poq7h7bm7nZGfykwd81ubJvb42H2hsJxhbD8G+VGykOWRIgMxUDXM6FxLq5dEb2mtKqHuKGYFnImMru6QkEj5h5yvKnqWJIlznkRbOjCTRIR2NSviTL16mhntx7bTjTEqOHABQvgcoeERje8ACONpk1likAozh1WYKBupQOzMZXDneVA2f898Fr6j3TxTIpTFvu69u05KBXmNr6eeKczeD6YDC0YvnniNTDARrUCKvUnQOPIm5/fmbonnFzxTHqphkmAGJB1owKjsFi6VBrVxHkuR0EdCHq4KcNlDMiYVgSsDEQN7tFfqnkSb8RGYyfkT+xQD0aaZ+nxDEM5V2NkzvmAQ+73ncDexIF3GHALVn70WJXNY20bAUPD/rSHJmKChkfuEcuFSEDEBn7KYwQ9RkNqi/t9NMqhjOzkUHB5gZckM7WAQOnXoktSHbla/b1ESRDu6Q/wfG8H/+lFDL/qlVDATvdTbWBZBbjMVresT33RC/R5/Qowx/sRh9yiO+n8eg/5G1CDYSjHBjLswJHOE2ZLAKo9Sfx6i4utkI28H4MIZctBZhp/PJoJQGsSq58vB8Yha6ceFVhel1TZ/q3gHQ1kmlRY+FhFz3YSsRHtyCb6iNgOLlt8nLfMGVwr0+Di+S6jskk5gKR0LOYdR/OOLczyMyblKRApAs5oT+WZMFJqDNvqkUZ/65308///QGUh0e6I0513JvkNLZRvPKyrEQt0Cgx8Hom1Jeg0f6bP55Lb35kjLl9gP9E DmOZ5EFx LzetLc2LzH2f/8NA/W5ayFR+ILtFwt53mqh3fKm/N/01m5D7m+enbEYEwiB9bd9gsN8QRCXhWLeKA+I3rSPmijtCdyzuS29o3SUqCeLMrslmylspNrzX7xX51olXLrX3MM2Cq4DE7esDJcXfdkT1a1RME4hO4Y0tihTxBHPTqpNnhoWE2bnVFCIne/lB2jI9mr9qsN6l8dYnByHgqnVUGBibGj+Dep0QvwZ/I3/nKOUB0s29UQ+b1f96PzK4pIaMZyBnOmm7+5YbI4NcYFxluF/KHlQ== 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: The shmem_is_huge() is now used to check if the top-level huge page is enabled, thus rename it to reflect its usage. Signed-off-by: Baolin Wang Reviewed-by: Ryan Roberts Acked-by: David Hildenbrand --- include/linux/shmem_fs.h | 9 +++++---- mm/huge_memory.c | 5 +++-- mm/shmem.c | 15 ++++++++------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index 1d06b1e5408a..405ee8d3589a 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -111,14 +111,15 @@ extern void shmem_truncate_range(struct inode *inode, loff_t start, loff_t end); int shmem_unuse(unsigned int type); #ifdef CONFIG_TRANSPARENT_HUGEPAGE -extern bool shmem_is_huge(struct inode *inode, pgoff_t index, bool shmem_huge_force, - struct mm_struct *mm, unsigned long vm_flags); +extern bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, bool shmem_huge_force, + struct mm_struct *mm, unsigned long vm_flags); unsigned long shmem_allowable_huge_orders(struct inode *inode, struct vm_area_struct *vma, pgoff_t index, bool global_huge); #else -static __always_inline bool shmem_is_huge(struct inode *inode, pgoff_t index, bool shmem_huge_force, - struct mm_struct *mm, unsigned long vm_flags) +static __always_inline bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, + bool shmem_huge_force, struct mm_struct *mm, + unsigned long vm_flags) { return false; } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index f9696c94e211..cc9bad12be75 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -152,8 +152,9 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, * own flags. */ if (!in_pf && shmem_file(vma->vm_file)) { - bool global_huge = shmem_is_huge(file_inode(vma->vm_file), vma->vm_pgoff, - !enforce_sysfs, vma->vm_mm, vm_flags); + bool global_huge = shmem_huge_global_enabled(file_inode(vma->vm_file), + vma->vm_pgoff, !enforce_sysfs, + vma->vm_mm, vm_flags); if (!vma_is_anon_shmem(vma)) return global_huge ? orders : 0; diff --git a/mm/shmem.c b/mm/shmem.c index db7e9808830f..1445dcd39b6f 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -548,9 +548,9 @@ static bool shmem_confirm_swap(struct address_space *mapping, static int shmem_huge __read_mostly = SHMEM_HUGE_NEVER; -static bool __shmem_is_huge(struct inode *inode, pgoff_t index, - bool shmem_huge_force, struct mm_struct *mm, - unsigned long vm_flags) +static bool __shmem_huge_global_enabled(struct inode *inode, pgoff_t index, + bool shmem_huge_force, struct mm_struct *mm, + unsigned long vm_flags) { loff_t i_size; @@ -581,14 +581,15 @@ static bool __shmem_is_huge(struct inode *inode, pgoff_t index, } } -bool shmem_is_huge(struct inode *inode, pgoff_t index, +bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, bool shmem_huge_force, struct mm_struct *mm, unsigned long vm_flags) { if (HPAGE_PMD_ORDER > MAX_PAGECACHE_ORDER) return false; - return __shmem_is_huge(inode, index, shmem_huge_force, mm, vm_flags); + return __shmem_huge_global_enabled(inode, index, shmem_huge_force, + mm, vm_flags); } #if defined(CONFIG_SYSFS) @@ -1156,7 +1157,7 @@ static int shmem_getattr(struct mnt_idmap *idmap, STATX_ATTR_NODUMP); generic_fillattr(idmap, request_mask, inode, stat); - if (shmem_is_huge(inode, 0, false, NULL, 0)) + if (shmem_huge_global_enabled(inode, 0, false, NULL, 0)) stat->blksize = HPAGE_PMD_SIZE; if (request_mask & STATX_BTIME) { @@ -2153,7 +2154,7 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index, return 0; } - huge = shmem_is_huge(inode, index, false, fault_mm, + huge = shmem_huge_global_enabled(inode, index, false, fault_mm, vma ? vma->vm_flags : 0); /* Find hugepage orders that are allowed for anonymous shmem. */ if (vma && vma_is_anon_shmem(vma)) From patchwork Sat Jul 13 13:24:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13732409 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 6CF73C3DA45 for ; Sat, 13 Jul 2024 13:24:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A39A46B0083; Sat, 13 Jul 2024 09:24:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 999766B0093; Sat, 13 Jul 2024 09:24:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6877E6B0083; Sat, 13 Jul 2024 09:24:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3A2F86B0088 for ; Sat, 13 Jul 2024 09:24:40 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id D80CAA3EF3 for ; Sat, 13 Jul 2024 13:24:39 +0000 (UTC) X-FDA: 82334799078.03.03CEDDD Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by imf06.hostedemail.com (Postfix) with ESMTP id 19013180015 for ; Sat, 13 Jul 2024 13:24:34 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=RbTK9CIg; spf=pass (imf06.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.130 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=1720877042; 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=Q6qMaXIaTDYvJfprl3aijdTJlnnyWcHY799Vnupoh5o=; b=0KLmTUSog8HsVYScLhOl+tWRiEwjcyVlvndM2NC5jUJb9yNIF/AA7XEbrM9sHh8Iks0C3G ohX7ztyRewNRg/7otKUJaZ7Km2paZZjq1+wwzwFoKp6CfDUp7/DCzNRpo4YF82N62KXS0H toOljtP/gchNbbiiUdVbZ1PSvXwK41I= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720877042; a=rsa-sha256; cv=none; b=LlF4jRvUiEOiVoz9xQ+s1cxN4cLZCxVd5qgbqYbfkJNh72bXaWkKtlJkC6NebFn20AsnDh DK8bQTzfo5HrYM3nkmJzgB/OWb/V/qULPHO0mXUt80NlvnFi8t0movehJeNp/Z1MmlFXQ1 HgzFgOsNThbPhV55U7J3oZTC82980e4= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=RbTK9CIg; spf=pass (imf06.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.130 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=1720877072; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Q6qMaXIaTDYvJfprl3aijdTJlnnyWcHY799Vnupoh5o=; b=RbTK9CIg8a98a66riFWIVYJEGtymoqhicvFe7sZwSM/EBZQNu7gKKtCXTF+AZzSyWUwI66wEfTPy+JKNcxvhdCUyTUQIpCDrtbmfEsf8QXGS77oGm3PS0EqmZML74zEwaYshsi5WbjNuAZpjMzsBtjSZR0SxmfRY+EgZRQLUnOE= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R601e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033045220184;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0WAQzACU_1720877070; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WAQzACU_1720877070) by smtp.aliyun-inc.com; Sat, 13 Jul 2024 21:24:31 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, 21cnbao@gmail.com, ryan.roberts@arm.com, ziy@nvidia.com, ioworker0@gmail.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] mm: shmem: move shmem_huge_global_enabled() into shmem_allowable_huge_orders() Date: Sat, 13 Jul 2024 21:24:22 +0800 Message-Id: <16dad33282617ecb90a3f466b35273b10be68d21.1720755678.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: jpbx93fg45hocrjqbtpto4eq1k6d3tdu X-Rspamd-Queue-Id: 19013180015 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1720877074-641484 X-HE-Meta: U2FsdGVkX1/3t/dbsAKMp4a4qsrVwm0aNJZ/LBNvlbS3cN7Ez2C72KzcB9RssDgt1wvhDkgLQoOe+MDq+0ZXr7+GKhKIx96GLXnkpi8CaEGKMR4N1rBnytgj7Du1ltTdTWmKoZw0ca+ac9j0T3ehG9U7R20+cXXgmNXKhHUDiA5nbjyjIn2vmbWXFKeb7miqREH8SsRlSZLfkHX7zLYvDn4+diaSiT28GyTnRdeK0YCbRXhG3kRGYW53hWCuX6Q65x3S4SRq5sftilQjPHptXGl1npqmUThqG1C9rAp5oW2HML5OJkHxd6RQ8cjyzIYtW2maAMSWjRgMGKGWHtzbNJPSNlsFNmwPez+0uCti0pbDLHk9mPTLeFYoDcC72LRKTjEO7NFHbgiwj5eqtiL1iNCvNKf4O4oQnMp2CTrZVYe1o8rISev/LiJ7rSSq6MYxKZSTVTg/MMg1SYPcxhFIwVRnALVU4J9V5aDZejF+kRO0/EWXt8LIE/OYQ31pqtXCywxjIWNyASvWbxgireKlFW5pdhEzoqOiKE0/eSGXRhEqb2IVPuDjFSTCa8uWaZFWXMHK9/XtCQViyo891cflEAa7afdlsKnAzK4a7Dn4EHS2Mpy/aSRKDCoDOMhCSF37oKxkU/DBV0XyZ2UHNT6Dq5Q/VGGT880hQ6US2lVZWWzrBnmoEW+ay2Oh7atJDiKNi5K5W7cbDMz4xyDPdFTjk73etNXOJEjj+00JRAB4w6CU6YJyYrIsmnbkemXm0UsbX2RMjcsVNZd9f/gp0QfB7O/z3Ozln1SJ986AtXEY6v9vMazsQcSDUwrgzR0qG0uPoCq/dSkqw4BpvQpi/Ul2xVVfDmmCBJNoI+ZCZKBgXQZnXkWh7gbpkNpUnL7Yi0GWTkH0soZBV7Wy1VQKtRF0/RX32AJtYdsAxjiL9/i7+ZYIF9qJaBKKt49Kl9sGgFyzvqYdrLIYfgll1po3G9T pCDd4WiN vsA+TdhJ0EScanOHbUs87StEMzCxj7EmC+kW286X9kR3R/ND9t1N8D/4B3J/4SboBLQ0BeP/YmWsYF99Baw1ZCv8r9l3bX4EbHFmZF3fJgvkcRQ7AgDRTljQ0zCePDXdO0mn3v6QPszL+nF/YkPq9j+pcW1wTQKgTxmRS5SQTm7MYB7Y9YkfIbdtME1Cmz5NsKBcnISP0d70eXFufREE3FTrj+GS7+e++k7GUIXreVdI3kZV67NSYB2M/9w== 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: Move shmem_huge_global_enabled() into the shmem_allowable_huge_orders() function, so that shmem_allowable_huge_orders() can also help to find the allowable huge orders for tmpfs. Moreover the shmem_huge_global_enabled() can become static. No functional changes. Signed-off-by: Baolin Wang Reviewed-by: Ryan Roberts Acked-by: David Hildenbrand --- include/linux/shmem_fs.h | 12 ++---------- mm/huge_memory.c | 12 +++--------- mm/shmem.c | 41 ++++++++++++++++++++++++++-------------- 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index 405ee8d3589a..1564d7d3ca61 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -111,21 +111,13 @@ extern void shmem_truncate_range(struct inode *inode, loff_t start, loff_t end); int shmem_unuse(unsigned int type); #ifdef CONFIG_TRANSPARENT_HUGEPAGE -extern bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, bool shmem_huge_force, - struct mm_struct *mm, unsigned long vm_flags); unsigned long shmem_allowable_huge_orders(struct inode *inode, struct vm_area_struct *vma, pgoff_t index, - bool global_huge); + bool shmem_huge_force); #else -static __always_inline bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, - bool shmem_huge_force, struct mm_struct *mm, - unsigned long vm_flags) -{ - return false; -} static inline unsigned long shmem_allowable_huge_orders(struct inode *inode, struct vm_area_struct *vma, pgoff_t index, - bool global_huge) + bool shmem_huge_force) { return 0; } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index cc9bad12be75..f69980b5b5fc 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -151,16 +151,10 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, * Must be done before hugepage flags check since shmem has its * own flags. */ - if (!in_pf && shmem_file(vma->vm_file)) { - bool global_huge = shmem_huge_global_enabled(file_inode(vma->vm_file), - vma->vm_pgoff, !enforce_sysfs, - vma->vm_mm, vm_flags); - - if (!vma_is_anon_shmem(vma)) - return global_huge ? orders : 0; + if (!in_pf && shmem_file(vma->vm_file)) return shmem_allowable_huge_orders(file_inode(vma->vm_file), - vma, vma->vm_pgoff, global_huge); - } + vma, vma->vm_pgoff, + !enforce_sysfs); if (!vma_is_anonymous(vma)) { /* diff --git a/mm/shmem.c b/mm/shmem.c index 1445dcd39b6f..4d274f5a17d9 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -581,7 +581,7 @@ static bool __shmem_huge_global_enabled(struct inode *inode, pgoff_t index, } } -bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, +static bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, bool shmem_huge_force, struct mm_struct *mm, unsigned long vm_flags) { @@ -772,6 +772,13 @@ 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, + bool shmem_huge_force, struct mm_struct *mm, + unsigned long vm_flags) +{ + return false; +} #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ /* @@ -1625,27 +1632,39 @@ static gfp_t limit_gfp_mask(gfp_t huge_gfp, gfp_t limit_gfp) #ifdef CONFIG_TRANSPARENT_HUGEPAGE unsigned long shmem_allowable_huge_orders(struct inode *inode, struct vm_area_struct *vma, pgoff_t index, - bool global_huge) + bool shmem_huge_force) { 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->vm_flags; + unsigned long vm_flags = vma ? vma->vm_flags : 0; + struct mm_struct *fault_mm = vma ? vma->vm_mm : NULL; /* * Check all the (large) orders below HPAGE_PMD_ORDER + 1 that * are enabled for this vma. */ unsigned long orders = BIT(PMD_ORDER + 1) - 1; + bool global_huge; loff_t i_size; int order; - if ((vm_flags & VM_NOHUGEPAGE) || - test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags)) + if (vma && ((vm_flags & VM_NOHUGEPAGE) || + test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags))) return 0; /* If the hardware/firmware marked hugepage support disabled. */ if (transparent_hugepage_flags & (1 << TRANSPARENT_HUGEPAGE_UNSUPPORTED)) return 0; + global_huge = shmem_huge_global_enabled(inode, index, shmem_huge_force, + fault_mm, 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; + } + /* * Following the 'deny' semantics of the top level, force the huge * option off from all mounts. @@ -2081,7 +2100,7 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index, struct mm_struct *fault_mm; struct folio *folio; int error; - bool alloced, huge; + bool alloced; unsigned long orders = 0; if (WARN_ON_ONCE(!shmem_mapping(inode->i_mapping))) @@ -2154,14 +2173,8 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index, return 0; } - huge = shmem_huge_global_enabled(inode, index, false, fault_mm, - vma ? vma->vm_flags : 0); - /* Find hugepage orders that are allowed for anonymous shmem. */ - if (vma && vma_is_anon_shmem(vma)) - orders = shmem_allowable_huge_orders(inode, vma, index, huge); - else if (huge) - orders = BIT(HPAGE_PMD_ORDER); - + /* Find hugepage orders that are allowed for anonymous shmem and tmpfs. */ + orders = shmem_allowable_huge_orders(inode, vma, index, false); if (orders > 0) { gfp_t huge_gfp;