From patchwork Thu Mar 17 23:48:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 12784678 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 DDF07C43219 for ; Thu, 17 Mar 2022 23:48:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 778108D0008; Thu, 17 Mar 2022 19:48:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 74F1E8D0001; Thu, 17 Mar 2022 19:48:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5C9228D0008; Thu, 17 Mar 2022 19:48:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.27]) by kanga.kvack.org (Postfix) with ESMTP id 4DBE48D0001 for ; Thu, 17 Mar 2022 19:48:44 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 1A9361052 for ; Thu, 17 Mar 2022 23:48:44 +0000 (UTC) X-FDA: 79255520568.03.6F7261A Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by imf17.hostedemail.com (Postfix) with ESMTP id 9C03940013 for ; Thu, 17 Mar 2022 23:48:43 +0000 (UTC) Received: by mail-pj1-f42.google.com with SMTP id o68-20020a17090a0a4a00b001c686a48263so1898932pjo.1 for ; Thu, 17 Mar 2022 16:48:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Lh1UGdWCnbI+ssw0qidScDsXf7KLfyH1hGff66irmcE=; b=R1QJxrwiBU4YS9L9DkNURkUR9lfvb/Cy/T8EIWRnh6gbYSCC+76DVh7/Jg9jXSf55g K6fpUi/kIkvkwh+o4gfxQRQ5zFay3g2W0HPBHBD6F0DwymIdlYggztiNO9NHEThRgSbr TtnUpg1e0ovlzbqghftQc0RWPR74EJoBCVaUoW93aADPRfCh7a47k3yhbTmOiWYCBy1I 9EotNKrzw5joQz0eceyxb0qCftsl2fDAIaB+5eS4UgleMXpNCi4e479tODCu9TAGkrNj 06Ao5McZwciCNSoBQ3XEaZmXgisinxI7sJzX9BY53KfeZsQezL79/RTAj83B6BCpzaJs BQ5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lh1UGdWCnbI+ssw0qidScDsXf7KLfyH1hGff66irmcE=; b=jpYPChap3D+H4uUSTHmwzqbV95KdCChr1Pd54FGycFIIbqcYDoOWe33pGQjSJBwY3t dcqijG0L/m/PZUuuwnluzK1mwGtjuhNH5l2k4XSipQn6WVHixuVu5X0SxAlAKiw9qXYk 8pnlGC8RS9QIF/KvlMXTieO6A9O+QzGrj/RETJWcYNH7Q4XAd96+2POkXQGMHxSr0x83 ndHL3ob2kuaMKhHDowGNsav/G8KgR0dbyF5rprlElH+SPOY+7U6jgOwR967MGcSsU9gg tMuL9lRIAYrsTkqXeOCs+iCpHzmtBugRt47fWPw/NTUoYO+H7B5quKjTlYg89i0WRG72 gbww== X-Gm-Message-State: AOAM533wQgxqZLPXjSv4OQYmxbqXaiqRcJEpx8mxW0A32cCiKwU+22oy yN3Xh0SSXkz9ccWKtDiSAtg= X-Google-Smtp-Source: ABdhPJxH1oWUw7HG5U383xf4tuloVnFsIXbUZKg15Usu8FWbDYGloqS9CKbXc3kH1w7IZ+w1PBStrQ== X-Received: by 2002:a17:90a:e541:b0:1c6:55e5:ae4b with SMTP id ei1-20020a17090ae54100b001c655e5ae4bmr13968964pjb.62.1647560922758; Thu, 17 Mar 2022 16:48:42 -0700 (PDT) Received: from localhost.localdomain (c-67-174-241-145.hsd1.ca.comcast.net. [67.174.241.145]) by smtp.gmail.com with ESMTPSA id o7-20020aa79787000000b004f8e44a02e2sm8581329pfp.45.2022.03.17.16.48.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 16:48:42 -0700 (PDT) From: Yang Shi To: vbabka@suse.cz, kirill.shutemov@linux.intel.com, linmiaohe@huawei.com, songliubraving@fb.com, riel@surriel.com, willy@infradead.org, ziy@nvidia.com, akpm@linux-foundation.org, tytso@mit.edu, adilger.kernel@dilger.ca, darrick.wong@oracle.com Cc: shy828301@gmail.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [v2 PATCH 4/8] mm: thp: only regular file could be THP eligible Date: Thu, 17 Mar 2022 16:48:23 -0700 Message-Id: <20220317234827.447799-5-shy828301@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20220317234827.447799-1-shy828301@gmail.com> References: <20220317234827.447799-1-shy828301@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 9C03940013 X-Stat-Signature: cciaf9515itbzsrqu58kg8rn9dohu5q4 Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=R1QJxrwi; spf=pass (imf17.hostedemail.com: domain of shy828301@gmail.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=shy828301@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-HE-Tag: 1647560923-233324 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: Since commit a4aeaa06d45e ("mm: khugepaged: skip huge page collapse for special files"), khugepaged just collapses THP for regular file which is the intended usecase for readonly fs THP. Only show regular file as THP eligible accordingly. And make file_thp_enabled() available for khugepaged too in order to remove duplicate code. Signed-off-by: Yang Shi --- include/linux/huge_mm.h | 14 ++++++++++++++ mm/huge_memory.c | 11 ++--------- mm/khugepaged.c | 9 ++------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index e4c18ba8d3bf..3cfa79732112 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -172,6 +172,20 @@ static inline bool __transparent_hugepage_enabled(struct vm_area_struct *vma) return false; } +static inline bool file_thp_enabled(struct vm_area_struct *vma) +{ + struct inode *inode; + + if (!vma->vm_file) + return false; + + inode = vma->vm_file->f_inode; + + return (IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS)) && + (vma->vm_flags & VM_EXEC) && + !inode_is_open_for_write(inode) && S_ISREG(inode->i_mode); +} + bool transparent_hugepage_active(struct vm_area_struct *vma); #define transparent_hugepage_use_zero_page() \ diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 406a3c28c026..a87b3df63209 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -64,13 +64,6 @@ static atomic_t huge_zero_refcount; struct page *huge_zero_page __read_mostly; unsigned long huge_zero_pfn __read_mostly = ~0UL; -static inline bool file_thp_enabled(struct vm_area_struct *vma) -{ - return transhuge_vma_enabled(vma, vma->vm_flags) && vma->vm_file && - !inode_is_open_for_write(vma->vm_file->f_inode) && - (vma->vm_flags & VM_EXEC); -} - bool transparent_hugepage_active(struct vm_area_struct *vma) { /* The addr is used to check if the vma size fits */ @@ -82,8 +75,8 @@ bool transparent_hugepage_active(struct vm_area_struct *vma) return __transparent_hugepage_enabled(vma); if (vma_is_shmem(vma)) return shmem_huge_enabled(vma); - if (IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS)) - return file_thp_enabled(vma); + if (transhuge_vma_enabled(vma, vma->vm_flags) && file_thp_enabled(vma)) + return true; return false; } diff --git a/mm/khugepaged.c b/mm/khugepaged.c index a0e4fa33660e..3dbac3e23f43 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -465,13 +465,8 @@ static bool hugepage_vma_check(struct vm_area_struct *vma, return false; /* Only regular file is valid */ - if (IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) && vma->vm_file && - (vm_flags & VM_EXEC)) { - struct inode *inode = vma->vm_file->f_inode; - - return !inode_is_open_for_write(inode) && - S_ISREG(inode->i_mode); - } + if (file_thp_enabled(vma)) + return true; if (!vma->anon_vma || vma->vm_ops) return false;