From nobody Thu Nov 30 00:38:12 2023 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 4Sgcjw5bdSz52Thc; Thu, 30 Nov 2023 00:38:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sgcjw4tgWz3MG2; Thu, 30 Nov 2023 00:38:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304692; 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=uh5YtTIXWLRiuUxMzoqe0OnTZf+eBdczqODAgODFJVw=; b=jsmeE1qaYA/0+NSgkfo4rtfSknUT4xO+FbdZ67BPvDoib7f/vH8+RESabrf1KyH8UmhvsF sUp8GHT9HbI6mB7RTlBG4YjE/lmkC01j3MCwr0Fb90/RbXhDGkneQlHOAMPIxqr6cEOiKZ hIGZdiFlnrfHDg7xVNaeGztGw1Y0Ijs5ALCq8a/1tKFrwrj9DuaEXzDWpD2ewUmFzNQGlH ynSdKee6PompXbYTYTPAEG3XsuN6VNWg5m51hZLf8KfxTI3sESmaciypMrIAL2Ml77WppD egqntJzSghraLiPzV/eomd4ds8jpVTDD1vE1BltsC+lyAb20hSwB7EbYzkFzVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304692; 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=uh5YtTIXWLRiuUxMzoqe0OnTZf+eBdczqODAgODFJVw=; b=BsXOMSMTWGwM1+b9q+pFx1J2BoAQIafCNm208ELPHaSfKgyf+IDgeg0SAUjQDxnueOAZhu 9A/4pRm2KNtPNvskQKpDfLuO+52LPhwTi+xVWarrxEpcoou5bydzip6VlHnh2ZsLSPJLIF 38bGQVnQ8929qNUjDcq5MC+jjYHssl82yU+XEaoY/DAUvvkJG7QAopnQIsxn7At5/4Nncv mvIn/W8ZLtlU02YKmNfJW9WkAZY/ofiA7XLFYPTCAYp3iF8LSBVAuByVj+ae/ybb3uMhkV cU5qI2qfidL3c6wP2TOKwBGEefqKTP1NGYzywy5+ieFU5RL33nH4ozrezHCs+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304692; a=rsa-sha256; cv=none; b=CI59VsSB342CNYtSUNH8CuX7Ze0+wQVxyoL42abnSSYMRIWCChZKPtfaWjn9hlcbwjd+85 7tAQrKUpq8eymg4UPk4i9wXHp5o9y+0YZGT/fMXpqyqhme5hHkr0j8RNY8mfiQzKXRc3kh N5iWpLgtMzrGuV0pYhMSjZNTpmW7pimE56v3HNsU/k86HwlQ+TgGgxhSNMxu/RNIE7GE8j 08uHXdkmj05RON00gfpSpvUfqEVTcHIDR8sKQOeYyPkv5lUrUQvdwJ49eZE3BxtYpBgwXG y+9aetKKuZay+pEvczZESdPgekJkbcX+Sc4WAjZ3fcr247ftJncD+kTEPlWkoA== 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 4Sgcjw3VxKzD42; Thu, 30 Nov 2023 00:38:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AU0cCT0051785; Thu, 30 Nov 2023 00:38:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0cCjv051782; Thu, 30 Nov 2023 00:38:12 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:12 GMT Message-Id: <202311300038.3AU0cCjv051782@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: 24df98cc9d9d - stable/14 - net80211: de-inline ieee80211_ref_node() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 24df98cc9d9dce1b6b3d47d340f9eb77445d2d2c Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=24df98cc9d9dce1b6b3d47d340f9eb77445d2d2c commit 24df98cc9d9dce1b6b3d47d340f9eb77445d2d2c Author: Bjoern A. Zeeb AuthorDate: 2023-10-02 20:20:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:57 +0000 net80211: de-inline ieee80211_ref_node() Make ieee80211_ref_node() a macro so we can pass __func__, __LINE__ in for IEEE80211_DEBUG_REFCNT as we do for other refcount related functions. Add the appropriate IEEE80211_DPRINTF() call to the _ieee80211_ref_node() implementation to support wlandebug(8) +node printf style tracing. As a plus we can now also use Dtrace fbt on the _ieee80211_{ref,free}_node() implementations with futher logic, gathering backtraces, etc. more flexibly. Sponsored by: The FreeBSD Foundation (cherry picked from commit 2188852196151e5f04533eaa928a7ad0896e4bd6) --- sys/net80211/ieee80211_node.c | 14 ++++++++++++++ sys/net80211/ieee80211_node.h | 11 ++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index b7cdc5090c96..88c8ab4eff1c 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -2056,6 +2056,20 @@ _ieee80211_find_txnode(struct ieee80211vap *vap, return ni; } +struct ieee80211_node * +_ieee80211_ref_node(struct ieee80211_node *ni, + const char *func __debrefcnt_used, int line __debrefcnt_used) +{ + +#ifdef IEEE80211_DEBUG_REFCNT + IEEE80211_DPRINTF(ni->ni_vap, IEEE80211_MSG_NODE, + "%s (%s:%u) %p<%s> refcnt %d\n", __func__, func, line, ni, + ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)+1); +#endif + ieee80211_node_incref(ni); + return (ni); +} + static void __ieee80211_free_node(struct ieee80211_node *ni) { diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h index 826ecccb1238..67ad4a7c44f6 100644 --- a/sys/net80211/ieee80211_node.h +++ b/sys/net80211/ieee80211_node.h @@ -319,13 +319,6 @@ MALLOC_DECLARE(M_80211_NODE_IE); #define IEEE80211_RSSI_GET(x) \ IEEE80211_RSSI_EP_RND(x, IEEE80211_RSSI_EP_MULTIPLIER) -static __inline struct ieee80211_node * -ieee80211_ref_node(struct ieee80211_node *ni) -{ - ieee80211_node_incref(ni); - return ni; -} - static __inline void ieee80211_unref_node(struct ieee80211_node **ni) { @@ -404,6 +397,8 @@ struct ieee80211_node *ieee80211_node_create_wds(struct ieee80211vap *, struct ieee80211_channel *); /* These functions are taking __func__, __LINE__ for IEEE80211_DEBUG_REFCNT */ +struct ieee80211_node *_ieee80211_ref_node(struct ieee80211_node *, + const char *func, int line); void _ieee80211_free_node(struct ieee80211_node *, const char *func, int line); struct ieee80211_node *_ieee80211_find_node_locked( @@ -433,6 +428,8 @@ struct ieee80211_node *_ieee80211_find_rxnode_withkey( struct ieee80211_node *_ieee80211_find_txnode(struct ieee80211vap *, const uint8_t macaddr[IEEE80211_ADDR_LEN], const char *func, int line); +#define ieee80211_ref_node(ni) \ + _ieee80211_ref_node(ni, __func__, __LINE__) #define ieee80211_free_node(ni) \ _ieee80211_free_node(ni, __func__, __LINE__) #define ieee80211_find_node_locked(nt, mac) \