From nobody Sat Apr 12 20:49:40 2025 X-Original-To: dev-commits-src-all@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 4ZZlzS6TX2z5sffM; Sat, 12 Apr 2025 20:49:40 +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 4ZZlzS58QZz454W; Sat, 12 Apr 2025 20:49:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744490980; 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=MoD2896I2R4bjQ0lCytJOraOh2gvoj+j7AbBl+u7ylI=; b=YF953DBDDHRrURx+tNx+UfOHCkZfObV6wloLcTEZ2/eEbnvDdt7n6vibxW1qpkbpisYAg4 wVTk/nglb+0cAUGchgTrUH64hL8KXt8VcNmpHkQb8ITAMd9MrUPXbWFfb0xNPShzXHpZf+ rgkBemyoJ5+62Y1Wzrw6bp+WsIAyoIECqGE7XsLncf1TyELRJg4ZevIv18Ilu7UchWs5qJ 4LPMNy5N3kX5XPLLooe07xvwpfXclp43ID1UapuCxsCee25FMjQft0l48ccCfIqQjNMmep oc0KyaQMULeS926k+g3urQo78FX93T6HGIIRwiQJ1tK2Zd1m3Ew6f+bOYbTBHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744490980; a=rsa-sha256; cv=none; b=Dno2LUsoq7PslHQ59O411gYOSwg/+XEceHIz/uuqTHF1G/6Pioithjofuy3TRsjkk7pPwX l97uQEY6FztrZRK1tTKRrQcSLy2pr9e46fuVC+j/ttYNrsZaP+O48QgYLj6Ztdu6BQkNsU YSqQHiDZIJzkOqmqrIl6BXy3daCHWQLoNAuADOl01IlYnqIzQu/s1hKrNwcq+Gr9oGeo59 EVN47X7uLQbywDk62dMxXujbK+mWF3lbKFtzd8rHZ5YqDBCeW7aM4+ZYYuv/Qv1snwr+Mj r1dX1BXvpsIX+QGtfVDgLmD/uFdaks2UApa5UW9mFIf33+Hq3vBwcf7mmYX2aA== 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=1744490980; 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=MoD2896I2R4bjQ0lCytJOraOh2gvoj+j7AbBl+u7ylI=; b=RUNJyykw7nNCnfQKNH/PSk9cio9NLK4Ld4h0LrJqn8qjsfgeixioEWGRzgRk92HxgAtfib KTR+ZNG0Uva/ho/0GfQk1k3EN5+eUrrKd/WREOa3E9G578WpclhIjpNI4nHVwCnck8c85A N9Xwq7XP5h0NOTYcULMiIZtUpCMMwNposhhf5Cw5vrybj3bI0UuK1zB1WUZuLhK4Gdn0vN dh0brUYO93OUmufuW3VBuGvXBGZkrTFGTYKhVgKxNFPQYtpPfca7ij6cCl/jJB8wQaE88k iyt1tw1ay6hBtNoMkVV7ufh5AC+tvx20uYyECKw4cKMNOcDvlwr8U84HWiH83g== 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 4ZZlzS4lw7zYwB; Sat, 12 Apr 2025 20:49:40 +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 53CKne6C094647; Sat, 12 Apr 2025 20:49:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53CKne5e094644; Sat, 12 Apr 2025 20:49:40 GMT (envelope-from git) Date: Sat, 12 Apr 2025 20:49:40 GMT Message-Id: <202504122049.53CKne5e094644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c5cf4b64f4a9 - main - malloc: extend malloc_usable_size() for contigmalloc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: c5cf4b64f4a976f5c5d75d52816078def86bf3e4 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c5cf4b64f4a976f5c5d75d52816078def86bf3e4 commit c5cf4b64f4a976f5c5d75d52816078def86bf3e4 Author: Bjoern A. Zeeb AuthorDate: 2025-04-12 17:11:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-12 20:49:19 +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 MFC after: 3 days Suggested by: jhb (see D46657) Reviewed by: jhb, markj Fixes: 9e6544dd6e02 Differential Revision: https://reviews.freebsd.org/D49571 --- 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 0b76e633b04a..879220be050b 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1142,6 +1142,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;