From patchwork Mon Sep 14 13:00:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 11773723 Return-Path: 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 D6D6B14B7 for ; Mon, 14 Sep 2020 13:01:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9A852206B2 for ; Mon, 14 Sep 2020 13:01:05 +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="ozGlJSbF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A852206B2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D117E8E0001; Mon, 14 Sep 2020 09:00:56 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C6DF56B005C; Mon, 14 Sep 2020 09:00:56 -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 AE3428E0005; Mon, 14 Sep 2020 09:00:56 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0179.hostedemail.com [216.40.44.179]) by kanga.kvack.org (Postfix) with ESMTP id 7A89C8E0001 for ; Mon, 14 Sep 2020 09:00:56 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 26E7C157A9 for ; Mon, 14 Sep 2020 13:00:56 +0000 (UTC) X-FDA: 77261676912.21.edge12_590d64e27108 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 48B6118046C5D for ; Mon, 14 Sep 2020 13:00:52 +0000 (UTC) X-Spam-Summary: 1,0,0,265fe601bfaec91c,d41d8cd98f00b204,willy@infradead.org,,RULES_HIT:41:69:355:379:541:800:960:968:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1541:1711:1730:1747:1777:1792:2393:2559:2562:2691:2693:3138:3139:3140:3141:3142:3352:3865:3866:3867:3868:3871:3872:3874:4321:5007:6261:6653:7996:10004:11026:11658:11914:12043:12114:12294:12296:12297:12438:12555:12895:13069:13161:13229:13311:13357:13894:14181:14384:14394:14721:21080:21324:21451:21627:21987:21990:30054:30090,0,RBL:90.155.50.34:@infradead.org:.lbl8.mailshell.net-64.201.201.201 62.8.15.100;04y8y9stbkz41uxndbmtsn5sea8iqypfzs3974d5ohn7yrwxndrsesdse7s7ebc.riy5iimr43hggmy6136d4c1wucjkigssdig96bgknqtedfxp37t64dyzy8zby9m.q-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:28,LUA_SUMMARY:none X-HE-Tag: edge12_590d64e27108 X-Filterd-Recvd-Size: 3355 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf41.hostedemail.com (Postfix) with ESMTP for ; Mon, 14 Sep 2020 13:00:49 +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=BquVAG5cJo9Mjo1CPDl184L/mmeA/HhzvmJ2c4BZLkU=; b=ozGlJSbF/18v6F7REZyVtn9YUg RMboYm65nhrX0354KLqYDh6tEaAnJYjOvFqEdmo0g/gr+hxKaOnMBBxXhqFTPxGQJQ6OaWSsTKBFL pHXYd7CNVCWxNrIRJ1Pti79VVlDcly0nsnBXqyk9wp/2QkuAeZs0SXcajqfNim5KfB1H1ygEKr5b8 u9bS3/VsO1y6kDbEm0BUsW77j8SdfjNgNpIlht/VpzxrvAu1DV202sUkHx4ARolSVJKSJ5R/REezP gGkB/OPvLRwuX4UNgYizVgbO68NiSTcslmE1AZ4Dsf5qcnce4qRFh1KYAMwLpuv0y0XLozc15JFEP l1rpgUVQ==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kHo68-0002zm-Mq; Mon, 14 Sep 2020 13:00:44 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , Andrew Morton , Hugh Dickins , William Kucharski , Johannes Weiner , Jan Kara , Yang Shi , Dave Chinner , linux-kernel@vger.kernel.org Subject: [PATCH v2 02/12] mm/shmem: Use pagevec_lookup in shmem_unlock_mapping Date: Mon, 14 Sep 2020 14:00:32 +0100 Message-Id: <20200914130042.11442-3-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200914130042.11442-1-willy@infradead.org> References: <20200914130042.11442-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 48B6118046C5D X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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: The comment shows that the reason for using find_get_entries() is now stale; find_get_pages() will not return 0 if it hits a consecutive run of swap entries, and I don't believe it has since 2011. pagevec_lookup() is a simpler function to use than find_get_pages(), so use it instead. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Jan Kara --- mm/shmem.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 58bc9e326d0d..108931a6cc43 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -840,7 +840,6 @@ unsigned long shmem_swap_usage(struct vm_area_struct *vma) void shmem_unlock_mapping(struct address_space *mapping) { struct pagevec pvec; - pgoff_t indices[PAGEVEC_SIZE]; pgoff_t index = 0; pagevec_init(&pvec); @@ -848,16 +847,8 @@ void shmem_unlock_mapping(struct address_space *mapping) * Minor point, but we might as well stop if someone else SHM_LOCKs it. */ while (!mapping_unevictable(mapping)) { - /* - * Avoid pagevec_lookup(): find_get_pages() returns 0 as if it - * has finished, if it hits a row of PAGEVEC_SIZE swap entries. - */ - pvec.nr = find_get_entries(mapping, index, - PAGEVEC_SIZE, pvec.pages, indices); - if (!pvec.nr) + if (!pagevec_lookup(&pvec, mapping, &index)) break; - index = indices[pvec.nr - 1] + 1; - pagevec_remove_exceptionals(&pvec); check_move_unevictable_pages(&pvec); pagevec_release(&pvec); cond_resched();