Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
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>,
	Johannes Thumshirn <Johannes.Thumshirn@wdc.com>,
	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/12] mm: use SWP_SYNCHRONOUS_IO more intelligently
Date: Tue, 15 Sep 2020 17:18:26 +0200	[thread overview]
Message-ID: <20200915151829.1767176-10-hch@lst.de> (raw)
In-Reply-To: <20200915151829.1767176-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: 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


  parent reply	other threads:[~2020-09-15 22:53 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-15 15:18 bdi cleanups v5 Christoph Hellwig
2020-09-15 15:18 ` [PATCH 01/12] fs: remove the unused SB_I_MULTIROOT flag Christoph Hellwig
2020-09-15 15:18 ` [PATCH 02/12] drbd: remove dead code in device_to_statistics Christoph Hellwig
2020-09-15 15:18 ` [PATCH 03/12] drbd: remove RB_CONGESTED_REMOTE Christoph Hellwig
2020-09-15 15:18 ` [PATCH 04/12] bdi: initialize ->ra_pages and ->io_pages in bdi_init Christoph Hellwig
2020-09-15 15:18 ` [PATCH 05/12] md: update the optimal I/O size on reshape Christoph Hellwig
2020-09-15 15:18 ` [PATCH 06/12] block: lift setting the readahead size into the block layer Christoph Hellwig
2020-09-15 15:18 ` [PATCH 07/12] bdi: remove BDI_CAP_CGROUP_WRITEBACK Christoph Hellwig
2020-09-15 15:18 ` [PATCH 08/12] bdi: remove BDI_CAP_SYNCHRONOUS_IO Christoph Hellwig
2020-09-15 15:18 ` Christoph Hellwig [this message]
2020-09-15 15:18 ` [PATCH 10/12] bdi: replace BDI_CAP_STABLE_WRITES with a queue and a sb flag Christoph Hellwig
2020-09-15 15:18 ` [PATCH 11/12] bdi: invert BDI_CAP_NO_ACCT_WB Christoph Hellwig
2020-09-15 15:18 ` [PATCH 12/12] bdi: replace BDI_CAP_NO_{WRITEBACK,ACCT_DIRTY} with a single flag Christoph Hellwig
  -- strict thread matches above, loose matches on Subject: below --
2020-09-10 14:48 bdi cleanups v4 Christoph Hellwig
2020-09-10 14:48 ` [PATCH 09/12] mm: use SWP_SYNCHRONOUS_IO more intelligently Christoph Hellwig
2020-09-17  9:06   ` Jan Kara

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=20200915151829.1767176-10-hch@lst.de \
    --to=hch@lst.de \
    --cc=Johannes.Thumshirn@wdc.com \
    --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=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 \
    --subject='Re: [PATCH 09/12] mm: use SWP_SYNCHRONOUS_IO more intelligently' \
    /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

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).