From nobody Tue Sep 30 15:23:49 2025 X-Original-To: dev-commits-src-branches@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 4cbhfZ01Cgz69DdH; Tue, 30 Sep 2025 15:23:50 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cbhfY4RtPz3M3Y; Tue, 30 Sep 2025 15:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759245829; 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=EV+KgM3KHBMEd//iQF09A8jX4VB2i97FZZHt0SEoBkY=; b=ULS2JclWGvObZMcnKEPce7ZAPLK/mGHrp7YF/qSpCZUolIURBiUi26ba0FfPUSF4TTyew/ 1gSfI1K1yVm9ezMgbMHWRaJxKu+gE1IFEs1KktThqwH1iRMEY3CpUseYmiirSxrSvhXAGO uzxXvcuG6vry5uCNSsQel9EtYijpnWSAhlGBaPTE0MleyCQue3UF7eYYytzvvm/6KFDBwd Lr3Y4lgiXztM8Fc/ECLYWmpMwUNE4yxdQCYqZSWttsBobo5V+zv14dBAvhWXATs+v1OnDz PNNJx20T9mlhWMjVUjWusQi4M+ZTT93Qc2AuNujiSxcGS6BP35WLxMU1wdWHkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759245829; 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=EV+KgM3KHBMEd//iQF09A8jX4VB2i97FZZHt0SEoBkY=; b=Bx2zcjpVci9u+h7i2lfZLe6nWZt/3kUwvdofS8Wf8bxpbPvqBOkYOKzSAwEcPY0ChTP5Vw BzHs/30PYV8LEcy2EmhuC5Vza5B4PF3d/fakMW9Yt/spbZ8+kP1IJO5pzVG3/N2LqgZwYD DBE9ZrngWFZmKU5cugRcAVHrVS2nos1ImycSznBqukl/MRDcAR6c1jkjPB9bd74UcA1jGr f3ZmZIkDx7BQVsfHG59dzcMZzN1I4I1o6LtPXjVF9Q/pPWgYe0n0jN4V8TbtVek+PW7ovK UwjyOvz3LCOa4xSIDWOBg4NWWFkeDFdV8hhb2di47hJ/BxXiewRAven/onvjIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759245829; a=rsa-sha256; cv=none; b=Rx1LG6PY+VevZkZ4yOy8U5dxxxWw4jMeaG+jI9K9IuizlRLmkF4FmcLiIcJv8sYWuFoABK UKqh4eo5nfF0rpn7BiLplZO6f/Nwj82e+KVXP2HEqAIVX4zaQafmsQXpcfX+lIb5mzRJK9 SxX+PRULnjHRRxFzq/E7RFDTdcBHbLCZc1pLCDtCTi2k8w5NYjwNDi8amsCD1Eswb0r+au dYg4XQpxFNYoYnU9NxUsFex9XoVps2LDGbGh6WnsDALD4xS1oFtxRxI1BA/HXTDJUjqCQ3 /Wyv9YhxWoG6t1m3n7bExaw+aygbjwTm4QeGa1FHgNdjsNxVyZd5V7EVrpaNxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cbhfY40vwzjGM; Tue, 30 Sep 2025 15:23:49 +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 58UFNnPG046043; Tue, 30 Sep 2025 15:23:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58UFNnLk046040; Tue, 30 Sep 2025 15:23:49 GMT (envelope-from git) Date: Tue, 30 Sep 2025 15:23:49 GMT Message-Id: <202509301523.58UFNnLk046040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0ab811d89311 - stable/15 - re: Make sure re_rxeof() is called in net epoch context List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0ab811d89311a37f99da0088d9f6b0063f914c3d Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0ab811d89311a37f99da0088d9f6b0063f914c3d commit 0ab811d89311a37f99da0088d9f6b0063f914c3d Author: Mark Johnston AuthorDate: 2025-09-10 14:35:24 +0000 Commit: Mark Johnston CommitDate: 2025-09-30 09:43:08 +0000 re: Make sure re_rxeof() is called in net epoch context It may pass packets up the stack and so needs to be called in a network epoch. When a watchdog timeout happens, we need to enter a section explicitly. Reviewed by: zlei, glebius, adrian MFC after: 2 weeks Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D51885 (cherry picked from commit b653a281f5a977ba73b3d405874f8af8e8b6b50d) --- sys/dev/re/if_re.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c index 76d395165df7..d56c975a43d2 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -3560,6 +3560,7 @@ re_ioctl(if_t ifp, u_long command, caddr_t data) static void re_watchdog(struct rl_softc *sc) { + struct epoch_tracker et; if_t ifp; RL_LOCK_ASSERT(sc); @@ -3580,7 +3581,9 @@ re_watchdog(struct rl_softc *sc) if_printf(ifp, "watchdog timeout\n"); if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); + NET_EPOCH_ENTER(et); re_rxeof(sc, NULL); + NET_EPOCH_EXIT(et); if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING); re_init_locked(sc); if (!if_sendq_empty(ifp))