Received-SPF: pass (google.com: domain of linux-kernel+bounces-208477-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Daniel Gomez <da.gomez@samsung.com>
To: Baolin Wang <baolin.wang@linux.alibaba.com>
CC: "akpm@linux-foundation.org" <akpm@linux-foundation.org>,
	"hughd@google.com" <hughd@google.com>, "willy@infradead.org"
	<willy@infradead.org>, "david@redhat.com" <david@redhat.com>,
	"wangkefeng.wang@huawei.com" <wangkefeng.wang@huawei.com>,
	"chrisl@kernel.org" <chrisl@kernel.org>, "ying.huang@intel.com"
	<ying.huang@intel.com>, "21cnbao@gmail.com" <21cnbao@gmail.com>,
	"ryan.roberts@arm.com" <ryan.roberts@arm.com>, "shy828301@gmail.com"
	<shy828301@gmail.com>, "ziy@nvidia.com" <ziy@nvidia.com>,
	"ioworker0@gmail.com" <ioworker0@gmail.com>, Pankaj Raghav
	<p.raghav@samsung.com>, "linux-mm@kvack.org" <linux-mm@kvack.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 5/7] mm: add new 'orders' parameter for
 find_get_entries() and find_lock_entries()
Thread-Topic: [PATCH 5/7] mm: add new 'orders' parameter for
	find_get_entries() and find_lock_entries()
