From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: "Pavel Begunkov" <asml.silence@gmail.com>, "Mike Snitzer" <snitzer@redhat.com>, "Ryusuke Konishi" <konishi.ryusuke@gmail.com>, "Konstantin Komarov" <almaz.alexandrovich@paragon-software.com>, "Andrew Morton" <akpm@linux-foundation.org>, "Md . Haris Iqbal " <haris.iqbal@ionos.com>, "Jack Wang" <jinpu.wang@ionos.com>, "Roger Pau Monné" <roger.pau@citrix.co>, "Philipp Reisner" <philipp.reisner@linbit.com>, "Lars Ellenberg" <lars.ellenberg@linbit.com>, linux-block@vger.kernel.org, dm-devel@redhat.com, linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-nilfs@vger.kernel.org, ntfs3@lists.linux.dev, xen-devel@lists.xenproject.org, drbd-dev@lists.linbit.com Subject: [PATCH 01/19] fs: remove mpage_alloc Date: Tue, 18 Jan 2022 08:19:34 +0100 [thread overview] Message-ID: <20220118071952.1243143-2-hch@lst.de> (raw) In-Reply-To: <20220118071952.1243143-1-hch@lst.de> open code mpage_alloc in it's two callers and simplify the results because of the context: - __mpage_writepage always passes GFP_NOFS and can thus always sleep and will never get a NULL return from bio_alloc at all. - do_mpage_readpage can only get a non-sleeping context for readahead which never sets PF_MEMALLOC and thus doesn't need the retry loop either. Both cases will never have __GFP_HIGH set. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/mpage.c | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/fs/mpage.c b/fs/mpage.c index 334e7d09aa652..c5817699b369b 100644 --- a/fs/mpage.c +++ b/fs/mpage.c @@ -67,29 +67,6 @@ static struct bio *mpage_bio_submit(int op, int op_flags, struct bio *bio) return NULL; } -static struct bio * -mpage_alloc(struct block_device *bdev, - sector_t first_sector, int nr_vecs, - gfp_t gfp_flags) -{ - struct bio *bio; - - /* Restrict the given (page cache) mask for slab allocations */ - gfp_flags &= GFP_KERNEL; - bio = bio_alloc(gfp_flags, nr_vecs); - - if (bio == NULL && (current->flags & PF_MEMALLOC)) { - while (!bio && (nr_vecs /= 2)) - bio = bio_alloc(gfp_flags, nr_vecs); - } - - if (bio) { - bio_set_dev(bio, bdev); - bio->bi_iter.bi_sector = first_sector; - } - return bio; -} - /* * support function for mpage_readahead. The fs supplied get_block might * return an up to date buffer. This is used to map that buffer into @@ -303,10 +280,11 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args) page)) goto out; } - args->bio = mpage_alloc(bdev, blocks[0] << (blkbits - 9), - bio_max_segs(args->nr_pages), gfp); + args->bio = bio_alloc(gfp, bio_max_segs(args->nr_pages)); if (args->bio == NULL) goto confused; + bio_set_dev(args->bio, bdev); + args->bio->bi_iter.bi_sector = blocks[0] << (blkbits - 9); } length = first_hole << blkbits; @@ -615,10 +593,9 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc, page, wbc)) goto out; } - bio = mpage_alloc(bdev, blocks[0] << (blkbits - 9), - BIO_MAX_VECS, GFP_NOFS|__GFP_HIGH); - if (bio == NULL) - goto confused; + bio = bio_alloc(GFP_NOFS, BIO_MAX_VECS); + bio_set_dev(bio, bdev); + bio->bi_iter.bi_sector = blocks[0] << (blkbits - 9); wbc_init_bio(wbc, bio); bio->bi_write_hint = inode->i_write_hint; -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: linux-block@vger.kernel.org, linux-nfs@vger.kernel.org, linux-nilfs@vger.kernel.org, "Mike Snitzer" <snitzer@redhat.com>, "Philipp Reisner" <philipp.reisner@linbit.com>, "Ryusuke Konishi" <konishi.ryusuke@gmail.com>, "Konstantin Komarov" <almaz.alexandrovich@paragon-software.com>, "Roger Pau Monné" <roger.pau@citrix.co>, dm-devel@redhat.com, "Md . Haris Iqbal " <haris.iqbal@ionos.com>, "Lars Ellenberg" <lars.ellenberg@linbit.com>, linux-fsdevel@vger.kernel.org, xen-devel@lists.xenproject.org, "Andrew Morton" <akpm@linux-foundation.org>, ntfs3@lists.linux.dev, "Jack Wang" <jinpu.wang@ionos.com>, "Pavel Begunkov" <asml.silence@gmail.com>, drbd-dev@lists.linbit.com Subject: [dm-devel] [PATCH 01/19] fs: remove mpage_alloc Date: Tue, 18 Jan 2022 08:19:34 +0100 [thread overview] Message-ID: <20220118071952.1243143-2-hch@lst.de> (raw) In-Reply-To: <20220118071952.1243143-1-hch@lst.de> open code mpage_alloc in it's two callers and simplify the results because of the context: - __mpage_writepage always passes GFP_NOFS and can thus always sleep and will never get a NULL return from bio_alloc at all. - do_mpage_readpage can only get a non-sleeping context for readahead which never sets PF_MEMALLOC and thus doesn't need the retry loop either. Both cases will never have __GFP_HIGH set. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/mpage.c | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/fs/mpage.c b/fs/mpage.c index 334e7d09aa652..c5817699b369b 100644 --- a/fs/mpage.c +++ b/fs/mpage.c @@ -67,29 +67,6 @@ static struct bio *mpage_bio_submit(int op, int op_flags, struct bio *bio) return NULL; } -static struct bio * -mpage_alloc(struct block_device *bdev, - sector_t first_sector, int nr_vecs, - gfp_t gfp_flags) -{ - struct bio *bio; - - /* Restrict the given (page cache) mask for slab allocations */ - gfp_flags &= GFP_KERNEL; - bio = bio_alloc(gfp_flags, nr_vecs); - - if (bio == NULL && (current->flags & PF_MEMALLOC)) { - while (!bio && (nr_vecs /= 2)) - bio = bio_alloc(gfp_flags, nr_vecs); - } - - if (bio) { - bio_set_dev(bio, bdev); - bio->bi_iter.bi_sector = first_sector; - } - return bio; -} - /* * support function for mpage_readahead. The fs supplied get_block might * return an up to date buffer. This is used to map that buffer into @@ -303,10 +280,11 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args) page)) goto out; } - args->bio = mpage_alloc(bdev, blocks[0] << (blkbits - 9), - bio_max_segs(args->nr_pages), gfp); + args->bio = bio_alloc(gfp, bio_max_segs(args->nr_pages)); if (args->bio == NULL) goto confused; + bio_set_dev(args->bio, bdev); + args->bio->bi_iter.bi_sector = blocks[0] << (blkbits - 9); } length = first_hole << blkbits; @@ -615,10 +593,9 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc, page, wbc)) goto out; } - bio = mpage_alloc(bdev, blocks[0] << (blkbits - 9), - BIO_MAX_VECS, GFP_NOFS|__GFP_HIGH); - if (bio == NULL) - goto confused; + bio = bio_alloc(GFP_NOFS, BIO_MAX_VECS); + bio_set_dev(bio, bdev); + bio->bi_iter.bi_sector = blocks[0] << (blkbits - 9); wbc_init_bio(wbc, bio); bio->bi_write_hint = inode->i_write_hint; -- 2.30.2 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2022-01-18 7:20 UTC|newest] Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-18 7:19 improve the bio allocation interface Christoph Hellwig 2022-01-18 7:19 ` Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-18 7:19 ` Christoph Hellwig [this message] 2022-01-18 7:19 ` [dm-devel] [PATCH 01/19] fs: remove mpage_alloc Christoph Hellwig 2022-01-18 7:19 ` [PATCH 02/19] nilfs2: remove nilfs_alloc_seg_bio Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-18 7:19 ` [PATCH 03/19] nfs/blocklayout: remove bl_alloc_init_bio Christoph Hellwig 2022-01-18 7:19 ` Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-18 7:19 ` [PATCH 04/19] ntfs3: remove ntfs_alloc_bio Christoph Hellwig 2022-01-18 7:19 ` Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-18 7:19 ` [PATCH 05/19] dm: bio_alloc can't fail if it is allowed to sleep Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-18 7:19 ` [PATCH 06/19] dm-crypt: remove clone_init Christoph Hellwig 2022-01-18 7:19 ` Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-18 7:19 ` [PATCH 07/19] dm-snap: use blkdev_issue_flush instead of open coding it Christoph Hellwig 2022-01-18 7:19 ` Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-18 7:19 ` [PATCH 08/19] dm-thin: " Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-18 7:19 ` [PATCH 09/19] drbd: bio_alloc can't fail if it is allow to sleep Christoph Hellwig 2022-01-18 7:19 ` Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-18 7:19 ` [PATCH 10/19] rnbd-srv: simplify bio mapping in process_rdma Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-19 0:20 ` Jinpu Wang 2022-01-19 0:20 ` [dm-devel] " Jinpu Wang 2022-01-19 0:48 ` Jinpu Wang 2022-01-19 0:48 ` [dm-devel] " Jinpu Wang 2022-01-20 8:37 ` Christoph Hellwig 2022-01-20 8:37 ` Christoph Hellwig 2022-01-20 8:37 ` [dm-devel] " Christoph Hellwig 2022-01-20 8:46 ` Jinpu Wang 2022-01-20 8:46 ` Jinpu Wang 2022-01-20 8:46 ` [dm-devel] " Jinpu Wang 2022-01-18 7:19 ` [PATCH 11/19] rnbd-src: remove struct rnbd_dev_blk_io Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-19 15:32 ` Jinpu Wang 2022-01-19 15:32 ` [dm-devel] " Jinpu Wang 2022-01-18 7:19 ` [PATCH 12/19] xen-blkback: bio_alloc can't fail if it is allow to sleep Christoph Hellwig 2022-01-18 7:19 ` Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] [PATCH 13/19] block: move blk_next_bio to bio.c Christoph Hellwig 2022-01-18 7:19 ` Christoph Hellwig 2022-01-18 22:10 ` Chaitanya Kulkarni 2022-01-18 22:10 ` Chaitanya Kulkarni 2022-01-18 22:10 ` [dm-devel] " Chaitanya Kulkarni 2022-01-18 7:19 ` [PATCH 14/19] block: pass a block_device and opf to blk_next_bio Christoph Hellwig 2022-01-18 7:19 ` Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-18 22:11 ` Chaitanya Kulkarni 2022-01-18 22:11 ` Chaitanya Kulkarni 2022-01-18 22:11 ` [dm-devel] " Chaitanya Kulkarni 2022-01-20 8:34 ` Christoph Hellwig 2022-01-20 8:34 ` Christoph Hellwig 2022-01-20 8:34 ` [dm-devel] " Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] [PATCH 15/19] block: pass a block_device and opf to bio_alloc_bioset Christoph Hellwig 2022-01-18 7:19 ` Christoph Hellwig 2022-01-18 7:19 ` Christoph Hellwig 2022-01-18 22:12 ` Chaitanya Kulkarni 2022-01-18 22:12 ` Chaitanya Kulkarni 2022-01-18 22:12 ` [dm-devel] " Chaitanya Kulkarni 2022-01-18 7:19 ` [PATCH 16/19] block: pass a block_device and opf to bio_alloc_kiocb Christoph Hellwig 2022-01-18 7:19 ` Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-18 22:12 ` Chaitanya Kulkarni 2022-01-18 22:12 ` Chaitanya Kulkarni 2022-01-18 22:12 ` [dm-devel] " Chaitanya Kulkarni 2022-01-18 7:19 ` [PATCH 17/19] block: pass a block_device and opf to bio_alloc Christoph Hellwig 2022-01-18 7:19 ` Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-18 22:14 ` Chaitanya Kulkarni 2022-01-18 22:14 ` Chaitanya Kulkarni 2022-01-18 22:14 ` [dm-devel] " Chaitanya Kulkarni 2022-01-18 7:19 ` [PATCH 18/19] block: pass a block_device and opf to bio_init Christoph Hellwig 2022-01-18 7:19 ` Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-18 22:15 ` Chaitanya Kulkarni 2022-01-18 22:15 ` Chaitanya Kulkarni 2022-01-18 22:15 ` [dm-devel] " Chaitanya Kulkarni 2022-01-18 7:19 ` [PATCH 19/19] block: pass a block_device and opf to bio_reset Christoph Hellwig 2022-01-18 7:19 ` Christoph Hellwig 2022-01-18 7:19 ` [dm-devel] " Christoph Hellwig 2022-01-18 22:16 ` Chaitanya Kulkarni 2022-01-18 22:16 ` Chaitanya Kulkarni 2022-01-18 22:16 ` [dm-devel] " Chaitanya Kulkarni 2022-01-19 13:27 ` improve the bio allocation interface Jens Axboe 2022-01-19 13:27 ` Jens Axboe 2022-01-19 13:27 ` [dm-devel] " Jens Axboe 2022-01-24 9:10 improve the bio allocation interface v2 Christoph Hellwig 2022-01-24 9:10 ` [PATCH 01/19] fs: remove mpage_alloc 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=20220118071952.1243143-2-hch@lst.de \ --to=hch@lst.de \ --cc=akpm@linux-foundation.org \ --cc=almaz.alexandrovich@paragon-software.com \ --cc=asml.silence@gmail.com \ --cc=axboe@kernel.dk \ --cc=dm-devel@redhat.com \ --cc=drbd-dev@lists.linbit.com \ --cc=haris.iqbal@ionos.com \ --cc=jinpu.wang@ionos.com \ --cc=konishi.ryusuke@gmail.com \ --cc=lars.ellenberg@linbit.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-nfs@vger.kernel.org \ --cc=linux-nilfs@vger.kernel.org \ --cc=ntfs3@lists.linux.dev \ --cc=philipp.reisner@linbit.com \ --cc=roger.pau@citrix.co \ --cc=snitzer@redhat.com \ --cc=xen-devel@lists.xenproject.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.