From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: Song Liu <song@kernel.org>, Hans de Goede <hdegoede@redhat.com>, Richard Weinberger <richard@nod.at>, Minchan Kim <minchan@kernel.org>, linux-mtd@lists.infradead.org, dm-devel@redhat.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, drbd-dev@lists.linbit.com, linux-raid@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, Johannes Thumshirn <johannes.thumshirn@wdc.com> Subject: [PATCH 09/14] bdi: remove BDI_CAP_CGROUP_WRITEBACK Date: Sun, 26 Jul 2020 17:03:28 +0200 [thread overview] Message-ID: <20200726150333.305527-10-hch@lst.de> (raw) In-Reply-To: <20200726150333.305527-1-hch@lst.de> Just checking SB_I_CGROUPWB for cgroup writeback support is enough. Either the file system allocates its own bdi (e.g. btrfs), in which case it is known to support cgroup writeback, or the bdi comes from the block layer, which always supports cgroup writeback. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> --- block/blk-core.c | 1 - fs/btrfs/disk-io.c | 1 - include/linux/backing-dev.h | 8 +++----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index ea1665de7a2079..68db7e745b49dd 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -538,7 +538,6 @@ struct request_queue *blk_alloc_queue(int node_id) if (!q->stats) goto fail_stats; - q->backing_dev_info->capabilities = BDI_CAP_CGROUP_WRITEBACK; q->node = node_id; timer_setup(&q->backing_dev_info->laptop_mode_wb_timer, diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index f92c45fe019c48..4b5a8640329e4c 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3032,7 +3032,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device goto fail_sb_buffer; } - sb->s_bdi->capabilities |= BDI_CAP_CGROUP_WRITEBACK; sb->s_bdi->ra_pages *= btrfs_super_num_devices(disk_super); sb->s_bdi->ra_pages = max(sb->s_bdi->ra_pages, SZ_4M / PAGE_SIZE); diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h index 0b06b2d26c9aa3..52583b6f2ea05d 100644 --- a/include/linux/backing-dev.h +++ b/include/linux/backing-dev.h @@ -123,7 +123,6 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio); * BDI_CAP_NO_ACCT_WB: Don't automatically account writeback pages * BDI_CAP_STRICTLIMIT: Keep number of dirty pages below bdi threshold. * - * BDI_CAP_CGROUP_WRITEBACK: Supports cgroup-aware writeback. * BDI_CAP_SYNCHRONOUS_IO: Device is so fast that asynchronous IO would be * inefficient. */ @@ -233,9 +232,9 @@ int inode_congested(struct inode *inode, int cong_bits); * inode_cgwb_enabled - test whether cgroup writeback is enabled on an inode * @inode: inode of interest * - * cgroup writeback requires support from both the bdi and filesystem. - * Also, both memcg and iocg have to be on the default hierarchy. Test - * whether all conditions are met. + * Cgroup writeback requires support from the filesystem. Also, both memcg and + * iocg have to be on the default hierarchy. Test whether all conditions are + * met. * * Note that the test result may change dynamically on the same inode * depending on how memcg and iocg are configured. @@ -247,7 +246,6 @@ static inline bool inode_cgwb_enabled(struct inode *inode) return cgroup_subsys_on_dfl(memory_cgrp_subsys) && cgroup_subsys_on_dfl(io_cgrp_subsys) && bdi_cap_account_dirty(bdi) && - (bdi->capabilities & BDI_CAP_CGROUP_WRITEBACK) && (inode->i_sb->s_iflags & SB_I_CGROUPWB); } -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: linux-raid@vger.kernel.org, Hans de Goede <hdegoede@redhat.com>, Minchan Kim <minchan@kernel.org>, Richard Weinberger <richard@nod.at>, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Song Liu <song@kernel.org>, dm-devel@redhat.com, linux-mtd@lists.infradead.org, Johannes Thumshirn <johannes.thumshirn@wdc.com>, linux-fsdevel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, drbd-dev@lists.linbit.com Subject: [PATCH 09/14] bdi: remove BDI_CAP_CGROUP_WRITEBACK Date: Sun, 26 Jul 2020 17:03:28 +0200 [thread overview] Message-ID: <20200726150333.305527-10-hch@lst.de> (raw) In-Reply-To: <20200726150333.305527-1-hch@lst.de> Just checking SB_I_CGROUPWB for cgroup writeback support is enough. Either the file system allocates its own bdi (e.g. btrfs), in which case it is known to support cgroup writeback, or the bdi comes from the block layer, which always supports cgroup writeback. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> --- block/blk-core.c | 1 - fs/btrfs/disk-io.c | 1 - include/linux/backing-dev.h | 8 +++----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index ea1665de7a2079..68db7e745b49dd 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -538,7 +538,6 @@ struct request_queue *blk_alloc_queue(int node_id) if (!q->stats) goto fail_stats; - q->backing_dev_info->capabilities = BDI_CAP_CGROUP_WRITEBACK; q->node = node_id; timer_setup(&q->backing_dev_info->laptop_mode_wb_timer, diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index f92c45fe019c48..4b5a8640329e4c 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3032,7 +3032,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device goto fail_sb_buffer; } - sb->s_bdi->capabilities |= BDI_CAP_CGROUP_WRITEBACK; sb->s_bdi->ra_pages *= btrfs_super_num_devices(disk_super); sb->s_bdi->ra_pages = max(sb->s_bdi->ra_pages, SZ_4M / PAGE_SIZE); diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h index 0b06b2d26c9aa3..52583b6f2ea05d 100644 --- a/include/linux/backing-dev.h +++ b/include/linux/backing-dev.h @@ -123,7 +123,6 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio); * BDI_CAP_NO_ACCT_WB: Don't automatically account writeback pages * BDI_CAP_STRICTLIMIT: Keep number of dirty pages below bdi threshold. * - * BDI_CAP_CGROUP_WRITEBACK: Supports cgroup-aware writeback. * BDI_CAP_SYNCHRONOUS_IO: Device is so fast that asynchronous IO would be * inefficient. */ @@ -233,9 +232,9 @@ int inode_congested(struct inode *inode, int cong_bits); * inode_cgwb_enabled - test whether cgroup writeback is enabled on an inode * @inode: inode of interest * - * cgroup writeback requires support from both the bdi and filesystem. - * Also, both memcg and iocg have to be on the default hierarchy. Test - * whether all conditions are met. + * Cgroup writeback requires support from the filesystem. Also, both memcg and + * iocg have to be on the default hierarchy. Test whether all conditions are + * met. * * Note that the test result may change dynamically on the same inode * depending on how memcg and iocg are configured. @@ -247,7 +246,6 @@ static inline bool inode_cgwb_enabled(struct inode *inode) return cgroup_subsys_on_dfl(memory_cgrp_subsys) && cgroup_subsys_on_dfl(io_cgrp_subsys) && bdi_cap_account_dirty(bdi) && - (bdi->capabilities & BDI_CAP_CGROUP_WRITEBACK) && (inode->i_sb->s_iflags & SB_I_CGROUPWB); } -- 2.27.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-07-26 15:03 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-26 15:03 bdi cleanups v3 Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` [PATCH 01/14] fs: remove the unused SB_I_MULTIROOT flag Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` [PATCH 03/14] drbd: remove RB_CONGESTED_REMOTE Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig [not found] ` <20200726150333.305527-1-hch-jcswGhMUV9g@public.gmane.org> 2020-07-26 15:03 ` [PATCH 02/14] drbd: remove dead code in device_to_statistics Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` [PATCH 04/14] bdi: initialize ->ra_pages in bdi_init Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` [PATCH 05/14] md: update the optimal I/O size on reshape Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` [PATCH 06/14] block: lift setting the readahead size into the block layer Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-08-26 22:07 ` Mike Snitzer 2020-08-26 22:07 ` Mike Snitzer 2020-09-02 15:11 ` Christoph Hellwig 2020-09-02 15:11 ` Christoph Hellwig 2020-09-02 15:11 ` Christoph Hellwig 2020-09-02 16:20 ` Mike Snitzer 2020-09-02 16:20 ` Mike Snitzer 2020-09-10 9:28 ` Christoph Hellwig 2020-09-10 9:28 ` Christoph Hellwig 2020-09-10 9:28 ` Christoph Hellwig 2020-09-10 17:15 ` Mike Snitzer 2020-09-10 17:15 ` Mike Snitzer 2020-09-15 7:05 ` Christoph Hellwig 2020-09-15 7:05 ` Christoph Hellwig 2020-09-15 7:05 ` Christoph Hellwig 2020-07-26 15:03 ` [PATCH 07/14] block: make QUEUE_SYSFS_BIT_FNS a little more useful Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-29 8:57 ` [block] 54529aac98: fsmark.files_per_sec -13.6% regression kernel test robot 2020-07-29 8:57 ` kernel test robot 2020-07-30 2:14 ` [block] 54529aac98: blktests.block.005.fail kernel test robot 2020-07-30 2:14 ` kernel test robot 2020-07-26 15:03 ` [PATCH 08/14] block: add helper macros for queue sysfs entries Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` [PATCH 13/14] bdi: invert BDI_CAP_NO_ACCT_WB Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig [this message] 2020-07-26 15:03 ` [PATCH 09/14] bdi: remove BDI_CAP_CGROUP_WRITEBACK Christoph Hellwig 2020-07-26 15:03 ` [PATCH 10/14] bdi: remove BDI_CAP_SYNCHRONOUS_IO Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 19:06 ` Minchan Kim 2020-07-26 19:06 ` Minchan Kim [not found] ` <20200726190639.GA560221-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> 2020-07-27 7:58 ` Christoph Hellwig 2020-07-27 7:58 ` Christoph Hellwig 2020-07-27 7:58 ` Christoph Hellwig 2020-07-26 15:03 ` [PATCH 11/14] mm: use SWP_SYNCHRONOUS_IO more intelligently Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` [PATCH 12/14] bdi: replace BDI_CAP_STABLE_WRITES with a queue and a sb flag Christoph Hellwig 2020-07-26 15:03 ` Christoph Hellwig 2020-07-26 15:03 ` [PATCH 14/14] bdi: replace BDI_CAP_NO_{WRITEBACK,ACCT_DIRTY} with a single flag Christoph Hellwig 2020-07-26 15:03 ` [PATCH 14/14] bdi: replace BDI_CAP_NO_{WRITEBACK, ACCT_DIRTY} " Christoph Hellwig 2020-07-26 15:12 ` bdi cleanups v3 Christoph Hellwig 2020-07-26 15:12 ` Christoph Hellwig -- strict thread matches above, loose matches on Subject: below -- 2020-07-24 7:32 Christoph Hellwig [not found] ` <20200724073313.138789-1-hch-jcswGhMUV9g@public.gmane.org> 2020-07-24 7:33 ` [PATCH 09/14] bdi: remove BDI_CAP_CGROUP_WRITEBACK Christoph Hellwig 2020-07-24 7:33 ` Christoph Hellwig 2020-07-24 7:33 ` Christoph Hellwig 2020-07-22 6:25 bdi cleanups v2 Christoph Hellwig 2020-07-22 6:25 ` [PATCH 09/14] bdi: remove BDI_CAP_CGROUP_WRITEBACK Christoph Hellwig 2020-07-22 6:25 ` Christoph Hellwig 2020-07-22 7:45 ` Johannes Thumshirn 2020-07-22 7:45 ` Johannes Thumshirn 2020-07-26 9:01 ` Wols Lists 2020-07-26 9:01 ` Wols Lists 2020-07-20 7:51 bdi cleanups Christoph Hellwig 2020-07-20 7:51 ` [PATCH 09/14] bdi: remove BDI_CAP_CGROUP_WRITEBACK Christoph Hellwig 2020-07-20 7:51 ` Christoph Hellwig
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200726150333.305527-10-hch@lst.de \ --to=hch@lst.de \ --cc=axboe@kernel.dk \ --cc=cgroups@vger.kernel.org \ --cc=dm-devel@redhat.com \ --cc=drbd-dev@lists.linbit.com \ --cc=hdegoede@redhat.com \ --cc=johannes.thumshirn@wdc.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-mtd@lists.infradead.org \ --cc=linux-raid@vger.kernel.org \ --cc=minchan@kernel.org \ --cc=richard@nod.at \ --cc=song@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.