From nobody Thu Oct 23 11:20:50 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 4csk9Z54w8z6DDVS; Thu, 23 Oct 2025 11:20:50 +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 4csk9Z4MHjz41mg; Thu, 23 Oct 2025 11:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761218450; 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=8FM52pak5xNQEmtq3L69+ES0PW50duFgIyCkQYgUCW4=; b=NktzjVFBkDaVdcjl21eSsCOOP0bZI6VdNpOLEswQnW3kXQfDadV/KWibEP+s9KuRcEkGKq egcPUt5dB6Oa8gSfj6JhthuqxM2YqUrDAqC0Mc1cSZltp/sM7dnf9ppRRptCFs46i9MAYE gOGiP2aK6OoAhMfwPOl+Op5OXSKr54jRM7z0STSfGhsPgMGZlIWVuvUjR8sJbo4/HwG1yF GNYersloszDxYfyv8j76fbuoijZWcCOQTRzH95jUfOFnfQEQaJSay7a/ovo4ZwmhX1bgEE qhWEzpxkjbvcORAC+D3L7K07wWovl9O1H7tkYd9aP6wCaVuZe+hKDaXsmqFCvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761218450; 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=8FM52pak5xNQEmtq3L69+ES0PW50duFgIyCkQYgUCW4=; b=HYbpBgtncn3HifyK/+2tM+bSvoPtKeej/Sob3iKG9WzzXS1UFTxSzepvhUWdWJT8wfMvE5 l1PUZoidW7PgEm/v10MVsrgQN8gzW1zaY5Denu3cZxxXPh2alnyO2Ef3AJJd6FelIOldzX t6cfKgxdk5KIT8KoZsvWkvO31PciIuK0vfby8rVFYLfCBeh5iJ0QNKLiSl2pV67Cw0qswa 8sIn+OgRvbiuYyKhIns92cqIV8aRDsPthnGYg6K76eodno1FHvEIdxn9b7/EoGTo8HsxU1 hV4Bgp/0cJDcVXtPj9sZ3k6vndQuqih31PxjXxvdtAh1m3WCBfQDTDG2DCAO2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761218450; a=rsa-sha256; cv=none; b=q52v9YlKwRIDv1Zs9dYu7ti65rcNvsIVbN5VSSeG8JnmkWq3rPfRG65UIWSdYD/d8Wv/+W +N2+9bP3YvmQxo3rVFObyv/w+/RzGSbqn/O0gdk/E76sPTvwVMk73zSOwWAPyNkVIjP6IJ obqPljf7Z/5e9qTJvQ5dckihEPWJ+bgCO8qAaQR+IAiEMCz8NfBREESyDvaLy1V/OYtlYE KP1li+eCPjJnL8UfqJ3q5qhUbvRVfJoKFrKpNnjoV6788MlBwdYJs+UJvFlRYOz3YX2nDV ydgGI4iQ9qDe+qZ4XK4DXW3KVf1Fh/GsPO+MG46ALOOuVnQzafba3ZsB7fjXjA== 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 4csk9Z3lmkz1BpN; Thu, 23 Oct 2025 11:20:50 +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 59NBKoxx041345; Thu, 23 Oct 2025 11:20:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NBKoX5041342; Thu, 23 Oct 2025 11:20:50 GMT (envelope-from git) Date: Thu, 23 Oct 2025 11:20:50 GMT Message-Id: <202510231120.59NBKoX5041342@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 218b164aef21 - stable/14 - UDP: let udp_pcblist() support UDP and UDP-Lite 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 218b164aef21de718bc3b4fb68ac4c4b57b40cab Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=218b164aef21de718bc3b4fb68ac4c4b57b40cab commit 218b164aef21de718bc3b4fb68ac4c4b57b40cab Author: Michael Tuexen AuthorDate: 2025-10-20 21:21:47 +0000 Commit: Michael Tuexen CommitDate: 2025-10-23 11:20:29 +0000 UDP: let udp_pcblist() support UDP and UDP-Lite Provide the IPPROTO_UDP in the arg2 parameter of udp_pcblist() and use this to determine the inpcbinfo. This allows the same function to be used in an upcoming commit to provide the list of pcbs for UDP-Lite just by providing IPPROTO_UDPLITE in the arg2 parameter. Reviewed by: rrs Differential Revision: https://reviews.freebsd.org/D53218 (cherry picked from commit be3c59ff508204dbab9e3616dc82ed7620f05d0c) --- sys/netinet/udp_usrreq.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index f44bd1838d07..88df8f8d38fc 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -786,7 +786,8 @@ udplite_ctlinput(struct icmp *icmp) static int udp_pcblist(SYSCTL_HANDLER_ARGS) { - struct inpcb_iterator inpi = INP_ALL_ITERATOR(&V_udbinfo, + struct inpcbinfo *pcbinfo = udp_get_inpcbinfo(arg2); + struct inpcb_iterator inpi = INP_ALL_ITERATOR(pcbinfo, INPLOOKUP_RLOCKPCB); struct xinpgen xig; struct inpcb *inp; @@ -798,7 +799,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) if (req->oldptr == 0) { int n; - n = V_udbinfo.ipi_count; + n = pcbinfo->ipi_count; n += imax(n / 8, 10); req->oldidx = 2 * (sizeof xig) + n * sizeof(struct xinpcb); return (0); @@ -809,8 +810,8 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) bzero(&xig, sizeof(xig)); xig.xig_len = sizeof xig; - xig.xig_count = V_udbinfo.ipi_count; - xig.xig_gen = V_udbinfo.ipi_gencnt; + xig.xig_count = pcbinfo->ipi_count; + xig.xig_gen = pcbinfo->ipi_gencnt; xig.xig_sogen = so_gencnt; error = SYSCTL_OUT(req, &xig, sizeof xig); if (error) @@ -837,9 +838,9 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) * that something happened while we were processing this * request, and it might be necessary to retry. */ - xig.xig_gen = V_udbinfo.ipi_gencnt; + xig.xig_gen = pcbinfo->ipi_gencnt; xig.xig_sogen = so_gencnt; - xig.xig_count = V_udbinfo.ipi_count; + xig.xig_count = pcbinfo->ipi_count; error = SYSCTL_OUT(req, &xig, sizeof xig); } @@ -847,7 +848,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) } SYSCTL_PROC(_net_inet_udp, UDPCTL_PCBLIST, pcblist, - CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, + CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, IPPROTO_UDP, udp_pcblist, "S,xinpcb", "List of active UDP sockets");