Thread-Index: AQHauAk68+kKkF9tKUiB4eqFXoRvB7HBE1kA
Date: Mon, 10 Jun 2024 15:23:06 +0000
Message-ID: <v3dqmzgrfpqmfckqnl4voelofevm56q4n4lbk2fq5o5rfclylb@wmtz6ms22ep2>
In-Reply-To: <5304c4c54868336985b396d2c46132c2e0cdf803.1717673614.git.baolin.wang@linux.alibaba.com>
Accept-Language: en-US, en-GB
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-ms-exchange-transport-fromentityheader: Hosted
Content-Type: text/plain; charset="us-ascii"
Content-ID: <9399C4818E7B364CA97436B94E4A03A5@scsc.local>
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJKsWRmVeSWpSXmKPExsWy7djP87oxUulpBqf+m1p8vitkMWf9GjaL
	/3uPMVo0PXjEZPF1/S9mi6ef+lgsFv02tri8aw6bxb01/1ktenZPZbRYcGIxo0Xj5/uMFr9/
	ACVOzprMYjH76D12B36PNfPWMHrsnHWX3WPBplKPliNvWT02r9DyWLznJZPHplWdbB6bPk1i
	9zgx4zeLx86Hlh69ze/YPN7vu8rm8XmTXABvFJdNSmpOZllqkb5dAlfG9ZbbLAW/PCu6Lt5l
	aWA8adXFyMkhIWAise7UF8YuRi4OIYEVjBJvrl5jgXC+MEocaJ/ADuF8ZpTYefILC1zL3D2s
	EInljBJ/W1aywFX1H5oH5ZxhlFi37CkbhLMSaPKSt0wg/WwCmhL7Tm4CGszBISKgL9E71xek
	hlngEKtE49lzjCA1wgIZEic2rQSrFxHIlGj+dIURwjaSaLu1lg2kl0VAVWLHJ1WQMK+Ar0R3
	/zF2EJtTIEViU+9WsFZGAVmJRyt/gcWZBcQlbj2ZzwTxgqDEotl7mCFsMYl/ux6yQdg6Emev
	P2GEsA0kti7dB/WyokTHsZtsEHN0JBbs/gRlW0rs3/oIytaWWLbwNTPEPYISJ2c+AQeEhMBR
	Lol3D9ayQgxykXg45SnUEcISr45vYZ/AqDMLyX2zkOyYhWTHLCQ7ZiHZsYCRdRWjeGppcW56
	arFxXmq5XnFibnFpXrpecn7uJkZg6jz97/jXHYwrXn3UO8TIxMF4iFGCg1lJhFcoIzlNiDcl
	sbIqtSg/vqg0J7X4EKM0B4uSOK9qinyqkEB6YklqdmpqQWoRTJaJg1OqgcluQd//E03HfrLb
	yh7xul4VcX6VuTrDpBPGwlqdXgeX/g35w6P2t7YuLTFTo6Pshodx2XrnOqF7qzRVEtriEg2C
	z+VesAo9+2G9qE2ZU+/KC1ETv3jMO+V2QSPByig+xK/AdpeNtuEyly92HOVhVWohq05NqAsU
	LE3Yw5fH3Mx9u2v57f7D27LKtvTNOHGyScPli1qm4rn0SbvvnhGNmsjXoqD4afsPefdS5afM
	cr+fulkLvFi5tuPqRS/3hYfcp3hNyDo0800Aaw/nDfe027UxzVuavSRjr9kwbDRdFS8iWf6o
	4Pp12akR+5O6mz8+b1vu1iS7/Fb189+qi3zf7I0IsLheF5f15cPJ9MnhSizFGYmGWsxFxYkA
	mbeB5AwEAAA=
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgk+LIzCtJLcpLzFFi42I5/e/4Xd1oqfQ0g88f1C0+3xWymLN+DZvF
	/73HGC2aHjxisvi6/hezxdNPfSwWi34bW1zeNYfN4t6a/6wWPbunMlosOLGY0aLx831Gi98/
	gBInZ01msZh99B67A7/HmnlrGD12zrrL7rFgU6lHy5G3rB6bV2h5LN7zkslj06pONo9Nnyax
	e5yY8ZvFY+dDS4/e5ndsHu/3XWXz+LxJLoA3Ss+mKL+0JFUhI7+4xFYp2tDCSM/Q0kLPyMRS
	z9DYPNbKyFRJ384mJTUnsyy1SN8uQS/jesttloJfnhVdF++yNDCetOpi5OSQEDCRWDd3D2sX
	IxeHkMBSRolzb++xQiRkJDZ+uQplC0v8udbFBlH0kVHixY6tUM4ZRonpcw9DOSsZJebMOQrW
	wiagKbHv5Cb2LkYODhEBfYneub4gNcwCh1glGs+eYwSpERbIkPjXf4sRoiZT4vf9cpCwiICR
	RNuttWwgYRYBVYkdn1RBwrwCvhLd/cfYIVbNYpTonTeHDSTBKZAisal3KxOIzSggK/Fo5S92
	EJtZQFzi1pP5TBAfCEgs2XOeGcIWlXj5+B/UZzoSZ68/YYSwDSS2Lt3HAmErSnQcu8kGMUdH
	YsHuT1C2pcT+rY+gbG2JZQtfM0McJyhxcuYTlgmMMrOQrJ6FpH0WkvZZSNpnIWlfwMi6ilEk
	tbQ4Nz232FCvODG3uDQvXS85P3cTIzApbjv2c/MOxnmvPuodYmTiYDzEKMHBrCTCK5SRnCbE
	m5JYWZValB9fVJqTWnyI0RQYdhOZpUST84FpOa8k3tDMwNTQxMzSwNTSzFhJnNezoCNRSCA9
	sSQ1OzW1ILUIpo+Jg1OqgWl2TOCNta+tlluErnnwwWqy8L4XTG/OaXPP2Lyv7Efp+WrzaQYu
	xzj2V9xXTV10S4rtkrb57uVMPmx3pFbMnSPJmlG+6NG+4oe7mnZ7H5rwz+bqE+8rq64uZNOs
	OXF95sPJejHOF/ZdVJ+avFxx3Y19gRluW8qnOLd8rT1dU9ybd+fp5qKFh47fmr6Ip1Yp7NVy
	Ncm/H1QN12WyvK9ne+N/3aGg4PyPYNfM9h3VBwyd6zITpV8Y39X0aarwlftRcH1Py77TUy1n
	Prnew3sopUngXrp92J5tW1Z+NspnkTjJZhxcmf2uOu+FhWvA4upZH7ntu2TttL5ujTESbn1q
	seHbClP+/PomwzXfZJv3T/FQYinOSDTUYi4qTgQADOPzoBMEAAA=
