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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C329EE4993 for ; Mon, 21 Aug 2023 11:16:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 654368D0001; Mon, 21 Aug 2023 07:16:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5910C8D000A; Mon, 21 Aug 2023 07:16:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E4278D0001; Mon, 21 Aug 2023 07:16:50 -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 132218D0001 for ; Mon, 21 Aug 2023 07:16:50 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id DBD2EA03FA for ; Mon, 21 Aug 2023 11:16:49 +0000 (UTC) X-FDA: 81147859338.11.67E6402 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf19.hostedemail.com (Postfix) with ESMTP id 0149D1A001D; Mon, 21 Aug 2023 11:16:45 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=q0ejeWqc; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=hHCYmD6L; dmarc=none; spf=pass (imf19.hostedemail.com: domain of jack@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=jack@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692616606; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Udw7N5HlVBQuWC31pCAPQtIePMwhDXYjsCpuvYAFClY=; b=lmMmmOKRzDlm4d4CLNICHVPIzl0xyM7Txj4GzfB2RsGslkg7t+SSIvAGAXd6gQx9XxjK+j 1PO4Yo126/2ajuxVFaNtqMwoLR+Xl1urINqrPrPhkSoi/5/TBvAcPNWxnFDowQHA8B/PYP VZ7es13XBy+yA/76CjdgOkF3itzcKm4= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=q0ejeWqc; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=hHCYmD6L; dmarc=none; spf=pass (imf19.hostedemail.com: domain of jack@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=jack@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692616607; a=rsa-sha256; cv=none; b=4wxicphAA2IBA1Wf4CNvvJAP7jDPa0aUNwtREorm4sBFMcCbZz2xZqDZmsT4gEgW8Y7Kxx Vobj/RXJJ4svNe5jTF6Z0d66p4u4INcehjnhPCvWhENhCgOC2bH7jRlkw8mvZeUCtP4k3Q 60rtDanCMubQgpRvsl2oqYD19E3HZjA= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B0F1A22BB9; Mon, 21 Aug 2023 11:16:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1692616603; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Udw7N5HlVBQuWC31pCAPQtIePMwhDXYjsCpuvYAFClY=; b=q0ejeWqcUAQb3vDZNJm1S6WgvBkl01RlwpUJxixgt8bhgc1UiPiVf5ggrBin/SCdgAkRdi Uq8jZ/rmfp0CEzXHkTXnuKSLH6eESqU1NrYVVJKkQpNo6v2uLsraVnFC8NF6jyZ6cQt7cL pvNOktrEJbBOoDwl6gfmIjBlWgdUHzU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1692616603; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Udw7N5HlVBQuWC31pCAPQtIePMwhDXYjsCpuvYAFClY=; b=hHCYmD6LNEDeyOqj0a7Wau8GaaDOUykSuq8KjMmU3dThSVmDW2iwK7bzJgLaU/KpXZTPk/ TFXXUmeD1HbJooCA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 9CE8413421; Mon, 21 Aug 2023 11:16:43 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id d3FFJptH42TQFgAAMHmgww (envelope-from ); Mon, 21 Aug 2023 11:16:43 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 367D1A0774; Mon, 21 Aug 2023 13:16:43 +0200 (CEST) Date: Mon, 21 Aug 2023 13:16:43 +0200 From: Jan Kara To: Xueshi Hu Cc: dan.j.williams@intel.com, vishal.l.verma@intel.com, dave.jiang@intel.com, jayalk@intworks.biz, daniel@ffwll.ch, deller@gmx.de, bcrl@kvack.org, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.com, tytso@mit.edu, adilger.kernel@dilger.ca, miklos@szeredi.hu, mike.kravetz@oracle.com, muchun.song@linux.dev, djwong@kernel.org, willy@infradead.org, akpm@linux-foundation.org, hughd@google.com, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-mm@kvack.org, linux-xfs@vger.kernel.org Subject: Re: [PATCH] fs: clean up usage of noop_dirty_folio Message-ID: <20230821111643.5vxtktznjqk42cak@quack3> References: <20230819124225.1703147-1-xueshi.hu@smartx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230819124225.1703147-1-xueshi.hu@smartx.com> X-Rspam-User: X-Stat-Signature: tji7ybhnjs3bo18asniqjppccp76ab93 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 0149D1A001D X-HE-Tag: 1692616605-15884 X-HE-Meta: U2FsdGVkX1+OYk4aSBXcn/DSspL6acj+fRx/jcgGWiLkQCqweO74Gn+6xVtRX3Z/3fPs7Kr4XvL5oig203AlBZIXXPijHnx2jK9ENvPkyuAa9qTn7lyQ3Z9p+qsF8hos/NKxanqlLGiy7BvIYd4uYS/5tKpJ/8XX04z8GbGV8dhi4ppmELInfwELLQZiY4SC8Pos7qtllrKv5cyVWgutu5tNGpVz1Bnu9SF+0NIYyWI8tL+BuWjkvbg863ByKs3hs3RFivzCUQNTi9uOE8yG2QaNESLnjJWdk8OUEv0Vaj52GXiTRFfaJa92Olt4EiOcgnueqS1OGkqThXZkrG7C33kwiSPZxdMmmdGcRzcKNvFBJ5mykB68PufGnb2T6+PwbwZRl8NF1fZY+txxC0EmzdYd0TFsH9+a7Knc/vJshZHN+jTpwAZbcDtGTCYHSYNeqTr7ZJcgYBaX6v7/cwCVq4jXpECbJnNEXI3p+n2gzTvw6Nnl8ZwjvVRiaYQakPIC2WfhPI+RkvVEoWPsciN15fL3SoFr8CuLzKV5XmBVoaPZSCUiBa4qMLWs9MJ71b2CQc+RnnvAjp09EzwIgI0IyHngEk72QcFgdYn/lDf4lvNm+h03WAJVIHzMPHmDQZB2PIIJ2qyKfEBhQil+z66WPGtU/En6K4FS6QSGchaLdlhgbIavYraAE6NjEWa0uQVKllq8wCNhtTDIOu1EqCVbuEmzQcPF2rxbcvup0xNFgd3VZYDOaFJO3CmtSldoKsxMF4Lz314aWYN9Agzi7XgzRTuTvotOzUKBVOBoeUwVuvP74jpSIjXtGiVexAEAx63OrDia/g7FhI2PnqzxjHpK3J/I8R3gpsIBZq4gsoeEcwVOUerEQUjlbrUe3BrxA9/9zN8Iy0BjooC8jBX1Mf8m5tyjrfoh5mW36ZjrYyiBIzNamAtWEcqAU0G3pZAw30Ux+ftQdpOEce9oDwbliHP 1CvLCwyh EvNSOe1W0W7w1riP6S0uKo/4xi5m7g1f31YoTHc06DQSQS+yK5VefQoBDBUI8XsvJZM5Rd6/B0RAxRruYNQjYUq1CJE07oI9+LMEjZFORBYwtxQyRVHJcBAEvYSvy5+LPf/VeXygRX9ign7UnKxl7CQPOUGJPMlMNvPf4F8rIe2vqYyZg91uHyjOnhjPjmB5PVQNu7nX9Ur1uR05so+Oo7ouWq/DUsNUwQlSpcYDwVgB5l75voepIJYpV84p7HFN79Yi8GOhYLqoCTrFbP4m7CBO8Uo6pZOgid6+l5KVQgnc3ZtBYIi6UaL8HWjFJ0a8C8u05aWexweGlVH82ueL7wHrhmEhiv/WcntSRGQ9G5X4lC78= 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: On Sat 19-08-23 20:42:25, Xueshi Hu wrote: > In folio_mark_dirty(), it will automatically fallback to > noop_dirty_folio() if a_ops->dirty_folio is not registered. > > As anon_aops, dev_dax_aops and fb_deferred_io_aops becames empty, remove > them too. > > Signed-off-by: Xueshi Hu Yeah, looks sensible to me but for some callbacks we are oscilating between all users having to provide some callback and providing some default behavior for NULL callback. I don't have a strong opinion either way so feel free to add: Reviewed-by: Jan Kara But I guess let's see what Matthew thinks about this and what plans he has so that we don't switch back again in the near future. Matthew? Honza > --- > drivers/dax/device.c | 5 ----- > drivers/video/fbdev/core/fb_defio.c | 5 ----- > fs/aio.c | 1 - > fs/ext2/inode.c | 1 - > fs/ext4/inode.c | 1 - > fs/fuse/dax.c | 1 - > fs/hugetlbfs/inode.c | 1 - > fs/libfs.c | 5 ----- > fs/xfs/xfs_aops.c | 1 - > include/linux/pagemap.h | 1 - > mm/page-writeback.c | 6 +++--- > mm/secretmem.c | 1 - > mm/shmem.c | 1 - > mm/swap_state.c | 1 - > 14 files changed, 3 insertions(+), 28 deletions(-) > > diff --git a/drivers/dax/device.c b/drivers/dax/device.c > index 30665a3ff6ea..018aa9f88ec7 100644 > --- a/drivers/dax/device.c > +++ b/drivers/dax/device.c > @@ -345,10 +345,6 @@ static unsigned long dax_get_unmapped_area(struct file *filp, > return current->mm->get_unmapped_area(filp, addr, len, pgoff, flags); > } > > -static const struct address_space_operations dev_dax_aops = { > - .dirty_folio = noop_dirty_folio, > -}; > - > static int dax_open(struct inode *inode, struct file *filp) > { > struct dax_device *dax_dev = inode_dax(inode); > @@ -358,7 +354,6 @@ static int dax_open(struct inode *inode, struct file *filp) > dev_dbg(&dev_dax->dev, "trace\n"); > inode->i_mapping = __dax_inode->i_mapping; > inode->i_mapping->host = __dax_inode; > - inode->i_mapping->a_ops = &dev_dax_aops; > filp->f_mapping = inode->i_mapping; > filp->f_wb_err = filemap_sample_wb_err(filp->f_mapping); > filp->f_sb_err = file_sample_sb_err(filp); > diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c > index 274f5d0fa247..08be3592281f 100644 > --- a/drivers/video/fbdev/core/fb_defio.c > +++ b/drivers/video/fbdev/core/fb_defio.c > @@ -221,10 +221,6 @@ static const struct vm_operations_struct fb_deferred_io_vm_ops = { > .page_mkwrite = fb_deferred_io_mkwrite, > }; > > -static const struct address_space_operations fb_deferred_io_aops = { > - .dirty_folio = noop_dirty_folio, > -}; > - > int fb_deferred_io_mmap(struct fb_info *info, struct vm_area_struct *vma) > { > vma->vm_ops = &fb_deferred_io_vm_ops; > @@ -307,7 +303,6 @@ void fb_deferred_io_open(struct fb_info *info, > { > struct fb_deferred_io *fbdefio = info->fbdefio; > > - file->f_mapping->a_ops = &fb_deferred_io_aops; > fbdefio->open_count++; > } > EXPORT_SYMBOL_GPL(fb_deferred_io_open); > diff --git a/fs/aio.c b/fs/aio.c > index 77e33619de40..4cf386f9cb1c 100644 > --- a/fs/aio.c > +++ b/fs/aio.c > @@ -484,7 +484,6 @@ static int aio_migrate_folio(struct address_space *mapping, struct folio *dst, > #endif > > static const struct address_space_operations aio_ctx_aops = { > - .dirty_folio = noop_dirty_folio, > .migrate_folio = aio_migrate_folio, > }; > > diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c > index 75983215c7a1..ce191bdf1c78 100644 > --- a/fs/ext2/inode.c > +++ b/fs/ext2/inode.c > @@ -971,7 +971,6 @@ const struct address_space_operations ext2_aops = { > static const struct address_space_operations ext2_dax_aops = { > .writepages = ext2_dax_writepages, > .direct_IO = noop_direct_IO, > - .dirty_folio = noop_dirty_folio, > }; > > /* > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index 43775a6ca505..67c1710c01b0 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -3561,7 +3561,6 @@ static const struct address_space_operations ext4_da_aops = { > static const struct address_space_operations ext4_dax_aops = { > .writepages = ext4_dax_writepages, > .direct_IO = noop_direct_IO, > - .dirty_folio = noop_dirty_folio, > .bmap = ext4_bmap, > .swap_activate = ext4_iomap_swap_activate, > }; > diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c > index 8e74f278a3f6..50ca767cbd5e 100644 > --- a/fs/fuse/dax.c > +++ b/fs/fuse/dax.c > @@ -1326,7 +1326,6 @@ bool fuse_dax_inode_alloc(struct super_block *sb, struct fuse_inode *fi) > static const struct address_space_operations fuse_dax_file_aops = { > .writepages = fuse_dax_writepages, > .direct_IO = noop_direct_IO, > - .dirty_folio = noop_dirty_folio, > }; > > static bool fuse_should_enable_dax(struct inode *inode, unsigned int flags) > diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c > index 7b17ccfa039d..5404286f0c13 100644 > --- a/fs/hugetlbfs/inode.c > +++ b/fs/hugetlbfs/inode.c > @@ -1266,7 +1266,6 @@ static void hugetlbfs_destroy_inode(struct inode *inode) > static const struct address_space_operations hugetlbfs_aops = { > .write_begin = hugetlbfs_write_begin, > .write_end = hugetlbfs_write_end, > - .dirty_folio = noop_dirty_folio, > .migrate_folio = hugetlbfs_migrate_folio, > .error_remove_page = hugetlbfs_error_remove_page, > }; > diff --git a/fs/libfs.c b/fs/libfs.c > index 5b851315eeed..982f220a9ee3 100644 > --- a/fs/libfs.c > +++ b/fs/libfs.c > @@ -627,7 +627,6 @@ const struct address_space_operations ram_aops = { > .read_folio = simple_read_folio, > .write_begin = simple_write_begin, > .write_end = simple_write_end, > - .dirty_folio = noop_dirty_folio, > }; > EXPORT_SYMBOL(ram_aops); > > @@ -1231,16 +1230,12 @@ EXPORT_SYMBOL(kfree_link); > > struct inode *alloc_anon_inode(struct super_block *s) > { > - static const struct address_space_operations anon_aops = { > - .dirty_folio = noop_dirty_folio, > - }; > struct inode *inode = new_inode_pseudo(s); > > if (!inode) > return ERR_PTR(-ENOMEM); > > inode->i_ino = get_next_ino(); > - inode->i_mapping->a_ops = &anon_aops; > > /* > * Mark the inode dirty from the very beginning, > diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c > index 451942fb38ec..300acea9ee63 100644 > --- a/fs/xfs/xfs_aops.c > +++ b/fs/xfs/xfs_aops.c > @@ -590,6 +590,5 @@ const struct address_space_operations xfs_address_space_operations = { > > const struct address_space_operations xfs_dax_aops = { > .writepages = xfs_dax_writepages, > - .dirty_folio = noop_dirty_folio, > .swap_activate = xfs_iomap_swapfile_activate, > }; > diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h > index 716953ee1ebd..9de3be51dee2 100644 > --- a/include/linux/pagemap.h > +++ b/include/linux/pagemap.h > @@ -1074,7 +1074,6 @@ bool folio_clear_dirty_for_io(struct folio *folio); > bool clear_page_dirty_for_io(struct page *page); > void folio_invalidate(struct folio *folio, size_t offset, size_t length); > int __set_page_dirty_nobuffers(struct page *page); > -bool noop_dirty_folio(struct address_space *mapping, struct folio *folio); > > #ifdef CONFIG_MIGRATION > int filemap_migrate_folio(struct address_space *mapping, struct folio *dst, > diff --git a/mm/page-writeback.c b/mm/page-writeback.c > index d3f42009bb70..638ec965cf0b 100644 > --- a/mm/page-writeback.c > +++ b/mm/page-writeback.c > @@ -2588,13 +2588,12 @@ int do_writepages(struct address_space *mapping, struct writeback_control *wbc) > /* > * For address_spaces which do not use buffers nor write back. > */ > -bool noop_dirty_folio(struct address_space *mapping, struct folio *folio) > +static bool noop_dirty_folio(struct address_space *mapping, struct folio *folio) > { > if (!folio_test_dirty(folio)) > return !folio_test_set_dirty(folio); > return false; > } > -EXPORT_SYMBOL(noop_dirty_folio); > > /* > * Helper function for set_page_dirty family. > @@ -2799,7 +2798,8 @@ bool folio_mark_dirty(struct folio *folio) > */ > if (folio_test_reclaim(folio)) > folio_clear_reclaim(folio); > - return mapping->a_ops->dirty_folio(mapping, folio); > + if (mapping->a_ops->dirty_folio) > + return mapping->a_ops->dirty_folio(mapping, folio); > } > > return noop_dirty_folio(mapping, folio); > diff --git a/mm/secretmem.c b/mm/secretmem.c > index 86442a15d12f..3fe1c35f9c8d 100644 > --- a/mm/secretmem.c > +++ b/mm/secretmem.c > @@ -157,7 +157,6 @@ static void secretmem_free_folio(struct folio *folio) > } > > const struct address_space_operations secretmem_aops = { > - .dirty_folio = noop_dirty_folio, > .free_folio = secretmem_free_folio, > .migrate_folio = secretmem_migrate_folio, > }; > diff --git a/mm/shmem.c b/mm/shmem.c > index f5af4b943e42..90a7c046894a 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -4088,7 +4088,6 @@ static int shmem_error_remove_page(struct address_space *mapping, > > const struct address_space_operations shmem_aops = { > .writepage = shmem_writepage, > - .dirty_folio = noop_dirty_folio, > #ifdef CONFIG_TMPFS > .write_begin = shmem_write_begin, > .write_end = shmem_write_end, > diff --git a/mm/swap_state.c b/mm/swap_state.c > index f8ea7015bad4..3666439487db 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -30,7 +30,6 @@ > */ > static const struct address_space_operations swap_aops = { > .writepage = swap_writepage, > - .dirty_folio = noop_dirty_folio, > #ifdef CONFIG_MIGRATION > .migrate_folio = migrate_folio, > #endif > -- > 2.40.1 > -- Jan Kara SUSE Labs, CR