Hey Bjoern, For some reason this commit breaks booting on two of my Dell laptops. I'm unsure why. Reverting this particular commit makes them happy again.
Thanks, -- Shawn Webb Cofounder / Security Engineer HardenedBSD Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50 https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc On Fri, Jul 26, 2024 at 10:48:23AM +0000, Bjoern A. Zeeb wrote: > The branch main has been updated by bz: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=4fab5f005482aa88bc0f7d7a0a5e81b436869112 > > commit 4fab5f005482aa88bc0f7d7a0a5e81b436869112 > Author: Bjoern A. Zeeb <[email protected]> > AuthorDate: 2024-07-24 15:56:32 +0000 > Commit: Bjoern A. Zeeb <[email protected]> > CommitDate: 2024-07-26 10:46:37 +0000 > > kern_malloc: fold free and zfree together into one __always_inline func > > free() and zfree() are essentially the same copy and pasted code with > the extra explicit_bzero() (and formerly kasan) calls. Add a bool to add > the extra functionality and make both functions a wrapper around the > common > code and let the compiler do the optimization based on the bool input > when inlining. > > No functional changes intended. > > Suggested by: kib (in D45812) > Sponsored by: The FreeBSD Foundation > MFC after: 10 days > Reviewed by: kib, markj > Differential Revision: https://reviews.freebsd.org/D46101 > --- > sys/kern/kern_malloc.c | 90 > +++++++++++++++----------------------------------- > 1 file changed, 27 insertions(+), 63 deletions(-) > > diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c > index 37684e26b451..ebdd00808f22 100644 > --- a/sys/kern/kern_malloc.c > +++ b/sys/kern/kern_malloc.c > @@ -914,15 +914,8 @@ free_dbg(void **addrp, struct malloc_type *mtp) > } > #endif > > -/* > - * free: > - * > - * Free a block of memory allocated by malloc. > - * > - * This routine may not block. > - */ > -void > -free(void *addr, struct malloc_type *mtp) > +static __always_inline void > +_free(void *addr, struct malloc_type *mtp, bool dozero) > { > uma_zone_t zone; > uma_slab_t slab; > @@ -938,8 +931,8 @@ free(void *addr, struct malloc_type *mtp) > > vtozoneslab((vm_offset_t)addr & (~UMA_SLAB_MASK), &zone, &slab); > if (slab == NULL) > - panic("free: address %p(%p) has not been allocated", > - addr, (void *)((u_long)addr & (~UMA_SLAB_MASK))); > + panic("%s(%d): address %p(%p) has not been allocated", __func__, > + dozero, addr, (void *)((uintptr_t)addr & (~UMA_SLAB_MASK))); > > switch (GET_SLAB_COOKIE(slab)) { > case __predict_true(SLAB_COOKIE_SLAB_PTR): > @@ -947,79 +940,50 @@ free(void *addr, struct malloc_type *mtp) > #if defined(INVARIANTS) && !defined(KASAN) > free_save_type(addr, mtp, size); > #endif > + if (dozero) > + explicit_bzero(addr, size); > uma_zfree_arg(zone, addr, slab); > break; > case SLAB_COOKIE_MALLOC_LARGE: > size = malloc_large_size(slab); > + if (dozero) > + explicit_bzero(addr, size); > free_large(addr, size); > break; > case SLAB_COOKIE_CONTIG_MALLOC: > - size = contigmalloc_size(slab); > + size = round_page(contigmalloc_size(slab)); > + if (dozero) > + explicit_bzero(addr, size); > kmem_free(addr, size); > - size = round_page(size); > break; > default: > - panic("%s: addr %p slab %p with unknown cookie %d", __func__, > - addr, slab, GET_SLAB_COOKIE(slab)); > + panic("%s(%d): addr %p slab %p with unknown cookie %d", > + __func__, dozero, addr, slab, GET_SLAB_COOKIE(slab)); > /* NOTREACHED */ > } > malloc_type_freed(mtp, size); > } > > /* > - * zfree: > - * > - * Zero then free a block of memory allocated by malloc. > - * > + * free: > + * Free a block of memory allocated by malloc/contigmalloc. > * This routine may not block. > */ > void > -zfree(void *addr, struct malloc_type *mtp) > +free(void *addr, struct malloc_type *mtp) > { > - uma_zone_t zone; > - uma_slab_t slab; > - u_long size; > - > -#ifdef MALLOC_DEBUG > - if (free_dbg(&addr, mtp) != 0) > - return; > -#endif > - /* free(NULL, ...) does nothing */ > - if (addr == NULL) > - return; > - > - vtozoneslab((vm_offset_t)addr & (~UMA_SLAB_MASK), &zone, &slab); > - if (slab == NULL) > - panic("free: address %p(%p) has not been allocated", > - addr, (void *)((u_long)addr & (~UMA_SLAB_MASK))); > + _free(addr, mtp, false); > +} > > - switch (GET_SLAB_COOKIE(slab)) { > - case __predict_true(SLAB_COOKIE_SLAB_PTR): > - size = zone->uz_size; > -#if defined(INVARIANTS) && !defined(KASAN) > - free_save_type(addr, mtp, size); > -#endif > - kasan_mark(addr, size, size, 0); > - explicit_bzero(addr, size); > - uma_zfree_arg(zone, addr, slab); > - break; > - case SLAB_COOKIE_MALLOC_LARGE: > - size = malloc_large_size(slab); > - kasan_mark(addr, size, size, 0); > - explicit_bzero(addr, size); > - free_large(addr, size); > - break; > - case SLAB_COOKIE_CONTIG_MALLOC: > - size = round_page(contigmalloc_size(slab)); > - explicit_bzero(addr, size); > - kmem_free(addr, size); > - break; > - default: > - panic("%s: addr %p slab %p with unknown cookie %d", __func__, > - addr, slab, GET_SLAB_COOKIE(slab)); > - /* NOTREACHED */ > - } > - malloc_type_freed(mtp, size); > +/* > + * zfree: > + * Zero then free a block of memory allocated by malloc/contigmalloc. > + * This routine may not block. > + */ > +void > +zfree(void *addr, struct malloc_type *mtp) > +{ > + _free(addr, mtp, true); > } > > /* >
signature.asc
Description: PGP signature
