From nobody Wed Sep 10 16:00:53 2025 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 4cMQQZ6WPXz66WPL; Wed, 10 Sep 2025 16:00:54 +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 4cMQQZ1Vsjz3KPr; Wed, 10 Sep 2025 16:00:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757520054; 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=N87x1HjBWQ7gd9TGPdKr67VS8tSRl81yR6f9ZIB4d5c=; b=XStWALn+rSvcgdtEwjwVP9e64trXjhXy41JDHI8tPq3tvOFOd4YN5ZQLTg20P24kQYjsYn fh1tgbq8i7n//bnhMorGgp3uE2LhNkrb7Gkxpyb7z9fWIjQquJhZZ5wflga8B+W4Y/ZfuA yWrsjxjaaC1DmF0qqNXVB+BXlFvuTs9UYYZjUH+qMpR+cGO3WRZpp1wVAxx8R5wQdwmvSx oT3mkg7y6xvSFMX4QEU8peqs0xv5Xf7QVsYEifBCNvmweKkSiLVdvdjXRvrgssY1OZ0whs butERUbfb03aZ0pjVr7TEI7IokDsKD+MHoXlslg1nTymZ5PvVrFhrUMqC/VFqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757520054; 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=N87x1HjBWQ7gd9TGPdKr67VS8tSRl81yR6f9ZIB4d5c=; b=miDumqx+JTGrPDV1G9OzOW1G3CcnVBgMiD5zDKQRM27vJLLsQS7ROog6SRYQYHmldzCZuO MCSKtetmFeEsD7VhWP9iup93vcW+2OAc7FBMbR2ICCDGhA9UPbFYDUB8gnMA5qqNrDLJ00 A1sQjHlSvCf/QW3aH96ap9oTk1xDJ9JOCZuDVad9pd/rdQQ5IgdvIPLMXbsC5QDFoFPHni j32BFBcXwKjH4D8mY3RuECl0EG8DhDWAqGiepn0sXjANm08Nj5zJx9OEG+ChntfeEOMcWd /CSVwA5HVTn6fxLSgfqyFbCqj5EwXDfvsMPdERbDWzqWSZygfztO6dOuOvO5jA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757520054; a=rsa-sha256; cv=none; b=Npl3cBKSnLBpQA4ajZ18aW4SehKjwGTicKuKcWV73SLMLmB1o5VProq9BE/aCx9Ff6SNTq MKHFDQ2FToVn94snOQgxhR+///zXE4SKV0s0GcdyVNLasVgWGogJgFgH4prEYjFpT8S5YO AkvzjouWNW5SS7hdUXjmO27C/7bPZSnqPglU9nugIZE8ZYcMdvHvQRHHif3FxJDBmDMyLu /vdVgYuY/vCnpkzrHPf+1ljdA1Ii4SBQ5A4eJ6dCfBYdln6PlIYWwY7umIimCyglihJNPx 8LRY8ukNOwNSDd1D3gOUYzbQm/61A0FsbX2gTlTznYDi0h0rmbfUOub8xP5HLg== 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 4cMQQZ0DzZzBYJ; Wed, 10 Sep 2025 16:00:54 +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 58AG0r5K058483; Wed, 10 Sep 2025 16:00:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58AG0rBM058479; Wed, 10 Sep 2025 16:00:53 GMT (envelope-from git) Date: Wed, 10 Sep 2025 16:00:53 GMT Message-Id: <202509101600.58AG0rBM058479@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b653a281f5a9 - main - re: Make sure re_rxeof() is called in net epoch context 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b653a281f5a977ba73b3d405874f8af8e8b6b50d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b653a281f5a977ba73b3d405874f8af8e8b6b50d commit b653a281f5a977ba73b3d405874f8af8e8b6b50d Author: Mark Johnston AuthorDate: 2025-09-10 14:35:24 +0000 Commit: Mark Johnston CommitDate: 2025-09-10 16:00:13 +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 --- 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 091ab2db72ec..67864c2de388 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -3558,6 +3558,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); @@ -3578,7 +3579,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))