From nobody Wed Mar 5 05:00:57 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 4Z70kL41Sgz5pYw8; Wed, 05 Mar 2025 05:00:58 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z70kL0ShHz43sg; Wed, 05 Mar 2025 05:00:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741150858; 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=dKSmlFxx79N+dUJb+xiKnGB2H+lFht1pTXVagLNgFvY=; b=XKXmpmbNOB0mwsE1ctR7t+3HRznIPeAMe0nihZCSX+vyxd+JtWI6hj2EekpuDG94nQtTIP YP2/2z/H7bs2RSCuajw/qzezjZxOLwPXEy9Gutrccn7oLuwMeWXTd2B73ru5rBPNQwFM8N QGH1+LQO2YvKftR3uVPrZmX96egU/WfixYpJROektGoMciNmVtxlBFxTqikUgXFKiAzLRF 9AawE5fZDvqn0xIE6YmVzTam9khELmgSNaC96PZkZSgW+PIno7ZDDmTIa8PjR+R37S3+B9 B4aG89T0Ut5Tnol/D9oCeEEzgPK+fNkLh7BXWxPpyRVOrsKKBNLq0cdo70DtnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741150858; a=rsa-sha256; cv=none; b=VPs03ahms4HFWloX8WX4Q4nQVq2kvpDVwDS2tzJD70J6TE62GSOn7284Lq9JXEV895PRfZ loGdaSM/n8CESgtSR9spCIwdy/ChYjtgc8QgUlhX0eosh1V2hzbL7Pf11ObNDAAxJPFmJn h+UBZamRJdV61FIi1HFBkvepNhnaHBySecc19jhX+4NfWsapU1kEHjdT+S7G1qjrG19paQ UQVXS6xaI4lLrAOzD1hzdALXhvYvV3zpgqPK3qoRTBroBRdKP9TYzRoHx3ZoCLHmkIuLnQ Lw6pUJxAHkuf/C6Kwh12iT2KCVzHOTmXbXpshAQDDsY94LnGuVY96c3Osi86sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741150858; 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=dKSmlFxx79N+dUJb+xiKnGB2H+lFht1pTXVagLNgFvY=; b=ssYQKoz7n/zqSmyrLi3FxqQGcF8z7I8btESVLM3+MAfTjIKoB+mccZriYMkbNbxtkMaQzR ihwhGr30BlM1iwaMy/HWBfR+lNicJgweRwjU3QXrIkQPOJOnCpEpe0qfY3YzDQpdtOkG0b ObqzHDDX6UkPrOPGIGQoSBFsOC6CoaPQsn9XKYGDGzSTGxGtWC9TJwmfcvwOrLHUWT3bwL hccwitkcrOs7z2qaqysnKc4jbuhZnOoGbUOVLIcH0IKCp7lCH25FhQf6xRsDdxzV9FmxDi Jj6EjKLwAtH+uol+wD92awnIPxiEVMSYwWqzka2S9TvjnDro3Bhg/QB5FVNveA== 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 4Z70kK0rSvzqHP; Wed, 05 Mar 2025 05:00:57 +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 52550vcH039092; Wed, 5 Mar 2025 05:00:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52550vhk039089; Wed, 5 Mar 2025 05:00:57 GMT (envelope-from git) Date: Wed, 5 Mar 2025 05:00:57 GMT Message-Id: <202503050500.52550vhk039089@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 2472f4dbe930 - main - udp: Do not recursively enter net epoch 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2472f4dbe93049d70afe0897f66f9651b67672e9 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2472f4dbe93049d70afe0897f66f9651b67672e9 commit 2472f4dbe93049d70afe0897f66f9651b67672e9 Author: Zhenlei Huang AuthorDate: 2025-03-05 04:57:30 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-05 04:57:30 +0000 udp: Do not recursively enter net epoch The only caller udp_send() has already entered net epoch before invoking udp_v4mapped_pktinfo(). No functional change intended. This partially reverts commit d74b7baeb0d4 (ifnet_byindex() actually requires network epoch). Reviewed by: ae, glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49227 --- sys/netinet/udp_usrreq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 2c68d0880100..b3d980956b66 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1040,6 +1040,8 @@ udp_v4mapped_pktinfo(struct cmsghdr *cm, struct sockaddr_in * src, struct in6_pktinfo *pktinfo; struct in_addr ia; + NET_EPOCH_ASSERT(); + if ((flags & PRUS_IPV6) == 0) return (0); @@ -1061,11 +1063,7 @@ udp_v4mapped_pktinfo(struct cmsghdr *cm, struct sockaddr_in * src, /* Validate the interface index if specified. */ if (pktinfo->ipi6_ifindex) { - struct epoch_tracker et; - - NET_EPOCH_ENTER(et); ifp = ifnet_byindex(pktinfo->ipi6_ifindex); - NET_EPOCH_EXIT(et); /* XXXGL: unsafe ifp */ if (ifp == NULL) return (ENXIO); } else