From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAFB3C28B30 for ; Mon, 24 Mar 2025 01:08:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 10552280002; Sun, 23 Mar 2025 21:08:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0B682280001; Sun, 23 Mar 2025 21:08:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EBF7C280002; Sun, 23 Mar 2025 21:08:22 -0400 (EDT) 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 C95F6280001 for ; Sun, 23 Mar 2025 21:08:22 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 0D1111A09E7 for ; Mon, 24 Mar 2025 01:08:23 +0000 (UTC) X-FDA: 83254658886.21.0A75A01 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf04.hostedemail.com (Postfix) with ESMTP id 4201F4000D for ; Mon, 24 Mar 2025 01:08:16 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fqS9zwmF; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf04.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=1742778496; a=rsa-sha256; cv=none; b=Q4I4rljmyG3Rr7ccy4eKqUycxH/eDKxS3VBiwYedVIwWnrziLkvgv5b3QJzxp6Osj2wA0B xx3IUE4kr8Ef6NLq+HAzF7ROwcmQmnVMQV3ijM9mUTt1DHhS57h8fZsajWSvMHcjzdjwnk DixmDvUhiDKleb3hfdW0QEWeEs6thpM= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fqS9zwmF; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf04.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=1742778496; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=C0ry4lY4x2+hqK6ZCLNUPERIg6iDxjpwe3Lrc8jTe4U=; b=VViE1+x64Xm2FDPdpZgqqsST8AvJzJQ7V5OSmQoVRU1byApgUTewjYnXa4o8f4erviplx+ 1MA7sqhQ1KB9qDKs+TbeqWxqxBJZTouQ6Hj5ZaKloWudhHZN9w2ezDcNEkllVpPLj7HoOq 4HGlg1PcF9UuV06vrp4xY6h+ErDTdx0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1742778495; 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: in-reply-to:in-reply-to:references:references; bh=C0ry4lY4x2+hqK6ZCLNUPERIg6iDxjpwe3Lrc8jTe4U=; b=fqS9zwmFgInniI1W4zmQ1v5JzMBsQme2Q9P9/m+S5FF+yKdPDUJuSrQvgqWDM7sOG+WNzq xKiqMnv5mMMgOLRJZkouSdKa+93B+Mr5mdwm5UXR70+jRmN1EWcJ9aqCsUfbV5NSDT6Jkk /KA4Nb2ANIX5mJvKXrhAI2QI3DN4EQw= 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-502-UvbDM-vLPTSlfUuZVyFCjA-1; Sun, 23 Mar 2025 21:08:12 -0400 X-MC-Unique: UvbDM-vLPTSlfUuZVyFCjA-1 X-Mimecast-MFC-AGG-ID: UvbDM-vLPTSlfUuZVyFCjA_1742778490 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 595A61800257; Mon, 24 Mar 2025 01:08:10 +0000 (UTC) Received: from localhost (unknown [10.72.112.24]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 539FF180A801; Mon, 24 Mar 2025 01:07:56 +0000 (UTC) Date: Mon, 24 Mar 2025 09:07:10 +0800 From: Baoquan He To: Kemeng Shi Cc: akpm@linux-foundation.org, kasong@tencent.com, tim.c.chen@linux.intel.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 7/8] mm: swap: factor out helper to drop cache of entries within a single cluster Message-ID: References: <20250320114829.25751-1-shikemeng@huaweicloud.com> <20250320114829.25751-8-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250320114829.25751-8-shikemeng@huaweicloud.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Rspamd-Queue-Id: 4201F4000D X-Stat-Signature: 715naoijdcdtahth71c3obtt4dibdpyk X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1742778496-890590 X-HE-Meta: U2FsdGVkX1/43IB0htoNI6UnzwW6dXRtO25a28B0R8M4O8PCG+MEHaAQHv6D1WUO0kbQ1mbrGN3p0R8T4B6v9y8UV/MVMa5nRdoTu4nDMgb8q6WR3+dJBvaTS4LRd1IpiBOrIXc4amVfFqlTc5tcYKw0PC/mLLBQkQOqaks959R2IXU/sCTqsDSjvaVp7KXjVfR77/mk/WjLeJfHjrkBJAd2cM5Ed4tzyfoBxM8xjPIqhozohukYjJYJzGvOa17iztuYR9WQhJVrpBANB5mgUhvQU3aCsHp5IHwb7zAZFevik3ZnaV2/Ofwo86bXlM9UPvD1XR8/xAUBT0Fj1P9OG5QMjA/vpC096AWAEuM4ugoF3UO3PaWnjM9xvCfSz3YzzhXvU52LY2spQLIf0+QfLCWHKsNdVIVZyfN0gFek6urzwhZQuRfxXZs7h3n8BjLZLTrTvarp8t8YzK7MRvlSROW59EEZqavmFsF/wdsyaAl7dIc2xfqb8DTTHOrSSU0r2caHI5Fq2e037f2ZP/q9ZtCiQdCvh4iz+v4OJnd+7l4gYdsf20CMXJuhsukYfGzZoDUhE9QxX/K11zz0Uz1JpkXLYZDNxAGFnAdDtOYr7w+64vJ4zuUmfOIGpEu676iM3KPPpd5SlHBzkxZa6aP5tlQD8uG03+OQzD3IYAkH6GhMBdRNSYUca3FitA+8daqPDIfiFe02ORx8veLeNCWybYPH8C29dgiCzI0+UdEUUlIoklUhQ4gieIzRHSyeobnhkidab8i53R8+NnjDcEl5DTmL544YEKJ0xo+pXLKnb79kYz/953RJT6HNxe04JbEQe2o99T9ZYEKai0bYAj8b5H/FXscmjguMtJrPgIlOsxWaynz+TDCgY9Bx3dfDPFZ8+FFyOo2NGscIcNI1hQkgzmtc+LBO7636fniPDECR3b9QPoNwuYbjGpNCyjrclodVuLC3zpkeo+af6JrkZx/ 4h8SXcLg ptHMhFa3AhxHlaqjlf93EuA6AhOpE7bCjp8Cg8cr8fAxkB/61jvKTSfVH1gnvyQ2Gu6LoQh0SnvlZyr2JaDcjDUXAZrjUlXqbRX3zqEjfLGB8GTxbOEFzO+JKS/3bW1SKFbYlNBWOoIu4Rk709oErvTblcafY+ipclu53mDL0V9IXkH+YYIbof7zRorj/blsx6yICvdFF05tAUsB3c+xCCBOk0gGRfJqI2XMwjPdvSDtgKNWrdersUyIdR4Hk6h7roA7Zml/tGQ0M1PPU0t7Y54fXlYhkUPlMsvAU9/Warn+e4owO60MT1b+ngZuSRizoz5x9/T1AqYWKQxGf/sMyENXVhrFV6EOHT7wRlzUhoFXOW52ar1qDUkSMknkbfmGIY8q+5YK4D5PPZMPv//CNdsmR10Av2VB8xXMYcBDPYBt8AX+yV+k1G2+TyAv944k88CIk 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: On 03/20/25 at 07:48pm, Kemeng Shi wrote: > Factor out helper swap_entries_put_cache() from put_swap_folio() to server ~~~~~ s/server/serve/? > as a general-purpose routine for dropping cache flag of entries within a > single cluster. > > Signed-off-by: Kemeng Shi > Reviewed-by: Tim Chen > --- > mm/swapfile.c | 27 +++++++++++++++++---------- > 1 file changed, 17 insertions(+), 10 deletions(-) > > diff --git a/mm/swapfile.c b/mm/swapfile.c > index 646efccdd2ec..40a7d75c01e8 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -1455,6 +1455,22 @@ struct swap_info_struct *get_swap_device(swp_entry_t entry) > return NULL; > } > > +static void swap_entries_put_cache(struct swap_info_struct *si, > + swp_entry_t entry, int nr) > +{ > + unsigned long offset = swp_offset(entry); > + struct swap_cluster_info *ci; > + > + ci = lock_cluster(si, offset); > + if (swap_only_has_cache(si, offset, nr)) > + swap_entries_free(si, ci, entry, nr); > + else { > + for (int i = 0; i < nr; i++, entry.val++) > + swap_entry_put_locked(si, ci, entry, SWAP_HAS_CACHE); > + } > + unlock_cluster(ci); > +} > + > static bool swap_entries_put_map(struct swap_info_struct *si, > swp_entry_t entry, int nr) > { > @@ -1595,8 +1611,6 @@ void swap_free_nr(swp_entry_t entry, int nr_pages) > */ > void put_swap_folio(struct folio *folio, swp_entry_t entry) > { > - unsigned long offset = swp_offset(entry); > - struct swap_cluster_info *ci; > struct swap_info_struct *si; > int size = 1 << swap_entry_order(folio_order(folio)); > > @@ -1604,14 +1618,7 @@ void put_swap_folio(struct folio *folio, swp_entry_t entry) > if (!si) > return; > > - ci = lock_cluster(si, offset); > - if (swap_only_has_cache(si, offset, size)) > - swap_entries_free(si, ci, entry, size); > - else { > - for (int i = 0; i < size; i++, entry.val++) > - swap_entry_put_locked(si, ci, entry, SWAP_HAS_CACHE); > - } > - unlock_cluster(ci); > + swap_entries_put_cache(si, entry, size); > } > > int __swap_count(swp_entry_t entry) > -- > 2.30.0 > >