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; }