From patchwork Sat Apr 12 16:39:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Gruenbacher X-Patchwork-Id: 14049060 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 51351C369B2 for ; Sat, 12 Apr 2025 16:39:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 451B9680048; Sat, 12 Apr 2025 12:39:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3AE3F680041; Sat, 12 Apr 2025 12:39:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 27A58680048; Sat, 12 Apr 2025 12:39:30 -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 F108F680041 for ; Sat, 12 Apr 2025 12:39:29 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 4AD811CD73F for ; Sat, 12 Apr 2025 16:39:31 +0000 (UTC) X-FDA: 83325952542.20.B030CE4 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf15.hostedemail.com (Postfix) with ESMTP id 94739A0004 for ; Sat, 12 Apr 2025 16:39:29 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=d9dWWctD; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf15.hostedemail.com: domain of agruenba@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=agruenba@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744475969; 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=NjNrk1HgolEIwV02ZG7AB9GjiuoLr1F9uxJuhPbeArk=; b=duVpPJyDbrEeAbXvdeTKr9lJmaBzxcuthVwWSCFpOVr3wUhcD/vRkx86vHT1tzAVoDeAsv uTsGj/32qUvJjStfrPLTGu1Ysy94GypTVQ+PRcTHBUdye3IuYz95yzQwL5sPNPTC1sDD9u bp2SLcyx7r2Nee9Q0/8kL5MAvQCim30= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=d9dWWctD; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf15.hostedemail.com: domain of agruenba@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=agruenba@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744475969; a=rsa-sha256; cv=none; b=aWiWPid3q7HMVV0NbIa0VSVks5AoCplwEOTSS/gfvTYG1uOkSRgTmhEYsR3ml6i0XgkRTG 0YtXPsjctLKjySmQXpQtUjmBCs8U2Y2938vSdCsaZAuO7Fip6zKH+xkQu6k05b3V0nzzqH lH6W1JPtDVEmdjr6ZPoGDX2EC0kYzqE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744475969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NjNrk1HgolEIwV02ZG7AB9GjiuoLr1F9uxJuhPbeArk=; b=d9dWWctD6B/2LLoPYQFSXpP3NyQTJ/3QHWRLZ6ObFfWl5lj2DwgxDluxWXFjsafOJK19+m 1IOSvAFMq7ksR/KcWNCphPIyhPFbe6B69eCwfVKAoxd0hY9odFRCNWWpF1S9wzTwQck6n7 yopUT/e1CR/QIoiBqjoLMgc5E+/nAWg= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-394-6SfgKDCXPOSmpakrrN3VVA-1; Sat, 12 Apr 2025 12:39:24 -0400 X-MC-Unique: 6SfgKDCXPOSmpakrrN3VVA-1 X-Mimecast-MFC-AGG-ID: 6SfgKDCXPOSmpakrrN3VVA_1744475963 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E3EF9180025A; Sat, 12 Apr 2025 16:39:22 +0000 (UTC) Received: from pasta.fast.eng.rdu2.dc.redhat.com (unknown [10.45.224.37]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C8C85180174E; Sat, 12 Apr 2025 16:39:19 +0000 (UTC) From: Andreas Gruenbacher To: cgroups@vger.kernel.org Cc: Andreas Gruenbacher , Tetsuo Handa , Jan Kara , Rafael Aquini , gfs2@lists.linux.dev, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/2] gfs2: replace sd_aspace with sd_inode Date: Sat, 12 Apr 2025 18:39:11 +0200 Message-ID: <20250412163914.3773459-2-agruenba@redhat.com> In-Reply-To: <20250412163914.3773459-1-agruenba@redhat.com> References: <20250412163914.3773459-1-agruenba@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Rspamd-Server: rspam01 X-Stat-Signature: rom4he854hjqu56tz97t7i3uy7kyuwnw X-Rspam-User: X-Rspamd-Queue-Id: 94739A0004 X-HE-Tag: 1744475969-618044 X-HE-Meta: U2FsdGVkX1+61EbfxTUU4mptVJ0yUBbQmSO2tKDckVX0xFT/OXKFJbRzjsILJb48IxWspRarxKjT7BJzBXdfpb9nmODECHTYTrupHs2sm1tbrMzb5UBep0zBwuTdqhBwy372i5RH5yfAhG+0Oq6h7fxYUtGyWLHioA/Gc2fIMF2S99nGsp/HdjyhoWeo/aa/PmrcpMJ82BTXldcbBRSxShIfm9BTRA1dIOfj4bR26jTdYGFTeKYbM0pA8s3gWem4l4OYoN8mGzm5UScS3d3wnAf05f9ucs2x9Y3Ir0cgNdvUBdjiVFtYKjAwLODLBqqWBJIXjy8V6Jqw466G2kdr1tvqtk2XMgVMKb+HPObaTdXSVYUSLWwKQVuKTy12hCGC3p/H4tzkOmsORnXUpwfVajWmIUmEv7m+hOOCWnb58fB12RHsxToXJKAiThGda6ii+bwiwJIrW8+G4suuR4RN1GvAW/mgMtoN03ggI8J26yvRFJyM1LF8yaoqVb+sodSfUAljewY5JA8FOUgi7d5xATq9w7gVLbyY3EAUoHn83wmebEya/HJBi172+9nSjf3xMWTQh3p1b1JPYuKh0dg9oYed09uN92sFeztPeHUgtXga9Sknb6EogVyN6tegrxhRGGMAW8tZxe+AxwOD2wASvQ18en9jbTiXPjIMNSQt8sM1knus4IKOOHM/+qBDxuUqYx/i4CFX9fYTa4s1elgme8JwncsEWl1Him8CmxnvNyi4B9iEEhK8VSYCU+558EPNamjnbuaFabnPJw9Z/DhOkJ4LU4AOytLH6CXkncSlaNdOkwX51Sc1mfpsJeQUgjPm7KwWCcANmms9i2aVfzggPgbb0zaUy5CRA9kL3SI1dLW67M5p8cnAuP/Z+JUMd50Mjbn8t0bcLXMG4gXalBefRPWJTqXnnxicKWyN9upgb5aeJzj6ziTgdRPzBHHTUeo9rPQECmqN98mpTO+hayK ezaGfrS3 KluCiYgCUPgxfGgig0pIeYXirNE9C7y1Wg7Mdd82OqhT61QLjBQs+raBkCyWEVm7TnLjEe4ZXLzGpHi+f8kx9ly3M9cWBJ6Rv89VmDetEHsTqv7W1gMreLH20ZvlEZ7Q5ojlDV2E/hhPAyMp2q9IO0F04QzpzG2uqkXufOUM4kA9KL/bi3uQg5gwFbuwdQ0LrHuOMNzWwuBNosI3ubjohHdjGEBdvp2CZCA0zY9Q8ojGoowZRQDs+gjbnPBjX2CxnDuE4uiNjykVc4ibEadP3ckvb4bbNbK0Fpv1nanhrWtAVQdQkPn56SUX9l/KH2JwL8H1z23+GeYx2etYPlzM7DvWcXatVxO5cy3YQYS3VfMyN+Y+gathygK4MMybgzmFEMiVn 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: Currently, sdp->sd_aspace and the per-inode metadata address spaces use sb->s_bdev->bd_mapping->host as their ->host; folios in those address spaces will thus appear to be on bdev rather than on gfs2 filesystems. This is a problem because gfs2 doesn't support cgroup writeback (SB_I_CGROUPWB), but bdev does. Fix that by using a "dummy" gfs2 inode as ->host in those address spaces. When coming from a folio, folio->mapping->host->i_sb will then be a gfs2 super block and the SB_I_CGROUPWB flag will not be set in sb->s_iflags. Based on a previous version from Bob Peterson from several years ago. Thanks to Tetsuo Handa, Jan Kara, and Rafael Aquini for helping figure this out. Signed-off-by: Andreas Gruenbacher --- fs/gfs2/glock.c | 3 +-- fs/gfs2/glops.c | 4 ++-- fs/gfs2/incore.h | 9 ++++++++- fs/gfs2/meta_io.c | 2 +- fs/gfs2/meta_io.h | 4 +--- fs/gfs2/ops_fstype.c | 31 ++++++++++++++++++------------- fs/gfs2/super.c | 2 +- 7 files changed, 32 insertions(+), 23 deletions(-) diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index d7220a6fe8f5..ba25b884169e 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -1166,7 +1166,6 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number, const struct gfs2_glock_operations *glops, int create, struct gfs2_glock **glp) { - struct super_block *s = sdp->sd_vfs; struct lm_lockname name = { .ln_number = number, .ln_type = glops->go_type, .ln_sbd = sdp }; @@ -1229,7 +1228,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number, mapping = gfs2_glock2aspace(gl); if (mapping) { mapping->a_ops = &gfs2_meta_aops; - mapping->host = s->s_bdev->bd_mapping->host; + mapping->host = sdp->sd_inode; mapping->flags = 0; mapping_set_gfp_mask(mapping, GFP_NOFS); mapping->i_private_data = NULL; diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index eb4714f299ef..116efe335c32 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c @@ -168,7 +168,7 @@ void gfs2_ail_flush(struct gfs2_glock *gl, bool fsync) static int gfs2_rgrp_metasync(struct gfs2_glock *gl) { struct gfs2_sbd *sdp = gl->gl_name.ln_sbd; - struct address_space *metamapping = &sdp->sd_aspace; + struct address_space *metamapping = gfs2_aspace(sdp); struct gfs2_rgrpd *rgd = gfs2_glock2rgrp(gl); const unsigned bsize = sdp->sd_sb.sb_bsize; loff_t start = (rgd->rd_addr * bsize) & PAGE_MASK; @@ -225,7 +225,7 @@ static int rgrp_go_sync(struct gfs2_glock *gl) static void rgrp_go_inval(struct gfs2_glock *gl, int flags) { struct gfs2_sbd *sdp = gl->gl_name.ln_sbd; - struct address_space *mapping = &sdp->sd_aspace; + struct address_space *mapping = gfs2_aspace(sdp); struct gfs2_rgrpd *rgd = gfs2_glock2rgrp(gl); const unsigned bsize = sdp->sd_sb.sb_bsize; loff_t start, end; diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 74abbd4970f8..0a41c4e76b32 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h @@ -795,7 +795,7 @@ struct gfs2_sbd { /* Log stuff */ - struct address_space sd_aspace; + struct inode *sd_inode; spinlock_t sd_log_lock; @@ -851,6 +851,13 @@ struct gfs2_sbd { unsigned long sd_glock_dqs_held; }; +#define GFS2_BAD_INO 1 + +static inline struct address_space *gfs2_aspace(struct gfs2_sbd *sdp) +{ + return sdp->sd_inode->i_mapping; +} + static inline void gfs2_glstats_inc(struct gfs2_glock *gl, int which) { gl->gl_stats.stats[which]++; diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c index 198cc7056637..9dc8885c95d0 100644 --- a/fs/gfs2/meta_io.c +++ b/fs/gfs2/meta_io.c @@ -132,7 +132,7 @@ struct buffer_head *gfs2_getbuf(struct gfs2_glock *gl, u64 blkno, int create) unsigned int bufnum; if (mapping == NULL) - mapping = &sdp->sd_aspace; + mapping = gfs2_aspace(sdp); shift = PAGE_SHIFT - sdp->sd_sb.sb_bsize_shift; index = blkno >> shift; /* convert block to page */ diff --git a/fs/gfs2/meta_io.h b/fs/gfs2/meta_io.h index 831d988c2ceb..b7c8a6684d02 100644 --- a/fs/gfs2/meta_io.h +++ b/fs/gfs2/meta_io.h @@ -44,9 +44,7 @@ static inline struct gfs2_sbd *gfs2_mapping2sbd(struct address_space *mapping) struct gfs2_glock_aspace *gla = container_of(mapping, struct gfs2_glock_aspace, mapping); return gla->glock.gl_name.ln_sbd; - } else if (mapping->a_ops == &gfs2_rgrp_aops) - return container_of(mapping, struct gfs2_sbd, sd_aspace); - else + } else return inode->i_sb->s_fs_info; } diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index e83d293c3614..6ce475e1c6d6 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c @@ -72,7 +72,6 @@ void free_sbd(struct gfs2_sbd *sdp) static struct gfs2_sbd *init_sbd(struct super_block *sb) { struct gfs2_sbd *sdp; - struct address_space *mapping; sdp = kzalloc(sizeof(struct gfs2_sbd), GFP_KERNEL); if (!sdp) @@ -109,16 +108,6 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb) INIT_LIST_HEAD(&sdp->sd_sc_inodes_list); - mapping = &sdp->sd_aspace; - - address_space_init_once(mapping); - mapping->a_ops = &gfs2_rgrp_aops; - mapping->host = sb->s_bdev->bd_mapping->host; - mapping->flags = 0; - mapping_set_gfp_mask(mapping, GFP_NOFS); - mapping->i_private_data = NULL; - mapping->writeback_index = 0; - spin_lock_init(&sdp->sd_log_lock); atomic_set(&sdp->sd_log_pinned, 0); INIT_LIST_HEAD(&sdp->sd_log_revokes); @@ -1135,6 +1124,7 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc) int silent = fc->sb_flags & SB_SILENT; struct gfs2_sbd *sdp; struct gfs2_holder mount_gh; + struct address_space *mapping; int error; sdp = init_sbd(sb); @@ -1156,6 +1146,7 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_flags |= SB_NOSEC; sb->s_magic = GFS2_MAGIC; sb->s_op = &gfs2_super_ops; + sb->s_d_op = &gfs2_dops; sb->s_export_op = &gfs2_export_ops; sb->s_qcop = &gfs2_quotactl_ops; @@ -1181,9 +1172,21 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc) sdp->sd_tune.gt_statfs_quantum = 30; } + /* Set up an address space for metadata writes */ + sdp->sd_inode = new_inode(sb); + error = -ENOMEM; + if (!sdp->sd_inode) + goto fail_free; + sdp->sd_inode->i_ino = GFS2_BAD_INO; + sdp->sd_inode->i_size = OFFSET_MAX; + + mapping = gfs2_aspace(sdp); + mapping->a_ops = &gfs2_rgrp_aops; + mapping_set_gfp_mask(mapping, GFP_NOFS); + error = init_names(sdp, silent); if (error) - goto fail_free; + goto fail_iput; snprintf(sdp->sd_fsname, sizeof(sdp->sd_fsname), "%s", sdp->sd_table_name); @@ -1192,7 +1195,7 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc) WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_FREEZABLE, 0, sdp->sd_fsname); if (!sdp->sd_glock_wq) - goto fail_free; + goto fail_iput; sdp->sd_delete_wq = alloc_workqueue("gfs2-delete/%s", WQ_MEM_RECLAIM | WQ_FREEZABLE, 0, sdp->sd_fsname); @@ -1309,6 +1312,8 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc) fail_glock_wq: if (sdp->sd_glock_wq) destroy_workqueue(sdp->sd_glock_wq); +fail_iput: + iput(sdp->sd_inode); fail_free: free_sbd(sdp); sb->s_fs_info = NULL; diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 44e5658b896c..4529b7dda8ca 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -648,7 +648,7 @@ static void gfs2_put_super(struct super_block *sb) gfs2_jindex_free(sdp); /* Take apart glock structures and buffer lists */ gfs2_gl_hash_clear(sdp); - truncate_inode_pages_final(&sdp->sd_aspace); + iput(sdp->sd_inode); gfs2_delete_debugfs_file(sdp); gfs2_sys_fs_del(sdp);