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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4606C5B552 for ; Thu, 5 Jun 2025 13:17:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7082A6B04F0; Thu, 5 Jun 2025 09:17:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 57DAF6B04FE; Thu, 5 Jun 2025 09:17:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0C2736B04F0; Thu, 5 Jun 2025 09:17:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 6F65E6B04EC for ; Thu, 5 Jun 2025 09:17:08 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B48B5160928 for ; Thu, 5 Jun 2025 13:17:07 +0000 (UTC) X-FDA: 83521397694.26.D1742AF Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf12.hostedemail.com (Postfix) with ESMTP id DC41C40003 for ; Thu, 5 Jun 2025 13:17:03 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf12.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749129426; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QYWQUPdda76PujUpVZjP5DyY97Hc/QTJGzCplbmfT18=; b=CugfGDoEtFo2cflHiWhUtvpYO68Y/psEjGun6tvXRJWSMd2edV0BeGi998qS7u0OitHwuQ tiHLaSGxm+4Z8w2c4peLQkuq19s9mZahv0QpodOvjd4CiZBE6ZgjkUrECp4+iduHQF5/Y2 +qHqapbezAA3ldpsIji2pk1HC4nxMAo= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf12.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749129426; a=rsa-sha256; cv=none; b=Syy91Mqalzo3tHTkt6t4h94Who8zF+7nr9zSUF1aG1fjdIcE7enywnSup9I16GYyW1zG4G Dwm5hEC+tXtJn36Ywf0lNQr77PxupigEO4XRzFb0pnTXD9JblBZV/5isEMVGW1fk4QB1ap qweVMWB1iztA+L0SM9jEJsaiXW1LIe4= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4bClNF2RwJzKHNH6 for ; Thu, 5 Jun 2025 21:17:01 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id B335E1A08AE for ; Thu, 5 Jun 2025 21:16:59 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP1 (Coremail) with SMTP id cCh0CgDnTH3HmEFobD9lOQ--.29489S9; Thu, 05 Jun 2025 21:16:59 +0800 (CST) From: Kemeng Shi To: hughd@google.com, baolin.wang@linux.alibaba.com, willy@infradead.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 7/7] mm: shmem: eliminate unneeded page counting in shmem_unuse_swap_entries() Date: Fri, 6 Jun 2025 06:10:37 +0800 Message-Id: <20250605221037.7872-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250605221037.7872-1-shikemeng@huaweicloud.com> References: <20250605221037.7872-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:cCh0CgDnTH3HmEFobD9lOQ--.29489S9 X-Coremail-Antispam: 1UD129KBjvJXoW7urWxCFW7tFWUKFWUKFW7urg_yoW8Aw48pF W3W3srJr4kXFW8Cr97A34kZw1aq393KFWjqFy3Gwn3Z3WUJw12krySkryjqF15C348G34S qw4UKry5ua1Utr7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPSb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJw A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxVAaw2 AFwI0_JF0_Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r 1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF 7I0E14v26F4j6r4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI 0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7I U09YFtUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Stat-Signature: r63f3rpx6abpnph6dypdzsst7k8kpjik X-Rspamd-Queue-Id: DC41C40003 X-Rspam-User: X-Rspamd-Server: rspam02 X-HE-Tag: 1749129423-835548 X-HE-Meta: U2FsdGVkX18aRUUtFkAcs++IiKnM7NiBoUPy3S8MAQVdsPDQBfjsszim2e6MaH54aSMD3bYLilR/tMxlMfBDgX2FPrC1TISduY1FeCk46eEditnkIZHGowNStxo7FF1zd1ntYx1TlUtEcPF+sEom3SYImJ1bDQwa+MpdbEUy3huHi13woWw/m+UdZnTOQbXdS1cMkA6f1TMqA99mTTDj+kG9fmHxYyEVjaECN1TOatxKtTY++cMgq8NYiu6tSHKhxUJd6ueDpuMnFFeQbSMvV7NMFcEvvtXT7ZTNFXjMK9egp7+zqRB6pxvLeRA2wSC+TVClTzYG67J1e6jLCKPZ4U6/I7QIDWvrpE6KDP4O0hltnsOmdQrXCVbEsCPa58Bh18o/FWyLUKDtXwuOGarCwaEjXR+eVGkx8KfkRdbi8dSS9PW+AvfIiVM6Uss0LS2g/lRKLhkyf3KDIbMK5AtsUCSDV7ewp1dpjBoA3o1XCiWEiMjX6VQvP1MAdzNMoToeez3AbGn/HdOIbrJWP9+c3iPIYo6UvTHsd/5v/4Up/uwiYScnt3TYRyKiOHjLoogf1tddAZufjSsY/0ctgaiyksiDbSrtTsmotdVBpHP7pdoNnvE8gSg4FUEdnWfiLXNWFQ6QGB/WryJq/a0b2yRjwTBlk3wpHqJhf9trfu9h7hZGKwR0jAG822ljixD4Rf/XP2Fhsti8qhkACH85sLrBl66/2ZCVFJt+NHbN+TXX804hMAyLyKUMqE7pl0pNFW/B7j6a7QG+ug1Lbw++ER7wly8GZlIUmrQXHgL18+iDFPnX1vegxcmz1Nv/YTQUr+4KjAaZy2vbBAXzNLg/G/drU4RvV6RPIbcrkxYaR2MJnCgCLRDBtUoHg+l79u8CDS8Egqnu5ngjbEsR03ENRLVY/8wuKjygRJlMTeroB674lrgzKZtKTnjpiccPBN8MaoNZ8Ic63jfABfmrF4raB0d kiAV4r5D eFWWWsPkCGJDF7a0HZ5cniFufnTJLqwkNvJICPNzR2uEXJ6yEchTuH5rw+E3zOQb7L6j55J14543iI5lOCUqkhKl0pZ3V8kgN4tGQ8m0yEavVsWPnGukEQdTbQvnZ1SBisv2XHf6FEniHm8Sy/+Pdfvdsf7ckrMaKeGhYCbrq1HgJu+rU4PPfh7tEcEjy+9eUkP/KcbiBVzmggQw5p4Kn2ChSVA== 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: List-Subscribe: List-Unsubscribe: Caller of shmem_unuse_swap_entries() will not use the count of pages swapped in, so eliminate unneeded page counting in shmem_unuse_swap_entries(). Signed-off-by: Kemeng Shi --- mm/shmem.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index c6ea45d542d2..c83baabc169d 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1480,14 +1480,13 @@ static unsigned int shmem_find_swap_entries(struct address_space *mapping, } /* - * Move the swapped pages for an inode to page cache. Returns the count - * of pages swapped in, or the error in case of failure. + * Move the swapped pages for an inode to page cache. Returns 0 if success, + * or returns error in case of failure. */ static int shmem_unuse_swap_entries(struct inode *inode, struct folio_batch *fbatch, pgoff_t *indices) { int i = 0; - int ret = 0; int error = 0; struct address_space *mapping = inode->i_mapping; @@ -1499,13 +1498,11 @@ static int shmem_unuse_swap_entries(struct inode *inode, if (error == 0) { folio_unlock(folio); folio_put(folio); - ret++; } if (error == -ENOMEM) - break; - error = 0; + return error; } - return error ? error : ret; + return 0; } /* @@ -1517,24 +1514,20 @@ static int shmem_unuse_inode(struct inode *inode, unsigned int type) pgoff_t start = 0; struct folio_batch fbatch; pgoff_t indices[PAGEVEC_SIZE]; - int ret = 0; + int ret; do { folio_batch_init(&fbatch); if (!shmem_find_swap_entries(mapping, start, &fbatch, - indices, type)) { - ret = 0; - break; - } + indices, type)) + return 0; ret = shmem_unuse_swap_entries(inode, &fbatch, indices); if (ret < 0) - break; + return ret; start = indices[folio_batch_count(&fbatch) - 1]; } while (true); - - return ret; } /* -- 2.30.0