Commit 76934cf0 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Liu Shixin
Browse files

mm: free non-hugetlb large folios in a batch 

mainline inclusion
from mainline-v6.10-rc1
commit 2f166704290eadec480209cf28060f154184afe9
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9R3AY
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2f166704290eadec480209cf28060f154184afe9

--------------------------------

Patch series "Clean up __folio_put()".

With all the changes over the last few years, __folio_put_small and
__folio_put_large have become almost identical to each other ...  except
you can't tell because they're spread over two files.  Rearrange it all so
that you can tell, and then inline them both into __folio_put().

This patch (of 5):

free_unref_folios() can now handle non-hugetlb large folios, so keep
normal large folios in the batch.  hugetlb folios still need to be handled
specially.

[peterx@redhat.com: fix panic]
  Link: https://lkml.kernel.org/r/ZikjPB0Dt5HA8-uL@x1n
Link: https://lkml.kernel.org/r/20240405153228.2563754-1-willy@infradead.org
Link: https://lkml.kernel.org/r/20240405153228.2563754-2-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarZi Yan <ziy@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
parent 421edb8f

mm/swap.c

+2 −2
Original line number Diff line number Diff line
@@ -158,8 +158,8 @@ void put_pages_list(struct list_head *pages) 
	list_for_each_entry_safe(folio, next, pages, lru) {

		if (!folio_put_testzero(folio))

			continue;

		if (folio_test_large(folio)) {

			__folio_put_large(folio);

		if (folio_test_hugetlb(folio)) {

			free_huge_folio(folio);

			continue;

		}

		/* LRU flag must be clear because it's passed using the lru */