From nobody Tue Sep 30 21:14:45 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 4cbrRT4mGrz69M5J; Tue, 30 Sep 2025 21:14:45 +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 4cbrRT2Grxz3t7r; Tue, 30 Sep 2025 21:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759266885; 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=nwsZ0OjVpKdIvs928ipaU8GEghFta3mc7zmA4VZNUi8=; b=TK9iJuZK5rRdZ6gei6tCnYla93uvKiUOiPslHJo1Qw46ctGjz4kdtYYKSzDKGX+fSsaXSl qDYn9eSlFYdKIowcT1YtsjCw+zkSPab0FBZRt4I3Q1oZFAbvuFyS/f376XBFT+f9nD74lZ Ly/FAc00ORaX2GAVBXQ1StSjYGxYzn6N/WQuvQH4UmAo4uYds7Xcf/yLiVAJdcsBgZib2U LhhfCpOVLukL9pkbH/fXrdFdbQX/QjjWqmzy4ZyHjazJ0SfAuU8VRGXYRUOFVmQ554U9Z4 TfLfqzsBOk3vUUcHo2xqSoTbsFqPODezhdEcEgcdeEvaCixl0ztiy3Ln1+Xr0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759266885; 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=nwsZ0OjVpKdIvs928ipaU8GEghFta3mc7zmA4VZNUi8=; b=x1PUhjmp1OWKK/khQ1lPvPUvd/8jEDhqrWce7595mzEDSPbS2eZuaojQDBRlOHNCN0h0eY eAMvLCOOC4jqXOPxOf0km7AENpmgf3t/FCapwMPTWDfDLWjvFzmjqytohql3FkcBm4/wd4 +PuS0UaCXNZL6+AxtZj1gGKdnKNH9lB05TDQglxzqy/RJaDVGgOY6nVGUzK0t0EywrJA/6 tCuLBeNOFQMzc7uJ4PtTCZpbC03Fm0Zf0zveMxlx0GSr3IITC+yvtszXzhmmjYvLD6cJmx ZZEy6vA2UjDmbmYnq2uyOyoh7xe6yFMIiFhBw/OvXMm2krhZTB6G1RfVISty5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759266885; a=rsa-sha256; cv=none; b=N95H5msuDJJa0DhYTkKSLIr+8CJOchPtxdCtULmiAe/auLg0/6jpXfjpUm4eK3qixA0Ppi bhngbwWCH89yaiEiIr4Jc3UL2Bb3PRzsh6bWWdNgXohcZRWTz0DKzXQ4EXisRiZaituYmv 4691Zn9aPC2GDwFsOPrtjna3soGLtJpXVJ3Ij377IZRe6/b33zaO/cQ+KhFd0is9XNDLBc MvO6MUJm3EZOzuZXwLCgqz3hVgpLbPFGr+TSWJirrz/RjFiM9nNWyBEvbWM/CBER3q3Bwu niqYW4av66RvzxjV/SgjEpPkqa8iitZmyYurt/hvfc8JmKPTKQpV51oRli01Ew== 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 4cbrRT1kRvztSQ; Tue, 30 Sep 2025 21:14:45 +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 58ULEj9q010498; Tue, 30 Sep 2025 21:14:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58ULEjes010495; Tue, 30 Sep 2025 21:14:45 GMT (envelope-from git) Date: Tue, 30 Sep 2025 21:14:45 GMT Message-Id: <202509302114.58ULEjes010495@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: 4008dd50c8f9 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 4008dd50c8f90fb076280a8ea56390f25d7519a9 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4008dd50c8f90fb076280a8ea56390f25d7519a9 commit 4008dd50c8f90fb076280a8ea56390f25d7519a9 Author: Mark Johnston AuthorDate: 2025-09-10 14:35:24 +0000 Commit: Mark Johnston CommitDate: 2025-09-30 21:14:29 +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 a74f4898fa4a..be2bfe5384de 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -3562,6 +3562,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); @@ -3582,7 +3583,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))