[merged mm-hotfixes-stable] kho-init-alloc-tags-when-restoring-pages-from-reserved-memory.patch removed from -mm tree

[merged mm-hotfixes-stable] kho-init-alloc-tags-when-restoring-pages-from-reserved-memory.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: kho: init alloc tags when restoring pages from reserved memory
has been removed from the -mm tree.  Its filename was
     kho-init-alloc-tags-when-restoring-pages-from-reserved-memory.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Ran Xiaokai <ran.xiaokai@zte.com.cn>
Subject: kho: init alloc tags when restoring pages from reserved memory
Date: Fri, 9 Jan 2026 10:42:51 +0000

Memblock pages (including reserved memory) should have their allocation
tags initialized to CODETAG_EMPTY via clear_page_tag_ref() before being
released to the page allocator.  When kho restores pages through
kho_restore_page(), missing this call causes mismatched
allocation/deallocation tracking and below warning message:

alloc_tag was not set
WARNING: include/linux/alloc_tag.h:164 at ___free_pages+0xb8/0x260, CPU#1: swapper/0/1
RIP: 0010:___free_pages+0xb8/0x260
 kho_restore_vmalloc+0x187/0x2e0
 kho_test_init+0x3c4/0xa30
 do_one_initcall+0x62/0x2b0
 kernel_init_freeable+0x25b/0x480
 kernel_init+0x1a/0x1c0
 ret_from_fork+0x2d1/0x360

Add missing clear_page_tag_ref() annotation in kho_restore_page() to
fix this.

Link: https://lkml.kernel.org/r/20260113033403.161869-1-ranxiaokai627@163.com
Link: https://lkml.kernel.org/r/20260109104251.157767-1-ranxiaokai627@163.com
Fixes: fc33e4b44b27 ("kexec: enable KHO support for memory preservation")
Signed-off-by: Ran Xiaokai <ran.xiaokai@zte.com.cn>
Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: Suren Baghdasaryan <surenb@google.com>
Reviewed-by: Pasha Tatashin <pasha.tatashin@soleen.com>
Cc: Alexander Graf <graf@amazon.com>
Cc: Pratyush Yadav <pratyush@kernel.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/liveupdate/kexec_handover.c |    1 +
 1 file changed, 1 insertion(+)

--- a/kernel/liveupdate/kexec_handover.c~kho-init-alloc-tags-when-restoring-pages-from-reserved-memory
+++ a/kernel/liveupdate/kexec_handover.c
@@ -255,6 +255,7 @@ static struct page *kho_restore_page(phy
 	if (is_folio && info.order)
 		prep_compound_page(page, info.order);
 
+	clear_page_tag_ref(page);
 	adjust_managed_page_count(page, nr_pages);
 	return page;
 }
_

Patches currently in -mm which might be from ran.xiaokai@zte.com.cn are

alloc_tag-fix-rw-permission-issue-when-handling-boot-parameter.patch

Re: [merged mm-hotfixes-stable] kho-init-alloc-tags-when-restoring-pages-from-reserved-memory.patch removed from -mm tree

[Pratyush Yadav]

Hi Andrew,

On Mon, Jan 19 2026, Andrew Morton wrote:

> The quilt patch titled
>      Subject: kho: init alloc tags when restoring pages from reserved memory
> has been removed from the -mm tree.  Its filename was
>      kho-init-alloc-tags-when-restoring-pages-from-reserved-memory.patch
>
> This patch was dropped because it was merged into the mm-hotfixes-stable branch
> of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

This patch isn't quite complete. See [0]. It doesn't do anything wrong,
it just doesn't fix the problem for every case.

I suggested a re-roll of this patch based on top of my cleanup patches
[1], since I think with those the end result is a bit nicer.

I suppose we have 3 options:

1. Take this patch in hotfixes and leave kho_restore_pages() path
   unfixed. The fix the rest next merge window.

2. Do a new version of this patch fixing kho_restore_pages() with the
   current code, and then re-roll the clean up series to fix conflicts
   for next merge window.

3. Pull in the cleanups in hotfixes too, and then do a new revision of
   this patch on top.

I don't think the end result of option 2 is too horrible, so I think
that is probably the best option, but do let me know what you'd prefer.

[0] https://lore.kernel.org/linux-mm/2vxzpl7chw8d.fsf@kernel.org/
[1] https://lore.kernel.org/linux-mm/20260116112217.915803-1-pratyush@kernel.org/T/#u

