From nobody Fri Dec 1 00:56:04 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 4ShF450Mlsz532wW; Fri, 1 Dec 2023 00:56:05 +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 4ShF4472hZz4Q9H; Fri, 1 Dec 2023 00:56:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701392165; 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=BDI7NaMDxcJ05fr9u5BGApsaTs/Hj17ParBIsKCm0i8=; b=hjSIT6IOCyVwrnum0tr0j/6dIrPdfqKZLKrnKZJ44Us9Kv7R+XxZ285QEo8LCPdbB4PhyJ ECwaDOoYEFEp3JuaHgNwm7GpzPLQeA+Lyu7p2Do0ktRMa+BYT9xqUQ3RAKtWmf92+23ahW jxPQWzIQ8s4JlwdyjhqNSWCajU5CSLSfFEp283kKnrhASJ5MZr/7GFCXrf0RCkb95Ejt0u gsVcgOiC6DtZSAf/8M9c9dNMtOeEmv3EqQqftX6klMGoKVIqWLXDiKr3CezDEkBPtfjVo7 eAE5Vs2o772Rfe2spyNO2QhdEbiJjot1Kmldx2kodWU63iyZU/grOZuu/pTINw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701392165; 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=BDI7NaMDxcJ05fr9u5BGApsaTs/Hj17ParBIsKCm0i8=; b=S4s7BnRrn5LGcRqCauvARVxQBQE5MdphCzApaXeJND2zKuE6+g+OD3llyEuSTM33qXHhtr o8nnAyVeSlQ+d9IdUn79Th6uKLzHvk+k9InyxrV3gmd7zTQFRtC2xnaGRcmkO4w9BHuwev zv6BBaxKwToaRPSUw5AWLV83CbBN+Bc9zeOS64UOeO+REfevQwDcgsedc3JjUhBBdHA8GS KQNK58lTQ6w4IxqSGPpaxA2OM3Lrf5LxWd+8aFJvc7V9Hg9HCPyGYP572+LN2QLTXCIBtW j/Zp5okPU5APHWSDmvayc1kS4bNw2lS+88+Kp8+ubKoSzFesUgeScHuRDdr0tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701392165; a=rsa-sha256; cv=none; b=k/TPc4tu86mDo2YS1MNta0dv5tONEhL/iP/4mbF1lGaPKE5ujyeog3zktkK2EqkEy87KN0 SWmemP5pq9lwDZHCfvZReSXEqtna5WctCO4NT+X9GXPbuLjoqbe8YhA32YRfq/ksDw4DKB w5UejcydmJhvlyvyQpG/hc6AwfLKzNfCvdrIv17PfIdPcgeMnUwFrjHTiWZyDBHBO1Xy8C 9ZxjK64DNpRiG6nUSitLKFegfhmr6NfgNwsce2DCwOpS7gq4izqbfkedMbsvvIix3+6qij Qbgy5pBqhzdy267VNW25UQ0eBRR0AIV+EcgQQDdwSGekEavcJ4u0mnyoITkHrQ== 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 4ShF445vP1z1BdV; Fri, 1 Dec 2023 00:56:04 +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 3B10u43R090668; Fri, 1 Dec 2023 00:56:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B10u4k9090665; Fri, 1 Dec 2023 00:56:04 GMT (envelope-from git) Date: Fri, 1 Dec 2023 00:56:04 GMT Message-Id: <202312010056.3B10u4k9090665@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: eb3821e6d92f - main - Revert "[ath] Attempt to fix epoch handling." 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: eb3821e6d92fa45ece7ec08efde45e35be1bdc95 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=eb3821e6d92fa45ece7ec08efde45e35be1bdc95 commit eb3821e6d92fa45ece7ec08efde45e35be1bdc95 Author: Bjoern A. Zeeb AuthorDate: 2023-11-03 21:50:31 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-12-01 00:48:55 +0000 Revert "[ath] Attempt to fix epoch handling." This reverts commit af2441fbc7fa9e522e7f8697e5a181bdd4ff9e00. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/dev/ath/if_ath.c | 2 +- sys/dev/ath/if_ath_rx.c | 11 +---------- sys/dev/ath/if_ath_rx_edma.c | 4 ---- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 094517da5689..31bfa1108592 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -758,7 +758,7 @@ ath_attach(u_int16_t devid, struct ath_softc *sc) taskqueue_start_threads(&sc->sc_tq, 1, PI_NET, "%s taskq", device_get_nameunit(sc->sc_dev)); - TASK_INIT(&sc->sc_rxtask, 0, sc->sc_rx.recv_tasklet, sc); + NET_TASK_INIT(&sc->sc_rxtask, 0, sc->sc_rx.recv_tasklet, sc); TASK_INIT(&sc->sc_bmisstask, 0, ath_bmiss_proc, sc); TASK_INIT(&sc->sc_tsfoortask, 0, ath_tsfoor_proc, sc); TASK_INIT(&sc->sc_bstucktask,0, ath_bstuck_proc, sc); diff --git a/sys/dev/ath/if_ath_rx.c b/sys/dev/ath/if_ath_rx.c index c0af0b59ccb5..cd22d9c683dc 100644 --- a/sys/dev/ath/if_ath_rx.c +++ b/sys/dev/ath/if_ath_rx.c @@ -667,8 +667,6 @@ ath_rx_pkt(struct ath_softc *sc, struct ath_rx_status *rs, HAL_STATUS status, int is_good = 0; struct ath_rx_edma *re = &sc->sc_rxedma[qtype]; - NET_EPOCH_ASSERT(); - /* * Calculate the correct 64 bit TSF given * the TSF64 register value and rs_tstamp. @@ -1090,8 +1088,6 @@ ath_rx_proc(struct ath_softc *sc, int resched) int kickpcu = 0; int ret; - NET_EPOCH_ASSERT(); - /* XXX we must not hold the ATH_LOCK here */ ATH_UNLOCK_ASSERT(sc); ATH_PCU_UNLOCK_ASSERT(sc); @@ -1311,7 +1307,6 @@ static void ath_legacy_rx_tasklet(void *arg, int npending) { struct ath_softc *sc = arg; - struct epoch_tracker et; ATH_KTR(sc, ATH_KTR_RXPROC, 1, "ath_rx_proc: pending=%d", npending); DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s: pending %u\n", __func__, npending); @@ -1324,18 +1319,14 @@ ath_legacy_rx_tasklet(void *arg, int npending) } ATH_PCU_UNLOCK(sc); - NET_EPOCH_ENTER(et); ath_rx_proc(sc, 1); - NET_EPOCH_EXIT(et); } static void ath_legacy_flushrecv(struct ath_softc *sc) { - struct epoch_tracker et; - NET_EPOCH_ENTER(et); + ath_rx_proc(sc, 0); - NET_EPOCH_EXIT(et); } static void diff --git a/sys/dev/ath/if_ath_rx_edma.c b/sys/dev/ath/if_ath_rx_edma.c index 6c722ca8275f..fb25fb77b062 100644 --- a/sys/dev/ath/if_ath_rx_edma.c +++ b/sys/dev/ath/if_ath_rx_edma.c @@ -555,7 +555,6 @@ ath_edma_recv_proc_deferred_queue(struct ath_softc *sc, HAL_RX_QUEUE qtype, int16_t nf; ath_bufhead rxlist; struct mbuf *m; - struct epoch_tracker et; TAILQ_INIT(&rxlist); @@ -572,8 +571,6 @@ ath_edma_recv_proc_deferred_queue(struct ath_softc *sc, HAL_RX_QUEUE qtype, TAILQ_CONCAT(&rxlist, &sc->sc_rx_rxlist[qtype], bf_list); ATH_RX_UNLOCK(sc); - NET_EPOCH_ENTER(et); - /* Handle the completed descriptors */ /* * XXX is this SAFE call needed? The ath_buf entries @@ -597,7 +594,6 @@ ath_edma_recv_proc_deferred_queue(struct ath_softc *sc, HAL_RX_QUEUE qtype, if (ngood) { sc->sc_lastrx = tsf; } - NET_EPOCH_EXIT(et); ATH_KTR(sc, ATH_KTR_INTERRUPTS, 1, "ath edma rx deferred proc: ngood=%d\n",