From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B37AC433E0 for ; Wed, 10 Jun 2020 20:13:56 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 564502074B for ; Wed, 10 Jun 2020 20:13:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="LkO1X8I4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 564502074B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 3650E8D0006; Wed, 10 Jun 2020 16:13:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D66898D000B; Wed, 10 Jun 2020 16:13:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B19F88D0002; Wed, 10 Jun 2020 16:13:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0037.hostedemail.com [216.40.44.37]) by kanga.kvack.org (Postfix) with ESMTP id 781808D0006 for ; Wed, 10 Jun 2020 16:13:49 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 2171A1A1E12 for ; Wed, 10 Jun 2020 20:13:49 +0000 (UTC) X-FDA: 76914402978.02.army25_16058c726dce Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id F04031A1E0D for ; Wed, 10 Jun 2020 20:13:48 +0000 (UTC) X-HE-Tag: army25_16058c726dce X-Filterd-Recvd-Size: 4187 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf04.hostedemail.com (Postfix) with ESMTP for ; Wed, 10 Jun 2020 20:13:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=PUB7gfbS6ya/Oo2I8iRDMBuQXcmwMzHEvRek9lLjtrk=; b=LkO1X8I4f9ucjNuiIzDwWeYSWv tcZiSpsQMP6v0AfubRtN5yEuKdqJfX+vAeUQkz6WQ3IEqXIuuPtOHqkaudY9BnFJnxy8HhlafpghG 5gJcWMvLnrf84utweVaf3uut8m6rt9uhCww3CZPUMMBONYuglZ83iCxeOWKrVOouWFTP20af0MAGj DWS6kbuW89rGv93C9UpLVDw4yPjF2cF8BtvP38cQiBJhJ/NktrV8Bw4oyjy4xwvR7OKwMVLfSH4sJ 2qc+GO3Qp3GelzcO3dBjUrnBWZScZfR1TxX21ZmLZHJQ4WXZDw0ucQR0j+xSd3yC9quB1AZVD4854 EXhPakMQ==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jj76Z-0003UJ-PQ; Wed, 10 Jun 2020 20:13:47 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 14/51] fs: Add a filesystem flag for THPs Date: Wed, 10 Jun 2020 13:13:08 -0700 Message-Id: <20200610201345.13273-15-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200610201345.13273-1-willy@infradead.org> References: <20200610201345.13273-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: F04031A1E0D X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 Content-Transfer-Encoding: quoted-printable 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: From: "Matthew Wilcox (Oracle)" The page cache needs to know whether the filesystem supports THPs. Signed-off-by: Matthew Wilcox (Oracle) --- fs/inode.c | 2 ++ include/linux/fs.h | 1 + include/linux/pagemap.h | 6 ++++++ mm/shmem.c | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/fs/inode.c b/fs/inode.c index 72c4c347afb7..9d78c37b00b8 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -181,6 +181,8 @@ int inode_init_always(struct super_block *sb, struct = inode *inode) mapping->a_ops =3D &empty_aops; mapping->host =3D inode; mapping->flags =3D 0; + if (sb->s_type->fs_flags & FS_THP_SUPPORT) + __set_bit(AS_THP_SUPPORT, &mapping->flags); mapping->wb_err =3D 0; atomic_set(&mapping->i_mmap_writable, 0); #ifdef CONFIG_READ_ONLY_THP_FOR_FS diff --git a/include/linux/fs.h b/include/linux/fs.h index 19ef6c88c152..ac411a08f83c 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2241,6 +2241,7 @@ struct file_system_type { #define FS_HAS_SUBTYPE 4 #define FS_USERNS_MOUNT 8 /* Can be mounted by userns root */ #define FS_DISALLOW_NOTIFY_PERM 16 /* Disable fanotify permission events= */ +#define FS_THP_SUPPORT 8192 /* Remove once all fs converted */ #define FS_RENAME_DOES_D_MOVE 32768 /* FS will handle d_move() during re= name() internally. */ int (*init_fs_context)(struct fs_context *); const struct fs_parameter_spec *parameters; diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 484a36185bb5..8a45b572bcf1 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -29,6 +29,7 @@ enum mapping_flags { AS_EXITING =3D 4, /* final truncate in progress */ /* writeback related tags are not used */ AS_NO_WRITEBACK_TAGS =3D 5, + AS_THP_SUPPORT =3D 6, /* THPs supported */ }; =20 /** @@ -119,6 +120,11 @@ static inline void mapping_set_gfp_mask(struct addre= ss_space *m, gfp_t mask) m->gfp_mask =3D mask; } =20 +static inline bool mapping_thp_support(struct address_space *mapping) +{ + return test_bit(AS_THP_SUPPORT, &mapping->flags); +} + void release_pages(struct page **pages, int nr); =20 /* diff --git a/mm/shmem.c b/mm/shmem.c index a0dbe62f8042..a05d129a45e9 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3854,7 +3854,7 @@ static struct file_system_type shmem_fs_type =3D { .parameters =3D shmem_fs_parameters, #endif .kill_sb =3D kill_litter_super, - .fs_flags =3D FS_USERNS_MOUNT, + .fs_flags =3D FS_USERNS_MOUNT | FS_THP_SUPPORT, }; =20 int __init shmem_init(void) --=20 2.26.2