Message ID | 20200726150333.305527-12-hch@lst.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=D/pI=BF=kvack.org=owner-linux-mm@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CDFAF1392 for <patchwork-linux-mm@patchwork.kernel.org>; Sun, 26 Jul 2020 15:35:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9AD1D2070B for <patchwork-linux-mm@patchwork.kernel.org>; Sun, 26 Jul 2020 15:35:35 +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="BMbowpfs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9AD1D2070B 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 E48746B000A; Sun, 26 Jul 2020 11:35:34 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DF9148D0003; Sun, 26 Jul 2020 11:35:34 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D35E38D0002; Sun, 26 Jul 2020 11:35:34 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0006.hostedemail.com [216.40.44.6]) by kanga.kvack.org (Postfix) with ESMTP id BDA206B000A for <linux-mm@kvack.org>; Sun, 26 Jul 2020 11:35:34 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 83E5E54A30 for <linux-mm@kvack.org>; Sun, 26 Jul 2020 15:35:34 +0000 (UTC) X-FDA: 77080626588.26.dock98_330849d26f59 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id 156301831AD1D for <linux-mm@kvack.org>; Sun, 26 Jul 2020 15:04:07 +0000 (UTC) X-Spam-Summary: 1,0,0,549fc09f9144be88,d41d8cd98f00b204,batv+8f57b4b3bbfec193988a+6181+infradead.org+hch@casper.srs.infradead.org,,RULES_HIT:41:355:379:541:800:960:966:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1541:1711:1730:1747:1777:1792:2196:2199:2282:2393:2559:2562:3138:3139:3140:3141:3142:3352:3865:3867:3870:3871:3872:4321:4385:5007:6261:6653:6742:8660:10004:11026:11658:11914:12043:12160:12297:12438:12517:12519:12555:12895:12986:13069:13148:13161:13229:13230:13311:13357:13894:14096:14181:14384:14394:14721:14877:21080:21451:21627:21939:30054,0,RBL:90.155.50.34:@casper.srs.infradead.org:.lbl8.mailshell.net-62.8.15.100 64.201.201.201;04yfbwsi1kj83q8f5pa4zhzoa5765ypb8e5oajf7pw6tqwug65psmhkngs8z7xx.1fqe7hu4iyxtdqq9i47z7cpuq1bwpzs4qmzy56f1eymz7ou7g44wxu6c47g44jm.1-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: dock98_330849d26f59 X-Filterd-Recvd-Size: 3052 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf12.hostedemail.com (Postfix) with ESMTP for <linux-mm@kvack.org>; Sun, 26 Jul 2020 15:04:06 +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=r6GVNDpJ00GIAfQlV8fGdOFlOngs4z7GOfztVZ4Wopg=; b=BMbowpfsbZEhpuMJ8DYPQ7Qin5 AQuz9qHcP4FRJQj2XTlZO4ZJZx1UC+VJvW+Ph/39TKP9n8Is8IGlvVsOTzfXXgANJdguMqd+hGm5Z M+6y+HiO58GP+VgVYJN11mhXPVXUFPXLPtg+vqYwR0Nt+DxfuFk83F7EoiDDyfkwScfRwUfnQUSdN m3Mu2ERK2RvQl9TqCDSVmRz6jSPUp7884WN9UfeF94qr8Z4g73m+CpUECQm//TVDG4AS/BOCsUuiJ U3+PYA/qQFsx+yMFY83SOHqYESyyEvZ2qTRk2fIf1WglhphPGqsbwP9/96Ys182lD//JWKo5tJFLb dq1KpQzg==; Received: from [2001:4bb8:18c:2acc:2375:88ff:9f84:118d] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jziBt-0005hx-76; Sun, 26 Jul 2020 15:03:53 +0000 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>, 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: Sun, 26 Jul 2020 17:03:30 +0200 Message-Id: <20200726150333.305527-12-hch@lst.de> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200726150333.305527-1-hch@lst.de> References: <20200726150333.305527-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from <hch@infradead.org> by casper.infradead.org. See http://www.infradead.org/rpr.html X-Rspamd-Queue-Id: 156301831AD1D 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: <linux-mm.kvack.org> |
Series |
[01/14] fs: remove the unused SB_I_MULTIROOT flag
|
expand
|
diff --git a/mm/page_io.c b/mm/page_io.c index ccda7679008851..7eef3c84766abc 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;
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> --- mm/page_io.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)