From nobody Fri Feb 21 01:57:24 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 4YzYD51wP5z5nmcJ; Fri, 21 Feb 2025 01:57:25 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YzYD45ZHhz3nsk; Fri, 21 Feb 2025 01:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740103044; 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=XMJIiciZkk2c0+VFzYLDQud0/P9Ey6nvXPjzbABZX6g=; b=BceDoYGoZ7pf7XR1tMW+LILKEKdH1W4lCNgMtGe+UefJHSJlZTkvTpH+64ztWNb2Stxf+N C4viCdmG5p6Y895o++nxSG12lMIjbBEIauAC8wOG493iJ9gTpn7ZKNQlWNFJb1h5XoKziS Tygu9B4KgUwEvCM3pfl34KCQQysFIKOunaQboP6kbnBvFcdsV5H4iEb17JnfShK7PzyQGC Csfx7wpUhh8SRwoA6uc7A2yIvY6nvmGhYx3P7sNjVlSIVbT/u30Jb6/xx0PE325MHLpT5Y GgLdbUeyIA2s9AjI2/3XbmN3dWz8rqRg6/e3N8A3DgeKjRROFRwVH5bvXOV99Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740103044; a=rsa-sha256; cv=none; b=KSApcUXIxriD6c6KZ83ERIVe6rFXgFbfgogn5lwKQoHrdThpJYWhmtZu+RYUEiXsV05/8C OM4yZWtCYes20ZCkF8Fk4XYhnsRhwuEReTyIxEAcqpGQhL5hRTOKG/E77zszYdxoPx4/E7 HO9he9IMoECdVChm4xrZtSxpWbv7wIrcgnLbqprVgXs1Vggt8qJ5kWJXa16MYxWPjPVydT 0EcGPtbgQg4DYRUPe5KCiZNS0l3gBxmtNsj3m3RDA+omBUZK13AhXKVpNItFOdAAUkpgdS q0/gNYRGRWYGxcun88x3iB4V1L4L5XBnGnsSXDOHNYbJzdpDuNBjUELUWj/gwQ== 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=1740103044; 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=XMJIiciZkk2c0+VFzYLDQud0/P9Ey6nvXPjzbABZX6g=; b=Pa/GtyFlcovoBN0JYaUAJXK2neIDnRwb3x2rUE/9anTKVcFqIrTjfUs3iuI+TKpGT9swsc D1ePK4lXoGXvIGj4QRdzgOFy0JQ6qOcA4HexwWMCz5rSiJMX7XF5ayBSEIhDKwxJ4lN91U fsHE7Ifqsqcrw/M7gexr9HS1prh3ZTKTTJlCCfuLpjx6Cn2fBfr49QLw/80rwSH2PLSKlo VYOCKL14nOcFV/gmYj/JNNrkpj7LJr440B1+S2yfUu/zN62M3x1aSMmDOswstw4joGm8Uk sPvHdGwjpRk4tmB3TvvVWpGLIwHAWUL74gBk/qm++fAKKI8HVNozVGwZawm/+Q== 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 4YzYD4595jz1GQb; Fri, 21 Feb 2025 01:57:24 +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 51L1vOcd067663; Fri, 21 Feb 2025 01:57:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51L1vOun067660; Fri, 21 Feb 2025 01:57:24 GMT (envelope-from git) Date: Fri, 21 Feb 2025 01:57:24 GMT Message-Id: <202502210157.51L1vOun067660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b65e307e9458 - stable/14 - inpcb: Move the definition of struct inpcblbgroup to in_pcb_var.h 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b65e307e9458bac617b77cac171a2d953ebd11dc Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b65e307e9458bac617b77cac171a2d953ebd11dc commit b65e307e9458bac617b77cac171a2d953ebd11dc Author: Mark Johnston AuthorDate: 2025-01-23 16:20:55 +0000 Commit: Mark Johnston CommitDate: 2025-02-21 01:04:50 +0000 inpcb: Move the definition of struct inpcblbgroup to in_pcb_var.h It's only needed for in_pcb.c and in6_pcb.c, so can go to the private header. No functional change intended. Reported by: glebius MFC after: 2 weeks Sponsored by: Klara, Inc. Sponsored by: Stormshield (cherry picked from commit ca94f92c23fd09b28ac3398657ae2ae9367bcdf5) --- sys/netinet/in_pcb.h | 22 ---------------------- sys/netinet/in_pcb_var.h | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 6ea99b58f246..17f24ba0bee7 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -423,28 +423,6 @@ SYSINIT(prot##_inpcbstorage_init, SI_SUB_PROTO_DOMAIN, \ SYSUNINIT(prot##_inpcbstorage_uninit, SI_SUB_PROTO_DOMAIN, \ SI_ORDER_SECOND, in_pcbstorage_destroy, &prot) -/* - * Load balance groups used for the SO_REUSEPORT_LB socket option. Each group - * (or unique address:port combination) can be re-used at most - * INPCBLBGROUP_SIZMAX (256) times. The inpcbs are stored in il_inp which - * is dynamically resized as processes bind/unbind to that specific group. - */ -struct inpcblbgroup { - CK_LIST_ENTRY(inpcblbgroup) il_list; - struct epoch_context il_epoch_ctx; - struct ucred *il_cred; - uint16_t il_lport; /* (c) */ - u_char il_vflag; /* (c) */ - uint8_t il_numa_domain; - int il_fibnum; - union in_dependaddr il_dependladdr; /* (c) */ -#define il_laddr il_dependladdr.id46_addr.ia46_addr4 -#define il6_laddr il_dependladdr.id6_addr - uint32_t il_inpsiz; /* max count in il_inp[] (h) */ - uint32_t il_inpcnt; /* cur count in il_inp[] (h) */ - struct inpcb *il_inp[]; /* (h) */ -}; - #define INP_LOCK_DESTROY(inp) rw_destroy(&(inp)->inp_lock) #define INP_RLOCK(inp) rw_rlock(&(inp)->inp_lock) #define INP_WLOCK(inp) rw_wlock(&(inp)->inp_lock) diff --git a/sys/netinet/in_pcb_var.h b/sys/netinet/in_pcb_var.h index 1780a9859f5f..261cd5408956 100644 --- a/sys/netinet/in_pcb_var.h +++ b/sys/netinet/in_pcb_var.h @@ -64,4 +64,26 @@ struct inpcbport { u_short phd_port; }; +/* + * Load balance groups used for the SO_REUSEPORT_LB socket option. Each group + * (or unique address:port combination) can be re-used at most + * INPCBLBGROUP_SIZMAX (256) times. The inpcbs are stored in il_inp which + * is dynamically resized as processes bind/unbind to that specific group. + */ +struct inpcblbgroup { + CK_LIST_ENTRY(inpcblbgroup) il_list; + struct epoch_context il_epoch_ctx; + struct ucred *il_cred; + uint16_t il_lport; /* (c) */ + u_char il_vflag; /* (c) */ + uint8_t il_numa_domain; + int il_fibnum; + union in_dependaddr il_dependladdr; /* (c) */ +#define il_laddr il_dependladdr.id46_addr.ia46_addr4 +#define il6_laddr il_dependladdr.id6_addr + uint32_t il_inpsiz; /* max count in il_inp[] (h) */ + uint32_t il_inpcnt; /* cur count in il_inp[] (h) */ + struct inpcb *il_inp[]; /* (h) */ +}; + #endif /* !_NETINET_IN_PCB_VAR_H_ */