>
> ------------------------------------------------------
> From: Ran Xiaokai <ran.xiaokai@zte.com.cn>
> Subject: kho: init alloc tags when restoring pages from reserved memory
> Date: Fri, 9 Jan 2026 10:42:51 +0000
>
> Memblock pages (including reserved memory) should have their allocation
> tags initialized to CODETAG_EMPTY via clear_page_tag_ref() before being
> released to the page allocator.  When kho restores pages through
> kho_restore_page(), missing this call causes mismatched
> allocation/deallocation tracking and below warning message:
>
> alloc_tag was not set
> WARNING: include/linux/alloc_tag.h:164 at ___free_pages+0xb8/0x260, CPU#1: swapper/0/1
> RIP: 0010:___free_pages+0xb8/0x260
>  kho_restore_vmalloc+0x187/0x2e0
>  kho_test_init+0x3c4/0xa30
>  do_one_initcall+0x62/0x2b0
>  kernel_init_freeable+0x25b/0x480
>  kernel_init+0x1a/0x1c0
>  ret_from_fork+0x2d1/0x360
>
> Add missing clear_page_tag_ref() annotation in kho_restore_page() to
> fix this.
>
> Link: https://lkml.kernel.org/r/20260113033403.161869-1-ranxiaokai627@163.com
> Link: https://lkml.kernel.org/r/20260109104251.157767-1-ranxiaokai627@163.com
> Fixes: fc33e4b44b27 ("kexec: enable KHO support for memory preservation")
> Signed-off-by: Ran Xiaokai <ran.xiaokai@zte.com.cn>
> Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
> Reviewed-by: Suren Baghdasaryan <surenb@google.com>
> Reviewed-by: Pasha Tatashin <pasha.tatashin@soleen.com>
> Cc: Alexander Graf <graf@amazon.com>
> Cc: Pratyush Yadav <pratyush@kernel.org>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
>  kernel/liveupdate/kexec_handover.c |    1 +
>  1 file changed, 1 insertion(+)
>
> --- a/kernel/liveupdate/kexec_handover.c~kho-init-alloc-tags-when-restoring-pages-from-reserved-memory
> +++ a/kernel/liveupdate/kexec_handover.c
> @@ -255,6 +255,7 @@ static struct page *kho_restore_page(phy
>  	if (is_folio && info.order)
>  		prep_compound_page(page, info.order);
>  
> +	clear_page_tag_ref(page);
>  	adjust_managed_page_count(page, nr_pages);
>  	return page;
>  }
> _
>
> Patches currently in -mm which might be from ran.xiaokai@zte.com.cn are
>
> alloc_tag-fix-rw-permission-issue-when-handling-boot-parameter.patch
>

-- 
Regards,
Pratyush Yadav

Re: [merged mm-hotfixes-stable] kho-init-alloc-tags-when-restoring-pages-from-reserved-memory.patch removed from -mm tree

[Andrew Morton]

On Tue, 20 Jan 2026 15:24:06 +0000 Pratyush Yadav <pratyush@kernel.org> wrote:

> > The quilt patch titled
> >      Subject: kho: init alloc tags when restoring pages from reserved memory
> > has been removed from the -mm tree.  Its filename was
> >      kho-init-alloc-tags-when-restoring-pages-from-reserved-memory.patch
> >
> > This patch was dropped because it was merged into the mm-hotfixes-stable branch
> > of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
> 
> This patch isn't quite complete. See [0]. It doesn't do anything wrong,
> it just doesn't fix the problem for every case.
> 
> I suggested a re-roll of this patch based on top of my cleanup patches
> [1], since I think with those the end result is a bit nicer.
> 
> I suppose we have 3 options:
> 
> 1. Take this patch in hotfixes and leave kho_restore_pages() path
>    unfixed. The fix the rest next merge window.
> 
> 2. Do a new version of this patch fixing kho_restore_pages() with the
>    current code, and then re-roll the clean up series to fix conflicts
>    for next merge window.
> 
> 3. Pull in the cleanups in hotfixes too, and then do a new revision of
>    this patch on top.
> 
> I don't think the end result of option 2 is too horrible, so I think
> that is probably the best option, but do let me know what you'd prefer.

No probs, I removed this patch from mm-hotfixes-stable and put it back
into mm-hotfixes-unstable, with a note that an updated version is expected.

Re: [merged mm-hotfixes-stable] kho-init-alloc-tags-when-restoring-pages-from-reserved-memory.patch removed from -mm tree

[Pratyush Yadav]

On Tue, Jan 20 2026, Andrew Morton wrote:

