From nobody Fri Dec 1 00:56:03 2023 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 4ShF436wJlz5333t; Fri, 1 Dec 2023 00:56:03 +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 4ShF435vxsz4Plr; Fri, 1 Dec 2023 00:56:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701392163; 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=q5dr+aRjBuiXCFPWdqfpw93MU/HpZY2ZE0UeGYaBgT4=; b=K/NZzoE4Nbd0kyMiOlx/zyNbHn94sqs05uP969An0aChbu26cZm3I8ijAgclR/1sa3mXoe +FZG+c+MC0pcVvQKbGEWkQ7iAu19hB2dG3h59+Xi6npviG8tvLmpwiNcczQuOBuYakJaD2 6GJ8C7Ge42cLCm286I7cwidP4ohmcFAZvoJRdwN3uksHh0dEE2JH+2bdcidlUsuJ8aO+mF AfxBJ5b36hSByNq6B5M+L3FZ3u2IOIg3pHw6EQUNFWj916dkuJ/MVkTn2JitGidD1RexpA 3fxpnRgVSAqeM4s7yurxFemK+kCQG0/hzCacIbjG5FTmme0tuvEW+gib9NDioA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701392163; 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=q5dr+aRjBuiXCFPWdqfpw93MU/HpZY2ZE0UeGYaBgT4=; b=Qe6dhjPCahA/eKHLK/nlX+9fFnpa2fAUdYTxDKZP8FGL+S5qK65VXXF9AjJuNv9MZqce+M 4fUVsh2vKSgCoTN3vD3TyfXhOIL/7ytfZq/Rey5klTJHpYTW0mkAVjimHmm2TpPhD+jlq/ hax8TCodJ+MMCw/GMq0sdKdO6NsWqDC4E11Gd36sci2A3uArfnJckhUAN+785uAPoPn0r5 mx4htez4JRwlUJGDrp/MNsONgNF+0ht/79vxbpi2igNSqn5md5xHw+YHoFxBqSFqM4Me+A wK3e0wOpdJ/zlYLOQG3AICmdwmArCQbPB8hv16TLircwd54y8bG2XEWfhNQ8kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701392163; a=rsa-sha256; cv=none; b=kfuaMX9u2wITRWwHKgu9XJLviut+96kjKiRvhp07XSyAklfULPibpodOXkGaWz/DZXqlXz 9bnGihX1Heif/pLwmMAIGhixp/nJdlxKBFCUgZyitvI48PkF1gFTQs4gAG1V3iZM8qbVzy jDs5DXAnlQ9PNgnCYpPnV8MMXqbzdVGkcnPhLxiPBb2fJh0OXcRUy9GLmNngqJxGNMj5R0 xYqEZRdVOH4kByiyVWh7JOVAudOXSA4EyuZu5h39wjfXqUYiP+KpbQ/a41E3YlPOL/O7sZ jZYNo+QSqtEaD4xbpru+0T4ohg4H5bRqjOLAexDlOqu7Qiww0xCvzlBIIE2q4A== 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 4ShF434z3Nz1BdT; Fri, 1 Dec 2023 00:56:03 +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 3B10u3HA090611; Fri, 1 Dec 2023 00:56:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B10u3Eq090608; Fri, 1 Dec 2023 00:56:03 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:56:03 GMT Message-Id: <202312010056.3B10u3Eq090608@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: 75f298492a12 - main - Revert "Enter the network epoch in USB WiFi drivers when processing input" 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: 75f298492a12d53df97c26963ec9f2dc0b052878 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=75f298492a12d53df97c26963ec9f2dc0b052878 commit 75f298492a12d53df97c26963ec9f2dc0b052878 Author: Bjoern A. Zeeb AuthorDate: 2023-11-03 21:31:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-12-01 00:48:54 +0000 Revert "Enter the network epoch in USB WiFi drivers when processing input" This reverts commit 17c328b6aebfa03cd1c2cbfbbc617e3b341bf1e4. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/dev/otus/if_otus.c | 3 --- sys/dev/rtwn/usb/rtwn_usb_rx.c | 3 --- sys/dev/usb/wlan/if_rsu.c | 3 --- 3 files changed, 9 deletions(-) diff --git a/sys/dev/otus/if_otus.c b/sys/dev/otus/if_otus.c index c27b982d2d6e..dbb913d83ae8 100644 --- a/sys/dev/otus/if_otus.c +++ b/sys/dev/otus/if_otus.c @@ -1802,7 +1802,6 @@ otus_rxeof(struct usb_xfer *xfer, struct otus_data *data, struct mbufq *rxq) static void otus_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error) { - struct epoch_tracker et; struct otus_softc *sc = usbd_xfer_softc(xfer); struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_frame *wh; @@ -1853,7 +1852,6 @@ tr_setup: * callback and safe to unlock. */ OTUS_UNLOCK(sc); - NET_EPOCH_ENTER(et); while ((m = mbufq_dequeue(&scrx)) != NULL) { wh = mtod(m, struct ieee80211_frame *); ni = ieee80211_find_rxnode(ic, @@ -1866,7 +1864,6 @@ tr_setup: } else (void)ieee80211_input_mimo_all(ic, m); } - NET_EPOCH_EXIT(et); #ifdef IEEE80211_SUPPORT_SUPERG ieee80211_ff_age_all(ic, 100); #endif diff --git a/sys/dev/rtwn/usb/rtwn_usb_rx.c b/sys/dev/rtwn/usb/rtwn_usb_rx.c index 30921bdc2101..5db967ddcc18 100644 --- a/sys/dev/rtwn/usb/rtwn_usb_rx.c +++ b/sys/dev/rtwn/usb/rtwn_usb_rx.c @@ -361,7 +361,6 @@ rtwn_rx_frame(struct rtwn_softc *sc, struct mbuf *m) void rtwn_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error) { - struct epoch_tracker et; struct rtwn_usb_softc *uc = usbd_xfer_softc(xfer); struct rtwn_softc *sc = &uc->uc_sc; struct ieee80211com *ic = &sc->sc_ic; @@ -404,7 +403,6 @@ tr_setup: m->m_pkthdr.PH_loc.ptr = rtwn_rx_frame(sc, m); m = m->m_nextpkt; } - NET_EPOCH_ENTER(et); RTWN_UNLOCK(sc); m = m0; while (m != NULL) { @@ -422,7 +420,6 @@ tr_setup: m = next; } RTWN_LOCK(sc); - NET_EPOCH_EXIT(et); break; default: /* needs it to the inactive queue due to a error. */ diff --git a/sys/dev/usb/wlan/if_rsu.c b/sys/dev/usb/wlan/if_rsu.c index 7a1e85f652a2..e000d1fb5992 100644 --- a/sys/dev/usb/wlan/if_rsu.c +++ b/sys/dev/usb/wlan/if_rsu.c @@ -2553,7 +2553,6 @@ rsu_rxeof(struct usb_xfer *xfer, struct rsu_data *data) static void rsu_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error) { - struct epoch_tracker et; struct rsu_softc *sc = usbd_xfer_softc(xfer); struct ieee80211com *ic = &sc->sc_ic; struct ieee80211_node *ni; @@ -2588,7 +2587,6 @@ tr_setup: * ieee80211_input() because here is at the end of a USB * callback and safe to unlock. */ - NET_EPOCH_ENTER(et); while (m != NULL) { next = m->m_next; m->m_next = NULL; @@ -2607,7 +2605,6 @@ tr_setup: RSU_LOCK(sc); m = next; } - NET_EPOCH_EXIT(et); break; default: /* needs it to the inactive queue due to a error. */