From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAA06C43446 for ; Mon, 20 Jul 2020 07:52:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 802CF22BEF for ; Mon, 20 Jul 2020 07:52:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="YMIjYvYx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 802CF22BEF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 272B38D0008; Mon, 20 Jul 2020 03:52:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 248FF8D0007; Mon, 20 Jul 2020 03:52:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 138A28D0008; Mon, 20 Jul 2020 03:52:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0222.hostedemail.com [216.40.44.222]) by kanga.kvack.org (Postfix) with ESMTP id F27878D0007 for ; Mon, 20 Jul 2020 03:52:23 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id A7CF21807E785 for ; Mon, 20 Jul 2020 07:52:23 +0000 (UTC) X-FDA: 77057686566.11.team87_3806fce26f23 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 7B34518017079 for ; Mon, 20 Jul 2020 07:52:23 +0000 (UTC) X-HE-Tag: team87_3806fce26f23 X-Filterd-Recvd-Size: 2876 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf40.hostedemail.com (Postfix) with ESMTP for ; Mon, 20 Jul 2020 07:52:23 +0000 (UTC) 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==; Received: from [2001:4bb8:105:4a81:5185:88fc:94bb:f8bf] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jxQao-000439-0V; Mon, 20 Jul 2020 07:52:11 +0000 From: Christoph Hellwig 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 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> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720075148.172156-1-hch@lst.de> References: <20200720075148.172156-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-Rspamd-Queue-Id: 7B34518017079 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 synchronou= s) goto out; } =20 - ret =3D bdev_read_page(sis->bdev, swap_page_sector(page), page); - if (!ret) { + if (sis->flags & SWP_SYNCHRONOUS_IO) { + ret =3D 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); --=20 2.27.0