From 3a2c4d55e32ad65efebdb6de44eef3bfa08bb49d Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Wed, 2 Sep 2026 15:31:14 -0700 Subject: treewide: refresh kmalloc_obj() conversions This is another run of the Coccinelle script for converting kmalloc() family of allocations to kmalloc_obj() via the existing rules in scripts/coccinelle/api/kmalloc_objs.cocci This catches both the set of kmalloc() uses added since the first kmalloc_obj() conversions in v7.0 and adds a large group missed in the first pass due to Coccinelle not interacting well with the cleanup.h scoped_...() family of macros[1]. I worked around this with spatch's "--macro-file" argument to a file with all the scoped_...() macros mapped to Coccinelle's YACFE_ITERATOR[2] as that was the closest viable control flow indicator I could find. Build tested allmodconfig on x86, arm64, arm, loongarch, mips, powerpc, riscv, and s390 with no new warnings. Link: https://lore.kernel.org/lkml/202609021314.8A9C0B8@keescook/ [1] Link: https://github.com/coccinelle/coccinelle/blob/master/standard.h [2] Signed-off-by: Kees Cook --- arch/m68k/amiga/chipram.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 arch/m68k/amiga/chipram.c (limited to 'arch/m68k/amiga/chipram.c') diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c new file mode 100644 index 000000000..19a7bfefb --- /dev/null +++ b/arch/m68k/amiga/chipram.c @@ -0,0 +1,124 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +** linux/amiga/chipram.c +** +** Modified 03-May-94 by Geert Uytterhoeven +** - 64-bit aligned allocations for full AGA compatibility +** +** Rewritten 15/9/2000 by Geert to use resource management +*/ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +unsigned long amiga_chip_size; +EXPORT_SYMBOL(amiga_chip_size); + +static struct resource chipram_res = { + .name = "Chip RAM", .start = CHIP_PHYSADDR +}; +static atomic_t chipavail; + + +void __init amiga_chip_init(void) +{ + if (!AMIGAHW_PRESENT(CHIP_RAM)) + return; + + chipram_res.end = CHIP_PHYSADDR + amiga_chip_size - 1; + request_resource(&iomem_resource, &chipram_res); + + atomic_set(&chipavail, amiga_chip_size); +} + + +void *amiga_chip_alloc(unsigned long size, const char *name) +{ + struct resource *res; + void *p; + + res = kzalloc_obj(struct resource); + if (!res) + return NULL; + + res->name = name; + p = amiga_chip_alloc_res(size, res); + if (!p) { + kfree(res); + return NULL; + } + + return p; +} +EXPORT_SYMBOL(amiga_chip_alloc); + + + /* + * Warning: + * amiga_chip_alloc_res is meant only for drivers that need to + * allocate Chip RAM before kmalloc() is functional. As a consequence, + * those drivers must not free that Chip RAM afterwards. + */ + +void *amiga_chip_alloc_res(unsigned long size, struct resource *res) +{ + int error; + + /* round up */ + size = PAGE_ALIGN(size); + + pr_debug("amiga_chip_alloc_res: allocate %lu bytes\n", size); + error = allocate_resource(&chipram_res, res, size, 0, UINT_MAX, + PAGE_SIZE, NULL, NULL); + if (error < 0) { + pr_err("amiga_chip_alloc_res: allocate_resource() failed %d!\n", + error); + return NULL; + } + + atomic_sub(size, &chipavail); + pr_debug("amiga_chip_alloc_res: returning %pR\n", res); + return ZTWO_VADDR(res->start); +} + +void amiga_chip_free(void *ptr) +{ + unsigned long start = ZTWO_PADDR(ptr); + struct resource *res; + unsigned long size; + + res = lookup_resource(&chipram_res, start); + if (!res) { + pr_err("amiga_chip_free: trying to free nonexistent region at " + "%p\n", ptr); + return; + } + + size = resource_size(res); + pr_debug("amiga_chip_free: free %lu bytes at %p\n", size, ptr); + atomic_add(size, &chipavail); + release_resource(res); + kfree(res); +} +EXPORT_SYMBOL(amiga_chip_free); + + +unsigned long amiga_chip_avail(void) +{ + unsigned long n = atomic_read(&chipavail); + + pr_debug("amiga_chip_avail : %lu bytes\n", n); + return n; +} +EXPORT_SYMBOL(amiga_chip_avail); + -- cgit v1.3.1