From: Andrew Morton <akpm@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kent Overstreet <kent.overstreet@linux.dev>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Vitaly Wool <vitaly.wool@konsulko.se>
Subject: Re: linux-next: manual merge of the bcachefs tree with the mm-unstable tree
Date: Mon, 18 Aug 2025 19:29:41 -0700 [thread overview]
Message-ID: <20250818192941.94fa175267dd4e334ca529ad@linux-foundation.org> (raw)
In-Reply-To: <20250819111228.6c6209eb@canb.auug.org.au>
On Tue, 19 Aug 2025 11:12:28 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the bcachefs tree got a conflict in:
>
> fs/bcachefs/darray.c
>
> between commit:
>
> 97b75b7e275a ("mm/slub: allow to set node and align in k[v]realloc")
>
> from the mm-unstable tree and commit:
>
> 808708fe9da0 ("bcachefs: darray_make_room_rcu()")
>
> from the bcachefs tree.
>
> ...
>
> --- a/fs/bcachefs/darray.c
> +++ b/fs/bcachefs/darray.c
> @@@ -20,10 -22,11 +22,11 @@@ int __bch2_darray_resize_noprof(darray_
> if (unlikely(check_mul_overflow(new_size, element_size, &bytes)))
> return -ENOMEM;
>
> - void *data = likely(bytes < INT_MAX)
> + void *old = d->data;
> + void *new = likely(bytes < INT_MAX)
> - ? kvmalloc_noprof(bytes, gfp)
> + ? kvmalloc_node_align_noprof(bytes, 1, gfp, NUMA_NO_NODE)
> : vmalloc_noprof(bytes);
> - if (!data)
> + if (!new)
> return -ENOMEM;
uh, OK, I guess a 2GB allocation is reasonable on a 16TB machine.
But why does bcachefs find it necessary to bypass allocation profiling?
next prev parent reply other threads:[~2025-08-19 2:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-19 1:12 linux-next: manual merge of the bcachefs tree with the mm-unstable tree Stephen Rothwell
2025-08-19 2:29 ` Andrew Morton [this message]
2025-08-19 2:36 ` Kent Overstreet
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=20250818192941.94fa175267dd4e334ca529ad@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=kent.overstreet@linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=vitaly.wool@konsulko.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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