From: Jan Kara <jack@suse.cz>
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>, 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
Subject: Re: [PATCH 11/12] bdi: invert BDI_CAP_NO_ACCT_WB
Date: Thu, 17 Sep 2020 11:27:42 +0200 [thread overview]
Message-ID: <20200917092742.GD7347@quack2.suse.cz> (raw)
In-Reply-To: <20200910144833.742260-12-hch@lst.de>
On Thu 10-09-20 16:48:31, Christoph Hellwig wrote:
> Replace BDI_CAP_NO_ACCT_WB with a positive BDI_CAP_WRITEBACK_ACCT to
> make the checks more obvious. Also remove the pointless
> bdi_cap_account_writeback wrapper that just obsfucates the check.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
The patch looks good to me. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/fuse/inode.c | 3 ++-
> include/linux/backing-dev.h | 13 +++----------
> mm/backing-dev.c | 1 +
> mm/page-writeback.c | 4 ++--
> 4 files changed, 8 insertions(+), 13 deletions(-)
>
> diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
> index 17b00670fb539e..581329203d6860 100644
> --- a/fs/fuse/inode.c
> +++ b/fs/fuse/inode.c
> @@ -1050,7 +1050,8 @@ static int fuse_bdi_init(struct fuse_conn *fc, struct super_block *sb)
> return err;
>
> /* fuse does it's own writeback accounting */
> - sb->s_bdi->capabilities = BDI_CAP_NO_ACCT_WB | BDI_CAP_STRICTLIMIT;
> + sb->s_bdi->capabilities &= ~BDI_CAP_WRITEBACK_ACCT;
> + sb->s_bdi->capabilities |= BDI_CAP_STRICTLIMIT;
>
> /*
> * For a single fuse filesystem use max 1% of dirty +
> diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
> index 5da4ea3dd0cc5c..b217344a2c63be 100644
> --- a/include/linux/backing-dev.h
> +++ b/include/linux/backing-dev.h
> @@ -120,17 +120,17 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio);
> *
> * BDI_CAP_NO_ACCT_DIRTY: Dirty pages shouldn't contribute to accounting
> * BDI_CAP_NO_WRITEBACK: Don't write pages back
> - * BDI_CAP_NO_ACCT_WB: Don't automatically account writeback pages
> + * BDI_CAP_WRITEBACK_ACCT: Automatically account writeback pages
> * BDI_CAP_STRICTLIMIT: Keep number of dirty pages below bdi threshold.
> */
> #define BDI_CAP_NO_ACCT_DIRTY 0x00000001
> #define BDI_CAP_NO_WRITEBACK 0x00000002
> -#define BDI_CAP_NO_ACCT_WB 0x00000004
> +#define BDI_CAP_WRITEBACK_ACCT 0x00000004
> #define BDI_CAP_STRICTLIMIT 0x00000010
> #define BDI_CAP_CGROUP_WRITEBACK 0x00000020
>
> #define BDI_CAP_NO_ACCT_AND_WRITEBACK \
> - (BDI_CAP_NO_WRITEBACK | BDI_CAP_NO_ACCT_DIRTY | BDI_CAP_NO_ACCT_WB)
> + (BDI_CAP_NO_WRITEBACK | BDI_CAP_NO_ACCT_DIRTY)
>
> extern struct backing_dev_info noop_backing_dev_info;
>
> @@ -179,13 +179,6 @@ static inline bool bdi_cap_account_dirty(struct backing_dev_info *bdi)
> return !(bdi->capabilities & BDI_CAP_NO_ACCT_DIRTY);
> }
>
> -static inline bool bdi_cap_account_writeback(struct backing_dev_info *bdi)
> -{
> - /* Paranoia: BDI_CAP_NO_WRITEBACK implies BDI_CAP_NO_ACCT_WB */
> - return !(bdi->capabilities & (BDI_CAP_NO_ACCT_WB |
> - BDI_CAP_NO_WRITEBACK));
> -}
> -
> static inline bool mapping_cap_writeback_dirty(struct address_space *mapping)
> {
> return bdi_cap_writeback_dirty(inode_to_bdi(mapping->host));
> diff --git a/mm/backing-dev.c b/mm/backing-dev.c
> index f9a2842bd81c3d..ab0415dde5c66c 100644
> --- a/mm/backing-dev.c
> +++ b/mm/backing-dev.c
> @@ -744,6 +744,7 @@ struct backing_dev_info *bdi_alloc(int node_id)
> kfree(bdi);
> return NULL;
> }
> + bdi->capabilities = BDI_CAP_WRITEBACK_ACCT;
> bdi->ra_pages = VM_READAHEAD_PAGES;
> bdi->io_pages = VM_READAHEAD_PAGES;
> return bdi;
> diff --git a/mm/page-writeback.c b/mm/page-writeback.c
> index e9c36521461aaa..0139f9622a92da 100644
> --- a/mm/page-writeback.c
> +++ b/mm/page-writeback.c
> @@ -2738,7 +2738,7 @@ int test_clear_page_writeback(struct page *page)
> if (ret) {
> __xa_clear_mark(&mapping->i_pages, page_index(page),
> PAGECACHE_TAG_WRITEBACK);
> - if (bdi_cap_account_writeback(bdi)) {
> + if (bdi->capabilities & BDI_CAP_WRITEBACK_ACCT) {
> struct bdi_writeback *wb = inode_to_wb(inode);
>
> dec_wb_stat(wb, WB_WRITEBACK);
> @@ -2791,7 +2791,7 @@ int __test_set_page_writeback(struct page *page, bool keep_write)
> PAGECACHE_TAG_WRITEBACK);
>
> xas_set_mark(&xas, PAGECACHE_TAG_WRITEBACK);
> - if (bdi_cap_account_writeback(bdi))
> + if (bdi->capabilities & BDI_CAP_WRITEBACK_ACCT)
> inc_wb_stat(inode_to_wb(inode), WB_WRITEBACK);
>
> /*
> --
> 2.28.0
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2020-09-17 9:27 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-10 14:48 bdi cleanups v4 Christoph Hellwig
2020-09-10 14:48 ` [PATCH 01/12] fs: remove the unused SB_I_MULTIROOT flag Christoph Hellwig
2020-09-17 9:41 ` Jan Kara
2020-09-10 14:48 ` [PATCH 02/12] drbd: remove dead code in device_to_statistics Christoph Hellwig
2020-09-17 9:46 ` Jan Kara
2020-09-10 14:48 ` [PATCH 03/12] drbd: remove RB_CONGESTED_REMOTE Christoph Hellwig
2020-09-17 9:55 ` Jan Kara
2020-09-19 6:58 ` Christoph Hellwig
2020-09-10 14:48 ` [PATCH 04/12] bdi: initialize ->ra_pages and ->io_pages in bdi_init Christoph Hellwig
2020-09-17 10:04 ` Jan Kara
2020-09-19 7:01 ` Christoph Hellwig
2020-09-10 14:48 ` [PATCH 05/12] md: update the optimal I/O size on reshape Christoph Hellwig
2020-09-12 6:17 ` Song Liu
2020-09-10 14:48 ` [PATCH 06/12] block: lift setting the readahead size into the block layer Christoph Hellwig
2020-09-17 10:35 ` Jan Kara
2020-09-19 7:31 ` Christoph Hellwig
2020-09-10 14:48 ` [PATCH 07/12] bdi: remove BDI_CAP_CGROUP_WRITEBACK Christoph Hellwig
2020-09-16 9:28 ` David Sterba
2020-09-17 9:36 ` Jan Kara
2020-09-10 14:48 ` [PATCH 08/12] bdi: remove BDI_CAP_SYNCHRONOUS_IO Christoph Hellwig
2020-09-17 9:36 ` Jan Kara
2020-09-10 14:48 ` [PATCH 09/12] mm: use SWP_SYNCHRONOUS_IO more intelligently Christoph Hellwig
2020-09-17 9:06 ` Jan Kara
2020-09-10 14:48 ` [PATCH 10/12] bdi: replace BDI_CAP_STABLE_WRITES with a queue and a sb flag Christoph Hellwig
2020-09-17 9:25 ` Jan Kara
2020-09-19 6:51 ` Christoph Hellwig
2020-09-10 14:48 ` [PATCH 11/12] bdi: invert BDI_CAP_NO_ACCT_WB Christoph Hellwig
2020-09-17 9:27 ` Jan Kara [this message]
2020-09-10 14:48 ` [PATCH 12/12] bdi: replace BDI_CAP_NO_{WRITEBACK,ACCT_DIRTY} with a single flag Christoph Hellwig
2020-09-17 9:31 ` Jan Kara
2020-09-15 15:18 bdi cleanups v5 Christoph Hellwig
2020-09-15 15:18 ` [PATCH 11/12] bdi: invert BDI_CAP_NO_ACCT_WB 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=20200917092742.GD7347@quack2.suse.cz \
--to=jack@suse.cz \
--cc=axboe@kernel.dk \
--cc=cgroups@vger.kernel.org \
--cc=dm-devel@redhat.com \
--cc=drbd-dev@lists.linbit.com \
--cc=hch@lst.de \
--cc=hdegoede@redhat.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).