X-CMS-MailID: 20240610152307eucas1p10417f113fcc5e1729bdf638f370d54e4
X-Msg-Generator: CA
X-RootMTR: 20240610152307eucas1p10417f113fcc5e1729bdf638f370d54e4
X-EPHeader: CA
CMS-TYPE: 201P
X-CMS-RootMailID: 20240610152307eucas1p10417f113fcc5e1729bdf638f370d54e4
References: <cover.1717673614.git.baolin.wang@linux.alibaba.com>
	<5304c4c54868336985b396d2c46132c2e0cdf803.1717673614.git.baolin.wang@linux.alibaba.com>
	<CGME20240610152307eucas1p10417f113fcc5e1729bdf638f370d54e4@eucas1p1.samsung.com>

Hi Baolin,

On Thu, Jun 06, 2024 at 07:58:55PM +0800, Baolin Wang wrote:
> In the following patches, shmem will support the swap out of large folios=
,
> which means the shmem mappings may contain large order swap entries, so a=
n
> 'orders' array is added for find_get_entries() and find_lock_entries() to
> obtain the order size of shmem swap entries, which will help in the relea=
se
> of shmem large folio swap entries.
>=20
> Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com>
> ---
>  mm/filemap.c  | 27 +++++++++++++++++++++++++--
>  mm/internal.h |  4 ++--
>  mm/shmem.c    | 17 +++++++++--------
>  mm/truncate.c |  8 ++++----
>  4 files changed, 40 insertions(+), 16 deletions(-)
>=20
> diff --git a/mm/filemap.c b/mm/filemap.c
> index 37061aafd191..47fcd9ee6012 100644
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@ -2036,14 +2036,24 @@ static inline struct folio *find_get_entry(struct=
 xa_state *xas, pgoff_t max,
>   * Return: The number of entries which were found.
>   */
>  unsigned find_get_entries(struct address_space *mapping, pgoff_t *start,
> -		pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices)
> +		pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices,
> +		int *orders)
>  {
>  	XA_STATE(xas, &mapping->i_pages, *start);
>  	struct folio *folio;
> +	int order;
> =20
>  	rcu_read_lock();
>  	while ((folio =3D find_get_entry(&xas, end, XA_PRESENT)) !=3D NULL) {
>  		indices[fbatch->nr] =3D xas.xa_index;
> +		if (orders) {
> +			if (!xa_is_value(folio))
> +				order =3D folio_order(folio);
> +			else
> +				order =3D xa_get_order(xas.xa, xas.xa_index);
> +
> +			orders[fbatch->nr] =3D order;
> +		}
>  		if (!folio_batch_add(fbatch, folio))
>  			break;
>  	}
> @@ -2056,6 +2066,8 @@ unsigned find_get_entries(struct address_space *map=
ping, pgoff_t *start,
>  		folio =3D fbatch->folios[idx];
>  		if (!xa_is_value(folio))
>  			nr =3D folio_nr_pages(folio);
> +		else if (orders)
> +			nr =3D 1 << orders[idx];
>  		*start =3D indices[idx] + nr;
>  	}
>  	return folio_batch_count(fbatch);
> @@ -2082,10 +2094,12 @@ unsigned find_get_entries(struct address_space *m=
apping, pgoff_t *start,
>   * Return: The number of entries which were found.
>   */
>  unsigned find_lock_entries(struct address_space *mapping, pgoff_t *start=
,
> -		pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices)
> +		pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices,
> +		int *orders)
>  {
>  	XA_STATE(xas, &mapping->i_pages, *start);
>  	struct folio *folio;
> +	int order;
> =20
>  	rcu_read_lock();
>  	while ((folio =3D find_get_entry(&xas, end, XA_PRESENT))) {
> @@ -2099,9 +2113,16 @@ unsigned find_lock_entries(struct address_space *m=
apping, pgoff_t *start,
>  			if (folio->mapping !=3D mapping ||
>  			    folio_test_writeback(folio))
>  				goto unlock;
> +			if (orders)
> +				order =3D folio_order(folio);
>  			VM_BUG_ON_FOLIO(!folio_contains(folio, xas.xa_index),
>  					folio);
> +		} else if (orders) {
> +			order =3D xa_get_order(xas.xa, xas.xa_index);
>  		}
> +
> +		if (orders)
> +			orders[fbatch->nr] =3D order;
>  		indices[fbatch->nr] =3D xas.xa_index;
>  		if (!folio_batch_add(fbatch, folio))
>  			break;
> @@ -2120,6 +2141,8 @@ unsigned find_lock_entries(struct address_space *ma=
pping, pgoff_t *start,
>  		folio =3D fbatch->folios[idx];
>  		if (!xa_is_value(folio))
>  			nr =3D folio_nr_pages(folio);
> +		else if (orders)
> +			nr =3D 1 << orders[idx];
>  		*start =3D indices[idx] + nr;
>  	}
>  	return folio_batch_count(fbatch);
> diff --git a/mm/internal.h b/mm/internal.h
> index 3419c329b3bc..0b5adb6c33cc 100644
> --- a/mm/internal.h
> +++ b/mm/internal.h
> @@ -339,9 +339,9 @@ static inline void force_page_cache_readahead(struct =
address_space *mapping,
>  }
> =20
>  unsigned find_lock_entries(struct address_space *mapping, pgoff_t *start=
,
> -		pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices);
> +		pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices, int *orders=
);
>  unsigned find_get_entries(struct address_space *mapping, pgoff_t *start,
> -		pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices);
> +		pgoff_t end, struct folio_batch *fbatch, pgoff_t *indices, int *orders=
);
>  void filemap_free_folio(struct address_space *mapping, struct folio *fol=
io);
>  int truncate_inode_folio(struct address_space *mapping, struct folio *fo=
lio);
>  bool truncate_inode_partial_folio(struct folio *folio, loff_t start,
> diff --git a/mm/shmem.c b/mm/shmem.c
> index 0ac71580decb..28ba603d87b8 100644
> --- a/mm/shmem.c
> +++ b/mm/shmem.c
> @@ -840,14 +840,14 @@ static void shmem_delete_from_page_cache(struct fol=
io *folio, void *radswap)
>   * Remove swap entry from page cache, free the swap and its page cache.
>   */
>  static int shmem_free_swap(struct address_space *mapping,
> -			   pgoff_t index, void *radswap)
> +			   pgoff_t index, void *radswap, int order)
>  {
>  	void *old;

Matthew Wilcox suggested [1] returning the number of pages freed in shmem_f=
ree_swap().

[1] https://lore.kernel.org/all/ZQRf2pGWurrE0uO+@casper.infradead.org/

Which I submitted here:
https://lore.kernel.org/all/20231028211518.3424020-5-da.gomez@samsung.com/

Do you agree with the suggestion? If so, could we update my patch to use
free_swap_and_cache_nr() or include that here?

> =20
>  	old =3D xa_cmpxchg_irq(&mapping->i_pages, index, radswap, NULL, 0);
>  	if (old !=3D radswap)
>  		return -ENOENT;
> -	free_swap_and_cache(radix_to_swp_entry(radswap));
> +	free_swap_and_cache_nr(radix_to_swp_entry(radswap), 1 << order);
>  	return 0;
>  }
> =20
> @@ -981,6 +981,7 @@ static void shmem_undo_range(struct inode *inode, lof=
f_t lstart, loff_t lend,
>  	pgoff_t end =3D (lend + 1) >> PAGE_SHIFT;
>  	struct folio_batch fbatch;
>  	pgoff_t indices[PAGEVEC_SIZE];
> +	int orders[PAGEVEC_SIZE];
>  	struct folio *folio;
>  	bool same_folio;
>  	long nr_swaps_freed =3D 0;
> @@ -996,15 +997,15 @@ static void shmem_undo_range(struct inode *inode, l=
off_t lstart, loff_t lend,
>  	folio_batch_init(&fbatch);
>  	index =3D start;
>  	while (index < end && find_lock_entries(mapping, &index, end - 1,
> -			&fbatch, indices)) {
> +			&fbatch, indices, orders)) {
>  		for (i =3D 0; i < folio_batch_count(&fbatch); i++) {
>  			folio =3D fbatch.folios[i];
> =20
>  			if (xa_is_value(folio)) {
>  				if (unfalloc)
>  					continue;
> -				nr_swaps_freed +=3D !shmem_free_swap(mapping,
> -							indices[i], folio);
> +				if (!shmem_free_swap(mapping, indices[i], folio, orders[i]))
> +					nr_swaps_freed +=3D 1 << orders[i];
>  				continue;
>  			}
> =20
> @@ -1058,7 +1059,7 @@ static void shmem_undo_range(struct inode *inode, l=
off_t lstart, loff_t lend,
>  		cond_resched();
> =20
>  		if (!find_get_entries(mapping, &index, end - 1, &fbatch,
> -				indices)) {
> +				indices, orders)) {
>  			/* If all gone or hole-punch or unfalloc, we're done */
>  			if (index =3D=3D start || end !=3D -1)
>  				break;
> @@ -1072,12 +1073,12 @@ static void shmem_undo_range(struct inode *inode,=
 loff_t lstart, loff_t lend,
>  			if (xa_is_value(folio)) {
>  				if (unfalloc)
>  					continue;
> -				if (shmem_free_swap(mapping, indices[i], folio)) {
> +				if (shmem_free_swap(mapping, indices[i], folio, orders[i])) {
>  					/* Swap was replaced by page: retry */
>  					index =3D indices[i];
>  					break;
>  				}
> -				nr_swaps_freed++;
> +				nr_swaps_freed +=3D 1 << orders[i];
>  				continue;
>  			}
> =20
> diff --git a/mm/truncate.c b/mm/truncate.c
> index 5ce62a939e55..3a4bc9dba451 100644
> --- a/mm/truncate.c
> +++ b/mm/truncate.c
> @@ -352,7 +352,7 @@ void truncate_inode_pages_range(struct address_space =
*mapping,
>  	folio_batch_init(&fbatch);
>  	index =3D start;
>  	while (index < end && find_lock_entries(mapping, &index, end - 1,
> -			&fbatch, indices)) {
> +			&fbatch, indices, NULL)) {
>  		truncate_folio_batch_exceptionals(mapping, &fbatch, indices);
>  		for (i =3D 0; i < folio_batch_count(&fbatch); i++)
>  			truncate_cleanup_folio(fbatch.folios[i]);
> @@ -392,7 +392,7 @@ void truncate_inode_pages_range(struct address_space =
*mapping,
>  	while (index < end) {
>  		cond_resched();
>  		if (!find_get_entries(mapping, &index, end - 1, &fbatch,
> -				indices)) {
> +				indices, NULL)) {
>  			/* If all gone from start onwards, we're done */
>  			if (index =3D=3D start)
>  				break;
> @@ -496,7 +496,7 @@ unsigned long mapping_try_invalidate(struct address_s=
pace *mapping,
>  	int i;
> =20
>  	folio_batch_init(&fbatch);
> -	while (find_lock_entries(mapping, &index, end, &fbatch, indices)) {
> +	while (find_lock_entries(mapping, &index, end, &fbatch, indices, NULL))=
 {
>  		for (i =3D 0; i < folio_batch_count(&fbatch); i++) {
>  			struct folio *folio =3D fbatch.folios[i];
> =20
> @@ -622,7 +622,7 @@ int invalidate_inode_pages2_range(struct address_spac=
e *mapping,
> =20
>  	folio_batch_init(&fbatch);
>  	index =3D start;
> -	while (find_get_entries(mapping, &index, end, &fbatch, indices)) {
> +	while (find_get_entries(mapping, &index, end, &fbatch, indices, NULL)) =
{
>  		for (i =3D 0; i < folio_batch_count(&fbatch); i++) {
>  			struct folio *folio =3D fbatch.folios[i];
> =20
> --=20
> 2.39.3
>=20

Daniel=