* linux-next: manual merge of the slab tree with the slab-fixes tree
@ 2026-01-21 16:11 Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2026-01-21 16:11 UTC (permalink / raw)
To: Vlastimil Babka
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Swaraj Gaikwad
[-- Attachment #1: Type: text/plain, Size: 1488 bytes --]
Hi all,
Today's linux-next merge of the slab tree got a conflict in:
mm/slub.c
between commit:
99a3e3a1cfc93 ("slab: fix kmalloc_nolock() context check for PREEMPT_RT")
from the slab-fixes tree and commit:
da6ed0180825d ("slab: simplify kmalloc_nolock()")
a4ae75d1b6a24 ("slab: fix kmalloc_nolock() context check for PREEMPT_RT")
from the slab tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc mm/slub.c
index c58e664bb312a,331d274ba0a8c..0000000000000
--- a/mm/slub.c
+++ b/mm/slub.c
@@@ -5694,13 -5166,13 +5166,13 @@@ void *kmalloc_nolock_noprof(size_t size
if (unlikely(!size))
return ZERO_SIZE_PTR;
+ /*
+ * See the comment for the same check in
+ * alloc_frozen_pages_nolock_noprof()
+ */
- if (IS_ENABLED(CONFIG_PREEMPT_RT) && (in_nmi() || in_hardirq()))
+ if (IS_ENABLED(CONFIG_PREEMPT_RT) && !preemptible())
- /*
- * kmalloc_nolock() in PREEMPT_RT is not supported from
- * non-preemptible context because local_lock becomes a
- * sleeping lock on RT.
- */
return NULL;
retry:
if (unlikely(size > KMALLOC_MAX_CACHE_SIZE))
return NULL;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the slab tree with the slab-fixes tree
@ 2026-02-05 13:55 Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2026-02-05 13:55 UTC (permalink / raw)
To: Vlastimil Babka
Cc: Hao Ge, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1370 bytes --]
Hi all,
Today's linux-next merge of the slab tree got a conflict in:
mm/slub.c
between commit:
3a38d13f90d4e ("mm/slab: Add alloc_tagging_slab_free_hook for memcg_alloc_abort_single")
from the slab-fixes tree and commit:
bdc9282f78096 ("slab: remove the do_slab_free() fastpath")
from the slab tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc mm/slub.c
index f9d1f6b69305c,102fb47ae0133..0000000000000
--- a/mm/slub.c
+++ b/mm/slub.c
@@@ -6689,12 -6094,8 +6094,12 @@@ void slab_free(struct kmem_cache *s, st
static noinline
void memcg_alloc_abort_single(struct kmem_cache *s, void *object)
{
+ struct slab *slab = virt_to_slab(object);
+
+ alloc_tagging_slab_free_hook(s, slab, &object, 1);
+
if (likely(slab_free_hook(s, object, slab_want_init_on_free(s), false)))
- do_slab_free(s, slab, object, object, 1, _RET_IP_);
- __slab_free(s, virt_to_slab(object), object, object, 1, _RET_IP_);
++ __slab_free(s, slab, object, object, 1, _RET_IP_);
}
#endif
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-02-05 13:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-21 16:11 linux-next: manual merge of the slab tree with the slab-fixes tree Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2026-02-05 13:55 Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox