Merge tag 'kmalloc_obj-treewide-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull kmalloc_obj conversion from Kees Cook:
 "This does the tree-wide conversion to kmalloc_obj() and friends using
  coccinelle, with a subsequent small manual cleanup of whitespace
  alignment that coccinelle does not handle.

  This uncovered a clang bug in __builtin_counted_by_ref(), so the
  conversion is preceded by disabling that for current versions of
  clang.  The imminent clang 22.1 release has the fix.

  I've done allmodconfig build tests for x86_64, arm64, i386, and arm. I
  did defconfig builds for alpha, m68k, mips, parisc, powerpc, riscv,
  s390, sparc, sh, arc, csky, xtensa, hexagon, and openrisc"

* tag 'kmalloc_obj-treewide-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  kmalloc_obj: Clean up after treewide replacements
  treewide: Replace kmalloc with kmalloc_obj for non-scalar types
  compiler_types: Disable __builtin_counted_by_ref for Clang

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c
index b495d5291868..323dba59fce8 100644
--- a/drivers/resctrl/mpam_devices.c
+++ b/drivers/resctrl/mpam_devices.c
@@ -295,7 +295,7 @@ mpam_class_alloc(u8 level_idx, enum mpam_class_types type)
 
 	lockdep_assert_held(&mpam_list_lock);
 
-	class = kzalloc(sizeof(*class), GFP_KERNEL);
+	class = kzalloc_obj(*class, GFP_KERNEL);
 	if (!class)
 		return ERR_PTR(-ENOMEM);
 	init_garbage(&class->garbage);
@@ -343,7 +343,7 @@ mpam_component_alloc(struct mpam_class *class, int id)
 
 	lockdep_assert_held(&mpam_list_lock);
 
-	comp = kzalloc(sizeof(*comp), GFP_KERNEL);
+	comp = kzalloc_obj(*comp, GFP_KERNEL);
 	if (!comp)
 		return ERR_PTR(-ENOMEM);
 	init_garbage(&comp->garbage);
@@ -398,7 +398,7 @@ mpam_vmsc_alloc(struct mpam_component *comp, struct mpam_msc *msc)
 
 	lockdep_assert_held(&mpam_list_lock);
 
-	vmsc = kzalloc(sizeof(*vmsc), GFP_KERNEL);
+	vmsc = kzalloc_obj(*vmsc, GFP_KERNEL);
 	if (!vmsc)
 		return ERR_PTR(-ENOMEM);
 	init_garbage(&vmsc->garbage);
@@ -2419,7 +2419,7 @@ static int __allocate_component_cfg(struct mpam_component *comp)
 	if (comp->cfg)
 		return 0;
 
-	comp->cfg = kcalloc(mpam_partid_max + 1, sizeof(*comp->cfg), GFP_KERNEL);
+	comp->cfg = kzalloc_objs(*comp->cfg, mpam_partid_max + 1, GFP_KERNEL);
 	if (!comp->cfg)
 		return -ENOMEM;
 
@@ -2444,9 +2444,9 @@ static int __allocate_component_cfg(struct mpam_component *comp)
 			if (!ris->props.num_mbwu_mon)
 				continue;
 
-			mbwu_state = kcalloc(ris->props.num_mbwu_mon,
-					     sizeof(*ris->mbwu_state),
-					     GFP_KERNEL);
+			mbwu_state = kzalloc_objs(*ris->mbwu_state,
+						  ris->props.num_mbwu_mon,
+						  GFP_KERNEL);
 			if (!mbwu_state) {
 				__destroy_component_cfg(comp);
 				return -ENOMEM;