From patchwork Thu Sep 10 14:48:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 1361632 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=v6Xswxgy; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=casper.20170209 header.b=gWXdSveh; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BnMHL44xXz9sTK for ; Fri, 11 Sep 2020 00:49:50 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mQvm9PQKPh9YTAQPR5sK4Vqk5fditc6CCmIMjBV524s=; b=v6Xswxgya/lDfrkacyMs0wuKS EOrUDcDLp5oLr7+KKbp9McrL984IuyzPLhUdOKBDY4CPuVK5hkYJwrk1/WW0mvl8MOzx6zw1bW/A8 TLOmjQM1fUURFOzyBROIBip3Wc0uBmpzv2qnua2tT1NihRL5arVXljQNzaBvokBL/cwW38UekfqRI xjAc6spaalKYILPQc3OCTMW58wc/2V8/tlj2b/O3dmkZNL7IggDj8G3bv8Z6VuODprvTKwiTABvj8 /G17DGMssn1yzKlCFmAh3gtXJSkxuDHaKL1p4EVncjIHldBDWCLQWcd9j5rZV8TBJ7uDWEmUFT+3G sQV6EhMWw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGNsv-0003JJ-U8; Thu, 10 Sep 2020 14:49:14 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGNsY-00037j-O0 for linux-mtd@merlin.infradead.org; Thu, 10 Sep 2020 14:48:50 +0000 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=Src/OqkjxQSdZ62Mh67bzsrUw3RijigPMK2ar4X7t2Y=; b=gWXdSvehOkowhVdpfH7VZCocig yCLRi9ERfOF5FIu+vkFBTfgi/Ds264r21uA1sYnnKRHsbndIIzWlUwXOIc/d8xLROAG94FPRv9U/l YdVHVVIZBRvmivfYFh2OvsuHWAr/CvB+AYT+L4hrsBozPgF0AywPU/qNWYgRO+fkYne9yR8LQKyCT p+OEsoCxOCl8CkYKajH+aXBU5tpDhlTvTSgfLixGvTKRUIArPswCyijGZpGPCOx2VPs6BW+dOmeV3 jvB9tBZEnbfTmR8tXDOf9OBOPPhG2cIyBweSYO8w7sKGMPb24r1j2auUllYxH/o4jBG8JpoEFkcHa 2eQjefKQ==; Received: from [2001:4bb8:184:af1:3ecc:ac5b:136f:434a] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGNsX-0006xO-0l; Thu, 10 Sep 2020 14:48:49 +0000 From: Christoph Hellwig To: Jens Axboe Subject: [PATCH 09/12] mm: use SWP_SYNCHRONOUS_IO more intelligently Date: Thu, 10 Sep 2020 16:48:29 +0200 Message-Id: <20200910144833.742260-10-hch@lst.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200910144833.742260-1-hch@lst.de> References: <20200910144833.742260-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-raid@vger.kernel.org, Hans de Goede , Minchan Kim , Richard Weinberger , linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Song Liu , dm-devel@redhat.com, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, drbd-dev@lists.linbit.com Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.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. Signed-off-by: Christoph Hellwig Reviewed-by: Jan Kara --- 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;