From nobody Mon Jan 27 17:22:27 2025 X-Original-To: dev-commits-src-all@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 4YhZwz2C20z5m08N; Mon, 27 Jan 2025 17:22:27 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YhZwz1dRFz3dd7; Mon, 27 Jan 2025 17:22:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737998547; 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=b/Ot7z4m5zwbxzJaDhl4YcEhkr/IehVKblr2jm3b2Rk=; b=v3ymGzPYxnQt8rOlVNkgw95cgsDoqfWQkUEUaSzlDvVnteRwlaQ2lu5GIYJrNSUciOxFge LtQL/sVpWQj5n4EC0wafEOjtTYflsO3vA3MLcnHXkIyTqxChjr11FM3MYpG1/ofzOJ+bT6 Zdb4KkFOz4g81OGITiz9m3oklQnHV3VMT1yA9/vfLj+FX7AZvp8AJPksXhcs8tk+uardP6 Um2inXHVXv5uH9FfHBusUs8FyPzPAXSeamZ3s496vjBKmO4e1E3BdqvQYsmkhr9tA6BNmg laoQHL5HIoQHIgljyBwghthAYBDhTKVpq1E1fMOBnmX6B7/6HwDn/FiTvlvJuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737998547; 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=b/Ot7z4m5zwbxzJaDhl4YcEhkr/IehVKblr2jm3b2Rk=; b=EYlT0ZLnGhpl4sXkQkBr8f6k/zpojAjrAJX3GGoFCq1b8JKnUkIBSfgIf9ozVqhNKTz6oo sVHvFHLF5oBD+Lck++q8+i7xDQ9PF7f+J4iADy8z1c8AVo9K+uWGv3+FZ/iPwGWgpO/YIO ozsPbgVTUK6OVFIXnrPGdflFHtxPuOZ0vY3gT46o4HjWYXGT9c3gkYXEZ+AONoheRr716H vanhcydn190uu383RBzT6mc4NrlTndw0w0N/lAf3s70v3IEmsX6fpvsYIBmVsSKKWFixlz kwjZgm3yL8atrCo5oaSENrGOHxOe7blrDkPc6782iOOMrneusJyiBv0GkbWSpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737998547; a=rsa-sha256; cv=none; b=MyRVbGAIM2aZNEt/EgIa7hMxhp3gbOO5ppsspJF58GnwyPspS4WQQwffdSJkqhn2JEY0Vs rTTnnF3PLTKXYbfmG4D8Y7PhHSEqa2qy+MdxzZKz8k19gdV+/FjRgUlgUV4Tz2O+wSltmW 1vuRP1H/vPjUb+0zs7lSwdwL3VyG7+K8y/fd/4NlnmJDrM64f6VlV3+9Y1ngyU1a5FM1l3 FpWbVwEzIoaaoLdCJF3qiEwEnuJ82lKC3tVCFHW26fP9k8UPVwEXCm4nDaQZfSNmyHw+A4 EWljdWe79oCyXgfuX/GFhmc18xzX/zB9FIal7R83GaBJehR7RudIrJo3oEmhuA== 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 4YhZwz1DF6zfFB; Mon, 27 Jan 2025 17:22:27 +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 50RHMRRs096365; Mon, 27 Jan 2025 17:22:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RHMRcW096362; Mon, 27 Jan 2025 17:22:27 GMT (envelope-from git) Date: Mon, 27 Jan 2025 17:22:27 GMT Message-Id: <202501271722.50RHMRcW096362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 1c465e529208 - stable/13 - netinet: enter epoch in garp_rexmit() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1c465e52920848dec6a76f0672fa209db7d5e5b5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1c465e52920848dec6a76f0672fa209db7d5e5b5 commit 1c465e52920848dec6a76f0672fa209db7d5e5b5 Author: Kristof Provost AuthorDate: 2025-01-20 13:24:48 +0000 Commit: Kristof Provost CommitDate: 2025-01-27 09:04:31 +0000 netinet: enter epoch in garp_rexmit() garp_rexmit() is a callback, so is not in net_epoch, which arprequest_internal() expects. Enter and exit the net_epoch. PR: 284073 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 38fdcca05d09b4d5426a253d3c484f9481a73ac2) --- sys/netinet/if_ether.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index ac3dbfaa4a65..e0cb3031f546 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -1361,6 +1361,7 @@ sysctl_garp_rexmit(SYSCTL_HANDLER_ARGS) static void garp_rexmit(void *arg) { + struct epoch_tracker et; struct in_ifaddr *ia = arg; if (callout_pending(&ia->ia_garp_timer) || @@ -1370,6 +1371,7 @@ garp_rexmit(void *arg) return; } + NET_EPOCH_ENTER(et); CURVNET_SET(ia->ia_ifa.ifa_ifp->if_vnet); /* @@ -1401,6 +1403,7 @@ garp_rexmit(void *arg) } CURVNET_RESTORE(); + NET_EPOCH_EXIT(et); } /*