From nobody Mon Jan 27 17:22:28 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 4YhZx13Jbqz5m0Dj; Mon, 27 Jan 2025 17:22:29 +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 4YhZx06Dccz3f3n; Mon, 27 Jan 2025 17:22:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737998548; 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=0vAC43Mg2GUTzkOTKbtX8YUAevQ5y+CWySMJSNiF1fk=; b=c1xgzuNk7kqZ0GdKMbB/OrU0wJitnFut9jBxyUVcHwOK5ymQLktVTlcoVXoPaHgpS8wZMv bbBQYODGuUTlB4ireOulhEda9tE80YXvlL4juCEmsoU493BwXd45VuKiz1YNXYzWnltEWE f6cc3CSH2nCjgFWqdCp72skanKUQXAwz4mUz8JdLjwssbpoGVjHtcIIj9kVu/gqBOufdKE DZAk2m+KfHjcY69NAerrEA7tkOLv9jFV89MGaDgQFtLhmAAQIDG0Qc22qYN2/L1irYKVFW MouWzCbcX+opLTuUGgj0gZiGWxT11NqVmNRC8xeFqsGhBVx0hMqsYZATkwH/vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737998548; 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=0vAC43Mg2GUTzkOTKbtX8YUAevQ5y+CWySMJSNiF1fk=; b=I98ZCjIG9O7D1VwA+BUJq0IqJdpFAEBLXqnQGqr8FnTZ3gX3nLPhPm6K3ZVAukj73oIvdK XDZXoQkXMkMW5mTbaxc5uDWasW/tPTax3LYb6UWfVoxkxTcmqoE0pmmh3AjLhuUzPzY7xh DxfO7H3as+L9QTvLan48FHkGvzpnDqEnkT6Qhun0eamy4qWcs1ua6xbA9jRwmwlKtU8G0M SqmHmiHB5u77WyiCmlejfq8NBxtn0E0H/V55InExpzBnSB+9pK6v6stZZerYzH8BrRKBMn Ghgr53NwCBltSYk1YdyYSwziKXt0pBDe43nUkAJy3rmRMPtV6RXSNiHj+x9YAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737998548; a=rsa-sha256; cv=none; b=pPYaiMk4QDUymSkQjk3+FRVxupkgKEM4b/WUYbfmksiGeOFkuU7P5si087lF0sepxm50JC D3fqYlYUvJOTb10sffq+1JqiQiUDWWzHnxUfN0XCLiyuC9EmSJc5UxxgRWQo+2mXYPIHAb jA/2cPRawpVsAcZZ+DfUQ048yUtACu932i+HaWmc7jQKRBE5zBG6BT2TEDmpXKoW1RTC1S gJ71u5ZCumTVp+fb1LIsg+bNz1k/V+9cE55apoA/O3yOk06vXygYJgl4CpHGYgTQ+SNv+U l8XkvBtjCBXAFU3EJT2HNehP2kcBaYvM5KbL3qjXrzcVSSaQH0ysiReZg7eCyw== 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 4YhZx05nn4zfFC; Mon, 27 Jan 2025 17:22:28 +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 50RHMSX5096488; Mon, 27 Jan 2025 17:22:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50RHMSBH096485; Mon, 27 Jan 2025 17:22:28 GMT (envelope-from git) Date: Mon, 27 Jan 2025 17:22:28 GMT Message-Id: <202501271722.50RHMSBH096485@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: e69309223199 - stable/14 - netinet: enter epoch in garp_rexmit() 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e69309223199e56397df3b6f750f012eb729d904 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e69309223199e56397df3b6f750f012eb729d904 commit e69309223199e56397df3b6f750f012eb729d904 Author: Kristof Provost AuthorDate: 2025-01-20 13:24:48 +0000 Commit: Kristof Provost CommitDate: 2025-01-27 09:04:34 +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 0e4f28a06342..5b69520a12d3 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -1354,6 +1354,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) || @@ -1363,6 +1364,7 @@ garp_rexmit(void *arg) return; } + NET_EPOCH_ENTER(et); CURVNET_SET(ia->ia_ifa.ifa_ifp->if_vnet); /* @@ -1394,6 +1396,7 @@ garp_rexmit(void *arg) } CURVNET_RESTORE(); + NET_EPOCH_EXIT(et); } /*