From nobody Mon Oct 20 21:10:40 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 4cr7PY0llWz6D81B; Mon, 20 Oct 2025 21:10:41 +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 4cr7PX75Dzz3Vhd; Mon, 20 Oct 2025 21:10:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760994641; 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=kTxd3qYvwvkQfb30JO1S1rG//Hk5cnZRCZrX93b+MhM=; b=j9bi4jhd3IlZux/HyJxh+Y1/CtXCXpzGShXWl/PncoG4NrETiOgb93jflhDDFN/mjY87I4 OfrXPuYFcdeiCf5f22L/PsLAzx4P1RG5t2OOwsQxgg1qvyLy9UwX5ZIQLnLA/Q0kJlbN9A L73Ab+dsb5QR/6RJ8GEgD6YH8HBXX32mqAD01MRQ4efTEoSH0Uu9qPlB5Y6JaS6bw3Pq86 l+5t9cBPYvTvDVyVruLB3/uL0E0RndT2frLItlkbIC5xqO/3amhOnMtN8yT7aMpTnqcXrx n7DF7hGsizdlmVfYWiEYM/8oxQsZrDCUOfFPGdi9mA8xsQH+TZmZcHo6J+zWqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760994641; 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=kTxd3qYvwvkQfb30JO1S1rG//Hk5cnZRCZrX93b+MhM=; b=W5V560syuRx2jz65kYjp97KjhhD3h0r7dySvYlFJTgEzQ41bbGGV2h9LLU7ZUdArDbfeIn MjUNLznfUAa9slpbhQN/nWUNj8GCv1EEKyuglWf/JFNF+88WlbyDDcYd1vEYRwwhvKlCfS eNMastR+ayHf+fOtA0c3OrCfFZ3+BvFy9SjR9PPf8nDgg2XjrSixSeFtWjsaNteZM+S4k/ A4xZirSsZ6meuRHBWIineeKI2MMwbkUy9AeXVk9ge8OJBp8kLI0/L3lJxJMJVyyPsyEZLv POs19D3+D7NivuvBQrnmPam0JQO/458Pom4livd2LRue2B05nUqea4fDhjtQWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760994641; a=rsa-sha256; cv=none; b=hWxiFaB/y1cqTD/2s29M/98NwVCkyymrfppu9aRjvaF4g5L5wfkIPbAXlrKZ6uREHKR78h kpeoeYZRituc7/K9YjwqMp6A6GESyhjZL4gxYiuxmLTucqus3FPR2DGM6jFrCtcHBKRWtB CMC4XVlvmcqpW6pd5HX2Tse+ccMnfJC5hy28VurvBIN1FjLpzaYiXMWTxAa/27gDcuS7Ad 9f/aiQrODp/obx3/hVFhz0q0pz/PtHzjpepxlU2Hby0Rmx0YICodUx0g8jAYcvu+ZTW1af i/buoKJunu7pzaYCT+L9c6qJDzQvh6/CJga4QVPFA98xH74JrdZh4UAGXJPT7w== 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 4cr7PX6MXszTkR; Mon, 20 Oct 2025 21:10:40 +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 59KLAecU001661; Mon, 20 Oct 2025 21:10:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KLAeFZ001658; Mon, 20 Oct 2025 21:10:40 GMT (envelope-from git) Date: Mon, 20 Oct 2025 21:10:40 GMT Message-Id: <202510202110.59KLAeFZ001658@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 5f6f2c3fa25b - main - UDP: let udp_pcblist() support UDP and UDP-Lite 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f6f2c3fa25b3f37936b564b433251c33b27a8b3 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5f6f2c3fa25b3f37936b564b433251c33b27a8b3 commit 5f6f2c3fa25b3f37936b564b433251c33b27a8b3 Author: Michael Tuexen AuthorDate: 2025-10-20 21:07:38 +0000 Commit: Michael Tuexen CommitDate: 2025-10-20 21:10: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 MFC after: 3 days Pull Request: https://reviews.freebsd.org/D53218 --- 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");