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 C581EC3DA63 for ; Wed, 24 Jul 2024 07:46:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 258FC6B007B; Wed, 24 Jul 2024 03:46:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1E2156B0082; Wed, 24 Jul 2024 03:46:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0AA796B0083; Wed, 24 Jul 2024 03:46:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E09716B007B for ; Wed, 24 Jul 2024 03:46:17 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 89A091A072E for ; Wed, 24 Jul 2024 07:46:17 +0000 (UTC) X-FDA: 82373863194.10.1D540DC Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf02.hostedemail.com (Postfix) with ESMTP id 913008000C for ; Wed, 24 Jul 2024 07:46:14 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="WENq/h+9"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf02.hostedemail.com: domain of chrisl@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chrisl@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721807121; 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=hf720ynS9Dz7IZ53Kuon8v3u5pN2HFbQ9cx4oGcw6Jw=; b=TSP94cPzXECZYP01gKRE+ew44tiyPcrLMElaNXAuimFz8A6+Q16mVMtoDVI5Qn4IZXAQEH aqQdFHvBO5AELaB2dt20otWNmBmjOzGgJELQ2Rahj01zIQAJrem+DUKm8OBZ46RCokfTB9 nONUKZ6z0FVCEuNteP4QEtTkLd3LEFs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721807121; a=rsa-sha256; cv=none; b=QucsWcDyJgEWpEhWo1bag2oqklddzWHqFdlDcwyQc7C3IaE8hn1dxo4yhpVAmYXlAuqeV/ B7+lrpF1V3sFSlfRemz72zdwptiS73H2u+XZAj9nyPH9za7HbcQ40Tb2Y84w4rpCA3mKxV 7G5BpWJF9CEdZNeHpnF8H/N+uhH4iQA= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="WENq/h+9"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf02.hostedemail.com: domain of chrisl@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chrisl@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 7F380602F9 for ; Wed, 24 Jul 2024 07:46:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12747C4AF13 for ; Wed, 24 Jul 2024 07:46:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721807173; bh=FBMMrtHEP4jAsvlmIUxSauMRnMpG7zi4alT23X5pUEg=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=WENq/h+9Z063qDnGjK7VO+nxj/hVaAr2NE4CLGYRp/DnsQpAH29eVcFQsmFiY7l3r HLTH8oqy2ojqR+4GZ29dE12vGbf1akWj4/oh71XZP1CAyJ4NzCfWDFuuSqE60uUYUs EhIlUJ0WgnnKgXfrKhvmksEJOmWNsmHISKqT28jQccfycs7VpQEltwzD6K+pVB/YoV Y/1lDP9gy732k7bTukrUPyEN/5EBccP65kyvU8wZw5f9YGoHNm1KN70CUIM2cLAYDH lWxbVijQAwg3vmV9VLDRtE1ZCd7yurMBrtYjB4onVeA0wu1vcUf5KtLJbIDmkpUD7y evn/cSucZ7Www== Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-6694b50a937so57085267b3.0 for ; Wed, 24 Jul 2024 00:46:13 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCXTOnLB9rOPqdqCY/lDWB/30ZnzOumZgD81263rrKFKK8rvdTxoxwk9J4+jRXVFjDNr4hHcGIYSbjuzSWpUfaw7NDU= X-Gm-Message-State: AOJu0YzCh/DNucJTM6XPXxCq3tXPnhmRt4xkPoyub234uLGmGnW878bP CWB/GYnj9mxCzdqVEbmx2ELrVcYnoeQ9/+i+AB5ChRKf2jNwxQEcSk1mkCJC/r+id+AWo5+mueG KbrqP29x4BrDZ/Qy6dMHwcuJh6evY6dDyTugzrQ== X-Google-Smtp-Source: AGHT+IGop+rJ/oNopZpk4iSvJN5Yseo4mIWhH9RSmTEcfv93mywNA5w4BXIDkdNiOh0h5D8lLV6JPPSUaqTN6NB0qiU= X-Received: by 2002:a05:690c:c:b0:65f:8f77:720f with SMTP id 00721157ae682-671f09def59mr29089367b3.5.1721807172248; Wed, 24 Jul 2024 00:46:12 -0700 (PDT) MIME-Version: 1.0 References: <20240724020056.65838-1-21cnbao@gmail.com> In-Reply-To: <20240724020056.65838-1-21cnbao@gmail.com> From: Chris Li Date: Wed, 24 Jul 2024 00:46:01 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v3] mm: Extend 'usage' parameter so that cluster_swap_free_nr() can be reused To: Barry Song <21cnbao@gmail.com> Cc: akpm@linux-foundation.org, linux-mm@kvack.org, david@redhat.com, hanchuanhua@oppo.com, kasong@tencent.com, linux-kernel@vger.kernel.org, ryan.roberts@arm.com, v-songbaohua@oppo.com, ying.huang@intel.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 913008000C X-Stat-Signature: jjz5zn8u4r45msgaq9emsswz994ced33 X-Rspam-User: X-HE-Tag: 1721807174-830825 X-HE-Meta: U2FsdGVkX18i1pcPkoMngghBtOU9QYeZ2NGXnHTxKAZW0lPR4KP8zSPIUQvf9ULeHHKNfu/0IfAYw9z/F9F9W64hNvmABsvcCSMxk6RuYvcT4nMcoRnD9ryBqJJ5LLYSNZGUyvYG4LPReDjoyUKRaEagXuSLLT1V0g5gRxaciN097WHbfiy7da57pe6nYokw6V2FfP5lkwceEqO+E4HJjR5UG3NtDvLNf4lxr/2UsrmqYLOqcwUcWymO607JUUSLo1bkw/lO5jF0AhQUh2Py5LDs1KTXvt1MDv0UEsew21Mj4Q2oqhM1zNvTY/LqcANfugGJU+HUjui9hP6Bq9EpXIA+yWf0p2xiYiqCGoQ4Degnsyv7dCmzjF/owcHMHdj1JK+RxKYRBE8XiwLpTGURMo9P4QXl1XcMOkJcoR3VLPymlvIC+TjmROwj2CypCOU9NqtEDUwzMqOc3r/TfGa+Ehi9RVEfyJfTkXwYIITaNbIjedOxly7IId0u4cZfRi/VcSIEjjspyfHJZj1+ux5hfPWB5keqOn2r/GyHjJVrG5TrYMTQMfyFFt4zTeuwRgo4vmFCz36HAqbZyBGEZFrHCrKCua0Y2m0zg43/vQTbfdAUqh3i9w6Mx2lnHDR7au9pqF5coicPjImhH2ANK15RG8bufgK4gNbdHLAp1+CB/AnanaQyAshIcYz04lTnHsdn8zwsTqeFxcMffIDivIqFEIXG7L4zE6/5fuH9Wcj9jjidANYz/3vLhORUT2hMCpiJeFm+lCFnYSozdyk3fYDmGbf83aroReVuw7nSN1tDIAyoxP7jqKHQ6lzffwro7KO9+bYG8eE4C5Pvns/Lx+lQTL+RaJlaqYM0tcFNv5+CIPBaX1SuIXcu8evkYj0vBbKF//rtewCeBfUXlZ/PkvjKYZ+/o6rdZrrmbQLgXTuz6PF3uY6URain2RKwPYy6ZNIT6gA/hvFN2voistILuKb 78Gl2etb xDyrObqWalXpC98fo48NQuYysEIiofqE4aSVbSm2YTjE8CCNEXl/IeA1bHBNfZDHs21lJeDqPDLLynMMc4iKRNcaNVARz1IdsRTsSLVvXhC/glXWHjC/f9N92/Ab+9wuq3j72Jt1IWtwCngjfp9uVVic/cT/qFkXmPJ6g1l3Yxb6ktARtLYXGq+1SSd52KfwHRcCTbTx6WyphazJ8wBlT6heDwo+LwvhRP3HparMeuGj7irNK+dWtVEkRn5ihgjWEBfpiGpgVY1SlBWvykUMECgWwU33EB3otLU/HlO56prkIlQXgfYHZyiQSGRsoXjigGR6qqN0hqJSO6uX9dljf15zBahF/LbJyUYeN23tvoZe2WZZhSkGdov8CXUJgRZM6/ayXx2IQ1TLqHTlCsu55N5815LS1DNHnjjGkyrOcSS/R3V5d3HXq6Web41VsF+T5H2fJOVUgFRycavM5d/e/tB/quYqPvQEz1hsQ5G42w+lzenC1j2OrRFtxPw5mH9l1NIHp3Hfeza4bQRAq2jLRzN/eLT3mykCWUqb859k5H5tGwviDCVcAoeAqD1v2pvZTlObEECdvV8nKeI/nNP7ujSEVmLiyDXIYCt0C 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: Acked-by: Chris Li Chris On Tue, Jul 23, 2024 at 7:01=E2=80=AFPM Barry Song <21cnbao@gmail.com> wrot= e: > > From: Barry Song > > Extend a usage parameter so that cluster_swap_free_nr() can be reused by > both swapcache_clear() and swap_free(). > __swap_entry_free() is quite similar but more tricky as it requires the > return value of __swap_entry_free_locked() which cluster_swap_free_nr() > doesn't support. > > Cc: "Huang, Ying" > Cc: Chris Li > Cc: Kairui Song > Cc: David Hildenbrand > Cc: Chuanhua Han > Reviewed-by: Ryan Roberts > Signed-off-by: Barry Song > --- > -v3: resend &collect Ryan's reviewed-by > > mm/swapfile.c | 15 +++++---------- > 1 file changed, 5 insertions(+), 10 deletions(-) > > diff --git a/mm/swapfile.c b/mm/swapfile.c > index 38bdc439651a..5f73a8553371 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -1344,7 +1344,8 @@ static void swap_entry_free(struct swap_info_struct= *p, swp_entry_t entry) > } > > static void cluster_swap_free_nr(struct swap_info_struct *sis, > - unsigned long offset, int nr_pages) > + unsigned long offset, int nr_pages, > + unsigned char usage) > { > struct swap_cluster_info *ci; > DECLARE_BITMAP(to_free, BITS_PER_LONG) =3D { 0 }; > @@ -1354,7 +1355,7 @@ static void cluster_swap_free_nr(struct swap_info_s= truct *sis, > while (nr_pages) { > nr =3D min(BITS_PER_LONG, nr_pages); > for (i =3D 0; i < nr; i++) { > - if (!__swap_entry_free_locked(sis, offset + i, 1)= ) > + if (!__swap_entry_free_locked(sis, offset + i, us= age)) > bitmap_set(to_free, i, 1); > } > if (!bitmap_empty(to_free, BITS_PER_LONG)) { > @@ -1388,7 +1389,7 @@ void swap_free_nr(swp_entry_t entry, int nr_pages) > > while (nr_pages) { > nr =3D min_t(int, nr_pages, SWAPFILE_CLUSTER - offset % S= WAPFILE_CLUSTER); > - cluster_swap_free_nr(sis, offset, nr); > + cluster_swap_free_nr(sis, offset, nr, 1); > offset +=3D nr; > nr_pages -=3D nr; > } > @@ -3472,15 +3473,9 @@ int swapcache_prepare(swp_entry_t entry) > > void swapcache_clear(struct swap_info_struct *si, swp_entry_t entry) > { > - struct swap_cluster_info *ci; > unsigned long offset =3D swp_offset(entry); > - unsigned char usage; > > - ci =3D lock_cluster_or_swap_info(si, offset); > - usage =3D __swap_entry_free_locked(si, offset, SWAP_HAS_CACHE); > - unlock_cluster_or_swap_info(si, ci); > - if (!usage) > - free_swap_slot(entry); > + cluster_swap_free_nr(si, offset, 1, SWAP_HAS_CACHE); > } > > struct swap_info_struct *swp_swap_info(swp_entry_t entry) > -- > 2.34.1 >