From nobody Wed Mar 23 17:18:32 2022 X-Original-To: dev-commits-src-main@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 940DE1A37C52; Wed, 23 Mar 2022 17:18:33 +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 4KNw6x2CHfz3JdV; Wed, 23 Mar 2022 17:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648055913; 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=0w6yuWVec8DiNZ8cx+Ie1lJexEctA3iSpnKoNrMAtao=; b=AoMVZWgjHKOdYrFF10AaSN1M4uFyj/EDDatoLrpIfyW0soSUcjg/vJSO6KpMe6Sn43JtIb aNhh6sXBnk+h2tpEmJUU2GXvs755dDGm2zMUcLOlkD4Dr1ghSZzjALr/uAzILmPlwh+f13 MFkvaCEb8ZsgrswB9Tx6TtK56Ny4LJALjJlRZjloFLsxNsAZIVj1vi8FpSx9ZevFH8Ff1Q 8EiHH6drUVtZpdAuoCo9QrCdqeVzinz1OBSAOAV2Laws2qnjpSsrBdgbKj+nOxDUieN5R7 U8q5Xf4YV4OPWTCQL3SY4IOTF0hvzapAH8kYloS6oNJ533H+gq2BFVQFjCLj+w== 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 276B327A83; Wed, 23 Mar 2022 17:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22NHIXKZ005362; Wed, 23 Mar 2022 17:18:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22NHIW2E005361; Wed, 23 Mar 2022 17:18:32 GMT (envelope-from git) Date: Wed, 23 Mar 2022 17:18:32 GMT Message-Id: <202203231718.22NHIW2E005361@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: 67674c1cb115 - main - LinuxKPI: 802.11: fix lkpi_lsta_dump() debugging List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 67674c1cb11512f09873c6d8e463af31548ef87f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648055913; 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=0w6yuWVec8DiNZ8cx+Ie1lJexEctA3iSpnKoNrMAtao=; b=x+w4/i/OWf0wz0N13v35r9k55M1uW/nl5LIfd+MTE3k1VFt5/IW53woTPu8Gy72M2bOtWz VWzAcDoxA5t1rQlDU08iNuB4aLDdQONL8ussxeutWLasGkg6t/uaTec9B6SWAswN1QG++y iNtye5L47YsZnSYI+11JJ00hvuTID4bKsbflryL110mJmIsR6R3wrBvdX88ZF9rNMfReUx 6FzSigZJRZJmu55Qq6044nkFQDPqMCZKnI7hRUOb6LVOr17GwhGa+P2ncboEFdvQAFZngt +NJwi/nZLUBMObMWH0IL/HcHnFINbTiePxCtOJSTLZHHVjX1GqSoY2dRosfD2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648055913; a=rsa-sha256; cv=none; b=ZVQCMmmu4e7oo6FazKp4vT/ze9nGiax4F6rmAVH5Fh+lXLDq4RbLO9Z8/TP5iFlOK5su7U UYdrGY/VZNRZ/TW3QP885VS7nG3fWmP7HOLqUaoxTUWuHnIoX+n4uCg1+bTsP6m2+V9CT6 Yoy+UYhnj53ifq2ei6BZWj9ZCWV80hKQc7mPFc6a2PeWKXyXbz7okv8gsSAkkEZ5285DPV Qk7xq2bjibti4raKFgo+eGrm8VbQ8s2ZJuheKaieiojHhSgnIUBr79N2A0zB1skS+UzdrJ FbC6tfzk0e9NgbZJCrY3fkijkMQ8pn2JsygfSoxuv0FbiKoqJ/QRFvf4P7ZSeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=67674c1cb11512f09873c6d8e463af31548ef87f commit 67674c1cb11512f09873c6d8e463af31548ef87f Author: Bjoern A. Zeeb AuthorDate: 2022-03-23 17:14:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-23 17:18:00 +0000 LinuxKPI: 802.11: fix lkpi_lsta_dump() debugging Fix two last-minute changes of d9f59799fc3e7940c47aa674c25994e640eae45e: (1) for consitency name the debugging function lkpi_lsta_dump() (2) pass in the original node (ni) rather than taking it from the lsta to avoid problems realted to bss_update as mentioned in the above commit. No functional changes for users. Sponsored by: The FreeBSD Foundation MFC after: 3 days X-MFC with: d9f59799fc3e7940c47aa674c25994e640eae45e --- sys/compat/linuxkpi/common/src/linux_80211.c | 41 ++++++++++++++-------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 1d3e6de375dc..4805097fcd4f 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -141,7 +141,8 @@ static void lkpi_80211_txq_task(void *, int); static void lkpi_ieee80211_free_skb_mbuf(void *); static void -lkpi_dump_lsta(struct lkpi_sta *lsta, const char *_f, int _l) +lkpi_lsta_dump(struct lkpi_sta *lsta, struct ieee80211_node *ni, + const char *_f, int _l) { if ((debug_80211 & D80211_TRACE_STA) == 0) @@ -150,9 +151,9 @@ lkpi_dump_lsta(struct lkpi_sta *lsta, const char *_f, int _l) return; printf("%s:%d lsta %p ni %p sta %p\n", - _f, _l, lsta, lsta->ni, &lsta->sta); - if (lsta->ni != NULL) - ieee80211_dump_node(NULL, lsta->ni); + _f, _l, lsta, ni, &lsta->sta); + if (ni != NULL) + ieee80211_dump_node(NULL, ni); printf("\ttxq_task txq len %d mtx\n", mbufq_len(&lsta->txq)); printf("\tkc %p state %d added_to_drv %d in_mgd %d\n", lsta->kc, lsta->state, lsta->added_to_drv, lsta->in_mgd); @@ -1098,7 +1099,7 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int lsta = ni->ni_drv_data; sta = LSTA_TO_STA(lsta); - lkpi_dump_lsta(lsta, __func__, __LINE__); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); IEEE80211_UNLOCK(vap->iv_ic); @@ -1140,7 +1141,7 @@ lkpi_sta_auth_to_scan(struct ieee80211vap *vap, enum ieee80211_state nstate, int lsta->added_to_drv = false; /* mo manages. */ #endif - lkpi_dump_lsta(lsta, __func__, __LINE__); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); lkpi_lsta_remove(lsta, lvif); @@ -1324,7 +1325,7 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i lsta = ni->ni_drv_data; sta = LSTA_TO_STA(lsta); - lkpi_dump_lsta(lsta, __func__, __LINE__); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); IEEE80211_UNLOCK(vap->iv_ic); @@ -1349,7 +1350,7 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i IEEE80211_UNLOCK(vap->iv_ic); - lkpi_dump_lsta(lsta, __func__, __LINE__); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); /* Wake tx queues to get packet(s) out. */ lkpi_wake_tx_queues(hw, sta, true, true); @@ -1381,7 +1382,7 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i if (error != 0) goto out; - lkpi_dump_lsta(lsta, __func__, __LINE__); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); /* Adjust sta and change state (from NONE) to NOTEXIST. */ KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); @@ -1396,7 +1397,7 @@ _lkpi_sta_assoc_to_down(struct ieee80211vap *vap, enum ieee80211_state nstate, i lsta->added_to_drv = false; /* mo manages. */ #endif - lkpi_dump_lsta(lsta, __func__, __LINE__); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); /* Update bss info (bss_info_changed) (assoc, aid, ..). */ /* We need to do this now, can only do after sta is IEEE80211_STA_NOTEXIST. */ @@ -1640,7 +1641,7 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int lsta = ni->ni_drv_data; sta = LSTA_TO_STA(lsta); - lkpi_dump_lsta(lsta, __func__, __LINE__); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); IEEE80211_UNLOCK(vap->iv_ic); @@ -1665,7 +1666,7 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int IEEE80211_UNLOCK(vap->iv_ic); - lkpi_dump_lsta(lsta, __func__, __LINE__); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); /* Wake tx queues to get packet(s) out. */ lkpi_wake_tx_queues(hw, sta, true, true); @@ -1699,7 +1700,7 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int if (error != 0) goto out; - lkpi_dump_lsta(lsta, __func__, __LINE__); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); /* Update sta_state (ASSOC to AUTH). */ KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); @@ -1709,7 +1710,7 @@ lkpi_sta_run_to_assoc(struct ieee80211vap *vap, enum ieee80211_state nstate, int if (error != 0) goto out; - lkpi_dump_lsta(lsta, __func__, __LINE__); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); #if 0 /* Update bss info (bss_info_changed) (assoc, aid, ..). */ @@ -1749,7 +1750,7 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int lsta = ni->ni_drv_data; sta = LSTA_TO_STA(lsta); - lkpi_dump_lsta(lsta, __func__, __LINE__); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); IEEE80211_UNLOCK(vap->iv_ic); @@ -1774,7 +1775,7 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int IEEE80211_UNLOCK(vap->iv_ic); - lkpi_dump_lsta(lsta, __func__, __LINE__); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); /* Wake tx queues to get packet(s) out. */ lkpi_wake_tx_queues(hw, sta, true, true); @@ -1806,7 +1807,7 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int if (error != 0) goto out; - lkpi_dump_lsta(lsta, __func__, __LINE__); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); /* Update sta_state (ASSOC to AUTH). */ KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); @@ -1816,7 +1817,7 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int if (error != 0) goto out; - lkpi_dump_lsta(lsta, __func__, __LINE__); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); /* Update sta and change state (from AUTH) to NONE. */ KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); @@ -1826,7 +1827,7 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int if (error != 0) goto out; - lkpi_dump_lsta(lsta, __func__, __LINE__); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); /* Adjust sta and change state (from NONE) to NOTEXIST. */ KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); @@ -1841,7 +1842,7 @@ lkpi_sta_run_to_init(struct ieee80211vap *vap, enum ieee80211_state nstate, int lsta->added_to_drv = false; /* mo manages. */ #endif - lkpi_dump_lsta(lsta, __func__, __LINE__); + lkpi_lsta_dump(lsta, ni, __func__, __LINE__); /* Update bss info (bss_info_changed) (assoc, aid, ..). */ /*