From nobody Thu Mar 13 10:14:23 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 4ZD3JH5f53z5qQy2; Thu, 13 Mar 2025 10:14:23 +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 4ZD3JH54Y1z3lZR; Thu, 13 Mar 2025 10:14:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741860863; 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=rdctVdhajAYaqd0BDS4B+Iv3E5xv8VVob4twMVUx8oA=; b=AzJLL58agIB0y4wGpUbSBOa7gve2awUW+ofBzgjLSyez3QOxiVsmPsUMx+uQr5JHmw8pCy K4rU9D+9p6KtuTXrrqTMjfq/BdBgRHHz/zfUZG9GbIu4xDeAs4cv4sSnp/0j3sKduBQpHq IWeZfpr6nOLlh9NJthzNFSbkqVagOSp6LwWbztnW1CBfB+WOp4pCTb2mtmFvzNyMANqunc xxz8m0uwIOg82oYgTNnQk/uEVPTkqYcnq7o26oCxH3hBUWEzYMls7jOZkZnACkkoo6qPia 3JcqARWnBDndaBBgIEYrzPGI3rqcGTJd0BZmk2Z5TIf5TrpFt66FtHzeTrwnBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741860863; a=rsa-sha256; cv=none; b=UwsK0pStl40U6iFixIvU2xnX6lA8YiUGbamCHEDGWfOOw6Togtw3J7I4fNpGsi3F193NYg l0rkoLz1QanY/gDIDTiYLk1yVgGVenA23Yzz9K8onJ5NOt7HpZrQyfF6JQBoAzQxh2qin5 EkOnOyJHnTUucv1PcRpyuLf/V81JwRY7+af3v1lT7GOjcrdCA0oSPAD/YLvZRqBX31hk3z XOvgLtHVF/7GB7P7r2BGe9zOyfOGKGwqAqgUVAzkj8QDLBN10ttEkc4J8TwmgEihquxwQl gLkbGJYmVxAv0Ed26vAN5Of5qK4Yt1mFCeVRHN1nCUdxWgoG3MYvYxz/mblJAw== 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=1741860863; 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=rdctVdhajAYaqd0BDS4B+Iv3E5xv8VVob4twMVUx8oA=; b=YvtbTUJ1odBKsaeZ9GBuJGvyboEoWoglhCv8dWxwYEjIQbuXhr16DmruNL4wjDKen6TI/I HpEmMzom69C1JXAWquLZGd5dPVKqwz97f4veSqYwTp/QB92HBAlBA90PwdEhb0mgoZLkGx lVFm+WzZfEXfKJZ1JG1DH655/bcKIjqPhOpcCPEEjp1PmDqFr/3RywkV2rIlJy8qZWUtZb 5RjHflORqfrTZzzypdned1TYYOdOwByRwMwSeMeIWq7klrS/tkZrSOFRRYMaRwDxIxWwxg HzLczo95Pdr4ePtuokvFQfPjlqCMKND77slU9lssPzfpGQ8uxFqI+2LkzVR3bw== 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 4ZD3JH4QVtzt0Z; Thu, 13 Mar 2025 10:14:23 +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 52DAENP3091767; Thu, 13 Mar 2025 10:14:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DAENV2091764; Thu, 13 Mar 2025 10:14:23 GMT (envelope-from git) Date: Thu, 13 Mar 2025 10:14:23 GMT Message-Id: <202503131014.52DAENV2091764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: af1bd15d3be3 - stable/14 - udp: Do not recursively enter net epoch 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: af1bd15d3be3f1f348e0a0237a4edad636c4fc1b Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=af1bd15d3be3f1f348e0a0237a4edad636c4fc1b commit af1bd15d3be3f1f348e0a0237a4edad636c4fc1b Author: Zhenlei Huang AuthorDate: 2025-03-05 04:57:30 +0000 Commit: Zhenlei Huang CommitDate: 2025-03-13 10:13:50 +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 (cherry picked from commit 2472f4dbe93049d70afe0897f66f9651b67672e9) --- 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 0ea065f15ce4..178b5b431cf3 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1016,6 +1016,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); @@ -1037,11 +1039,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