From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: Song Liu <song@kernel.org>, Hans de Goede <hdegoede@redhat.com>, Coly Li <colyli@suse.de>, Richard Weinberger <richard@nod.at>, Minchan Kim <minchan@kernel.org>, Johannes Thumshirn <Johannes.Thumshirn@wdc.com>, Justin Sanders <justin@coraid.com>, linux-mtd@lists.infradead.org, dm-devel@redhat.com, linux-block@vger.kernel.org, linux-bcache@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, Jan Kara <jack@suse.cz>, Johannes Thumshirn <johannes.thumshirn@wdc.com> Subject: [PATCH 10/13] mm: use SWP_SYNCHRONOUS_IO more intelligently Date: Mon, 21 Sep 2020 10:07:31 +0200 [thread overview] Message-ID: <20200921080734.452759-11-hch@lst.de> (raw) In-Reply-To: <20200921080734.452759-1-hch@lst.de> There is no point in trying to call bdev_read_page if SWP_SYNCHRONOUS_IO is not set, as the device won't support it. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> --- mm/page_io.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index e485a6e8a6cddb..b199b87e0aa92b 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -403,15 +403,17 @@ int swap_readpage(struct page *page, bool synchronous) goto out; } - ret = bdev_read_page(sis->bdev, swap_page_sector(page), page); - if (!ret) { - if (trylock_page(page)) { - swap_slot_free_notify(page); - unlock_page(page); - } + if (sis->flags & SWP_SYNCHRONOUS_IO) { + ret = bdev_read_page(sis->bdev, swap_page_sector(page), page); + if (!ret) { + if (trylock_page(page)) { + swap_slot_free_notify(page); + unlock_page(page); + } - count_vm_event(PSWPIN); - goto out; + count_vm_event(PSWPIN); + goto out; + } } ret = 0; -- 2.28.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>, Justin Sanders <justin@coraid.com>, Jan Kara <jack@suse.cz>, Minchan Kim <minchan@kernel.org>, Johannes Thumshirn <johannes.thumshirn@wdc.com>, linux-bcache@vger.kernel.org, Coly Li <colyli@suse.de>, linux-block@vger.kernel.org, Song Liu <song@kernel.org>, dm-devel@redhat.com, linux-mtd@lists.infradead.org, Richard Weinberger <richard@nod.at>, linux-fsdevel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, drbd-dev@lists.linbit.com Subject: [PATCH 10/13] mm: use SWP_SYNCHRONOUS_IO more intelligently Date: Mon, 21 Sep 2020 10:07:31 +0200 [thread overview] Message-ID: <20200921080734.452759-11-hch@lst.de> (raw) In-Reply-To: <20200921080734.452759-1-hch@lst.de> There is no point in trying to call bdev_read_page if SWP_SYNCHRONOUS_IO is not set, as the device won't support it. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> --- mm/page_io.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index e485a6e8a6cddb..b199b87e0aa92b 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -403,15 +403,17 @@ int swap_readpage(struct page *page, bool synchronous) goto out; } - ret = bdev_read_page(sis->bdev, swap_page_sector(page), page); - if (!ret) { - if (trylock_page(page)) { - swap_slot_free_notify(page); - unlock_page(page); - } + if (sis->flags & SWP_SYNCHRONOUS_IO) { + ret = bdev_read_page(sis->bdev, swap_page_sector(page), page); + if (!ret) { + if (trylock_page(page)) { + swap_slot_free_notify(page); + unlock_page(page); + } - count_vm_event(PSWPIN); - goto out; + count_vm_event(PSWPIN); + goto out; + } } ret = 0; -- 2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-09-21 8:08 UTC|newest] Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-21 8:07 bdi cleanups v6 Christoph Hellwig 2020-09-21 8:07 ` Christoph Hellwig 2020-09-21 8:07 ` Christoph Hellwig 2020-09-21 8:07 ` [PATCH 01/13] fs: remove the unused SB_I_MULTIROOT flag Christoph Hellwig 2020-09-21 8:07 ` Christoph Hellwig 2020-09-21 8:07 ` [PATCH 02/13] drbd: remove dead code in device_to_statistics Christoph Hellwig 2020-09-21 8:07 ` Christoph Hellwig 2020-09-21 8:07 ` [PATCH 03/13] bcache: inherit the optimal I/O size Christoph Hellwig 2020-09-21 8:07 ` Christoph Hellwig 2020-09-21 9:54 ` Coly Li 2020-09-21 9:54 ` Coly Li 2020-09-21 14:00 ` Christoph Hellwig 2020-09-21 14:00 ` Christoph Hellwig 2020-09-21 14:00 ` Christoph Hellwig 2020-09-21 15:09 ` Coly Li 2020-09-21 15:09 ` Coly Li 2020-09-21 18:18 ` Christoph Hellwig 2020-09-21 18:18 ` Christoph Hellwig 2020-09-22 8:44 ` Jan Kara 2020-09-22 8:44 ` Jan Kara 2020-09-22 8:44 ` Jan Kara 2020-09-22 9:39 ` Coly Li 2020-09-22 9:39 ` Coly Li 2020-09-21 8:07 ` [PATCH 04/13] aoe: set an " Christoph Hellwig 2020-09-21 8:07 ` Christoph Hellwig 2020-09-22 8:45 ` Jan Kara 2020-09-22 8:45 ` Jan Kara 2020-09-21 8:07 ` [PATCH 05/13] bdi: initialize ->ra_pages and ->io_pages in bdi_init Christoph Hellwig 2020-09-21 8:07 ` Christoph Hellwig 2020-09-22 8:49 ` Jan Kara 2020-09-22 8:49 ` Jan Kara 2020-09-22 8:49 ` Jan Kara 2020-09-23 15:16 ` Christoph Hellwig 2020-09-23 15:16 ` Christoph Hellwig 2020-09-21 8:07 ` [PATCH 06/13] md: update the optimal I/O size on reshape Christoph Hellwig 2020-09-21 8:07 ` Christoph Hellwig 2020-09-21 8:07 ` Christoph Hellwig 2020-09-21 8:07 ` [PATCH 07/13] block: lift setting the readahead size into the block layer Christoph Hellwig 2020-09-21 8:07 ` Christoph Hellwig 2020-09-22 9:13 ` Jan Kara 2020-09-22 9:13 ` Jan Kara 2020-09-22 9:51 ` Coly Li 2020-09-22 9:51 ` Coly Li 2020-09-21 8:07 ` [PATCH 08/13] bdi: remove BDI_CAP_CGROUP_WRITEBACK Christoph Hellwig 2020-09-21 8:07 ` Christoph Hellwig 2020-09-21 8:07 ` [PATCH 09/13] bdi: remove BDI_CAP_SYNCHRONOUS_IO Christoph Hellwig 2020-09-21 8:07 ` Christoph Hellwig 2020-09-21 8:07 ` Christoph Hellwig [this message] 2020-09-21 8:07 ` [PATCH 10/13] mm: use SWP_SYNCHRONOUS_IO more intelligently Christoph Hellwig 2020-09-21 8:07 ` [PATCH 11/13] bdi: replace BDI_CAP_STABLE_WRITES with a queue and a sb flag Christoph Hellwig 2020-09-21 8:07 ` Christoph Hellwig 2020-09-21 8:07 ` [PATCH 12/13] bdi: invert BDI_CAP_NO_ACCT_WB Christoph Hellwig 2020-09-21 8:07 ` Christoph Hellwig 2020-09-21 8:07 ` [PATCH 13/13] bdi: replace BDI_CAP_NO_{WRITEBACK,ACCT_DIRTY} with a single flag Christoph Hellwig 2020-09-21 8:07 ` [PATCH 13/13] bdi: replace BDI_CAP_NO_{WRITEBACK, ACCT_DIRTY} " Christoph Hellwig 2020-09-24 6:51 bdi cleanups v7 Christoph Hellwig 2020-09-24 6:51 ` [PATCH 10/13] mm: use SWP_SYNCHRONOUS_IO more intelligently Christoph Hellwig 2020-09-24 6: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=20200921080734.452759-11-hch@lst.de \ --to=hch@lst.de \ --cc=Johannes.Thumshirn@wdc.com \ --cc=axboe@kernel.dk \ --cc=cgroups@vger.kernel.org \ --cc=colyli@suse.de \ --cc=dm-devel@redhat.com \ --cc=drbd-dev@lists.linbit.com \ --cc=hdegoede@redhat.com \ --cc=jack@suse.cz \ --cc=justin@coraid.com \ --cc=linux-bcache@vger.kernel.org \ --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.