diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2020-01-09 15:02:48 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2020-01-09 15:02:48 +0000 |
| commit | dc727127f1b858b2db618a7df0fe609e91014c16 (patch) | |
| tree | 4dd85574a5f0e4e1d83bc61f498e19713769f4c2 /sys/kern/kern_malloc.c | |
| parent | c23df8eafae7df124ac3110d5e00bb7615173f11 (diff) | |
| download | src-dc727127f1b858b2db618a7df0fe609e91014c16.tar.gz src-dc727127f1b858b2db618a7df0fe609e91014c16.zip | |
Change malloc_domain() to return the allocation size to the caller.
Otherwise the malloc type accounting in malloc_domainset(9) is wrong
after r355203.
Reviewed by: rlibby
Reported by: kaktus
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D23095
Notes
Notes:
svn path=/head/; revision=356555
Diffstat (limited to 'sys/kern/kern_malloc.c')
| -rw-r--r-- | sys/kern/kern_malloc.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index eba9fc3e1ef1..cf98ca8c2ff7 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -652,13 +652,15 @@ void * } static void * -malloc_domain(size_t size, int *indxp, struct malloc_type *mtp, int domain, +malloc_domain(size_t *sizep, int *indxp, struct malloc_type *mtp, int domain, int flags) { - int indx; - caddr_t va; uma_zone_t zone; + caddr_t va; + size_t size; + int indx; + size = *sizep; KASSERT(size <= kmem_zmax && (flags & M_EXEC) == 0, ("malloc_domain: Called with bad flag / size combination.")); if (size & KMEM_ZMASK) @@ -670,10 +672,9 @@ malloc_domain(size_t size, int *indxp, struct malloc_type *mtp, int domain, #endif va = uma_zalloc_domain(zone, NULL, domain, flags); if (va != NULL) - size = zone->uz_size; + *sizep = zone->uz_size; *indxp = indx; - - return ((void *) va); + return ((void *)va); } void * @@ -696,7 +697,7 @@ malloc_domainset(size_t size, struct malloc_type *mtp, struct domainset *ds, if (size <= kmem_zmax && (flags & M_EXEC) == 0) { vm_domainset_iter_policy_init(&di, ds, &domain, &flags); do { - ret = malloc_domain(size, &indx, mtp, domain, flags); + ret = malloc_domain(&size, &indx, mtp, domain, flags); } while (ret == NULL && vm_domainset_iter_policy(&di, &domain) == 0); malloc_type_zone_allocated(mtp, ret == NULL ? 0 : size, indx); |