From nobody Fri Apr 18 14:36:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZfHQT28lQz5stVx; Fri, 18 Apr 2025 14:36:49 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZfHQT1Pbjz3JwX; Fri, 18 Apr 2025 14:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744987009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ez1abwJ+N61cT8a5Jy5M9wL1CaSU9M1WI3/Mc06A8yw=; b=Fk+1920jYLoUvtS+LUgyggmFzRNEIt/fL+OL+imcrG7CoU8oU8/M+PsSBV7wP1syoNOqE7 YJVDL75Mg9FpCB7yDNa66M0/QFVv/gnXeaSgSIXzGwVe44pH9o1lkUhxFiJTlVSNJ648HQ FOFEBNft35XxUTiFrZlv1Fh3rueMEX5kRQT8PSxmmPkRgW0j3fd8enGnNYroi6QYLdri8C uUoE/aKlIXfNETnbnqTTaVPjhJKxRGSWOi3CaznkCwHAShUgQNXcaOG5BFcrzq8jX3yxNa ZBVs48WjuoK7NzK9w8FNvhVjsraEUIkBVuhxwtFfPBVe7yoydim2IDVPiuw+9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744987009; a=rsa-sha256; cv=none; b=L4605/eZZ6lALAb3yQJcU+zft8WV3P7kejwdjiY2OfmVRJvp1LqyBX1MOdNdUWZP0E2Ccw J5lTdKo2Mt6INkWSj2SN+S6N+2f/MpDzZm2Fl/2Jq8YWqD75bkYU6ubE/+X4+2PLQ3pOXO Vss2lozM8XiO9rwSkxqOFBXeND8djPJ1jfVoReJ73WN4HXQkuO7X1U2wrqUF8o6m9z1tz/ 1nIm9O+EZ4Et5AUk6jvTqI3mbkz78Y4m/50jU7UUWs+jmmLdfbKrfqWPopGRz4tJp/lMh7 f2StAdr0QQ5lw54DpSS2j01PPi0qnLpzPkfcmh0eP+DK/+Xf9mlVe3C4kaLr8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744987009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ez1abwJ+N61cT8a5Jy5M9wL1CaSU9M1WI3/Mc06A8yw=; b=o2rnfaPzuM8UiwEHWE+JC97urUFSGZG0ZaARbnsKzZnnbTqHg2Lz7U17ktpItVlKMmFXQc 8BMd/hbQbRXx+9951TtN004hbTZx1HKXBH/LdETBAmcd1MXWXRFHVfcCFENlMR5PpObJBr sMtD4XqKzniTGHlgQEcwRpsRF7Aeha0FLTn0qxIUrf4b1DDGNl2MACnzlitS6pa0r/N2/d PmoAB55Yx2OXe5ZL6t4MWoe/zreXrTuR8QukKY21LUud0aV2pXuXcXP0ojNdnkQEtLlVM2 fcrpKBB3DfBaPo7xQhR2gfOGoFLkmD+MEvhGV+mP7GCPW9+yNXbVA4DbJBHizg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZfHQT0S4gzdt7; Fri, 18 Apr 2025 14:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53IEamws090990; Fri, 18 Apr 2025 14:36:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53IEamAI090987; Fri, 18 Apr 2025 14:36:48 GMT (envelope-from git) Date: Fri, 18 Apr 2025 14:36:48 GMT Message-Id: <202504181436.53IEamAI090987@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 580c891f5add - stable/14 - malloc: extend malloc_usable_size() for contigmalloc List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 580c891f5addc9055f41933c72caae14e352ba4c Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=580c891f5addc9055f41933c72caae14e352ba4c commit 580c891f5addc9055f41933c72caae14e352ba4c Author: Bjoern A. Zeeb AuthorDate: 2025-04-12 17:11:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-18 14:35:56 +0000 malloc: extend malloc_usable_size() for contigmalloc Extend malloc_usable_size() for contigmalloc; it seems the only outside consumer is LinuxKPI ksize() which by itself has little to no consumer either. Sponsored by: The FreeBSD Foundation Suggested by: jhb (see D46657) Reviewed by: jhb, markj Fixes: 9e6544dd6e02 Differential Revision: https://reviews.freebsd.org/D49571 (cherry picked from commit c5cf4b64f4a976f5c5d75d52816078def86bf3e4) --- sys/kern/kern_malloc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index f31fc2a76a07..94583288430b 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1162,6 +1162,9 @@ malloc_usable_size(const void *addr) case SLAB_COOKIE_MALLOC_LARGE: size = malloc_large_size(slab); break; + case SLAB_COOKIE_CONTIG_MALLOC: + size = round_page(contigmalloc_size(slab)); + break; default: __assert_unreachable(); size = 0;