From nobody Thu Oct 23 11:08:19 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 4csjv804Hhz6DC8q; Thu, 23 Oct 2025 11:08:20 +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 4csjv76ddGz3ynl; Thu, 23 Oct 2025 11:08:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761217699; 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=hhK2Ee9bin4cGnj4o9Irs3XLqdpyExsZ8Rh4wRBpLZw=; b=yTkiLDLp5aiCcUUFAQ3QrhslVW/ozwq4f1QUdUiWO7HZNQo2L8xoi+kuXcM9pIrEhklpnM nrVNJjJYDaC2+f/OlcPstWv0ZWNUsOgvZkw95E6acbA5zW5+/sP0yp7JM6YKz6t4rrNz3B YuOfO4lmLRunRR7CqKcfgn9RwYSRAwe9n9ADxYe8ySSRMtP43zD3R1qx4vui9LhA0u0s0t Y5IiwFN7W9iiViK+qsEoNODBUmwNwxU+jJByZVGcAJTFV514XtPkVDCYbsenuhXviygREC eq0gcQ6cUaqfj9fvlTy6ATaPE5XTlJqlt5ATKuV8bEqyTwv7yr7m6qSaApaXkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761217699; 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=hhK2Ee9bin4cGnj4o9Irs3XLqdpyExsZ8Rh4wRBpLZw=; b=SX/mSDKCroaiQAZBM9+QuN2/0ZvNu0zXdQiFYtZRTC273ipXU328ZTP67qjANJSZgmwfYZ jWZlAz8HVI1iZpEsj6aN2XEHcSMBpeJGpmG/mGWHpuUbGynFcQNBJPNRR4IymkdBu9E0/1 zE2rP0QBWzl87qQ+USU0PajB4ABEGBJihS1eApsKCahjjFbCfpCbqZXepfw1oZjNZtn4Ah dEi9lSB/Um7+DMUZRH4eBZLPLr5liRPqHsFHuuqY27f93uE7LtF6IR9MNEBWOPF7eGBjel xE9eyoFG/eJtpXHQqQa9FAIyaDR9vrk0ztWWta0jif46rrHEN9DKf61cvsXyMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761217699; a=rsa-sha256; cv=none; b=GAinPbnhFZC7RV9+5SwmuZ5nuN2XP/rwVyYocLvHrb0KJNN2AZ1LrMuy8fELIm+SmbGyAV 5qVWQ8f3nyWsWSt+39tdja/T6CcXE1zKggJvdH23UhWzIJRy/DEGEFn/echDtZAYLYm/+q 1Zd/cFT1kbgO8FIthA8/e/465dx0IiciHx8bUDaoFhx1PKYY9YM7RS7Xak2CAObg09/wzx UqiyQP/F+mt6UwfARY4X48dI95WgwbeKMxiO+gC2W1jRvYdnCH60Te2cpAnsZzSHBtk/1p Fe1uluw2rilis7eAE91jUu7zG+SzIcj7/C3OUkiLW2csNnLGA/yLzzjRhd9Cbw== 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 4csjv769tcz1B0K; Thu, 23 Oct 2025 11:08:19 +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 59NB8J0F012468; Thu, 23 Oct 2025 11:08:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NB8JG7012465; Thu, 23 Oct 2025 11:08:19 GMT (envelope-from git) Date: Thu, 23 Oct 2025 11:08:19 GMT Message-Id: <202510231108.59NB8JG7012465@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: 365378184a46 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 365378184a46e2bcb30631c216a779df2ab8517a Auto-Submitted: auto-generated The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=365378184a46e2bcb30631c216a779df2ab8517a commit 365378184a46e2bcb30631c216a779df2ab8517a Author: Michael Tuexen AuthorDate: 2025-10-20 21:21:47 +0000 Commit: Michael Tuexen CommitDate: 2025-10-23 11:07:34 +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 cea8a916679b..0a89d91dfc37 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -787,7 +787,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; @@ -799,7 +800,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); @@ -810,8 +811,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) @@ -838,9 +839,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); } @@ -848,7 +849,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");