From nobody Wed Jun 11 09:14:22 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 4bHKjW3y8Vz60012; Wed, 11 Jun 2025 09:14:23 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bHKjW1QL3z3lqD; Wed, 11 Jun 2025 09:14:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633263; 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=8OxNjbqUKMvRTQ3/VCEkriWmCGVeaz0U+39ysU9hgII=; b=cWYPnIp2JVwbTp12wyHcofonD80fy0iqFO0mBIIsleh7v3qFE6My6lV8cMo0JXGzuNergl ygZWnk554tcBhCwkMh0K7WL0wSQhYNY/VD8q0dKwoiK6tP17eYKbUc5fhOun82EB+2Eq8o JHIv+JzTkJBTGZx70ThTPp9FqYAa44aKWmwE8pMpF5YDBIjahKtvU3x44eMbb/fJXepbyZ KVt6dzm3/cwYBxp9yiGt5LrHgvW/y0RF+Bzf9NtaCz31UxCW2FZEY4cxVnsgeRFmbw6QFb c8uXCP5rqOUoyV8Z/JfPeEjVt13r4A8AW157xb73pJK5sZbfbMTad/kSN3SS+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633263; 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=8OxNjbqUKMvRTQ3/VCEkriWmCGVeaz0U+39ysU9hgII=; b=eMpbxBgcOO6fUwmAmLW8oR2FFUiVQ/YjFE+uJ/BU1MjeSNqSogkaacOaU2Opi7sYUC+XYL lRIAz//IiWHpaLRlCHnL07bvEikUPjZ35ruVhR4gGL0Nv4hplOiVmi5HTjnHgV9z7AJ8g9 kRS9GBwktnrpeBwWfHJyp90+H9PptyWpc+0sQEjKylgmiWDj0UbiE6JoUnLl+G9pe+ZN03 fW8e5Qzk3dcJpM2yB+16r58fQyLgYeYL8YWqcGoZrLRRj2CrDZBkJyPDci+evweYED6VDM LGpwnbuv7fQPueNuqSLZeVLmyawPYS/0AiS3tsdNZmEGaw1ol+d9K8qT+o1T+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749633263; a=rsa-sha256; cv=none; b=MoXzhGFuIox4+bVXhIz7Iihkb+RCUGCiGLvynIaRX0709oW51yiP2HRogKwRVBIAeSc2Rv xVqBV4QgamGsP3fLQU+XittJTS8SBfV6BNVq4z4uYZF1ygQ39235YWLn8rYqQPPkg1852p rOmVzPW7LODCdR6IzaSNwWYBpctAVn8JpaL7tQm+6AVMmNyWbUEE3ysUcOy4XLkf0+F4aM FRTwYp7Ls2JY5HwDfXfwMlulu+1s7v9/TYSaG0c6DOT47s9n8bech6Wv72Nz3X/QUrjz3+ eEy7iuRqE0+DtEmBkRzQXdp+MlXqBZQJTLz4CBX29OcFVk+lO0w5mqVsQhTC2g== 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 4bHKjW0Zwtz5kt; Wed, 11 Jun 2025 09:14:23 +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 55B9EM0s062205; Wed, 11 Jun 2025 09:14:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55B9EM63062202; Wed, 11 Jun 2025 09:14:22 GMT (envelope-from git) Date: Wed, 11 Jun 2025 09:14:22 GMT Message-Id: <202506110914.55B9EM63062202@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: dcc99bf830b2 - stable/14 - LinuxKPI: 802.11: adjust logging for key handling 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/stable/14 X-Git-Reftype: branch X-Git-Commit: dcc99bf830b2b97bae91ca07f5daf15f30d4db14 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=dcc99bf830b2b97bae91ca07f5daf15f30d4db14 commit dcc99bf830b2b97bae91ca07f5daf15f30d4db14 Author: Bjoern A. Zeeb AuthorDate: 2025-06-05 20:53:47 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-10 23:40:14 +0000 LinuxKPI: 802.11: adjust logging for key handling Given there are still problems observed (at least in the Lab) adjust crypto key handling routines and enhance logging with td_tid, jiffies. Sponsored by: The FreeBSD Foundation (cherry picked from commit 80386ed954aaa33b849877e8a86918de9365a087) --- sys/compat/linuxkpi/common/src/linux_80211.c | 62 ++++++++++++++++------------ 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 89c067409774..a0e3123229ea 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1243,18 +1243,19 @@ lkpi_sta_del_keys(struct ieee80211_hw *hw, struct ieee80211_vif *vif, #ifdef LINUXKPI_DEBUG_80211 if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) - ic_printf(lsta->ni->ni_ic, "%s: running set_key cmd %d(%s) for " + ic_printf(lsta->ni->ni_ic, "%d %lu %s: running set_key cmd %d(%s) for " "sta %6D: keyidx %u hw_key_idx %u flags %b\n", - __func__, DISABLE_KEY, "DISABLE", lsta->sta.addr, ":", + curthread->td_tid, jiffies, __func__, + DISABLE_KEY, "DISABLE", lsta->sta.addr, ":", kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS); #endif err = lkpi_80211_mo_set_key(hw, DISABLE_KEY, vif, LSTA_TO_STA(lsta), kc); if (err != 0) { - ic_printf(lsta->ni->ni_ic, "%s: set_key cmd %d(%s) for " - "sta %6D failed: %d\n", __func__, DISABLE_KEY, - "DISABLE", lsta->sta.addr, ":", err); + ic_printf(lsta->ni->ni_ic, "%d %lu %s: set_key cmd %d(%s) for " + "sta %6D failed: %d\n", curthread->td_tid, jiffies, __func__, + DISABLE_KEY, "DISABLE", lsta->sta.addr, ":", err); error++; /* @@ -1266,9 +1267,10 @@ lkpi_sta_del_keys(struct ieee80211_hw *hw, struct ieee80211_vif *vif, } #ifdef LINUXKPI_DEBUG_80211 if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) - ic_printf(lsta->ni->ni_ic, "%s: set_key cmd %d(%s) for " + ic_printf(lsta->ni->ni_ic, "%d %lu %s: set_key cmd %d(%s) for " "sta %6D succeeded: keyidx %u hw_key_idx %u flags %b\n", - __func__, DISABLE_KEY, "DISABLE", lsta->sta.addr, ":", + curthread->td_tid, jiffies, __func__, + DISABLE_KEY, "DISABLE", lsta->sta.addr, ":", kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS); #endif @@ -1321,9 +1323,9 @@ lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) if (lsta->kc[k->wk_keyix] == NULL) { #ifdef LINUXKPI_DEBUG_80211 if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) - ic_printf(ic, "%s: sta %6D and no key information, " + ic_printf(ic, "%d %lu %s: sta %6D and no key information, " "keyidx %u wk_macaddr %6D; returning success\n", - __func__, sta->addr, ":", + curthread->td_tid, jiffies, __func__, sta->addr, ":", k->wk_keyix, k->wk_macaddr, ":"); #endif ieee80211_free_node(ni); @@ -1344,8 +1346,9 @@ lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) #ifdef LINUXKPI_DEBUG_80211 if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) - ic_printf(ic, "%s: running set_key cmd %d(%s) for sta %6D: " - "keyidx %u hw_key_idx %u flags %b\n", __func__, + ic_printf(ic, "%d %lu %s: running set_key cmd %d(%s) for sta %6D: " + "keyidx %u hw_key_idx %u flags %b\n", + curthread->td_tid, jiffies, __func__, DISABLE_KEY, "DISABLE", sta->addr, ":", kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS); #endif @@ -1356,16 +1359,18 @@ lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) vif = LVIF_TO_VIF(lvif); error = lkpi_80211_mo_set_key(hw, DISABLE_KEY, vif, sta, kc); if (error != 0) { - ic_printf(ic, "%s: set_key cmd %d(%s) for sta %6D failed: %d\n", - __func__, DISABLE_KEY, "DISABLE", sta->addr, ":", error); + ic_printf(ic, "%d %lu %s: set_key cmd %d(%s) for sta %6D failed: %d\n", + curthread->td_tid, jiffies, __func__, + DISABLE_KEY, "DISABLE", sta->addr, ":", error); error = 0; goto out; } #ifdef LINUXKPI_DEBUG_80211 if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) - ic_printf(ic, "%s: set_key cmd %d(%s) for sta %6D succeeded: " - "keyidx %u hw_key_idx %u flags %b\n", __func__, + ic_printf(ic, "%d %lu %s: set_key cmd %d(%s) for sta %6D succeeded: " + "keyidx %u hw_key_idx %u flags %b\n", + curthread->td_tid, jiffies, __func__, DISABLE_KEY, "DISABLE", sta->addr, ":", kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS); #endif @@ -1480,8 +1485,9 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) #ifdef LINUXKPI_DEBUG_80211 if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) - ic_printf(ic, "%s: running set_key cmd %d(%s) for sta %6D: " - "kc %p keyidx %u hw_key_idx %u keylen %u flags %b\n", __func__, + ic_printf(ic, "%d %lu %s: running set_key cmd %d(%s) for sta %6D: " + "kc %p keyidx %u hw_key_idx %u keylen %u flags %b\n", + curthread->td_tid, jiffies, __func__, SET_KEY, "SET", sta->addr, ":", kc, kc->keyidx, kc->hw_key_idx, kc->keylen, kc->flags, IEEE80211_KEY_FLAG_BITS); #endif @@ -1492,8 +1498,9 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) vif = LVIF_TO_VIF(lvif); error = lkpi_80211_mo_set_key(hw, SET_KEY, vif, sta, kc); if (error != 0) { - ic_printf(ic, "%s: set_key cmd %d(%s) for sta %6D failed: %d\n", - __func__, SET_KEY, "SET", sta->addr, ":", error); + ic_printf(ic, "%d %lu %s: set_key cmd %d(%s) for sta %6D failed: %d\n", + curthread->td_tid, jiffies, __func__, + SET_KEY, "SET", sta->addr, ":", error); lsta->kc[k->wk_keyix] = NULL; free(kc, M_LKPI80211); ieee80211_free_node(ni); @@ -1502,8 +1509,9 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) #ifdef LINUXKPI_DEBUG_80211 if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) - ic_printf(ic, "%s: set_key cmd %d(%s) for sta %6D succeeded: " - "kc %p keyidx %u hw_key_idx %u flags %b\n", __func__, + ic_printf(ic, "%d %lu %s: set_key cmd %d(%s) for sta %6D succeeded: " + "kc %p keyidx %u hw_key_idx %u flags %b\n", + curthread->td_tid, jiffies, __func__, SET_KEY, "SET", sta->addr, ":", kc, kc->keyidx, kc->hw_key_idx, kc->flags, IEEE80211_KEY_FLAG_BITS); #endif @@ -1582,9 +1590,9 @@ lkpi_iv_key_update_begin(struct ieee80211vap *vap) #ifdef LINUXKPI_DEBUG_80211 if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) - ic_printf(ic, "%s: tid %d vap %p ic %p %slocked nt %p %slocked " - "lvif ic_unlocked %d nt_unlocked %d\n", __func__, - curthread->td_tid, vap, + ic_printf(ic, "%d %lu %s: vap %p ic %p %slocked nt %p %slocked " + "lvif ic_unlocked %d nt_unlocked %d\n", + curthread->td_tid, jiffies, __func__, vap, ic, icislocked ? "" : "un", nt, ntislocked ? "" : "un", lvif->ic_unlocked, lvif->nt_unlocked); #endif @@ -1645,9 +1653,9 @@ lkpi_iv_key_update_end(struct ieee80211vap *vap) #ifdef LINUXKPI_DEBUG_80211 if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) - ic_printf(ic, "%s: tid %d vap %p ic %p %slocked nt %p %slocked " - "lvif ic_unlocked %d nt_unlocked %d\n", __func__, - curthread->td_tid, vap, + ic_printf(ic, "%d %lu %s: vap %p ic %p %slocked nt %p %slocked " + "lvif ic_unlocked %d nt_unlocked %d\n", + curthread->td_tid, jiffies, __func__, vap, ic, icislocked ? "" : "un", nt, ntislocked ? "" : "un", lvif->ic_unlocked, lvif->nt_unlocked); #endif