summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2024-04-16 14:03:20 -0700
committerAndrew Morton <akpm@linux-foundation.org>2024-04-16 14:03:20 -0700
commit40e170c23531a8c19001323125c60a2f2dcc8025 (patch)
tree7b9e238190cb5ffa1a8e433782165391a7ba3892
parentecb91afb58c8ba35cf0eeebdbbc5c26535e441ba (diff)
download25-new-40e170c23531a8c19001323125c60a2f2dcc8025.tar.gz
foo
-rw-r--r--patches/fork-defer-linking-file-vma-until-vma-is-fully-initialized.patch2
-rw-r--r--patches/lib-xarray-introduce-a-new-helper-xas_get_order.patch9
-rw-r--r--patches/loongarch-tlb-fix-error-parameter-ptep-set-but-not-used-due-to-__tlb_remove_tlb_entry.patch2
-rw-r--r--patches/mm-add-docs-for-per-order-mthp-counters-and-transhuge_page-abi.patch2
-rw-r--r--patches/mm-add-per-order-mthp-anon_fault_alloc-and-anon_fault_fallback-counters.patch2
-rw-r--r--patches/mm-add-per-order-mthp-anon_swpout-and-anon_swpout_fallback-counters.patch2
-rw-r--r--patches/mm-change-inlined-allocation-helpers-to-account-at-the-call-site.patch2
-rw-r--r--patches/mm-correct-the-docs-for-thp_fault_alloc-and-thp_fault_fallback.patch2
-rw-r--r--patches/mm-filemap-return-early-if-failed-to-allocate-memory-for-split.patch3
-rw-r--r--patches/mm-hugetlb-convert-dissolve_free_huge_pages-to-folios.patch2
-rw-r--r--patches/mm-hugetlb-rename-dissolve_free_huge_pages-to-dissolve_free_hugetlb_folios.patch2
-rw-r--r--patches/mm-memory-failure-fix-deadlock-when-hugetlb_optimize_vmemmap-is-enabled.patch1
-rw-r--r--patches/mm-zswap-refactor-limit-checking-from-zswap_store.patch2
-rw-r--r--patches/selftests-harness-remove-use-of-line_max-fix-fix.patch2
-rw-r--r--txt/loongarch-tlb-fix-error-parameter-ptep-set-but-not-used-due-to-__tlb_remove_tlb_entry.txt2
-rw-r--r--txt/selftests-harness-remove-use-of-line_max-fix-fix.txt2
16 files changed, 24 insertions, 15 deletions
diff --git a/patches/fork-defer-linking-file-vma-until-vma-is-fully-initialized.patch b/patches/fork-defer-linking-file-vma-until-vma-is-fully-initialized.patch
index 7a4d2b510..1f066ba9d 100644
--- a/patches/fork-defer-linking-file-vma-until-vma-is-fully-initialized.patch
+++ b/patches/fork-defer-linking-file-vma-until-vma-is-fully-initialized.patch
@@ -29,9 +29,9 @@ Fixes: 8d9bfb260814 ("hugetlb: add vma based lock for pmd sharing")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Reported-by: Thorvald Natvig <thorvald@google.com>
Closes: https://lore.kernel.org/linux-mm/20240129161735.6gmjsswx62o4pbja@revolver/T/ [1]
+Reviewed-by: Jane Chu <jane.chu@oracle.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
-Cc: Jane Chu <jane.chu@oracle.com>
Cc: Kent Overstreet <kent.overstreet@linux.dev>
Cc: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Mateusz Guzik <mjguzik@gmail.com>
diff --git a/patches/lib-xarray-introduce-a-new-helper-xas_get_order.patch b/patches/lib-xarray-introduce-a-new-helper-xas_get_order.patch
index e4f4fb89d..af7407244 100644
--- a/patches/lib-xarray-introduce-a-new-helper-xas_get_order.patch
+++ b/patches/lib-xarray-introduce-a-new-helper-xas_get_order.patch
@@ -2,11 +2,14 @@ From: Kairui Song <kasong@tencent.com>
Subject: lib/xarray: introduce a new helper xas_get_order
Date: Tue, 16 Apr 2024 01:18:55 +0800
-It can be used after xas_load to check the order of loaded entries.
+It can be used after xas_load to check the order of loaded entries.
Compared to xa_get_order, it saves an XA_STATE and avoid a rewalk.
-Also add new test for xas_get_order, to make the test work we have to
-export xas_get_order with EXPORT_SYMBOL_GPL.
+Added new test for xas_get_order, to make the test work, we have to export
+xas_get_order with EXPORT_SYMBOL_GPL.
+
+Also fix a sparse warning by checking the slot value with xa_entry instead
+of accessing it directly, as suggested by Matthew Wilcox.
Link: https://lkml.kernel.org/r/20240415171857.19244-4-ryncsn@gmail.com
Signed-off-by: Kairui Song <kasong@tencent.com>
diff --git a/patches/loongarch-tlb-fix-error-parameter-ptep-set-but-not-used-due-to-__tlb_remove_tlb_entry.patch b/patches/loongarch-tlb-fix-error-parameter-ptep-set-but-not-used-due-to-__tlb_remove_tlb_entry.patch
index 09c11dec4..9eb0bfff6 100644
--- a/patches/loongarch-tlb-fix-error-parameter-ptep-set-but-not-used-due-to-__tlb_remove_tlb_entry.patch
+++ b/patches/loongarch-tlb-fix-error-parameter-ptep-set-but-not-used-due-to-__tlb_remove_tlb_entry.patch
@@ -17,6 +17,8 @@ Signed-off-by: David Hildenbrand <david@redhat.com>
Reported-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Closes: https://lkml.kernel.org/r/CANiq72mQh3O9S4umbvrKBgMMorty48UMwS01U22FR0mRyd3cyQ@mail.gmail.com
Tested-by: Arnd Bergmann <arnd@arndb.de>
+Reviewed-by: Miguel Ojeda <ojeda@kernel.org>
+Tested-by: Miguel Ojeda <ojeda@kernel.org>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Nathan Chancellor <nathan@kernel.org>
diff --git a/patches/mm-add-docs-for-per-order-mthp-counters-and-transhuge_page-abi.patch b/patches/mm-add-docs-for-per-order-mthp-counters-and-transhuge_page-abi.patch
index 51c0bc158..dc39c4995 100644
--- a/patches/mm-add-docs-for-per-order-mthp-counters-and-transhuge_page-abi.patch
+++ b/patches/mm-add-docs-for-per-order-mthp-counters-and-transhuge_page-abi.patch
@@ -9,8 +9,8 @@ some time.
Link: https://lkml.kernel.org/r/20240412114858.407208-4-21cnbao@gmail.com
Signed-off-by: Barry Song <v-songbaohua@oppo.com>
Reviewed-by: Ryan Roberts <ryan.roberts@arm.com>
+Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Chris Li <chrisl@kernel.org>
-Cc: David Hildenbrand <david@redhat.com>
Cc: Domenico Cerasuolo <cerasuolodomenico@gmail.com>
Cc: Kairui Song <kasong@tencent.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
diff --git a/patches/mm-add-per-order-mthp-anon_fault_alloc-and-anon_fault_fallback-counters.patch b/patches/mm-add-per-order-mthp-anon_fault_alloc-and-anon_fault_fallback-counters.patch
index fdf315766..4e4e0a6e6 100644
--- a/patches/mm-add-per-order-mthp-anon_fault_alloc-and-anon_fault_fallback-counters.patch
+++ b/patches/mm-add-per-order-mthp-anon_fault_alloc-and-anon_fault_fallback-counters.patch
@@ -41,8 +41,8 @@ Incorporating additional counters should now be straightforward as well.
Link: https://lkml.kernel.org/r/20240412114858.407208-1-21cnbao@gmail.com
Link: https://lkml.kernel.org/r/20240412114858.407208-2-21cnbao@gmail.com
Signed-off-by: Barry Song <v-songbaohua@oppo.com>
+Acked-by: David Hildenbrand <david@redhat.com>
Cc: Chris Li <chrisl@kernel.org>
-Cc: David Hildenbrand <david@redhat.com>
Cc: Domenico Cerasuolo <cerasuolodomenico@gmail.com>
Cc: Kairui Song <kasong@tencent.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
diff --git a/patches/mm-add-per-order-mthp-anon_swpout-and-anon_swpout_fallback-counters.patch b/patches/mm-add-per-order-mthp-anon_swpout-and-anon_swpout_fallback-counters.patch
index da980fe60..8cf11875c 100644
--- a/patches/mm-add-per-order-mthp-anon_swpout-and-anon_swpout_fallback-counters.patch
+++ b/patches/mm-add-per-order-mthp-anon_swpout-and-anon_swpout_fallback-counters.patch
@@ -11,8 +11,8 @@ counter names.
Link: https://lkml.kernel.org/r/20240412114858.407208-3-21cnbao@gmail.com
Signed-off-by: Barry Song <v-songbaohua@oppo.com>
Reviewed-by: Ryan Roberts <ryan.roberts@arm.com>
+Acked-by: David Hildenbrand <david@redhat.com>
Cc: Chris Li <chrisl@kernel.org>
-Cc: David Hildenbrand <david@redhat.com>
Cc: Domenico Cerasuolo <cerasuolodomenico@gmail.com>
Cc: Kairui Song <kasong@tencent.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
diff --git a/patches/mm-change-inlined-allocation-helpers-to-account-at-the-call-site.patch b/patches/mm-change-inlined-allocation-helpers-to-account-at-the-call-site.patch
index f33bb83a4..42f934067 100644
--- a/patches/mm-change-inlined-allocation-helpers-to-account-at-the-call-site.patch
+++ b/patches/mm-change-inlined-allocation-helpers-to-account-at-the-call-site.patch
@@ -27,6 +27,7 @@ mechanism to charge allocations to the callers of these functions.
Link: https://lkml.kernel.org/r/20240415020731.1152108-1-surenb@google.com
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
+Acked-by: Jan Kara <jack@suse.cz> [jbd2]
Cc: Anna Schumaker <anna@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
@@ -38,7 +39,6 @@ Cc: Eric Dumazet <edumazet@google.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Jakub Sitnicki <jakub@cloudflare.com>
-Cc: Jan Kara <jack@suse.com>
Cc: Jiri Kosina <jikos@kernel.org>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
diff --git a/patches/mm-correct-the-docs-for-thp_fault_alloc-and-thp_fault_fallback.patch b/patches/mm-correct-the-docs-for-thp_fault_alloc-and-thp_fault_fallback.patch
index 92c8d16df..84af028df 100644
--- a/patches/mm-correct-the-docs-for-thp_fault_alloc-and-thp_fault_fallback.patch
+++ b/patches/mm-correct-the-docs-for-thp_fault_alloc-and-thp_fault_fallback.patch
@@ -10,8 +10,8 @@ THP_FAULT_ALLOC is only incremented after a successful charge.
Link: https://lkml.kernel.org/r/20240412114858.407208-5-21cnbao@gmail.com
Signed-off-by: Barry Song <v-songbaohua@oppo.com>
Reviewed-by: Ryan Roberts <ryan.roberts@arm.com>
+Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Chris Li <chrisl@kernel.org>
-Cc: David Hildenbrand <david@redhat.com>
Cc: Domenico Cerasuolo <cerasuolodomenico@gmail.com>
Cc: Kairui Song <kasong@tencent.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
diff --git a/patches/mm-filemap-return-early-if-failed-to-allocate-memory-for-split.patch b/patches/mm-filemap-return-early-if-failed-to-allocate-memory-for-split.patch
index 516edd412..b8faa04e0 100644
--- a/patches/mm-filemap-return-early-if-failed-to-allocate-memory-for-split.patch
+++ b/patches/mm-filemap-return-early-if-failed-to-allocate-memory-for-split.patch
@@ -2,7 +2,7 @@ From: Kairui Song <kasong@tencent.com>
Subject: mm/filemap: return early if failed to allocate memory for split
Date: Tue, 16 Apr 2024 01:18:53 +0800
-Patch series "mm/filemap: optimize folio adding and splitting", v3.
+Patch series "mm/filemap: optimize folio adding and splitting", v4.
Currently, at least 3 tree walks are needed for filemap folio adding if
the folio is previously evicted. One for getting the order of current
@@ -75,6 +75,7 @@ This patch (of 4):
xas_split_alloc could fail with NOMEM, and in such case, it should abort
early instead of keep going and fail the xas_split below.
+Link: https://lkml.kernel.org/r/20240416071722.45997-1-ryncsn@gmail.com
Link: https://lkml.kernel.org/r/20240415171857.19244-1-ryncsn@gmail.com
Link: https://lkml.kernel.org/r/20240415171857.19244-2-ryncsn@gmail.com
Signed-off-by: Kairui Song <kasong@tencent.com>
diff --git a/patches/mm-hugetlb-convert-dissolve_free_huge_pages-to-folios.patch b/patches/mm-hugetlb-convert-dissolve_free_huge_pages-to-folios.patch
index 1089ff8af..0c5fcf567 100644
--- a/patches/mm-hugetlb-convert-dissolve_free_huge_pages-to-folios.patch
+++ b/patches/mm-hugetlb-convert-dissolve_free_huge_pages-to-folios.patch
@@ -10,9 +10,9 @@ Link: https://lkml.kernel.org/r/20240411164756.261178-1-sidhartha.kumar@oracle.c
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
Reviewed-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
+Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
Cc: Jane Chu <jane.chu@oracle.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
-Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Muchun Song <muchun.song@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
diff --git a/patches/mm-hugetlb-rename-dissolve_free_huge_pages-to-dissolve_free_hugetlb_folios.patch b/patches/mm-hugetlb-rename-dissolve_free_huge_pages-to-dissolve_free_hugetlb_folios.patch
index ae3184f2d..f379e40bf 100644
--- a/patches/mm-hugetlb-rename-dissolve_free_huge_pages-to-dissolve_free_hugetlb_folios.patch
+++ b/patches/mm-hugetlb-rename-dissolve_free_huge_pages-to-dissolve_free_hugetlb_folios.patch
@@ -8,9 +8,9 @@ dissolve_free_hugetlb_folios() and change the comments which reference it.
Link: https://lkml.kernel.org/r/20240412182139.120871-2-sidhartha.kumar@oracle.com
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
+Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
Cc: Jane Chu <jane.chu@oracle.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
-Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Oscar Salvador <osalvador@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
diff --git a/patches/mm-memory-failure-fix-deadlock-when-hugetlb_optimize_vmemmap-is-enabled.patch b/patches/mm-memory-failure-fix-deadlock-when-hugetlb_optimize_vmemmap-is-enabled.patch
index deab04e66..ec5667b79 100644
--- a/patches/mm-memory-failure-fix-deadlock-when-hugetlb_optimize_vmemmap-is-enabled.patch
+++ b/patches/mm-memory-failure-fix-deadlock-when-hugetlb_optimize_vmemmap-is-enabled.patch
@@ -120,6 +120,7 @@ Link: https://lkml.kernel.org/r/20240407085456.2798193-1-linmiaohe@huawei.com
Fixes: a6b40850c442 ("mm: hugetlb: replace hugetlb_free_vmemmap_enabled with a static_key")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Acked-by: Oscar Salvador <osalvador@suse.de>
+Reviewed-by: Jane Chu <jane.chu@oracle.com>
Cc: Naoya Horiguchi <nao.horiguchi@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
diff --git a/patches/mm-zswap-refactor-limit-checking-from-zswap_store.patch b/patches/mm-zswap-refactor-limit-checking-from-zswap_store.patch
index 619ed2bb4..3f46d87ad 100644
--- a/patches/mm-zswap-refactor-limit-checking-from-zswap_store.patch
+++ b/patches/mm-zswap-refactor-limit-checking-from-zswap_store.patch
@@ -8,10 +8,10 @@ cleaner to move a function call around.
Link: https://lkml.kernel.org/r/20240413022407.785696-3-yosryahmed@google.com
Signed-off-by: Yosry Ahmed <yosryahmed@google.com>
+Reviewed-by: Nhat Pham <nphamcs@gmail.com>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>
-Cc: Nhat Pham <nphamcs@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
diff --git a/patches/selftests-harness-remove-use-of-line_max-fix-fix.patch b/patches/selftests-harness-remove-use-of-line_max-fix-fix.patch
index 4c50b081c..2598fbdc2 100644
--- a/patches/selftests-harness-remove-use-of-line_max-fix-fix.patch
+++ b/patches/selftests-harness-remove-use-of-line_max-fix-fix.patch
@@ -4,7 +4,7 @@ Date: Tue Apr 16 11:39:55 AM PDT 2024
check asprintf() return
-Cc: Edward Liaw <edliaw@google.com>
+Reviewed-by: Edward Liaw <edliaw@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
diff --git a/txt/loongarch-tlb-fix-error-parameter-ptep-set-but-not-used-due-to-__tlb_remove_tlb_entry.txt b/txt/loongarch-tlb-fix-error-parameter-ptep-set-but-not-used-due-to-__tlb_remove_tlb_entry.txt
index 8c4e0262b..23cafa5ee 100644
--- a/txt/loongarch-tlb-fix-error-parameter-ptep-set-but-not-used-due-to-__tlb_remove_tlb_entry.txt
+++ b/txt/loongarch-tlb-fix-error-parameter-ptep-set-but-not-used-due-to-__tlb_remove_tlb_entry.txt
@@ -17,6 +17,8 @@ Signed-off-by: David Hildenbrand <david@redhat.com>
Reported-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Closes: https://lkml.kernel.org/r/CANiq72mQh3O9S4umbvrKBgMMorty48UMwS01U22FR0mRyd3cyQ@mail.gmail.com
Tested-by: Arnd Bergmann <arnd@arndb.de>
+Reviewed-by: Miguel Ojeda <ojeda@kernel.org>
+Tested-by: Miguel Ojeda <ojeda@kernel.org>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Nathan Chancellor <nathan@kernel.org>
diff --git a/txt/selftests-harness-remove-use-of-line_max-fix-fix.txt b/txt/selftests-harness-remove-use-of-line_max-fix-fix.txt
index 235d67a2f..c4d3f4006 100644
--- a/txt/selftests-harness-remove-use-of-line_max-fix-fix.txt
+++ b/txt/selftests-harness-remove-use-of-line_max-fix-fix.txt
@@ -4,4 +4,4 @@ Date: Tue Apr 16 11:39:55 AM PDT 2024
check asprintf() return
-Cc: Edward Liaw <edliaw@google.com>
+Reviewed-by: Edward Liaw <edliaw@google.com>