From nobody Sun Jun 26 21:27:07 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 09D6387F0FC; Sun, 26 Jun 2022 21:27:08 +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 4LWP7v3SpSz3hwN; Sun, 26 Jun 2022 21:27:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656278827; 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=o8qliIr4HsQl1T1u+v/ksAk+JaeZub20DRNHqYWtcDc=; b=PJgT8ih5NywjgBffMmT4AY0KIwdnF7ZDFe5UbibFUurdrhnZdWKD80lFd+zucUZ17a2UJf AmrIR0uKtlk/l32GWoXlXHS23xH7vauuIpOiJNRM/ltaZ2Zo55M7UqQbPAW452AxgrA9D8 hXL6bKWPmP+0+GfcRek2HEG7Ot4PG+hz2xP0mQ0BmK3R6+e9p/hUYLWtxo+JWIgVfCPZCb z6GLlHUtku0w4b7LmznixsbpfzbCdwQdaDZ5L1xz8COxPVmwjv9wq56c72a1qFD7dr6ssq +/txUI4ob9epppB+qVCiPripwPBio1GuZO8nd5yaKy/VKvZCKFjtof9+mlkT3A== 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 415471BA91; Sun, 26 Jun 2022 21:27:07 +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 25QLR7h7007121; Sun, 26 Jun 2022 21:27:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25QLR7sk007120; Sun, 26 Jun 2022 21:27:07 GMT (envelope-from git) Date: Sun, 26 Jun 2022 21:27:07 GMT Message-Id: <202206262127.25QLR7sk007120@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: e24e8103e0e2 - main - LinuxKPI: 802.11: cleanup lsta better 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: e24e8103e0e2140751a1b2baf7b68725ca20aaa2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656278827; 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=o8qliIr4HsQl1T1u+v/ksAk+JaeZub20DRNHqYWtcDc=; b=ua5T+dF5dNWFZ5QMj1R6td3G/zCgktIGRniIOGVacSBCE1zpa2sX4yyoVL65KQvLjiT4PJ nCcn7jKE28Bl5OEXTjpgBZJ1ilGPbfQeXFUUPDfadVToaquL4Os+vh2mkpuo27eOmpuw1/ Jre7/pt9eA5SjyMraURPaya4k8Sd4VKiCtmpM7ubv/RUHVVdUihNJlmTXQQUFGWQ+wNBnW yZnO1qxCA7gE5xAu2MNv3p0Nz89o4JYnjsjVjEkk/NoGhuBzQ5nvsHkaWDdHRflQLvJxlX CqBJkVW+jY36nH6+BtjWFfwA4NV+WSyYAlrMBsmMkvH0dieuN/AKnJX6EC55gQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656278827; a=rsa-sha256; cv=none; b=mc9fQFTB5+ezj18o5BdIjKlfFWDA6977Ot/VcVYWK5En3KKXXR9rBPUWuPb6et1ks5Bx/B NHtpxrhTfK3oI9yzvndP6j25dYpti6OMlpKw3p6ecHMgU9mE8K5fo3Ww0Iuas3o0rnYtrb 62TddJ9jWrphujSdRvwrhWU6yOxsHTX6qEZEPDOHKN9jTKxBl3fhhhf3JtQgA/vsO3amz2 UfVxh9sTa93drwQ2z44eCkOEjYlKXUwfjAsaKAY7JFl9aWNNknxxhKU9vTMSxpkJJyiCvV 4dlPf85J5IpVf44+uX3DZRJKai1XbOOsYJPCMesV2z7zJmKSx+Q62LFFNzZLYw== 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=e24e8103e0e2140751a1b2baf7b68725ca20aaa2 commit e24e8103e0e2140751a1b2baf7b68725ca20aaa2 Author: Bjoern A. Zeeb AuthorDate: 2022-06-26 19:13:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-06-26 19:13:00 +0000 LinuxKPI: 802.11: cleanup lsta better This changes cleans up lsta from the VIF station list as well as deals with freeing the lsta itself so it is not leaked. lkpi_iv_update_bss() makes this more complicated than it should be as we ties more sta state (incl. drv/fw) to the node that net80211 does not know about. There is more work to be done detangling this now that is better understood. MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 29 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 321fa47a4088..0bb01a633e09 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -179,9 +179,12 @@ lkpi_lsta_remove(struct lkpi_sta *lsta, struct lkpi_vif *lvif) lsta->ni = NULL; ni->ni_drv_data = NULL; - ieee80211_free_node(ni); + if (ni != NULL) + ieee80211_free_node(ni); + + IMPROVE("more from lkpi_ic_node_free() should happen here."); - IMPROVE("free lsta here? We won't have a pointer to it from the node anymore."); + free(lsta, M_LKPI80211); } static struct lkpi_sta * @@ -998,12 +1001,15 @@ lkpi_sta_scan_to_auth(struct ieee80211vap *vap, enum ieee80211_state nstate, int goto out; } lsta->ni = ieee80211_ref_node(ni); - LKPI_80211_LVIF_LOCK(lvif); - TAILQ_INSERT_TAIL(&lvif->lsta_head, lsta, lsta_entry); - LKPI_80211_LVIF_UNLOCK(lvif); } else { lsta = ni->ni_drv_data; } + + /* Insert the [l]sta into the list of known stations. */ + LKPI_80211_LVIF_LOCK(lvif); + TAILQ_INSERT_TAIL(&lvif->lsta_head, lsta, lsta_entry); + LKPI_80211_LVIF_UNLOCK(lvif); + /* Add (or adjust) sta and change state (from NOTEXIST) to NONE. */ KASSERT(lsta != NULL, ("%s: ni %p lsta is NULL\n", __func__, ni)); KASSERT(lsta->state == IEEE80211_STA_NOTEXIST, ("%s: lsta %p state not " @@ -2816,7 +2822,6 @@ lkpi_ic_node_init(struct ieee80211_node *ni) struct ieee80211com *ic; struct lkpi_hw *lhw; struct lkpi_sta *lsta; - struct lkpi_vif *lvif; int error; ic = ni->ni_ic; @@ -2828,17 +2833,11 @@ lkpi_ic_node_init(struct ieee80211_node *ni) return (error); } - lvif = VAP_TO_LVIF(ni->ni_vap); - lsta = ni->ni_drv_data; /* Now take the reference before linking it to the table. */ lsta->ni = ieee80211_ref_node(ni); - LKPI_80211_LVIF_LOCK(lvif); - TAILQ_INSERT_TAIL(&lvif->lsta_head, lsta, lsta_entry); - LKPI_80211_LVIF_UNLOCK(lvif); - /* XXX-BZ Sync other state over. */ IMPROVE(); @@ -2888,11 +2887,11 @@ lkpi_ic_node_free(struct ieee80211_node *ni) mtx_destroy(&lsta->txq_mtx); /* Remove lsta if added_to_drv. */ - /* Remove lsta from vif */ - - /* remove ref from lsta node... */ + /* Remove lsta from vif */ + /* Remove ref from lsta node... */ /* Free lsta. */ + lkpi_lsta_remove(lsta, VAP_TO_LVIF(ni->ni_vap)); out: if (lhw->ic_node_free != NULL)