From: Christoph Hellwig Subject: [PATCH 11/14] mm: use SWP_SYNCHRONOUS_IO more intelligently Date: Mon, 20 Jul 2020 09:51:45 +0200 Message-ID: <20200720075148.172156-12-hch@lst.de> References: <20200720075148.172156-1-hch@lst.de> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=+j5IsWDLKMxe2xsBmliuIyKvW71zFHxDs8w/dpzkLoA=; b=YMIjYvYxlX9QZcNO6KqQW1dhNf J+WCe3kNYALq/tyXvMtxhnNvLo11HJ0rvNd8qMenEqttHbXYq48Cq1062tWX/tm/nO0Gh/w0/gvsq qgDm5vxaCHJzQ3DVjM43Uu1fvbpJ/S7kl/ffc7MF+R8IZLFO4+2Hz1+LYWmKNgRYxfUyfnH/n7S30 ENFDTVkcLsqZR8EyVoirLH8UpYTQ66LL6kAqiVT9nde3kkJWogGgSPg+pLbiUueXns72XIVkd8JQu sfYRJF6UwTPx+avFx1/ZBgf+/vckozGHVTxHE6vem5rwpVhvegVdfF1NZSiPg1RXFFvsSO7t1pFUr SW4NnsMg==; In-Reply-To: <20200720075148.172156-1-hch@lst.de> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="us-ascii" To: Jens Axboe Cc: Song Liu , Hans de Goede , Richard Weinberger , 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 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. Also there is no point in trying a bio submission if bdev_read_page failed. Signed-off-by: Christoph Hellwig --- mm/page_io.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index ccda7679008851..63b44b8221af0f 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -403,8 +403,11 @@ int swap_readpage(struct page *page, bool synchronous) goto out; } - ret = bdev_read_page(sis->bdev, swap_page_sector(page), page); - if (!ret) { + if (sis->flags & SWP_SYNCHRONOUS_IO) { + ret = bdev_read_page(sis->bdev, swap_page_sector(page), page); + if (ret) + goto out; + if (trylock_page(page)) { swap_slot_free_notify(page); unlock_page(page); -- 2.27.0