From: Christoph Hellwig Subject: [PATCH 10/13] mm: use SWP_SYNCHRONOUS_IO more intelligently Date: Thu, 24 Sep 2020 08:51:37 +0200 Message-ID: <20200924065140.726436-11-hch@lst.de> References: <20200924065140.726436-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=I7MiMBMaLkYFUGes/ZWFe9+6oC03kpbTj/tDtF5mSAI=; b=HBV7buYwNGxLjnd9sKeF7GQtNd UUng2lV5nzMBVocQjMJSGvXEI7sktQeKMwftgvg4UpKQtWdhfppv4NN68VOfRxhs2AdfzB1IqD9hH KTi83p7TAhICaZXOWgf12gtgYMLeUY2v9WOR6e7tF9OtS/t3wTzJjS1Wlg72Xb+GqsHf+/HjmZexD aAP+osOrfycWYvhQe7qgPvpGZ3+pd/DZgSk+a0TwPtkGoVdN/ET1Ip4RZPCknuQDHzkp5yZImuI2h 3vf/j5EpbrtatQcXUqcFFnzLMGAPpDgjtTfOIGuyC3xVHvzY2+EI93Q5rhcBKR/d6QQq97dU2mRiG SNIwLOmQ==; In-Reply-To: <20200924065140.726436-1-hch@lst.de> List-ID: Content-Type: text/plain; charset="us-ascii" To: Jens Axboe Cc: Song Liu , Hans de Goede , Coly Li , Richard Weinberger , Minchan Kim , Johannes Thumshirn , Justin Sanders , 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 , Johannes Thumshirn 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 Reviewed-by: Jan Kara Reviewed-by: Johannes Thumshirn --- 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