Merge tag 'slab-fixes-for-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab

torvalds · torvalds · commit 54fb58aec47a · 2023-10-19T10:53:31.000-07:00
Pull slab fix from Vlastimil Babka:

 - stable fix to prevent kernel warnings with KASAN_HW_TAGS on arm64
   due to improperly resolved kmalloc alignment restrictions (Catalin
   Marinas)

* tag 'slab-fixes-for-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab:
  mm: slab: Do not create kmalloc caches smaller than arch_slab_minalign()
diff --git a/mm/slab_common.c b/mm/slab_common.c
@@ -895,10 +895,13 @@ void __init setup_kmalloc_cache_index_table(void)
 
 static unsigned int __kmalloc_minalign(void)
 {
+	unsigned int minalign = dma_get_cache_alignment();
+
 	if (IS_ENABLED(CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC) &&
 	    is_swiotlb_allocated())
-		return ARCH_KMALLOC_MINALIGN;
-	return dma_get_cache_alignment();
+		minalign = ARCH_KMALLOC_MINALIGN;
+
+	return max(minalign, arch_slab_minalign());
 }
 
 void __init

Original file line number	Diff line number	Diff line change
`@@ -895,10 +895,13 @@ void __init setup_kmalloc_cache_index_table(void)`
`895`	`895`
`896`	`896`	`static unsigned int __kmalloc_minalign(void)`
`897`	`897`	`{`
	`898`	`+ unsigned int minalign = dma_get_cache_alignment();`
	`899`	`+`
`898`	`900`	`if (IS_ENABLED(CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC) &&`
`899`	`901`	`is_swiotlb_allocated())`
`900`		`- return ARCH_KMALLOC_MINALIGN;`
`901`		`- return dma_get_cache_alignment();`
	`902`	`+ minalign = ARCH_KMALLOC_MINALIGN;`
	`903`	`+`
	`904`	`+ return max(minalign, arch_slab_minalign());`
`902`	`905`	`}`
`903`	`906`
`904`	`907`	`void __init`