From owner-svn-src-all@freebsd.org Thu Jan 9 15:02:49 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8134D1F093B; Thu, 9 Jan 2020 15:02:49 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47tq9P2sX8z4G4X; Thu, 9 Jan 2020 15:02:49 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5D9222AA4; Thu, 9 Jan 2020 15:02:49 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 009F2nwb056284; Thu, 9 Jan 2020 15:02:49 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 009F2nLC056283; Thu, 9 Jan 2020 15:02:49 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202001091502.009F2nLC056283@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 9 Jan 2020 15:02:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356555 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 356555 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jan 2020 15:02:49 -0000 Author: markj Date: Thu Jan 9 15:02:48 2020 New Revision: 356555 URL: https://svnweb.freebsd.org/changeset/base/356555 Log: 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 Modified: head/sys/kern/kern_malloc.c Modified: head/sys/kern/kern_malloc.c ============================================================================== --- head/sys/kern/kern_malloc.c Thu Jan 9 14:58:41 2020 (r356554) +++ head/sys/kern/kern_malloc.c Thu Jan 9 15:02:48 2020 (r356555) @@ -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_t #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, 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);