From: Mike Rapoport <rppt@kernel•org>
To: Mark Brown <broonie@kernel•org>
Cc: "Gowans, James" <jgowans@amazon•com>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"jbeulich@suse•com" <jbeulich@suse•com>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the memblock tree with the origin tree
Date: Mon, 24 Jun 2024 08:53:27 +0300 [thread overview]
Message-ID: <ZnkJ1zj0NTR3dYwo@kernel.org> (raw)
In-Reply-To: <cf013a59-a297-4685-94ac-87566023aa5d@sirena.org.uk>
Hi,
On Fri, Jun 21, 2024 at 09:30:51PM +0100, Mark Brown wrote:
> On Fri, Jun 21, 2024 at 08:08:53PM +0000, Gowans, James wrote:
> > On Thu, 2024-06-20 at 19:00 +0100, Mark Brown wrote:
>
> > > Yes, the merge in -next is wrong.
>
> > What's the next step to fix the incorrect merge commit?
> > Looking at today's -next I see the same issue:
> > https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/mm/memblock.c?h=next-20240621&id=f689ee4c062317a0831fbffeeb30d7816608b2e7
>
> It's remembered by rerere, hopefully I'll convince rerere to forget it
> on Monday.
Just in case this is the resolution for merge conflict
diff --cc mm/memblock.c
index e81fb68f7f88,692dc551c0fd..000000000000
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@@ -1441,6 -1446,20 +1439,17 @@@ phys_addr_t __init memblock_alloc_range
enum memblock_flags flags = choose_memblock_flags();
phys_addr_t found;
- if (WARN_ONCE(nid == MAX_NUMNODES, "Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n"))
- nid = NUMA_NO_NODE;
-
+ /*
+ * Detect any accidental use of these APIs after slab is ready, as at
+ * this moment memblock may be deinitialized already and its
+ * internal data may be destroyed (after execution of memblock_free_all)
+ */
+ if (WARN_ON_ONCE(slab_is_available())) {
+ void *vaddr = kzalloc_node(size, GFP_NOWAIT, nid);
+
+ return vaddr ? virt_to_phys(vaddr) : 0;
+ }
+
if (!align) {
/* Can't use WARNs this early in boot on powerpc */
dump_stack();
--
Sincerely yours,
Mike.
prev parent reply other threads:[~2024-06-24 5:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 15:54 linux-next: manual merge of the memblock tree with the origin tree Mark Brown
2024-06-20 16:07 ` Gowans, James
2024-06-20 16:13 ` Mark Brown
2024-06-20 17:59 ` Gowans, James
2024-06-20 18:00 ` Mark Brown
2024-06-21 20:08 ` Gowans, James
2024-06-21 20:30 ` Mark Brown
2024-06-24 5:53 ` Mike Rapoport [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZnkJ1zj0NTR3dYwo@kernel.org \
--to=rppt@kernel$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=jbeulich@suse$(echo .)com \
--cc=jgowans@amazon$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox