From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
To: "axboe @ kernel . dk" <axboe@kernel.dk>
Cc: agruenba@redhat.com, cluster-devel@redhat.com,
damien.lemoal@wdc.com, dm-devel@redhat.com, hare@suse.de,
hch@lst.de, jfs-discussion@lists.sourceforge.net, kch@nvidia.com,
linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-mm@kvack.org, linux-raid@vger.kernel.org,
ming.lei@redhat.com, rpeterso@redhat.com, shaggy@kernel.org,
snitzer@kernel.org, song@kernel.org, willy@infradead.org,
Johannes Thumshirn <johannes.thumshirn@wdc.com>,
Damien Le Moal <damien.lemoal@opensource.wdc.com>
Subject: [PATCH v5 01/20] swap: use __bio_add_page to add page to bio
Date: Tue, 2 May 2023 12:19:15 +0200 [thread overview]
Message-ID: <20230502101934.24901-2-johannes.thumshirn@wdc.com> (raw)
In-Reply-To: <20230502101934.24901-1-johannes.thumshirn@wdc.com>
The swap code only adds a single page to a newly created bio. So use
__bio_add_page() to add the page which is guaranteed to succeed in this
case.
This brings us closer to marking bio_add_page() as __must_check.
Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
mm/page_io.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mm/page_io.c b/mm/page_io.c
index 87b682d18850..684cd3c7b59b 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -338,7 +338,7 @@ static void swap_writepage_bdev_sync(struct page *page,
bio_init(&bio, sis->bdev, &bv, 1,
REQ_OP_WRITE | REQ_SWAP | wbc_to_write_flags(wbc));
bio.bi_iter.bi_sector = swap_page_sector(page);
- bio_add_page(&bio, page, thp_size(page), 0);
+ __bio_add_page(&bio, page, thp_size(page), 0);
bio_associate_blkg_from_page(&bio, page);
count_swpout_vm_event(page);
@@ -360,7 +360,7 @@ static void swap_writepage_bdev_async(struct page *page,
GFP_NOIO);
bio->bi_iter.bi_sector = swap_page_sector(page);
bio->bi_end_io = end_swap_bio_write;
- bio_add_page(bio, page, thp_size(page), 0);
+ __bio_add_page(bio, page, thp_size(page), 0);
bio_associate_blkg_from_page(bio, page);
count_swpout_vm_event(page);
@@ -468,7 +468,7 @@ static void swap_readpage_bdev_sync(struct page *page,
bio_init(&bio, sis->bdev, &bv, 1, REQ_OP_READ);
bio.bi_iter.bi_sector = swap_page_sector(page);
- bio_add_page(&bio, page, thp_size(page), 0);
+ __bio_add_page(&bio, page, thp_size(page), 0);
/*
* Keep this task valid during swap readpage because the oom killer may
* attempt to access it in the page fault retry time check.
@@ -488,7 +488,7 @@ static void swap_readpage_bdev_async(struct page *page,
bio = bio_alloc(sis->bdev, 1, REQ_OP_READ, GFP_KERNEL);
bio->bi_iter.bi_sector = swap_page_sector(page);
bio->bi_end_io = end_swap_bio_read;
- bio_add_page(bio, page, thp_size(page), 0);
+ __bio_add_page(bio, page, thp_size(page), 0);
count_vm_event(PSWPIN);
submit_bio(bio);
}
--
2.40.0
next prev parent reply other threads:[~2023-05-02 15:38 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-02 10:19 [PATCH v5 00/20] bio: check return values of bio_add_page Johannes Thumshirn
2023-05-02 10:19 ` Johannes Thumshirn [this message]
2023-05-02 10:19 ` [PATCH v5 02/20] drbd: use __bio_add_page to add page to bio Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 03/20] dm: dm-zoned: use __bio_add_page for adding single metadata page Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 04/20] fs: buffer: use __bio_add_page to add single page to bio Johannes Thumshirn
2023-05-30 5:41 ` gouhao
2023-05-30 6:02 ` gouhao
2023-05-02 10:19 ` [PATCH v5 05/20] md: use __bio_add_page to add single page Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 06/20] md: raid5-log: " Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 07/20] md: raid5: use __bio_add_page to add single page to new bio Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 08/20] jfs: logmgr: use __bio_add_page to add single page to bio Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 09/20] gfs2: use __bio_add_page for adding " Johannes Thumshirn
2023-05-02 11:51 ` Bob Peterson
2023-05-02 11:53 ` Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 10/20] zonefs: " Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 11/20] zram: " Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 12/20] floppy: " Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 13/20] md: check for failure when adding pages in alloc_behind_master_bio Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 14/20] md: raid1: use __bio_add_page for adding single page to bio Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 15/20] md: raid1: check if adding pages to resync bio fails Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 16/20] dm-crypt: check if adding pages to clone " Johannes Thumshirn
2023-05-30 15:13 ` [dm-devel] " Mikulas Patocka
2023-05-30 15:49 ` Mike Snitzer
2023-05-30 19:43 ` Mikulas Patocka
2023-05-02 10:19 ` [PATCH v5 17/20] block: mark bio_add_page as __must_check Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 18/20] block: add __bio_add_folio Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 19/20] fs: iomap: use __bio_add_folio where possible Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 20/20] block: mark bio_add_folio as __must_check Johannes Thumshirn
2023-05-05 8:09 ` [PATCH v5 00/20] bio: check return values of bio_add_page Johannes Thumshirn
2023-05-05 14:11 ` Jens Axboe
2023-05-24 10:04 ` Johannes Thumshirn
2023-05-24 15:02 ` Jens Axboe
2023-05-26 6:37 ` Johannes Thumshirn
2023-05-30 15:14 ` Jens Axboe
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=20230502101934.24901-2-johannes.thumshirn@wdc.com \
--to=johannes.thumshirn@wdc.com \
--cc=agruenba@redhat.com \
--cc=axboe@kernel.dk \
--cc=cluster-devel@redhat.com \
--cc=damien.lemoal@opensource.wdc.com \
--cc=damien.lemoal@wdc.com \
--cc=dm-devel@redhat.com \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=jfs-discussion@lists.sourceforge.net \
--cc=kch@nvidia.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-raid@vger.kernel.org \
--cc=ming.lei@redhat.com \
--cc=rpeterso@redhat.com \
--cc=shaggy@kernel.org \
--cc=snitzer@kernel.org \
--cc=song@kernel.org \
--cc=willy@infradead.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).