> On Tue, 20 Jan 2026 15:24:06 +0000 Pratyush Yadav <pratyush@kernel.org> wrote:
>
>> > The quilt patch titled
>> >      Subject: kho: init alloc tags when restoring pages from reserved memory
>> > has been removed from the -mm tree.  Its filename was
>> >      kho-init-alloc-tags-when-restoring-pages-from-reserved-memory.patch
>> >
>> > This patch was dropped because it was merged into the mm-hotfixes-stable branch
>> > of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
>> 
>> This patch isn't quite complete. See [0]. It doesn't do anything wrong,
>> it just doesn't fix the problem for every case.
>> 
>> I suggested a re-roll of this patch based on top of my cleanup patches
>> [1], since I think with those the end result is a bit nicer.
>> 
>> I suppose we have 3 options:
>> 
>> 1. Take this patch in hotfixes and leave kho_restore_pages() path
>>    unfixed. The fix the rest next merge window.
>> 
>> 2. Do a new version of this patch fixing kho_restore_pages() with the
>>    current code, and then re-roll the clean up series to fix conflicts
>>    for next merge window.
>> 
>> 3. Pull in the cleanups in hotfixes too, and then do a new revision of
>>    this patch on top.
>> 
>> I don't think the end result of option 2 is too horrible, so I think
>> that is probably the best option, but do let me know what you'd prefer.
>
> No probs, I removed this patch from mm-hotfixes-stable and put it back
> into mm-hotfixes-unstable, with a note that an updated version is expected.

Thanks.

Ran, would you be able to send a fixup soon? We are at -rc6 and it would
be great if this can land in 6.19. If not, then I can take it up.

-- 
Regards,
Pratyush Yadav

[merged mm-hotfixes-stable] kho-init-alloc-tags-when-restoring-pages-from-reserved-memory.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: kho: init alloc tags when restoring pages from reserved memory
has been removed from the -mm tree.  Its filename was
     kho-init-alloc-tags-when-restoring-pages-from-reserved-memory.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Ran Xiaokai <ran.xiaokai@zte.com.cn>
Subject: kho: init alloc tags when restoring pages from reserved memory
Date: Thu, 22 Jan 2026 13:27:40 +0000

Memblock pages (including reserved memory) should have their allocation
tags initialized to CODETAG_EMPTY via clear_page_tag_ref() before being
released to the page allocator.  When kho restores pages through
kho_restore_page(), missing this call causes mismatched
allocation/deallocation tracking and below warning message:

alloc_tag was not set
WARNING: include/linux/alloc_tag.h:164 at ___free_pages+0xb8/0x260, CPU#1: swapper/0/1
RIP: 0010:___free_pages+0xb8/0x260
 kho_restore_vmalloc+0x187/0x2e0
 kho_test_init+0x3c4/0xa30
 do_one_initcall+0x62/0x2b0
 kernel_init_freeable+0x25b/0x480
 kernel_init+0x1a/0x1c0
 ret_from_fork+0x2d1/0x360

Add missing clear_page_tag_ref() annotation in kho_restore_page() to
fix this.

Link: https://lkml.kernel.org/r/20260122132740.176468-1-ranxiaokai627@163.com
Fixes: fc33e4b44b27 ("kexec: enable KHO support for memory preservation")
Signed-off-by: Ran Xiaokai <ran.xiaokai@zte.com.cn>
Reviewed-by: Pratyush Yadav <pratyush@kernel.org>
Reviewed-by: Pasha Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Cc: Alexander Graf <graf@amazon.com>
Cc: Kent Overstreet <kent.overstreet@linux.dev>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/liveupdate/kexec_handover.c |    8 ++++++++
 1 file changed, 8 insertions(+)

--- a/kernel/liveupdate/kexec_handover.c~kho-init-alloc-tags-when-restoring-pages-from-reserved-memory
+++ a/kernel/liveupdate/kexec_handover.c
@@ -255,6 +255,14 @@ static struct page *kho_restore_page(phy
 	if (is_folio && info.order)
 		prep_compound_page(page, info.order);
 
+	/* Always mark headpage's codetag as empty to avoid accounting mismatch */
+	clear_page_tag_ref(page);
+	if (!is_folio) {
+		/* Also do that for the non-compound tail pages */
+		for (unsigned int i = 1; i < nr_pages; i++)
+			clear_page_tag_ref(page + i);
+	}
+
 	adjust_managed_page_count(page, nr_pages);
 	return page;
 }
_

Patches currently in -mm which might be from ran.xiaokai@zte.com.cn are

alloc_tag-fix-rw-permission-issue-when-handling-boot-parameter.patch