From nobody Thu Feb 27 14:17:17 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 4Z3YM13j3dz5qGFn; Thu, 27 Feb 2025 14:17:17 +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 4Z3YM13GGDz3xHK; Thu, 27 Feb 2025 14:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665837; 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=V7juZ/A3c+p6WOOdjFpKMdzsnMZi/TqV2ju86j3Y/6k=; b=LdQzuVDMWCRmy/4mqOJGdcZoZLS577VQQfaauqNH8/FeUWgn6TOl9X0bSbOcJ1MqPIyGye cQBHojUTGIca51/dSwy4GHZQIfLxSVEfg+7k+oH28rczSlsSX7UvX1oc5SeXceSbqzszVF LGCj3b7TZuYQ4pfMZPtgqedfTYSBCtdWxD+9IuiWFJpE1kalvYghvW+sTgedIxhsIT/m+H Ba4LBcI7G9Ra5MXEFN8fThLFMcBIaEZC46tU6h1O2TK2wo6vbRWge+KHjPFP0G3z3uo61W QQpo1LDisl3IF7l2UH7zQtRWz/4o4opdhdd2zJ5dEPjr+8EsnUxcnfNnE/ue9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740665837; a=rsa-sha256; cv=none; b=rLCCNSqn39FvHgQuCxFh7AeHXeXtac3vqZ7M1ifNSO3d5Bs2fsx2DKlLI4xgj1Y145fRmk aY9/PSsTuhi7pj+ZBNCI1Fb578FT3Vxd8t0YRV+aZIL1U9vILkeDKmMqaWIBuDTTd7zCqM HdqDhHzwR9DByr7JknaVVr/Yvwd9PS0f87xCNppmOYaE6r6bfDWy6j30pPUlZxV3hbawAe owT+iAuLT5MaENuXEMjmXCWJg6E65QxoBTtrTvP5StrwcbpSr8g/hVMxynpPeSgWKItecd oJcl3GomFhduOcCHDN1Y3hJPItIcCYMoyqpijuzrRAVWsI8S1ns+SXDD3p6t2g== 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=1740665837; 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=V7juZ/A3c+p6WOOdjFpKMdzsnMZi/TqV2ju86j3Y/6k=; b=px6dQLlUWjrhdy3rFU1nj8xVLvMIE+ToNuXqywUsl8iUyDPP8mfeD3rDN73iUJdmI2FXkz HRRWu5fgnb4sS/FxDe879upZzhZv77DOD5hkwy9AY3IWECAhBvGenlAi08l6QpPDV0YHU5 EeKD4SOGUIdMUyu9OzvqnplhPhd9YbdTVNwh31cAfcKsA/Z7s1UawVQbxh5D5dPv5fQKDM QQSCFDGyanXmzn07++Tal7HrGSs7fxKMas51lz/tjHraLhnEeWu2KpJWHleUI1xxVLx5+0 hZVDNOOhaZb8JLKcVt3TgNAVzQl7Ogur3qNNbUvBM7rqdeExhwq0CR+pIKM25g== 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 4Z3YM12q5tzm7Q; Thu, 27 Feb 2025 14:17:17 +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 51REHHle017082; Thu, 27 Feb 2025 14:17:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51REHHGE017079; Thu, 27 Feb 2025 14:17:17 GMT (envelope-from git) Date: Thu, 27 Feb 2025 14:17:17 GMT Message-Id: <202502271417.51REHHGE017079@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: f3a90481145e - stable/14 - rman: Add rman_get/set_type 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f3a90481145e531a56363b6f2193aa9221aac0a5 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f3a90481145e531a56363b6f2193aa9221aac0a5 commit f3a90481145e531a56363b6f2193aa9221aac0a5 Author: John Baldwin AuthorDate: 2024-03-13 22:05:53 +0000 Commit: John Baldwin CommitDate: 2025-02-27 13:09:22 +0000 rman: Add rman_get/set_type This permits associating a resource type (e.g. SYS_RES_MEMORY) with a struct resource. I considered adding a new field to struct rman to store the type and only providing rman_get_type as an accessor. However, changing 'struct rman' is an ABI breakage. I might revisit this in main, but the current approach is MFC'able. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D44122 (cherry picked from commit b30a80b65587fb9fd4a5f012d606dbd0c6239a46) --- share/man/man9/Makefile | 2 ++ share/man/man9/rman.9 | 18 ++++++++++++++++-- sys/kern/subr_rman.c | 13 +++++++++++++ sys/sys/rman.h | 2 ++ 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index c2e145eaeb08..abf7ba82e6b3 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1874,6 +1874,7 @@ MLINKS+=rman.9 rman_activate_resource.9 \ rman.9 rman_get_rid.9 \ rman.9 rman_get_size.9 \ rman.9 rman_get_start.9 \ + rman.9 rman_get_type.9 \ rman.9 rman_get_virtual.9 \ rman.9 rman_init.9 \ rman.9 rman_init_from_resource.9 \ @@ -1888,6 +1889,7 @@ MLINKS+=rman.9 rman_activate_resource.9 \ rman.9 rman_set_bustag.9 \ rman.9 rman_set_mapping.9 \ rman.9 rman_set_rid.9 \ + rman.9 rman_set_type.9 \ rman.9 rman_set_virtual.9 MLINKS+=rmlock.9 rm_assert.9 \ rmlock.9 rm_destroy.9 \ diff --git a/share/man/man9/rman.9 b/share/man/man9/rman.9 index 095cd2760b8c..35a2d176233c 100644 --- a/share/man/man9/rman.9 +++ b/share/man/man9/rman.9 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 20, 2016 +.Dd March 13, 2024 .Dt RMAN 9 .Os .Sh NAME @@ -56,7 +56,9 @@ .Nm rman_set_bushandle , .Nm rman_get_bushandle , .Nm rman_set_rid , -.Nm rman_get_rid +.Nm rman_get_rid , +.Nm rman_set_type , +.Nm rman_get_type .Nd resource management functions .Sh SYNOPSIS .In sys/types.h @@ -125,6 +127,10 @@ .Fn rman_set_rid "struct resource *r" "int rid" .Ft int .Fn rman_get_rid "struct resource *r" +.Ft void +.Fn rman_set_type "struct resource *r" "int type" +.Ft int +.Fn rman_get_type "struct resource *r" .Sh DESCRIPTION The .Nm @@ -457,6 +463,14 @@ The function retrieves this RID. .Pp The +.Fn rman_set_type +function associates a resource type with a resource +.Fa r . +The +.Fn rman_get_type +function retrieves this type. +.Pp +The .Fn rman_get_device function returns a pointer to the device which reserved the resource .Fa r . diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c index 3e91fc40150a..f5a782a00dce 100644 --- a/sys/kern/subr_rman.c +++ b/sys/kern/subr_rman.c @@ -92,6 +92,7 @@ struct resource_i { device_t r_dev; /* device which has allocated this resource */ struct rman *r_rm; /* resource manager from whence this came */ int r_rid; /* optional rid for this resource. */ + int r_type; /* optional type for this resource. */ }; static int rman_debug = 0; @@ -942,6 +943,18 @@ rman_get_rid(struct resource *r) return (r->__r_i->r_rid); } +void +rman_set_type(struct resource *r, int type) +{ + r->__r_i->r_type = type; +} + +int +rman_get_type(struct resource *r) +{ + return (r->__r_i->r_type); +} + void rman_set_device(struct resource *r, device_t dev) { diff --git a/sys/sys/rman.h b/sys/sys/rman.h index bb63c4dfb100..e116ff5ed1c3 100644 --- a/sys/sys/rman.h +++ b/sys/sys/rman.h @@ -134,6 +134,7 @@ void rman_get_mapping(struct resource *, struct resource_map *); int rman_get_rid(struct resource *); rman_res_t rman_get_size(struct resource *); rman_res_t rman_get_start(struct resource *); +int rman_get_type(struct resource *); void *rman_get_virtual(struct resource *); int rman_deactivate_resource(struct resource *r); int rman_fini(struct rman *rm); @@ -158,6 +159,7 @@ void rman_set_irq_cookie(struct resource *_r, void *_c); void rman_set_mapping(struct resource *, struct resource_map *); void rman_set_rid(struct resource *_r, int _rid); void rman_set_start(struct resource *_r, rman_res_t _start); +void rman_set_type(struct resource *_r, int _type); void rman_set_virtual(struct resource *_r, void *_v); extern struct rman_head rman_head;