From patchwork Wed Feb 5 09:27:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13960695 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 88812C02192 for ; Wed, 5 Feb 2025 09:27:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 16AD6280008; Wed, 5 Feb 2025 04:27:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F47E280006; Wed, 5 Feb 2025 04:27:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EAEA7280008; Wed, 5 Feb 2025 04:27:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id C41D3280006 for ; Wed, 5 Feb 2025 04:27:39 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 7B3171A0883 for ; Wed, 5 Feb 2025 09:27:39 +0000 (UTC) X-FDA: 83085363438.07.78D6AB5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf21.hostedemail.com (Postfix) with ESMTP id AAF431C0002 for ; Wed, 5 Feb 2025 09:27:37 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="fms/NkEf"; spf=pass (imf21.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738747657; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=90rRcO0x8Pvov1XWHGz55JZuNeq5fISSOHzEENgRMag=; b=cyzK2wbawmFmKGR9XR4gRwIqNvWlS9pp8P/Gorv+qoSXhDanP1fTvTkQwA/Ifb4YXRgBWT dg/n6peRnXvwFgipXDwCQH4jZuNQMtSbVGbUTdTv6sZtotyuuE1Xr5HHTio7xbXj9Uv3Yo Kzt0bRAntui1WnIwDbw99v3T/XiID2g= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738747657; a=rsa-sha256; cv=none; b=gaI9JspCOO/mi/jdZGHqt4UgKMWzqSc7N2hmXLanr+d9tcXwY2WNZKQOz6FCYx8pmDGQ47 7NdLhGPRsi+QFFa7a1tKQ6S1+cxnL7KyNIqmHiqpQVzzUqBeLSU8t/d3Igu7DQmloEAjZ0 LILSPFcNT7ryG8Wpebb02n9EgU7uQaY= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="fms/NkEf"; spf=pass (imf21.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738747657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=90rRcO0x8Pvov1XWHGz55JZuNeq5fISSOHzEENgRMag=; b=fms/NkEfuloRcvLiotzFBuyKUM1nYDrwYR7BS7b2yT+R8hZ0ahH2Wli511gebI92PZpKfa mJF+/Ua6ZvEDYcpTy5j7j515R7zBix0LxwJYt0sKRXuxN27wSR5SXCdpAM5kgOhExwGUQj 76BwGe2QzU3E2Vg0Jt2DgEyUVDsnY8g= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-524-w343ZRs9MHuMWo5S_cZR1g-1; Wed, 05 Feb 2025 04:27:35 -0500 X-MC-Unique: w343ZRs9MHuMWo5S_cZR1g-1 X-Mimecast-MFC-AGG-ID: w343ZRs9MHuMWo5S_cZR1g Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1A3301800879; Wed, 5 Feb 2025 09:27:34 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.112.190]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4501F300018D; Wed, 5 Feb 2025 09:27:29 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, ryncsn@gmail.com, chrisl@kernel.org, Baoquan He Subject: [PATCH 01/12] mm/swap_state.c: fix the obsolete code comment Date: Wed, 5 Feb 2025 17:27:10 +0800 Message-ID: <20250205092721.9395-2-bhe@redhat.com> In-Reply-To: <20250205092721.9395-1-bhe@redhat.com> References: <20250205092721.9395-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Stat-Signature: bw61689iqipruj41byzi8sh95iae8j5t X-Rspam-User: X-Rspamd-Queue-Id: AAF431C0002 X-Rspamd-Server: rspam03 X-HE-Tag: 1738747657-592942 X-HE-Meta: U2FsdGVkX1+Yj9gzetiI+kx5cJEMXti5aj55n8jHPndXztiyflspv6aGtJPfY4x5Jd75FnY5HVvZz9jg721/9JmZZnPN4bMFIESrneaj18TLpyYSqN0u4aCtPfN4KptmMiL0ZZRVrs1hwt1oyzQb9ispCUzYh+qx/kuudP5pdBGg4pM7QEUuGrCzZExuNSYHezVWR6RnvJnJ6FKFW4Mij9+JFOBQWMovVEfwnpC0k8uGzH3PPNhG5fV1QPWOjz+SAsbsapiNLfGBsPzvJEr0uq8ZmSpFkKmypWO0icW9IuG6taOA8zMSCG0s8aVKXdsNsDxV0Ev3UG5mtybO2t7iXHQvGY7oSvSaBeWSm2AcUUzwo1w+HI6PqV79cYRVjhySx4a88E/6PqQtqL5fJjODcpJKMBMMlcfaVNd9jwS4HevaC+/Zrj+dKoIFmG/ykcWCzLk4thVVdsvqHq1EAxxFgs0sNp/pjhDQ+OvsRCEWEBEFN+iIh3C6C4UbEnYFwPARHRPNnCu7z/kpQd8b/nIvRF+CsCbzfgOx3OfwnXmAq0tpEPtHs/nVOIv4Jo9LGwe7YMQ2uiFMt17ywzTbH9j9yCDu//mUE1kyZ359BtDpHKd6lkSYJOrSct22r7Kwspb2mmpC+zQxAW19h4Rd/47WxW8rWVxzZlFjtmDcLNRdMS/0X/qwdpkXDWzybcHwgWHugXJk841XFyHaQHrJyLdivvcXI2CKqgggU8Gos4h+IxdSExXM9J80dSMynbEwEWSpee/wnyj7bl8FNM+iU3kBgFqB8EuXINWqMhCUqfcLyWShJ3cyKuyEpSMm8hkSFuSghC4BW8dfI3ni1Cpvw8lHDc3KoB4o7oQZGRaTtZy2dbV1AaXOb62YMobcRG94TGXEbzP5bbRrxS2g4yLZ3ROt2x/eXeuYN3w3RWWHQG6+V7125yEwT3A20b3b56T41QDX4wCjWA+ENuQL+Ondlkp 2l5ucPyh 2VXyoG1qOMsT6YUmMxTVMBQUdF1FELq911j//6Du66pdMJQtaSg93CFAmXT4cRlrtt9XzwORj18k0ysLQoIOIRBKJ+fLAuABSdwTWN2z1l3OiRmSLEiiDJN8Gxf8AzKM++5/Y7cNjD1of2b6d8b77NcQ5yUMKcSuwQY/+DYqirkqE/36VAtWPxTKqgzxbgUpcpY93gQ9FfRkOuXiTquNk0BsCrxIcM6sJ1Rj57zL3DKlcX6YsWav4DPBsR8GuSCbHlWQSjRN/kcNxaUZ6umh4hyX7ZSDrZJQU8nVHk3JV2+Z7+/sTUNWBAfP1J088rfUysmlQpKQzvuxVtBftDcRCmM8FXTxAQ9GCYFZc7WHrIlsWKJDeMYAARsH3KA== 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: Since commit 85a1333417a7 ("mm/swap: use dedicated entry for swap in folio"), there's a dedicated field in folio for swap entry. Let's update the code comment above add_to_swap_cache() accordingly. Signed-off-by: Baoquan He --- mm/swap_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/swap_state.c b/mm/swap_state.c index ca42b2be64d9..59acb55174c8 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -85,7 +85,7 @@ void *get_shadow_from_swap_cache(swp_entry_t entry) /* * add_to_swap_cache resembles filemap_add_folio on swapper_space, - * but sets SwapCache flag and private instead of mapping and index. + * but sets SwapCache flag and 'swap' instead of mapping and index. */ int add_to_swap_cache(struct folio *folio, swp_entry_t entry, gfp_t gfp, void **shadowp) From patchwork Wed Feb 5 09:27:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13960696 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 A6E01C02194 for ; Wed, 5 Feb 2025 09:27:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3B318280009; Wed, 5 Feb 2025 04:27:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 36294280006; Wed, 5 Feb 2025 04:27:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20349280009; Wed, 5 Feb 2025 04:27:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E9AE0280006 for ; Wed, 5 Feb 2025 04:27:46 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 9B16E80817 for ; Wed, 5 Feb 2025 09:27:46 +0000 (UTC) X-FDA: 83085363732.08.DE05E3D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf16.hostedemail.com (Postfix) with ESMTP id C8B3318000F for ; Wed, 5 Feb 2025 09:27:44 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=aE2vmJIY; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738747664; a=rsa-sha256; cv=none; b=lHsrL/Dvprde6DFfTHzWAKyV3HvzJERQI78UzJT/9Dwe41akYOQNnHk7555vVEc/n0M+AH dEscKFJXALPI3t4GqzlPyiU3M0wpBGiXTCPr1HVT/OZWbcDA/ZPEBG+8SGk8+w4/YXusJf /PzSoLmIDJFeBIDPXNqCfePfCdbpeyo= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=aE2vmJIY; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738747664; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=PEv2tk/qqvPIGyGgURFAveF2/GO9Pp83Lj9RTkxNFck=; b=bAL59tID92vyJV0gawSOhAcnYf0Hd13wTQ4FyCGbsGsYR3CdZWVzfRQ5iHAtTlZhYqqOdV U6FH0BuYmj6TIJDx4bF1FK8gMws/K+ByOS2Yx/KA/eDgmtWogaWcmEKhGikgZ3k3Ljriwz fPcIiJ2ag5h3HE4ebR7bYF8PMPmDG4k= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738747664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PEv2tk/qqvPIGyGgURFAveF2/GO9Pp83Lj9RTkxNFck=; b=aE2vmJIYDEsl6gWt074AuDuxMCW0xJn+F5aKzHYxAK4OVSbFTIdkMKzlRjNmNOH7u3fMXf WHpKfPasE4HjdYqKJQk7SKU/kXZmHCJ1IQR0HKU18NPMc+3nAwG8/sNREwLK4Tp9bkcvfK owlv1VAjkYMjuqvT+4tc5BT3Y0lyVds= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-502-U3GOdD5xNBmPUDlD5LmxzQ-1; Wed, 05 Feb 2025 04:27:40 -0500 X-MC-Unique: U3GOdD5xNBmPUDlD5LmxzQ-1 X-Mimecast-MFC-AGG-ID: U3GOdD5xNBmPUDlD5LmxzQ Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DD8991956086; Wed, 5 Feb 2025 09:27:38 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.112.190]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 01736300018D; Wed, 5 Feb 2025 09:27:34 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, ryncsn@gmail.com, chrisl@kernel.org, Baoquan He Subject: [PATCH 02/12] mm/swap_state.c: optimize the code in clear_shadow_from_swap_cache() Date: Wed, 5 Feb 2025 17:27:11 +0800 Message-ID: <20250205092721.9395-3-bhe@redhat.com> In-Reply-To: <20250205092721.9395-1-bhe@redhat.com> References: <20250205092721.9395-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: C8B3318000F X-Stat-Signature: xf1s5ezhrpw9nnfxytne86butrt8kfgd X-HE-Tag: 1738747664-296830 X-HE-Meta: U2FsdGVkX1+Z7ZOUAU8vMBs/mwH50OFnFwoOoK8n7D46TTUX7Wlcwq0LPDiSFXk6UwRFaiGm4foMStn16xeqDmJq6/AlxrU3EIXJ9XPEIdITGR8hTO9nBUOadFuEmlB64m5NVA/DKO6GYwqK+ZL65h1oFJSI0lPpEmqfMZ+QYEzGJK/1ZXOeiAKezsC/PM6CCL9IqxWowzKaUrnpvGE8LFVDbi79esO/IVV8VA2gOYPOmibHU55JgINHcY3JP6YRQ3VF0FvhRY5uEu/F86ZNetMROIpHnZNXGERGfpJcj9grp7EMebnmWEWTK6LUokkb1ia+56WL0IwKq6b9ADrCzvga+8VRX13/0uLww5XrD0RQD/n+kbCyh4ipnc2dEo2dEBblfaXKXC/OIEgwc2EhvYgCkCIvrYrIt/QqEyHsoGi2XzmYHW6FFzbw/yuPd7oa/hLqyv6GoSWwInQTdTEkh9LGmV2Q8XrZpTIyfSDNGKuNEk9ULnuGGBBs+0W7M1fjjzOA7ndGXJ77FSjnA3Ggy1p2+FC3gpAwKBCPkBJArXO/tYz7/ThI0LfwN1XsAhlLB+FMHPNF0/tWyUfDU4spBYAQ5MO0+RuYnzAmoZGLHGQp+XC66UQ5jCy0zOF6MHRxPwszv6izuWB50Es83dJP3zYTM/0IsdVO0mo7EvqbB4osb0hGewOOrA4pVMjLn5Jz3HGatgIX3gf4Y1jyYHLMNZM228kfu5zwFIWeonu5ge883dRbhmf/F+lt5tq4fPFh1xwfhuwNioaj190C/3BTfm2E5hm5JQRvzrwcJSNuj4rO0LCWh5ngrKV+pR0WN3y9s4wjC1btlBN375pHmg3EzDl2FWF8mC3jN6r8gknXHdOVmc21kNxFD7AWjin586LfolzcpXdMrzUk3IzkTjtXjmpk000fh4RzVORADNXeb87mYREoHyTPKeg/0/4k1yS/u2aUgY1RvNM0ZojGxsF sTI3Czg0 aGYHSuSS6n60sooRrh23jrSGrUmWdIvwgDp/WrWnmFpCl8AoG7FJlJOptDm5x6d90a12HsXh7r72rCvX0K2gkpnLjuEOTUVHu+x6UttKL+cB1STguGikIj7c9T8JDHxIHiWTc9zgN7ZRdIg/g1jeRKYZJU39js6xm8fBIls3CUlfOgQKZ9GGSB6ovbk9UkN+bPMF1QjWyhP3hjrqrKdhktDpsVafoEHsZJHW0k1DeBO12dyV5M2ZPhU/BEfvAafvnwyJN7m1a/7RcEEGphnP7bhYSkIHrdxP3x79+4kfib+EwcgN9WkJAEvY5Em8M+ahNjkiuGhdkZhlO06fZkYiQ6aaLrS+Wo8YTFWgf8MTIBEIuzZFCOMDJpYI7+Q== 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: Use ALIGN to achieve the same effect and simplify the code. Signed-off-by: Baoquan He --- mm/swap_state.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mm/swap_state.c b/mm/swap_state.c index 59acb55174c8..d7cbf5bb2450 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -270,9 +270,7 @@ void clear_shadow_from_swap_cache(int type, unsigned long begin, xa_unlock_irq(&address_space->i_pages); /* search the next swapcache until we meet end */ - curr >>= SWAP_ADDRESS_SPACE_SHIFT; - curr++; - curr <<= SWAP_ADDRESS_SPACE_SHIFT; + curr = ALIGN((curr + 1), SWAP_ADDRESS_SPACE_PAGES); if (curr > end) break; } From patchwork Wed Feb 5 09:27:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13960697 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 B07B9C02194 for ; Wed, 5 Feb 2025 09:27:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 475F928000A; Wed, 5 Feb 2025 04:27:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 40003280006; Wed, 5 Feb 2025 04:27:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C6E628000A; Wed, 5 Feb 2025 04:27:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 0B3FB280006 for ; Wed, 5 Feb 2025 04:27:53 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 7CA2B120831 for ; Wed, 5 Feb 2025 09:27:52 +0000 (UTC) X-FDA: 83085363984.30.ACB3D8B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf01.hostedemail.com (Postfix) with ESMTP id B39204000D for ; Wed, 5 Feb 2025 09:27:50 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="JI/uPGbW"; spf=pass (imf01.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738747670; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=FIOS+/tyiatrDoGbeFH0VR1TEwzBCwvdDVquOSZT3r0=; b=OSch74ocheZPojFLMLMHGidgc4zTjKPWv1R06m+w8ZqMGPCzc690YT9CMFpRpz4tQxukCY hFNnaBI1Yn08auvuiBmsNGrWEon0uyyB5pKMw/TzW5RP4Jc8KE6DSeGaPW+AkqUj5kj4yr xN+tBF6NeT7lWwTcysf3mNlXd711CRA= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="JI/uPGbW"; spf=pass (imf01.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738747670; a=rsa-sha256; cv=none; b=Iy/xovCWlu+Mb//rIvgF+6ehk41Viy+5PojDJnnf+XDRcoKB15KRxq5/XO/ctAxJmmGy3e PEoPBFEJXhDvcF8oqZB/3xUKWwomSVT3okS0/I+QYn9joqsGGiCBdi5+E/OdRC2HrfkfJV FR5YQFT+PJwzJ9ewNA1ztAaZRslfZvs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738747670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FIOS+/tyiatrDoGbeFH0VR1TEwzBCwvdDVquOSZT3r0=; b=JI/uPGbW+XhvGbfHih7KsOfiAFf2YVKolfDbG6I36uCZxHUgEqYL+k2zUcsth/gmcAuDDQ IfA2QD+znH8bVn970aLmQ3keqcO0UpNDPhH1xjrtcRpPxf1TxL8e3/5yujMiBcwDAIbn2I azRhNfwT40MZmPkwXuGjyS9OekFsQnA= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-626-BmsBWnX8OmGC-bxlcS6guQ-1; Wed, 05 Feb 2025 04:27:46 -0500 X-MC-Unique: BmsBWnX8OmGC-bxlcS6guQ-1 X-Mimecast-MFC-AGG-ID: BmsBWnX8OmGC-bxlcS6guQ Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A05631801A3D; Wed, 5 Feb 2025 09:27:43 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.112.190]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C4E203000199; Wed, 5 Feb 2025 09:27:39 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, ryncsn@gmail.com, chrisl@kernel.org, Baoquan He Subject: [PATCH 03/12] mm/swap: remove SWAP_FLAG_PRIO_SHIFT Date: Wed, 5 Feb 2025 17:27:12 +0800 Message-ID: <20250205092721.9395-4-bhe@redhat.com> In-Reply-To: <20250205092721.9395-1-bhe@redhat.com> References: <20250205092721.9395-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: B39204000D X-Stat-Signature: gsu3eqtx8f3bz5fmd3fsqhe6q3hq5s54 X-Rspam-User: X-HE-Tag: 1738747670-543447 X-HE-Meta: U2FsdGVkX1+h6x2zVD8B8DpjnkGFN0YWvJ3U5eSZNRkENaUcOj0KA/LKdMpRJK4bCPdhPNIrnS/dLqgOqR6tuqUUYbFzTCWVUP2WtsaT/Q22BTB5gKUHF7r1CIkFTb64ui5wmj7N5oKqb+vIi8Bt3IUu+NFWeykV0s1KbPgO8AcmdDcrUHF0WG+zx7r5AD5xJH9KvEGT9lfnhNUrYsfhuYE0OWwirJEofrmL+GwBXHHMkzAUd4u3b1HzlSYJ5x6MX5s5dXlefaqInZUlW6KE82d/0P5sRDQeNmhdSt5Nc50tUD0XR49xQEbDZ3nOjQ1u5fo9/1zYUqw+RBuIIqfbWARpzBFaPLBhanGGhwdt6G4DzHeKtwGhYJxxoKIczQ2YKQwDKw96FX04LbxVFwFCqWsSvEFeLIW7B3i8M27ScZGHawX0a5cnka4XuW46omMi1XCmRXr5evx3tF0qoUcsQh8DD6eP7No3V47PLLafTT8pizaOA3RA6/F6wDLj/Wo26Snhs8AQd8buWjhxmZcW6kXJihNcX3Ph/XNtrmciDcLs5V9zrmZsd13xMA6KNJ89BvGeSKddIYepRJRs7HeVvFmkpJdR+q5JeG7lii5Li/cpZODc0sm3kQNRUsJMMBLlAeRxuaBiuRHVbMpL/pYS9/x07Z8jpNomdzGVedFA7HVzGkcPeo2PnLZsc1DW1eU2j/qajKVPfhq9lTQXFqgLxoLXQOcGsUPhH7Kxg/y2wTs3a+p4aYddLloen5/f4vz6YWxOVlG2LCBmm8wy/8Np7MNBcr2RsAHFerS8nCQ2slLCPZc7XN3loctqijFzKlxue66OCPnx8C3WoIDtHR56pGYphM3jk6tw+I/NtdLzYHZ6YiohpZgvPMCwDN/0GpEW/gJ3qGaz18Hd4PQWPKHqBplRzhIYt8Iwag7ravER0tZD/Oo+t3xp1s/KCvIh9AKZn2TCjs7nbqIvvpweyID pcVD/u9F gIoHllucOMACoHoYdUNXnMYk29VC3yEq+MZKpxAbXJMM1FOb7t+qVoCxmmSrCaotNFY8QwV5R6aP1VlugvrCyRa3Vj65/0HW7HwVU92VXEpQ1B4VHL8XzR9WQVhrfRjGmHyClYRYeA7Is8iDku56A5MNM6Qq1NT3M8is3vn7l14YgMbsQRgGzwUgzTuxaWWCvChXmVKum2d+Y51R8Rs6c3qzoeYUZSZw1X1sMMUpwPLW03JzlsGwI9vmhymgVCTTX56jMhboHiYyHGRsVJhf+uoJalSWtzFId3AwxEjGTHO0E8uKiTCP67wODS7WHrvcseFp7/uiQMDf4YzMugb6MiJKeI1a+3UtamsXDKIs7bLvDaM2Usca1X82aMQ== 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: It doesn't make sense to have a zero value of shift. Remove it to avoid confusion. Signed-off-by: Baoquan He --- include/linux/swap.h | 1 - mm/swapfile.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index b13b72645db3..20bfedc8c4f2 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -24,7 +24,6 @@ struct pagevec; #define SWAP_FLAG_PREFER 0x8000 /* set if swap priority specified */ #define SWAP_FLAG_PRIO_MASK 0x7fff -#define SWAP_FLAG_PRIO_SHIFT 0 #define SWAP_FLAG_DISCARD 0x10000 /* enable discard for swap */ #define SWAP_FLAG_DISCARD_ONCE 0x20000 /* discard swap area at swapon-time */ #define SWAP_FLAG_DISCARD_PAGES 0x40000 /* discard page-clusters after use */ diff --git a/mm/swapfile.c b/mm/swapfile.c index ba19430dd4ea..9c9a4ec6d4c6 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3449,8 +3449,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) mutex_lock(&swapon_mutex); prio = -1; if (swap_flags & SWAP_FLAG_PREFER) - prio = - (swap_flags & SWAP_FLAG_PRIO_MASK) >> SWAP_FLAG_PRIO_SHIFT; + prio = swap_flags & SWAP_FLAG_PRIO_MASK; enable_swap_info(si, prio, swap_map, cluster_info, zeromap); pr_info("Adding %uk swap on %s. Priority:%d extents:%d across:%lluk %s%s%s%s\n", From patchwork Wed Feb 5 09:27:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13960698 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 A4EEFC02192 for ; Wed, 5 Feb 2025 09:28:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 33D636B0082; Wed, 5 Feb 2025 04:28:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2EE0D6B0085; Wed, 5 Feb 2025 04:28:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 18F036B0088; Wed, 5 Feb 2025 04:28:00 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E82286B0082 for ; Wed, 5 Feb 2025 04:27:59 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 974B614079C for ; Wed, 5 Feb 2025 09:27:59 +0000 (UTC) X-FDA: 83085364278.12.23B9C04 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf09.hostedemail.com (Postfix) with ESMTP id D3668140009 for ; Wed, 5 Feb 2025 09:27:57 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GeFxOXxn; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf09.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738747677; a=rsa-sha256; cv=none; b=5nLpoNNU0uehAE/32q6ZUf20bnUvfwvBqf8NhhLaaHQyyVWRtpF3VVzL35Rainy/oc2xyH MoLwATkzn9Vm+Uq+4F3We0FLLYiwrpPMplQj28ZRZxWh76MYcVBmo81HuPDyq5yQiGEih1 sQVMAA7BI1SiqajGXDF/e3NxVz8Hw6U= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GeFxOXxn; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf09.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738747677; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=baZcIm7AlnLIRm7Dd7CyR7YXStnIxeq19AKgfb6y8wo=; b=yFr59tSGFTu7kK365RQqbpbi29vMzry10Xxv+fTXI3LvsrsZt06nhjW4bQy1+AAQpwsl6v bd/eIFJ9RTAoGCA9bkU1DWt2smnMrsWRb0q65BdeBBuXogrJWyTB01duPCg3w6mnlk9NLO GT1GcPkZxR5DBLoSRq9dvOQ6C8v7WDM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738747677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=baZcIm7AlnLIRm7Dd7CyR7YXStnIxeq19AKgfb6y8wo=; b=GeFxOXxnmyO/l1afIth1PAXdDzcQTvfGbkGXBJreIbxz7wrpFsSsQgo+vZcl5DkLLLTwBW DcocNvD2FJOhwIUnYWkbg00A/wXPaB3xTvVX1gKRfZaKatqHW23OqwLL3Tpc67nOQRtCjF vvaQckW26tthBkGXwa44X7p+e7ncVFI= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-548-WOpEV56FPm2xOHG6ElSdSA-1; Wed, 05 Feb 2025 04:27:53 -0500 X-MC-Unique: WOpEV56FPm2xOHG6ElSdSA-1 X-Mimecast-MFC-AGG-ID: WOpEV56FPm2xOHG6ElSdSA Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A0616195D6AC; Wed, 5 Feb 2025 09:27:48 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.112.190]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 94030300019E; Wed, 5 Feb 2025 09:27:44 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, ryncsn@gmail.com, chrisl@kernel.org, Baoquan He Subject: [PATCH 04/12] mm/swap: skip scanning cluster range if it's empty cluster Date: Wed, 5 Feb 2025 17:27:13 +0800 Message-ID: <20250205092721.9395-5-bhe@redhat.com> In-Reply-To: <20250205092721.9395-1-bhe@redhat.com> References: <20250205092721.9395-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: D3668140009 X-Stat-Signature: q8xn9bftccz56q837z5y478d4pypxmqu X-HE-Tag: 1738747677-35565 X-HE-Meta: U2FsdGVkX18tB8kUV5+fTPS5fYS6P/okv7pgxH0NFLFGMuuIjvReVAsLSB97WXoenkxXOxtexFI1ltJZH8T19LtW1t9H3Ba330Nld9VtFOdIXCiQ6tutGNJg56CpAAVCx3d5XGMbS2osdeNQJlWq5s02kDVbwdzFCFrpu9atWMP/KLRsvwJhUrVnHNgiXFDA6ayEhX+ulHdP/8T3UqP2DlzQP7GpAOxbXfJnjdiuQbj+nxaiPmuCDAYhnnKJO2XNI5bYrWfoQ/Ul/jmopaNEmJwJigzgtV7MVsau92MhxYRyxhI4iKnfQNqyXeGYi9Ph9i93WxgbnvBfAn5yZDsGF065nBxuVjIB1jMQ/ofzwnzNCxAve8+uqXIgF9pE+j+MkuGf9+AZ40zuasPCHiBY/Uy5j2Wb4nV6/H+SNWz/WxTD5Q56qsJUOQQbk/QZ4z7rX7wnLCVyFhvdKyGVvG7FhJZHklx4qyKRJtAv0m1hU4Gr14BtM4NBONOL2dSCCzwYmo3or+MwECF1qdmwoWDprhhiRxT1tgI7DnAbnN8EgXfiIMniqpqdZxooZVvGEZUGsrpnI0H6KnRYWrXNWaNSdhZUsslHJeAAOI5ivAyUVaeBhM7p3Jw7REpUlq95l6j2821Tov5liLyBCTTcMux7xF2EZFnnE1xXnosbe7RdE9MkrWh0D6w5i76oqpV4ew+U1AUSxa87MhSJUg9CEDgo9TUbRsO9xw1WcgkL6iVaiu45Z2uzT+0g2dfU0fnaaFcvUiOX1uJFsBJ3u2GLl3iIUwJLLPJjHukQDWTru2YWMQgv+2fihtzISD0FTUTf1IcKMU+OK0iGlCQaq6JIlyg8Yn9JeqSlTPs+SiWrShvQr+JjYrIvw7z4esFVsKoyjyAvkqG7ZkUhtiUmSX/vaElQo/PN0HnH3gejsEe1cpTDS43LjmaVrh9jBQxwS65CrK/djY3fYV3cliNktwnGM9G G4k1v2D0 7elwByMjv7LbTpNuA9/jajbxYceYgqu9p70iKIQ5+xTwIEqyUS3Qty2fmhk5r4NY0o+xtnXxGbWQMUI5MRFpwo9zy7iwSnI7yYBhzgE8Jc/mc3eTzvAER7g6JkX8EHip6/P/15htKTID/GiEVru6Ca9tOrU2VLTyQxvxiEoJbfuicKDOA4XjTSVdKr4pVC+hWhFHbBKjvIlFunThBOoP/9CysULB/ExATtGNvi/zTDuBl7UTr/e6GHDFZaTO0qVNQe6vr/oYKrQPPpGI9r5Mm7TuDS67iFLr2PRR4DoWNxrgaRuL3Of+5q0RpzobDtvq4PO94 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: Since ci->lock has been taken when isolating cluster from si->free_clusters or taking si->percpu_cluster->next[order], it's unnecessary to scan and check the cluster range availability if i'ts empty cluster, and this can accelerate the huge page swapping. Signed-off-by: Baoquan He --- mm/swapfile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mm/swapfile.c b/mm/swapfile.c index 9c9a4ec6d4c6..61efde853eea 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -729,6 +729,9 @@ static bool cluster_scan_range(struct swap_info_struct *si, unsigned long offset, end = start + nr_pages; unsigned char *map = si->swap_map; + if (cluster_is_empty(ci)) + return true; + for (offset = start; offset < end; offset++) { switch (READ_ONCE(map[offset])) { case 0: From patchwork Wed Feb 5 09:27:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13960699 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 68D48C02192 for ; Wed, 5 Feb 2025 09:28:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A920D6B0089; Wed, 5 Feb 2025 04:28:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A413B6B008A; Wed, 5 Feb 2025 04:28:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8BCDA6B008C; Wed, 5 Feb 2025 04:28:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 67E4D6B0089 for ; Wed, 5 Feb 2025 04:28:03 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 260751A0823 for ; Wed, 5 Feb 2025 09:28:03 +0000 (UTC) X-FDA: 83085364446.14.887C8A9 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf23.hostedemail.com (Postfix) with ESMTP id 60653140015 for ; Wed, 5 Feb 2025 09:28:01 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=OfDysnf9; spf=pass (imf23.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738747681; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=R7Vvp9EGlv2TMusLr7Im3+AMRbyPEdy+5VUuaPm2KpI=; b=bwPekvpDM4d1Ygd+paSny8EKWv4CZFn+PgIar89yY27HYDx7Dy+HAXXq8qCAHUrTyXk5wZ YiBYzkokT5WENcAvxK73TFhnnq0+Vjoa4USHJnwKRue6grmw87cHC+IlUJ6TqzT9Omutvg CYEnGrHzAVosUILuDb5LDvpx/xEbM2M= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738747681; a=rsa-sha256; cv=none; b=KTob7mgAgHlJqtUv+EL7P5m0hurn6GMlBM60u4krdlRD1CUn4ufzCR8uM3uaZOLG97o/zs WQI3QNcPAERDLYWaV/CUzROdQxggYPPz29DSWursW8dRBQxziF2P2QsfKmAWWm1uh5fDy7 8AYDJWB863oldzcAAgswVTw8w3/G1xM= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=OfDysnf9; spf=pass (imf23.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738747680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R7Vvp9EGlv2TMusLr7Im3+AMRbyPEdy+5VUuaPm2KpI=; b=OfDysnf9aKMgygDqUQKnwiFtMSYDjA029mp8M8BjlAEelx3qbSNYV/ya6aeZXoI2laKrLR ZL3P0DfbZxxGjRSM4AR/Nh6TkBjwuMopZtpzS+7Qn7qEVKIbRyfCvhJAb87cZ43aKmQnxS e4l5JlzFvDXp5/Jp5z3UBi1qyXLvOFQ= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-343-SbABTzTlOh2KRzsfQVnkxA-1; Wed, 05 Feb 2025 04:27:55 -0500 X-MC-Unique: SbABTzTlOh2KRzsfQVnkxA-1 X-Mimecast-MFC-AGG-ID: SbABTzTlOh2KRzsfQVnkxA Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 153DD1955D86; Wed, 5 Feb 2025 09:27:53 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.112.190]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4E542300018D; Wed, 5 Feb 2025 09:27:48 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, ryncsn@gmail.com, chrisl@kernel.org, Baoquan He Subject: [PATCH 05/12] mm/swap: rename swap_is_has_cache() to swap_only_has_cache() Date: Wed, 5 Feb 2025 17:27:14 +0800 Message-ID: <20250205092721.9395-6-bhe@redhat.com> In-Reply-To: <20250205092721.9395-1-bhe@redhat.com> References: <20250205092721.9395-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Stat-Signature: xy8wb1qycays1paj45d5nithogpufu84 X-Rspamd-Queue-Id: 60653140015 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1738747681-35610 X-HE-Meta: U2FsdGVkX19+d8ZZp6w6GHGKe0NsoO8E7VLsCguQ2+ORhGW8bVG01gRqzukBindiggAdIY9Z5MyosAYImzibj1P1vF8qdx4F1MToNXYaAbknpVYZNRoK1f9aYr1XTrb5NeJpBsztFRsjQ554vMQniVTuhIaD3k13vV3ArjNp5ITnOkRD6Q8zpLXySRQuNCQZNnjBg8Ubc6iGj6Gu5NIIFkXWxRMc8z/Owi1CdaMjBLouA5BjzuNjDSa3lDj7IIsAwgV3hf4qzzDyEKXkOXaqEJuPWikJCBARSss5c2xuSVIITbBLVrMimKrNFiS3TAA66BqEKbBMeiZti+Eq3iZPanqETwDdORIrNjufiQTrOVc6rYoEFtr8m33F5bWkdw13lTkJVM8rgrtPRz5drCSztdBVOW4S8ahfPeuQ3z6Mi0aQEl9NTxrF6jQ/gVEtgXGcQXvLAYoSFJi8GGYK4GhmLrtT37QjZJLhvfaz1r22biKg+Sg46EvI8z9IHbkqPn5fesQoNFi8aZOZhgJ4AUqekQFQjZrtklElgKDOfJIFF/cnbYNhLPYckAkN+Fmlz2Yb+Hrukp9nD43C4UPSC3t3CTDFfXqrADMbduBEzmAiQncQAvqgbmzGMWU8FfV0W4TDjIB7RefWzhP5BnSXTUESlrtB8PCkXw0wAiJXMr1KAh39BVVN+q5/W31XqLqg7TtWI1l+4Bv2FwVj1LDEjhuw/PR/pKqpFfVcFXnZEz3itr9K57uIivlnT764UI/F3pJSkqnIrcH48yZymB3iAbMJ+oPjkJs2OoOPzm/i3JqrrWH5ceD1/wBFTdzgMcxwkx1NxugiEySfMbRmRYXm8B+pj0AV3zs3c7K8+PG7R2C/jbBHTXyQJVQhDvKm/ixifnPEPlU3c+XBqN2t6W8AUAKbLFgKmCm/odaFGSc5aNpR+hAW6+1Oee4p+O3/0vO1sLb14FD9cpzJU6xEgBPepLR PvBhLupb Frwl879sF+urplkzFdlxx0vXzHn8a0uxNjd6VSQgSoZBGMM+0HFl7bWC63GPNH8RsiitvhBczMZQlwfohzajgJ4YaUXLqvFS7zGBTJySEeB5Qn16gB6dWhz60uNmDtGdv5ovk4EXJbd0vFmCapjwYoeizBVCyamJZ/BBCMtgVAdofIWpg1ZprKRaL6JCm/gjSBb+uBbFFy+CJxlvnV34K65zphAOIYaHiOjV4SJ9Q2olShQ5KXAhkkhiFXJLsXKjQfUSgv5g1JRxfHhYbEnp6H5agKfR0V9cRRBIKNSMvxqoXwzMhYSHEVJNIZDgYufLzk8TaVnFEGFRX8vynqn9PjmdkxlmO05F4LxegyY6ZpA0ipJiMNfa/kTUW/g== 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: There are two predicates in the name of swap_is_has_cache() which is confusing. Renaming it to remove the confusion and can better reflect its functionality. Signed-off-by: Baoquan He --- mm/swapfile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 61efde853eea..bf284ba16198 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -161,7 +161,7 @@ static long swap_usage_in_pages(struct swap_info_struct *si) /* Reclaim directly, bypass the slot cache and don't touch device lock */ #define TTRS_DIRECT 0x8 -static bool swap_is_has_cache(struct swap_info_struct *si, +static bool swap_only_has_cache(struct swap_info_struct *si, unsigned long offset, int nr_pages) { unsigned char *map = si->swap_map + offset; @@ -243,7 +243,7 @@ static int __try_to_reclaim_swap(struct swap_info_struct *si, * reference or pending writeback, and can't be allocated to others. */ ci = lock_cluster(si, offset); - need_reclaim = swap_is_has_cache(si, offset, nr_pages); + need_reclaim = swap_only_has_cache(si, offset, nr_pages); unlock_cluster(ci); if (!need_reclaim) goto out_unlock; @@ -1572,7 +1572,7 @@ void put_swap_folio(struct folio *folio, swp_entry_t entry) return; ci = lock_cluster(si, offset); - if (swap_is_has_cache(si, offset, size)) + if (swap_only_has_cache(si, offset, size)) swap_entry_range_free(si, ci, entry, size); else { for (int i = 0; i < size; i++, entry.val++) { From patchwork Wed Feb 5 09:27:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13960700 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 C6D8AC02194 for ; Wed, 5 Feb 2025 09:28:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3DBBC6B008A; Wed, 5 Feb 2025 04:28:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 38C2D6B008C; Wed, 5 Feb 2025 04:28:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 11A606B0092; Wed, 5 Feb 2025 04:28:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id DCE136B008A for ; Wed, 5 Feb 2025 04:28:04 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 4375A120837 for ; Wed, 5 Feb 2025 09:28:04 +0000 (UTC) X-FDA: 83085364488.16.83DAFD4 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf25.hostedemail.com (Postfix) with ESMTP id 68118A0007 for ; Wed, 5 Feb 2025 09:28:02 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=O9Cxo0bl; spf=pass (imf25.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738747682; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=tfQRbrAPzJ//p+aZcAFopIE6B9AWo00nZkaqbYuuJ/4=; b=jrh2l2mR5Ak21V2HpdzdS9S5hPBzW2FgAgWiIm+sj0Xn/Op3dlGWAg+aJsIKr6fzmKVrHA wIT7WTPPrgdXZbdBtt3Z23KlcnGytkk6qd6cdffxJXR7v1hvdUt+hJYeGMdsj6LsfaiMIG Am/96cK5Nw+Wa5HguDEfnjuIoXXQl+4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738747682; a=rsa-sha256; cv=none; b=bJdCxKeCXLSaaM/cuGl2mu0Sob1r6rYKDf7O+RVDtY0Xv6bcMZ4Thx5nwkiEoakREydud1 mEMOsgaeAcitwoaDbqTzKvdlOO9WSiBSECCDPQi3k6AYct1RB6W9sgG1D/dn50XTKmdV6E Ilw13HWrtxcqbPLlUx4obyxdUFSv4l4= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=O9Cxo0bl; spf=pass (imf25.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738747681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tfQRbrAPzJ//p+aZcAFopIE6B9AWo00nZkaqbYuuJ/4=; b=O9Cxo0bljrLhsQ6v0tkW1ropaWLeNk3kJpkfpNZhIQE4EGM3VR5Djroq0wY4fPQxHF4anU 1kHr6Ex4bexZx/+4SwrNaIa7pRxkVSMHeHzcHS7DtkmZRUkZjEHd477CxUit/zZkwyFe9R oOX+1jcoI2QQJ79xOlUMEUzZWTyHgE4= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-653-EwIqPDUzPAGcwC0RIUNX0A-1; Wed, 05 Feb 2025 04:27:58 -0500 X-MC-Unique: EwIqPDUzPAGcwC0RIUNX0A-1 X-Mimecast-MFC-AGG-ID: EwIqPDUzPAGcwC0RIUNX0A Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B08E019560BE; Wed, 5 Feb 2025 09:27:57 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.112.190]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F0C94300018D; Wed, 5 Feb 2025 09:27:53 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, ryncsn@gmail.com, chrisl@kernel.org, Baoquan He Subject: [PATCH 06/12] mm/swapfile.c: update the code comment above swap_count_continued() Date: Wed, 5 Feb 2025 17:27:15 +0800 Message-ID: <20250205092721.9395-7-bhe@redhat.com> In-Reply-To: <20250205092721.9395-1-bhe@redhat.com> References: <20250205092721.9395-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspamd-Queue-Id: 68118A0007 X-Stat-Signature: bryghmrkd3ctft6wp8368rfwqnq4pnug X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1738747682-592233 X-HE-Meta: U2FsdGVkX19nh+E36hauQDVjjR9y6N1m1S511oHBqa2EWyGxHAath2dZjwmoM02WKsclfJNN/1i47FKkKZQPjqjS1EgfECh5Xz72WVDvOwZ7pfFBE84kj1pY+7NqXsCzdgIVlpzZuduKaHFQr3Mg6CqpSRYUiPb20lwcOEQDqPIDStIgWVCkHm8tnG1Pr0OKJwbay0ZRqMyBu8vIX7ctNH9lmUc50OPobyZETUMVwx8HPAHY/bfQePHNeW5ZlFLCAC7zRac2VJTThVHHwzv7iA3buotKH0TI05hvX9X4+qNIMDlOCg/2Zh2k4Pckh0M8PY0LdNHehL1XgLCaRkLH9xfzdjs+8/Jqim+HSBsvP3oTK5ASMH5/cEjRujeniBXEmRtFnHvH1Htn4Sjl2BkeVUVkNGzStet0BUSAk2yvNzXYmBiTBFYM2odtHCBQ3IulvbgP0jjYstSZMTCtEpxepYQBUJy72fLyI3gKif3HEtUs/wrcVCd9pI5Lj8xXWHTcBAdPyxA8zkapz7NkRkMO/SbbUo4sw2xRJvatN7Ek/nw4UIBM0jRX25dV52uuobmjRdBEk7y//el7EZZFmq/W9x5QgjgZXT4MNkaO1OuUcUenJNV6T1aNMAp26uAnYdOu54rL49zWUeMVxjXP+C4FmjSAd4otRllAoRBaApxG5HWm2nOHMV2+LYZVw8Zu8tU75LhkuTvhf+gTVczn9YrGhtBVMCsLQdykYwyw8Vce9c4RA5j6HEZ6sFqc1RBIs80UixUP84S7hAJnGPjudonlom9T4PxgKNUYHmFm+fFaW9J0+pNxV77AO3IdftSopjc/ZDwh950UxxRG3oIh/3uqtdlbu6dR4yE7Y6loM2RAmRTnd72FpJOR/K7VkKBJW/3ONpRfaIewsQ1xDYz5aLLVQAnGEB6jU1xjcyCVOGwXdMIuo2On8Euzezi2Y7uv2BmSe2TheDdmmB5l5azDfrR 2kLOk6ui orLGeWKTSUIk4Ml2hfWFaDJfsrBBD4B4X2XfV1eCEBMyDtBPKMrJuT4Q5RnNQSJN4iqPOLc+/XPN3Us/VcBswohnBKEkEWc2uhP+gt4sxVsYlziVWBbuQ7Mm0nUNn8y0PVEJY2doJLdIuYPe03xPKhBVoXmFis89gB9GKXYDnBUyI4fr6c/EbOzLEzcDef/spGSgUrWQNfoPFb7rNjn0DAs/bAyTTCZIOeEaz2g6tcEmHgqSYMRQr5QCO/BbhYT5N7e9T9cZWJ50R2lTZxEC8aDvBpulKeLWZXg6lqxasEdkFg5AKGkUpE/ucSNwUqKEhyrYsBSxjCRl+X6FPXjLvdD4yuxCjBojTyoap90+W7fmfBMlRWhWeCeWfKw== 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: Now, swap_count_continued() has two callers, __swap_duplicate() and __swap_entry_free_locked(), the relevant code comment is stale. Update it to reflect the current situation. Signed-off-by: Baoquan He --- mm/swapfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index bf284ba16198..9ee2238042a5 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3789,8 +3789,8 @@ int add_swap_count_continuation(swp_entry_t entry, gfp_t gfp_mask) * into, carry if so, or else fail until a new continuation page is allocated; * when the original swap_map count is decremented from 0 with continuation, * borrow from the continuation and report whether it still holds more. - * Called while __swap_duplicate() or swap_entry_free() holds swap or cluster - * lock. + * Called while __swap_duplicate() or caller of __swap_entry_free_locked() + * holds swap or cluster lock. */ static bool swap_count_continued(struct swap_info_struct *si, pgoff_t offset, unsigned char count) From patchwork Wed Feb 5 09:27:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13960701 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 359DCC02192 for ; Wed, 5 Feb 2025 09:28:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C19C228000B; Wed, 5 Feb 2025 04:28:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BD241280006; Wed, 5 Feb 2025 04:28:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A691428000B; Wed, 5 Feb 2025 04:28:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8522D280006 for ; Wed, 5 Feb 2025 04:28:09 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 45A4EC096C for ; Wed, 5 Feb 2025 09:28:09 +0000 (UTC) X-FDA: 83085364698.30.AB0F3A4 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf13.hostedemail.com (Postfix) with ESMTP id 7CFB020006 for ; Wed, 5 Feb 2025 09:28:07 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Brfr4VAg; spf=pass (imf13.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738747687; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LKc3fZumFCD/91JO2q/vgJ8rLFG0/4maedUYtaTx5XI=; b=2QDwZ3tyzKLluKsABhCp9Lisx6kOLckedjMWgWSXSMoBx48ZAOlteyBXiwrKe4pt1LeGJl f3C9RdmT9NHZtf/2TpLaIygtlFnO7qi8vkNmjKN69EhYjomUlfxwSyzhNyUsrK9U7iBAKW vM1XRF8NbL0MUXv0K5aeapjFgGnSZxg= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Brfr4VAg; spf=pass (imf13.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738747687; a=rsa-sha256; cv=none; b=n12LSae9sJdiMn7IRilk1eXPI+WzLlsagO7oV1NKkEd+BR1WoScHOUM+hHEq1tQQPVuOFb eBDj60U9roHqPPTklzysnDEqRmBdvlTtjry3tVgLgZ9tbJnVXaSZcePEpkQf9Z9PlzKRmk m7VoA2/lDybYvMK7Suvq4i4o+GA5d/M= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738747686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LKc3fZumFCD/91JO2q/vgJ8rLFG0/4maedUYtaTx5XI=; b=Brfr4VAgaalv/1jPsVYluE059fWnHJsZzo7jelDs24h9GgIBzS5INrYbaXyON6eWM7HZze 2vEmwjWg94QHd8qClAiphf34Omx6RL7a4jUc5DXMeTjdW18kJRj/AhM+oMu8LlDU9QpukO rPUxcRwpoVw1A54W+xHkfRL0h8Jp+eE= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-111-EEDgiAEAOjaQS-4j2v0Clg-1; Wed, 05 Feb 2025 04:28:03 -0500 X-MC-Unique: EEDgiAEAOjaQS-4j2v0Clg-1 X-Mimecast-MFC-AGG-ID: EEDgiAEAOjaQS-4j2v0Clg Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5172E1955D83; Wed, 5 Feb 2025 09:28:02 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.112.190]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9B0A2300018D; Wed, 5 Feb 2025 09:27:58 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, ryncsn@gmail.com, chrisl@kernel.org, Baoquan He Subject: [PATCH 07/12] mm/swapfile.c: optimize code in setup_clusters() Date: Wed, 5 Feb 2025 17:27:16 +0800 Message-ID: <20250205092721.9395-8-bhe@redhat.com> In-Reply-To: <20250205092721.9395-1-bhe@redhat.com> References: <20250205092721.9395-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 7CFB020006 X-Stat-Signature: ud7fco9htxy86j4pnu48rpms65qginbh X-HE-Tag: 1738747687-155232 X-HE-Meta: U2FsdGVkX19Wb6uuTKBI9/F57HprDgCJRAQSHXD/QUfsOk59BymhWFvv6WvtPUvd1CoYBFHfMmyjKDXVcLy4EL2ee9FNvZO5vnW+DHKek2J1UejkmY9AdPaI+Kimlt41tkUN4Mi7Y/9tagZwaRiKPAGrzB1p9BdUZ+bNKOcnQXjVjc6oUjeuPD1oSLZjMJD8yAI+p+t3EFzJRrrMNi2tlTD1SkSbQbN0c7MrFHLjRTbf8AaQfHaInVMt4Vm6CyIaoHL82PUsBfZiTlKrKrbrwMyQmmAqTybWNax4AgRyov5Oz1/yzY3k7WpwTVi/kCz0SjW/rLDh+i1xfX1SNVu17le0t2P1dWouh4qDCtcPHORM9z9pzreSYnAUJqhQzuwrMo/Zw5hBvVEuS/Cnn45BfHTyrMaxIhuYS1vIFS18vGvFayfwak4HacMrRSTNb2EFdKPmRGEIkPKplIRosvDVPbfTYOvGLy/0P4gLkqOfed+H5oVovRXpt62XvdthAR0m7mEtCpJ4rYJVmBeOSmmIFbKHpk9TuhZdp20o5GFhWWtlu8ajTCK0peKCcXA9DLxi2MToiuGWgfXZIrl/iZCkgRFkG9JQVzWbXG35P5OLpou6gtXNU0nTa8grjebyodgy96FxveFDe0aIf1558GaWNT+SFcsrIIEjMmzJI5jyfahmzBUNpT+okomCGkvk0xIQwW0sKPRFkkKObi97UXe3dSxIVRo+ZfVy4WZmPeSye2mXU0ze1FrpL7J4XmWZFOvOmaynKjDQvscBQOcGa9Hd6nySESwltL58GDakMF0fo60YyrFW1Xgyxs1EwDklD0/yS5Wt+Cj8iVreETJT1JXHi/FAhj8XATb+ab3GIHSlJhNDC7ED5fNbQoXwroMu9ZZdrJBg/nLSEjGko6Y0WIdchl+Gfyxja4w7TRpqIjwhWNWGWBuFtlpZXD4ESJF8XooCNQLOYMHs8xoFLMhWq/5 KM/PJIrl GP1j6KfiZER1+tvDhoeWrwR2DMHFuW3Ylbeq9NiL7ZRERSfV8r0zWAY3HwOifexHQAWSjuERiWxOAQDX/7+DKcDwHzSiUpfKg8ePDC5e7c1nn5n6oKfRoMG4aAz+kVbgx5DdbtpSX3ezFHprshGwDeTCoGoYGqRHFkSwb6ZCpbPCz+Qk4UvYoCxJWHt00y3Am1+VNfJOk8dECHNBNnSawFKgyMO9FnwU/VjYlBQ3j92AgeLpCXE0rlVz4QtRvAgCBaD3WJmSTMl/B5BT3Z5ACkLV1OSG+C7r2yywHqyp6zb3aoHeUgVx7doIMfQwkPNzFCpjyB9v6yMmxxrBVasziR7uj9RZ00rAsuLYJFe707tMOb8MyprQcqI30sA== 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: In the last 'for' loop inside setup_clusters(), using two local variable 'k' and 'j' are obvisouly redundant. Using 'j' is enough and simpler. And also move macro SWAP_CLUSTER_COLS close to its only user setup_clusters(). Signed-off-by: Baoquan He --- mm/swapfile.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 9ee2238042a5..78b7329ad2c7 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3123,13 +3123,6 @@ static unsigned long read_swap_header(struct swap_info_struct *si, return maxpages; } -#define SWAP_CLUSTER_INFO_COLS \ - DIV_ROUND_UP(L1_CACHE_BYTES, sizeof(struct swap_cluster_info)) -#define SWAP_CLUSTER_SPACE_COLS \ - DIV_ROUND_UP(SWAP_ADDRESS_SPACE_PAGES, SWAPFILE_CLUSTER) -#define SWAP_CLUSTER_COLS \ - max_t(unsigned int, SWAP_CLUSTER_INFO_COLS, SWAP_CLUSTER_SPACE_COLS) - static int setup_swap_map_and_extents(struct swap_info_struct *si, union swap_header *swap_header, unsigned char *swap_map, @@ -3169,13 +3162,20 @@ static int setup_swap_map_and_extents(struct swap_info_struct *si, return nr_extents; } +#define SWAP_CLUSTER_INFO_COLS \ + DIV_ROUND_UP(L1_CACHE_BYTES, sizeof(struct swap_cluster_info)) +#define SWAP_CLUSTER_SPACE_COLS \ + DIV_ROUND_UP(SWAP_ADDRESS_SPACE_PAGES, SWAPFILE_CLUSTER) +#define SWAP_CLUSTER_COLS \ + max_t(unsigned int, SWAP_CLUSTER_INFO_COLS, SWAP_CLUSTER_SPACE_COLS) + static struct swap_cluster_info *setup_clusters(struct swap_info_struct *si, union swap_header *swap_header, unsigned long maxpages) { unsigned long nr_clusters = DIV_ROUND_UP(maxpages, SWAPFILE_CLUSTER); struct swap_cluster_info *cluster_info; - unsigned long i, j, k, idx; + unsigned long i, j, idx; int cpu, err = -ENOMEM; cluster_info = kvcalloc(nr_clusters, sizeof(*cluster_info), GFP_KERNEL); @@ -3236,8 +3236,7 @@ static struct swap_cluster_info *setup_clusters(struct swap_info_struct *si, * Reduce false cache line sharing between cluster_info and * sharing same address space. */ - for (k = 0; k < SWAP_CLUSTER_COLS; k++) { - j = k % SWAP_CLUSTER_COLS; + for (j = 0; j < SWAP_CLUSTER_COLS; j++) { for (i = 0; i < DIV_ROUND_UP(nr_clusters, SWAP_CLUSTER_COLS); i++) { struct swap_cluster_info *ci; idx = i * SWAP_CLUSTER_COLS + j; From patchwork Wed Feb 5 09:27:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13960702 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 B435BC02197 for ; Wed, 5 Feb 2025 09:28:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4EC8C28000C; Wed, 5 Feb 2025 04:28:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 49BE8280006; Wed, 5 Feb 2025 04:28:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 364DF28000C; Wed, 5 Feb 2025 04:28:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 165FF280006 for ; Wed, 5 Feb 2025 04:28:12 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C2BAA140796 for ; Wed, 5 Feb 2025 09:28:11 +0000 (UTC) X-FDA: 83085364782.10.8C3A8AD Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 00F06180005 for ; Wed, 5 Feb 2025 09:28:09 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=QxacZSE2; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738747690; a=rsa-sha256; cv=none; b=zpC7Q+lXdbB2/J2ujbMWkgpei2JeRQYQMCp8uD3pjS1iUqdW9qnH5KV43tGdxRJjapZVph Oow9lMV6gp4b+N54r7ChjL+RGAKilZseEQQcMXE810ajCkTyPLh6Pwe7j7Vx4f/rjHDc8O x2ZT4aPAR93IzZYd1AIuQn2wNGtn2u8= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=QxacZSE2; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738747690; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LKdSXZcqnstZAkYV6ff74HG8BN8BooEUO78YRxCe8Tc=; b=OZXEgFEBouRgrb3VMl3j/ZX+lwE/c+6KVgXXgwHA7UwikLEu1N+/WNAz167hGcCQP91HoK iaz0v52cj49Hnm3ymhE+yqobz55SXVaV7F1sqm6Y+CVvrhL8dG5CRjv15CjyoOo4W0pNdv UTK//CLJmWzGzEoaBkV64YoSk9XyRz0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738747689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LKdSXZcqnstZAkYV6ff74HG8BN8BooEUO78YRxCe8Tc=; b=QxacZSE23nAAQ2pPoLkxkrx3tt29gxrCIMtY43cU9bQkiMnXt4zeAuu4rBKOpMT1vRBJ/4 K6taEIksDAHQjGHPPXjotxLZqZazfK7daiLRzYZpIBa1qrF8i9hzCt0vIVAL4UhtQ1qqO3 rIK/2wYsWsbR6c4gpgWyKvzdH3JKMgo= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-179-cXFiB-0CPGi7ksJUR4_nxw-1; Wed, 05 Feb 2025 04:28:08 -0500 X-MC-Unique: cXFiB-0CPGi7ksJUR4_nxw-1 X-Mimecast-MFC-AGG-ID: cXFiB-0CPGi7ksJUR4_nxw Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1900819560B2; Wed, 5 Feb 2025 09:28:07 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.112.190]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 394AE300018D; Wed, 5 Feb 2025 09:28:02 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, ryncsn@gmail.com, chrisl@kernel.org, Baoquan He Subject: [PATCH 08/12] mm/swap_state.c: remove the meaningless code comment Date: Wed, 5 Feb 2025 17:27:17 +0800 Message-ID: <20250205092721.9395-9-bhe@redhat.com> In-Reply-To: <20250205092721.9395-1-bhe@redhat.com> References: <20250205092721.9395-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 00F06180005 X-Stat-Signature: dio63xo65xpsumpn8hnanpn34ynna1g9 X-Rspam-User: X-HE-Tag: 1738747689-521802 X-HE-Meta: U2FsdGVkX1/hkJsoX2UYXMnsYDsU/dJNwKoPHP4GfdUb+YkQ0emwcyxAd/u7c7CpubgzfKujRvkf9yk5vhSg6ZLHJTbk1Uy4vYX2Xsaw3A1cDzLpWkjfqO4l3DZudAE1ae1AlJBjaor8Le6PQlBaTfMXknzhoamovXEGy+dXvVCrPUwwRm4J+lL5JWEkc2v9KQRx4hqjp56YCFzyrRQKwRQlrQLZMynips++aZ08hJ4+V5FafQ2Al5W85SKdrMYPYvy691w6uzgwAPI15+9dYyT9409m5hnifW1hLbrDix4T9jPAaY93Etc/7OW8PICovonrVGQsDJP5LAHPsYZtGH/LktqPZtas+pEOOS0Kz7GZ4fQei6TzFBH1v35AKOrlfAZR8WNx+dF/0ioHP9CPvWQCKvAxo/MbJkyjHzfjOtdaZwr2nCBFJ08ensknqLkVBtMSshFAVqKBLohcxur1EI9JjtvUC8vx5NoseYwXiBAE4/y1aat5BT4fNjdUmlv+SkmlfCcgxEikJX//sQkU9ybHwO2V0V6fJhJdNFrO3DUBg3vEq1NEYqWBfIw0IkUu8mVrKrSPNY9bIWFZZBqb9emRJ03RMfzXxUwbe7xHGl0kBoO4QmLHL+B+JopjbDOQoPel5Sj43WFrImpjnqE5vrA6LbRqibahxwsocr8sIB+krvYCu3muhFgtgSfJXDyCaZKhiM37AGNnRtFUA2CdAnP/TBDHOhLFrZV1rKCuSyhYfqIrIS/xzuyULgpRAlvB9OyNPv/juOF++5iMhIBGotJ5324nnJhvaIBkDicRLBA3NxAHwQfvAyeX7JWc/qrxNpK11lulE1ojp5CsEhN/kivqX3DQxvV2ec01wu3HRoUZHzZDswMgVAWvuS7fhKo6HGuTikIcCZ9GwIqYUiHyFkqdrco1E03BiijZmKjOtFIElgSFxSGk12t1fUYwgPNDOD58lZQq2Eu56uk8DlJ fjpqfO0F K/9yvAeILwCRFpq99Ye/V2dJg/aFz+0teZ5L0rJk6zbehjJniPtAqbSJeePMinO7gcradJmpzcCVicjLx4XcbycN86PKWLiHYu/IxL9uLp1OeQaTvIzABieZkyrquo5vGgVw7SP87//DMNOOW8rBly7CvK5fAqdrnwCclkQ7LV5i3clgAJY9rRet3FT2giLS3N6iCeVD2zXn9p1VH9l2UK76d9THme0zbWmBhB364R8dCWUct2W0+Jce0dEoHeV3Ys6GKzw8B8guAy2XCxObQyS6xm3NJLvReX3wJFq4tqaTyD0ysQHd+RTqRc8qb2oc6XqZGbpxnEc45yIUfsyg/Vt3GeD9kwkPL8Rx+nvJBG+u8DL2AVZLTgy1UmQ== 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: Since commit 8d93b41c09d1 ("mm: Convert add_to_swap_cache to XArray"), there's no returned _EEXIT, so the code comment doesn't make sense any more. Signed-off-by: Baoquan He --- mm/swap_state.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mm/swap_state.c b/mm/swap_state.c index d7cbf5bb2450..b393cefb3be0 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -203,10 +203,6 @@ bool add_to_swap(struct folio *folio) err = add_to_swap_cache(folio, entry, __GFP_HIGH|__GFP_NOMEMALLOC|__GFP_NOWARN, NULL); if (err) - /* - * add_to_swap_cache() doesn't return -EEXIST, so we can safely - * clear SWAP_HAS_CACHE flag. - */ goto fail; /* * Normally the folio will be dirtied in unmap because its From patchwork Wed Feb 5 09:27:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13960703 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 84AF1C02192 for ; Wed, 5 Feb 2025 09:28:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 142C36B0095; Wed, 5 Feb 2025 04:28:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F3516B0096; Wed, 5 Feb 2025 04:28:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EFC286B0098; Wed, 5 Feb 2025 04:28:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id CD8FB6B0095 for ; Wed, 5 Feb 2025 04:28:18 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8050C140790 for ; Wed, 5 Feb 2025 09:28:18 +0000 (UTC) X-FDA: 83085365076.02.C280945 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf27.hostedemail.com (Postfix) with ESMTP id AC1F240004 for ; Wed, 5 Feb 2025 09:28:16 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Q7upYimR; spf=pass (imf27.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738747696; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=/m9fIb5RUGdXyEtpozVsgbTSVCO5CREUbIcsYzkG8Js=; b=mKCWXWvyyuQkgRtKlfmtGQuTKmoh7fWzltaeeNvbkwrktagiz7EN25/7KMpXDZEXvhuuJh pbXfCfuQMokVIt7X92/POcb14P97ft5MKkqBo+fxNTgvv4kA+OodPTEPmIjsy7qdXmNUt/ +OeBrREvCtqjoClC3oyrQHnmAC2VRNY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738747696; a=rsa-sha256; cv=none; b=ZXjEBpFHMj1/awxWod1fi5hJ1dXnS39PuQkkEr4oGcSw4n8ag6xuMJEBfpzm+mH8vX7US5 yqZ46kZFHUPic5zNoBYONUrP05QFe0DQK9Tt/sri4huhIUHCoLfrKeHCgUWqabkIEkpJG1 iwM3SbjvK9478jSNWqfN7eCKNGAu9w0= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Q7upYimR; spf=pass (imf27.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738747696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/m9fIb5RUGdXyEtpozVsgbTSVCO5CREUbIcsYzkG8Js=; b=Q7upYimRaJXrk4umcuYkE8OKvdtXKglb/O3CE2P7k+VcuOtzLXySFdMHkcyZv9PHL26RMB +DABxZnT5HE9XGckrsnpr+wcDbew7Cf1aP0xHk/wK50VnKOcvwt89d/gL21LaJSkGT/XeJ wIumNa4el6b44VmX6iyuDOeHPSheakQ= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-461-ipAmL9EeOJ-YRtbTyRkJew-1; Wed, 05 Feb 2025 04:28:12 -0500 X-MC-Unique: ipAmL9EeOJ-YRtbTyRkJew-1 X-Mimecast-MFC-AGG-ID: ipAmL9EeOJ-YRtbTyRkJew Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B3CBF1800871; Wed, 5 Feb 2025 09:28:11 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.112.190]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 000243000197; Wed, 5 Feb 2025 09:28:07 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, ryncsn@gmail.com, chrisl@kernel.org, Baoquan He Subject: [PATCH 09/12] mm/swapfile.c: remove the unneeded checking Date: Wed, 5 Feb 2025 17:27:18 +0800 Message-ID: <20250205092721.9395-10-bhe@redhat.com> In-Reply-To: <20250205092721.9395-1-bhe@redhat.com> References: <20250205092721.9395-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Stat-Signature: ncxxokyjto94175xirhptfepgkbundfq X-Rspamd-Queue-Id: AC1F240004 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1738747696-899432 X-HE-Meta: U2FsdGVkX1+iUGeMiRW7gZRiZ3k+sx6px8S5bhX5pUMi+ZBfbZnyBAmbd846XjFPcqqrYn7QOW4t2Y0dVmtfBNyT6fvQRPpQR6XbNNj+aaiTbd+lYnYaXmoiCk90vPOYS82AMvFtI9qmkbr/rEByFgVj63tTQAl6URH9EMLqwsZm5SfzQwbelnpw5Tbsc2uqRXQqOOheNaKZcaKg43DHT8gy4YOTDTA0RC7W/hs1mqbNy+sVAkFReuxEJqwnoCyOISKHVYhZooArYNPEGhvopBuPlSzhNzSi/nFEUMX6U14fFjcIgDhENowgobWLCAqDOAwG6oW+VEcoE9dROyjyzMQQ3J9t7CKUeTrq9jNi68h5tRpaQ1ucePesrxFvri0wkeBahEyShOpmvzji17zZC5p9O2FALslAGwhF7hcEoduNL0+S0M39bpS4za4kHvIy4zmm9cGV2Ugh4y7JRtE+rtd5xHI54/k466sGbQBevUr1+g4VpILlHUeszZ151PNbB3225NdiMt3Uc4IxwUOIOGipN1mKzKHH94UH2psMgnyT6FXfQuF0XCJ8GykTu+eRroaC7i7ibcKRktT+mMnS9V0iD1dDUen5eIRoiV6HINYzTcOFNfOtUw3w3G07vFZutG0lHYSSVknLJ98tTIA7ZnTK8RNG5/4z//kK7OaMXp7S5YVzkdlE9SWy1vguCidS8HAcK08HQIRYFOydJLWoBoULLt2shNPO4YJqOUWoqogL7oAiCCHLDz/J7OhQ8IQWdA99zJMOMjOtNKtW8D6R8mHl+bExYTFZLL9/kHHC4BofyDHEwc247uvpzFxikHJLnkgDr8F5linuKYRANkG1i9cIH5d1vS3KS+Josr8fg2VVVM7EVL5Mz/TBgsLIwKietHsZGfXHUdCVve3aHZPUJKBUyK2JGi9w/evNifOHpf9P9/YiOli1XE3bvvE6O4qB0sEh5T2UFiq6ZWYNshX L3uLl45G S4Dhe9HJtayJT+hVeFshOubcfwjVqCj2TjmBbVKP6AOR1An9X04rHhImg4dmdj5PL7Qm09E+6ZCN//kk6/uYqjjunm1Mul8UFrDeGSFukNuimWpAuRnVI/LEHjiOq08C+h1HjU8sZ3ZyGFe0av+xsUcbDlNBnDXPE9kcjPE5SyN8WFCvf44GPaRM1buhHdcEmBUq5k/7+Lx+nf8lyjd8wQPxINpVGQqhPLY6xvqld975QlaNg0YtryXSiN6p7rLM9Ym3EjDbxqLNZbY6Od24NDS5Xo6D83/P2f3CguSatAhWMkLKc6UD54jOnKCObirqki9KNIh9yxIJ2sYkeJgCK+vaghQ== 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: In free_swap_and_cache_nr(), invocation of get_swap_device() has done the checking if it's a swap entry. So remove the redundant checking here. Signed-off-by: Baoquan He --- mm/swapfile.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 78b7329ad2c7..2a25ff5f31c8 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1784,9 +1784,6 @@ void free_swap_and_cache_nr(swp_entry_t entry, int nr) bool any_only_cache = false; unsigned long offset; - if (non_swap_entry(entry)) - return; - si = get_swap_device(entry); if (!si) return; From patchwork Wed Feb 5 09:27:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13960704 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 EA3DCC02192 for ; Wed, 5 Feb 2025 09:28:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 78449280006; Wed, 5 Feb 2025 04:28:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 733FA280005; Wed, 5 Feb 2025 04:28:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 58661280006; Wed, 5 Feb 2025 04:28:23 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 30700280005 for ; Wed, 5 Feb 2025 04:28:23 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id DEFF2470FD for ; Wed, 5 Feb 2025 09:28:22 +0000 (UTC) X-FDA: 83085365244.11.F094D22 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf28.hostedemail.com (Postfix) with ESMTP id 209EFC0005 for ; Wed, 5 Feb 2025 09:28:20 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=K0Jkqwiq; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738747701; a=rsa-sha256; cv=none; b=NK3PbdMXmpblYXjUa84dIuXR05NiIms6NVrePDO/2l9+G5MhrFsLtDOJOQFdA3FpANLHW3 ixd5YG+FpPop8KCdrXJsELxwEYlcjsqEaWDH6ZTEWCd4EiRy03iYqPrrfx6XU4cEEbjDhD p43wS6Q7etfKUYgd4UyQArUjxl7HmZI= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=K0Jkqwiq; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738747701; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=8vVxPS21csuuvYhubTDPbniUZC89uu0FzC8UHkUR7f4=; b=EPIdcO1uX7/1w78BKX6NeAQnC6uuByYV30XrjscwcjZ8km32F6BvsBsbaxqcni4fZ2VdeF MqSFYCWux8ihdoU7kfl0fPBEPRoyUbhKhhjlnqhSqKircO2zUaJZbM2OXqTS1Qc16+LRCI CkOmp7+WWQAyUSNUMSCeCc1ozkA1CtY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738747700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8vVxPS21csuuvYhubTDPbniUZC89uu0FzC8UHkUR7f4=; b=K0JkqwiqoSFHzA2SEdjKI/4+4bmPtDiPzvD7ABsmChFsWJ3BrnvA73iQPmF+QSSxaHK3WW /DBzD7X47LkYDd1l8Ffa0e4GyjbdN87O0XnZkfnWZDuK61zNFwDH9MeCNJMu64wkcNter9 KmbfM9NxNhj67eMYMnMN8tRlXsbXnr0= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-626-YcE78HehONax1pGIvqF0gQ-1; Wed, 05 Feb 2025 04:28:17 -0500 X-MC-Unique: YcE78HehONax1pGIvqF0gQ-1 X-Mimecast-MFC-AGG-ID: YcE78HehONax1pGIvqF0gQ Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4F6261800877; Wed, 5 Feb 2025 09:28:16 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.112.190]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9B8CA3000197; Wed, 5 Feb 2025 09:28:12 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, ryncsn@gmail.com, chrisl@kernel.org, Baoquan He Subject: [PATCH 10/12] mm/swap: rename swap_swapcount() to swap_entry_swapped() Date: Wed, 5 Feb 2025 17:27:19 +0800 Message-ID: <20250205092721.9395-11-bhe@redhat.com> In-Reply-To: <20250205092721.9395-1-bhe@redhat.com> References: <20250205092721.9395-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 209EFC0005 X-Stat-Signature: pastzuzwwcnfx559jaz6a6rbsnjwfqmq X-HE-Tag: 1738747700-822118 X-HE-Meta: U2FsdGVkX19xK8jjCaGA0uMSebCAYGKG4LHNx/jdIYMA/yssEMA1QH/cWCc2r2eH+/zXt5inXaRsaFtvYsNE2iOEDaAQWl1qDFJZWzuf4ru7aXB/CCRgO8tqRd+VbXGdfGQPcgQe6vlXiZa6XrTUmI/ODMHI6rMInduKuSkVAJ7JmgEfgrHX2Pinx+fYwPPBAf/b5jTVmP04FWsUyjDVAddAT7VKquubAA4S4erXIouMs/gYgGuVNIrrk3PEpxs9M8kDBOkOH+DRIbf50sgeFk5GG/LxaBa74j1kohiJ+tHtG451zxDAFpDPmjHwjLgGQ8jccsp+1XXZsDB8T6d+PStQygb0JFTtG6BNMmKHEEcCDDFAlBkXcAYPBIzu7FENvyM9ysK2Ncp2c24+0cGx6vRmnrHbTdq5qB7gyWTz8iABfbRGhkAzO8FFcuHUsrXGnsdSuKfs70Pd8j9BjXWDQRCX0x7EPecAMhRpLGhvgTcfqxt+WUnS0g6wQ9OeBT7eKDrCvdRPZ+aW+/sGHaovclVq8oXK1fezj4JLAQ75QySKzSQXX9THUBD9JJEfPemTI2lIVcYbLD1CSQhc9CvGG5qwJdqZkmRJaYJ4HzFNari/8srXogoxBhgNx56o7F9lPdVFmndIOkjuTQKDc11dInefWoda0hWBQ3GXkkhobUC5BTMBMhVjtgoZiS7tdad8LlvQLMwKa6V9ZPC7Np+sfHEEYxmUIaletIyzkugPB93sd/jHzd8ZDf00cEgwQsR2MvEIt7H8y4CSF8jEaRmBNyJfZDzXbEVd8MpByvGkbbrI3oF3JILL1As8uuHeyYe4HPfSZQRHLjALYBkAWWjyYxiTTOgfXAidfIOrZ6cL/oRYuxiul1zZZmmF2UNA8K9fN6OGMy8aL+nx42O8EZDzozOb0iVylWDchOLfy4a6PFgcJ6p1ESbuPuS5NGXMuAfRvMBbUp0LuhDePM3vTdG HZOwhDaV CltnBRPkw0AeJD2oNc7a5uoOhqphqYS6zSmEyONOSK5qqz5/KpKMRB6dDbxpDulldlOngKEk0UCKUOTIajqWVQa1apH9B623q23gdq1YoA8x19f6+vl/KD3U+FN3vNWdSj/iPn7QkwK4unNipoFW5dtlHg+XrlMJ0IYLeRqwoCpGNHfX5sp7wJhamuLVniGx0RkH2eO01LCI86dVwK99TkygOJjtgXUZDW7qx7TJM8kRdFQPRDB4g/5xUOzhMieEtV34yRtqe9ydPY2WGeWdCMcewqB663zPOndR0Vnzj/tGgAP/yWvw49eDAuhtPoqjIqH6wlyEWyxsu6veHQ0r4DeQFeNPCAud0RKqnfiu6/qDJNHi5PyZC48BvNA== 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: The new function name can reflect the real behaviour of the function more clearly and more accurately. And the renaming avoids the confusion between swap_swapcount() and swp_swapcount(). Signed-off-by: Baoquan He --- include/linux/swap.h | 6 +++--- mm/swap_state.c | 2 +- mm/swapfile.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 20bfedc8c4f2..395d41cf9676 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -500,7 +500,7 @@ int find_first_swap(dev_t *device); extern unsigned int count_swap_pages(int, int); extern sector_t swapdev_block(int, pgoff_t); extern int __swap_count(swp_entry_t entry); -extern int swap_swapcount(struct swap_info_struct *si, swp_entry_t entry); +extern bool swap_entry_swapped(struct swap_info_struct *si, swp_entry_t entry); extern int swp_swapcount(swp_entry_t entry); struct swap_info_struct *swp_swap_info(swp_entry_t entry); struct backing_dev_info; @@ -583,9 +583,9 @@ static inline int __swap_count(swp_entry_t entry) return 0; } -static inline int swap_swapcount(struct swap_info_struct *si, swp_entry_t entry) +static inline bool swap_entry_swapped(struct swap_info_struct *si, swp_entry_t entry) { - return 0; + return false; } static inline int swp_swapcount(swp_entry_t entry) diff --git a/mm/swap_state.c b/mm/swap_state.c index b393cefb3be0..3dba6eb164db 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -457,7 +457,7 @@ struct folio *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, * as SWAP_HAS_CACHE. That's done in later part of code or * else swap_off will be aborted if we return NULL. */ - if (!swap_swapcount(si, entry) && swap_slot_cache_enabled) + if (!swap_entry_swapped(si, entry) && swap_slot_cache_enabled) goto put_and_return; /* diff --git a/mm/swapfile.c b/mm/swapfile.c index 2a25ff5f31c8..93fd12c12bba 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1615,7 +1615,7 @@ int __swap_count(swp_entry_t entry) * This does not give an exact answer when swap count is continued, * but does include the high COUNT_CONTINUED flag to allow for that. */ -int swap_swapcount(struct swap_info_struct *si, swp_entry_t entry) +bool swap_entry_swapped(struct swap_info_struct *si, swp_entry_t entry) { pgoff_t offset = swp_offset(entry); struct swap_cluster_info *ci; @@ -1624,7 +1624,7 @@ int swap_swapcount(struct swap_info_struct *si, swp_entry_t entry) ci = lock_cluster(si, offset); count = swap_count(si->swap_map[offset]); unlock_cluster(ci); - return count; + return !!count; } /* @@ -1710,7 +1710,7 @@ static bool folio_swapped(struct folio *folio) return false; if (!IS_ENABLED(CONFIG_THP_SWAP) || likely(!folio_test_large(folio))) - return swap_swapcount(si, entry) != 0; + return swap_entry_swapped(si, entry); return swap_page_trans_huge_swapped(si, entry, folio_order(folio)); } From patchwork Wed Feb 5 09:27:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13960705 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 DD75EC02192 for ; Wed, 5 Feb 2025 09:28:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 69BA3280015; Wed, 5 Feb 2025 04:28:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 64C3028000E; Wed, 5 Feb 2025 04:28:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C496280015; Wed, 5 Feb 2025 04:28:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 28B5E28000E for ; Wed, 5 Feb 2025 04:28:26 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id E22BAA079A for ; Wed, 5 Feb 2025 09:28:25 +0000 (UTC) X-FDA: 83085365370.17.06B3D5B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf05.hostedemail.com (Postfix) with ESMTP id 35F78100005 for ; Wed, 5 Feb 2025 09:28:24 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BsIzAQKm; spf=pass (imf05.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738747704; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=v1QWMGz/t53y8nWqSpKCm2XX0aS+6vebfqdvYfQONWo=; b=78yOn4kwjkPsLZO9d+o7/MnbbmufczVpyGLC12xi/Pvvf57WDSsF96DoTBDqgXiOBkRHCP LRn43Nrq1AVZLinB+KlFcEARSEeU1ip7fZdHLoJ8MYKhK+pZzLTZJ9DtbftrnaWTfADyyt jvMPYOCEwzkJSPk9XddUbZwhxSN0ssY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738747704; a=rsa-sha256; cv=none; b=yRLzi94+HxYQkEf20sSIyXQAssVXrr623W0nl08PIkeGOnOKhPh+SEFpLVw/6rxhGaI8qo vQ1/MrGQ4/QdfjJEEO0a2OhSX+fOI/7zH41eYBzuWwy8DAnIrWc4PfM3HKKluJDQEsj0ZN QQsZxdCAtrWQt7QQ72knHbqGUQg8PBY= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BsIzAQKm; spf=pass (imf05.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738747703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v1QWMGz/t53y8nWqSpKCm2XX0aS+6vebfqdvYfQONWo=; b=BsIzAQKmRvWeFDEHPzeDrxTg9Wo1xj0NkECOsX3jo5hSne62Ug4uQ8uV+Zho3ZABH/GW7U qPYfLAzdsB0CkszaBSuWOwfbE9yX+dFCETxQFNOnne4Tvzkezixmqm02uP+ndTrO6OOsiO h+GaPfS0lgf9teqFNIFtBpBvqJTvItA= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-368-2cv8CABvMBWC8Bt0PVaXnw-1; Wed, 05 Feb 2025 04:28:22 -0500 X-MC-Unique: 2cv8CABvMBWC8Bt0PVaXnw-1 X-Mimecast-MFC-AGG-ID: 2cv8CABvMBWC8Bt0PVaXnw Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EBDC8195608C; Wed, 5 Feb 2025 09:28:20 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.112.190]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 36D32300018D; Wed, 5 Feb 2025 09:28:16 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, ryncsn@gmail.com, chrisl@kernel.org, Baoquan He Subject: [PATCH 11/12] mm/swapfile.c: remove the incorrect code comment Date: Wed, 5 Feb 2025 17:27:20 +0800 Message-ID: <20250205092721.9395-12-bhe@redhat.com> In-Reply-To: <20250205092721.9395-1-bhe@redhat.com> References: <20250205092721.9395-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Stat-Signature: buj15byranu7k8xhyf7soxyd9fuusy9i X-Rspam-User: X-Rspamd-Queue-Id: 35F78100005 X-Rspamd-Server: rspam03 X-HE-Tag: 1738747704-839951 X-HE-Meta: U2FsdGVkX19uoWCdDfgEG7GMMRVFlFaV3Z1oxpfujntUnSasNSX7mkO8rr1tr4LQXIWIrKh/wjc/mof+lhFovrPD154xAoD5htPS6zVJLBa/Jngw0/Vbu/b42f+O8nBWpkL3KAPL1oi4nNR21uBt3XDq1K1RXLEnHXV0vLHZmiO1MEMTHeQFnt4kfhh2UHcXr4nd4dFmcVCS1J7kO6XgdWIodU3l9mLX1s4ZFuo9V45p8Asp7fmFyCxyffmwfz1+iRzqcLtYmNyPjRClU7HmLyZU58gQdAM8fhAg2SFY33rEhh9WXzvFP/+9le0jQe1oC6dvUNrlOo73sa2oP9A0hR6ThFKCBlrp44wHWHfwYE+TGYcILgAHpr3BIab+MVEFPmmI4UHytHSwZwXOvBdci3DxUe00pIAwuk68XOtTbFVRsOnBDEwS9EHbVi2UFl2EbYBQsKvA1INjknz+3ji+WZ/Vuc2nZAwQKgwNOWe8K2kpT7wSx/Qt1bOjniPN0Kg6MyWmBW0+uALX90wsJOIxvrGdPoCxa7jJDat9gqiuMq1h/LkN25YRhYw4JC0ME0+W/Wmc4Ij67B9lqy0VnWIAbJSRGtzPJZpub+RwevU8mlUWvkRiaV2c7DzIfP8/WE+Bl93rEDL+FHHdWQqG+IB5Dwk6URUqjj7hMTgRUSYUU4llqkSkFb2utPg1mtmOOmcg1hK8kE8AYJqnJoEUHXelMYi6OX9CwMJSsDB4fa4hOQVSniIWW6tv6n70LmGYZSdXvGhHKQxRZF8LV/yUO4+0obJ/xi6o0Qag1XFbCjJGUM4Zp+Eej8oC2LCMVox2fhyvXezuvokTBZhyZSCne6+tZG5zIw2BJ7KXtKYOhykOpYPJKoNZHaqnDOTqqen5H2bmSn+vwO4MNXYt5uT0txYcjn9kaZaoDj0YlGxdO6oKkL7vQUJk1ehpnbmjnoEzu/mIGGR/7cYDGVPoWiJQGBN c2Sj53+4 hyI3+ZHpwwjd2OdI5HdkzCGlDJer2Xtqy9KjEIrpgBPruXAoKuyUNOvla2mfrf7vpsk00M2kPdR19f9hdOrLHRYuDm2l8SmgB1BA5md8a85Vec9ndndMH+1353Twur3Yruqp9hCY36A7KbWH4QmJxtkBi4rLS4bxVF5hQH7AgoBdXAPApo3qhzRFX59bTdEoCECPf+OkMcoG5zeFS1nJzrMABALNWFbvtXtl6uN4tNj4D0t6BG4MBli4ynB8iAg0Jv/VkwYLHe0GdAEN6iI3Wlj0kQZ4h+fAytfnuJGr9KSDoBiUYlgO/HYrwr/tSgwhgnnGFdIvay6Y/QUHXVWQwYKcKSnpMfxYjRQdkQ8DO3Q0RB5RE6fH9r3rpkpMCuzkJDQm53K8hSKowFg4= 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: Since commit eb085574a752 ("mm, swap: fix race between swapoff and some swap operations"), the non_swap_entry() checking has been taken off from function __swap_duplicate(). Hence, in the kernel-doc comment, the line 'swp_entry is migration entry -> EINVAL' is obsolete. Remove that line to avoid misleading people. Signed-off-by: Baoquan He --- mm/swapfile.c | 1 - 1 file changed, 1 deletion(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 93fd12c12bba..12bb7556c7f1 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3525,7 +3525,6 @@ void si_swapinfo(struct sysinfo *val) * Returns error code in following case. * - success -> 0 * - swp_entry is invalid -> EINVAL - * - swp_entry is migration entry -> EINVAL * - swap-cache reference is requested but there is already one. -> EEXIST * - swap-cache reference is requested but the entry is not used. -> ENOENT * - swap-mapped reference requested but needs continued swap count. -> ENOMEM From patchwork Wed Feb 5 09:27:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13960706 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 C98E8C02194 for ; Wed, 5 Feb 2025 09:28:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D979280016; Wed, 5 Feb 2025 04:28:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5884728000E; Wed, 5 Feb 2025 04:28:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D9EE280016; Wed, 5 Feb 2025 04:28:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 1C5B628000E for ; Wed, 5 Feb 2025 04:28:31 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C4F73160842 for ; Wed, 5 Feb 2025 09:28:30 +0000 (UTC) X-FDA: 83085365580.13.E7CFD3D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf01.hostedemail.com (Postfix) with ESMTP id 1550140006 for ; Wed, 5 Feb 2025 09:28:28 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KR4BhiDT; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf01.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738747709; a=rsa-sha256; cv=none; b=VjQKY6EGb4sc6rHV4EJ3GluDc8369ytIYcGSJTY1bw27UWyq6skEAjW83FaYhXObPwF7WO E9AAHwK9M4n6/GBrtEdG8eurm8vd5P6uXZ5V7PIutpEp/m/m9+Vx4HpoPDruz1+6ZE+0P6 fdgJTPMaLYRq7qFTe7sOhKj+6YJdkzg= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KR4BhiDT; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf01.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738747709; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=eJxZpNwhXiHzAqXXfk54vRZnvA5qQBJ34Wvs1FodgiE=; b=K5B+0hGfUU8ZRiG1dF9W8oHfz18bidc8b2CQsjvG94vo8d9rc1gnjH6gy2jWTMMcV3DYCC j2dqeeZyp3/d30zWZ/3bKmZmusRWZ5jukapBiwNBiROxcPwyePK6fwMp4R3iX1+TIt4m60 Q6+//4XXjCMr3T1VLJRWC8fIay1m+us= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738747708; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eJxZpNwhXiHzAqXXfk54vRZnvA5qQBJ34Wvs1FodgiE=; b=KR4BhiDTOTV7MhVJCNS1wF53o8ALVhPhUWffvDrO8VHgeRO2OuO0YL1kzAmmZcwQjNGMsk wzPR7Q3pNPCiXbWPE+Yzxkrj+RofBiZKQvSWBlTTu6qYkQWtZG7xHSZGj84zEmqQaQEelH +Szbz3aTTtoS/CZ/WHh75pxyceVl4SY= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-34-gOIRUj3mNiWKdkWAHtpU_w-1; Wed, 05 Feb 2025 04:28:26 -0500 X-MC-Unique: gOIRUj3mNiWKdkWAHtpU_w-1 X-Mimecast-MFC-AGG-ID: gOIRUj3mNiWKdkWAHtpU_w Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8B858195608B; Wed, 5 Feb 2025 09:28:25 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.112.190]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D381C300018D; Wed, 5 Feb 2025 09:28:21 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, ryncsn@gmail.com, chrisl@kernel.org, Baoquan He Subject: [PATCH 12/12] mm/swapfile.c: open code cluster_alloc_swap() Date: Wed, 5 Feb 2025 17:27:21 +0800 Message-ID: <20250205092721.9395-13-bhe@redhat.com> In-Reply-To: <20250205092721.9395-1-bhe@redhat.com> References: <20250205092721.9395-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 1550140006 X-Stat-Signature: j3hzs8tq6so1kgmokmmn9exugzazrywd X-HE-Tag: 1738747708-443321 X-HE-Meta: U2FsdGVkX1/NT8Ggbaj37wZ/xL+f000CpcsEdaCQaO144ddqRs0bvV7anX8uLse5DVOTuiw/UD8ljkgyGHilNTq6UzX1py/0VL/MzyjqPi7zk2pi7XdI1ol9DgTHwFOzCc1qA5RVUH6qPAhdnsc5MSJLV5EUwQyXjokxhOR2qiYyQka1FpgQcC++t36KyfSEGnYlPlFBpjORK3R7JzKu2QtQZxjulEZ3t/XPZ4VpNLcmMoa+iJgnMDE842K95B3xYKxiQv0V7Fy8pF27rkRGfbJD6VFwBXKQ0vK+XJai5UyCn3M8dzN/5uRHm27kL1PEhp9XpVWLG6Hpu9vlDBS9etFgDk76lqdiPWaHukYsK3S7BXo/pjMvcdaUCYQWX1XJVf/UsXSSIiauGaTBLL6zbkx3kWiYYgLIm+IBUbVyR8LWE5ZmVVQ0G5AJwTeAQ5vLgFyAItZbYbfUZXGCzPRk8MgpbeMUIWaAl4PWyopG91N8W9Z6qHVUyAiZtqbMVt2s6kJmb+PZcGOoB5anYNSNdPOw6UURqWOs6yapAHdG3mglgMpJc+D63Gm8Lz5/pfXRp1qNwGmuoqYO3JqN8LegO+QShPybeABZkqdPe2AWPeG+jTYAdN7jGKFFNHMmF989t6SqT/r7eryNfC1ZTvIclZA8EcwFTRQholBhx+czCdl95iEGT0AxHLGln/RaSuP3d5Pl4WjH7gPmrhtLboKKNbDa/x5h4/82kfWpktOsRrX4AjKW4En6xdV9kUPcm90H7cLT8H7jnyAucc3/3hlOAuK39+3N2woLhdpFP8TEz7yVxYcBMfORH731d8dvrrB7x2Bh1UgW/KbEWSwebbhPCNwNm8PToU1AjAduKL+RX1RMZ/5Ki0YiZFuPZmg7Gj+9CSC1ZV9uQ9DjZyTFeMweRfQQqlq5+1SZf669V1ymVARgSIr/S7gZ4NFgGSR18BEkDOa8++YsO18hHFjf6/V 81972uoK AanekwRjq51tIsu0kOrVmyZYNqsq6q0PP7qNZRUlh48fVXvNujMWYiUN3kqZkENHRkgv1XSO5uH9nm045JJK/WrSggs5LuN5XeQ020um9vsDBTX2A5Zvra6pf0uLSQjDRNVrnLZZLHCNxbxFhY0lRzlDkV360kviTxHZvdL6XapGmm5xr5/sDpEV12Gs0qFB1B2TMaf5Td4tAwhw2R0mdzgW03/O/4FXB3IabcgRqHWzTodnQL4Zs0DQhXM572GhZRq7VRBcA4Da0Qqgv2ZpNW+bluR4GqzY5fJ32s3L4YaNyd2vnngjrOSLNVBsskL6CxIuGKRJYhPZrtj05cg+CPqDSxReaj3BHFDmsAm8v+86sqRl1QLLa6ute+Q== 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: It's only called in scan_swap_map_slots(). And also remove the stale code comment in scan_swap_map_slots() because it's not fit for the current cluster allocation mechanism. Signed-off-by: Baoquan He --- mm/swapfile.c | 38 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 12bb7556c7f1..7448a387621d 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1158,39 +1158,13 @@ static void swap_range_free(struct swap_info_struct *si, unsigned long offset, swap_usage_sub(si, nr_entries); } -static int cluster_alloc_swap(struct swap_info_struct *si, - unsigned char usage, int nr, - swp_entry_t slots[], int order) -{ - int n_ret = 0; - - while (n_ret < nr) { - unsigned long offset = cluster_alloc_swap_entry(si, order, usage); - - if (!offset) - break; - slots[n_ret++] = swp_entry(si->type, offset); - } - - return n_ret; -} - static int scan_swap_map_slots(struct swap_info_struct *si, unsigned char usage, int nr, swp_entry_t slots[], int order) { unsigned int nr_pages = 1 << order; + int n_ret = 0; - /* - * We try to cluster swap pages by allocating them sequentially - * in swap. Once we've allocated SWAPFILE_CLUSTER pages this - * way, however, we resort to first-free allocation, starting - * a new cluster. This prevents us from scattering swap pages - * all over the entire swap partition, so that we reduce - * overall disk seek times between swap pages. -- sct - * But we do now try to find an empty cluster. -Andrea - * And we let swap pages go all over an SSD partition. Hugh - */ if (order > 0) { /* * Should not even be attempting large allocations when huge @@ -1210,7 +1184,15 @@ static int scan_swap_map_slots(struct swap_info_struct *si, return 0; } - return cluster_alloc_swap(si, usage, nr, slots, order); + while (n_ret < nr) { + unsigned long offset = cluster_alloc_swap_entry(si, order, usage); + + if (!offset) + break; + slots[n_ret++] = swp_entry(si->type, offset); + } + + return n_ret; } static bool get_swap_device_info(struct swap_info_struct *si)