From nobody Thu Feb 6 16:27:34 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 4YpjF24Fq9z5mhVt; Thu, 06 Feb 2025 16:27:34 +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 4YpjF22FWBz4Mxy; Thu, 06 Feb 2025 16:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738859254; 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=PBun6Frd6laM0vjrrtteyqAkWzLok1Nz9dbNQg34aWk=; b=hW6ai6v9gjFOzwQWMbUykNxhjYbjnFilRllptXAcMTPxoVibXZ/MuckaU1ZZ6DTbGWW83p UtTsrOiatl8eMAitC/zLF6AAq6PSa6j5LBzY9OdbMG9Qy7VgrnM5o7dgd01vIbrO+ozyCW PySFeRiI2DLd5hoypXFqiNJ7WWbND2nkYKxSLu64wo8k63qzGR5pSig5S0dxhCDxJmzEGc ym5GNM0PsJlrEVIHEIEQI5mPBa4Af/0f5/YRj+yHGSx4LLhX5r099VmaZ+qdPp4QUJkHFn M+OFaLp1R6ephseDbyKdDB49TqU5xlGbjqKGt22VysX1tctmfMBxaa2gK6JbZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738859254; 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=PBun6Frd6laM0vjrrtteyqAkWzLok1Nz9dbNQg34aWk=; b=KPQJGFHSdMx0LvugOzVlnMjXNSQ4VniVZRcjvNk/+Cf6HbYnwFqdQvi7EnwPj6sFv9WcgJ VoRN5Z8C/SIi7WPIK/d0VMPpSbOZ3lTLJ5cCNmhhtAmByRezQXsM1bHLLMqblc3VW+i3Er 3ziDJ8EbKMEre+7mojyxZ782OnnC1BxH2QiIAevuqJlT0p7uo5/0bNx+vWRqEeVM/dlJ+x iOjNd6t46jTgSOxhvdQWpP5pbpFLrFNLvL2KP92Yq1uipS3A0cHSeWSyX981lBcENFEzp2 DlTqAkPKFeJ7N079WVc5l5nVJIG4oWGFNG50xAB5p3BqqBb20A5ot/Tk0ube3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738859254; a=rsa-sha256; cv=none; b=qMUIwPf7iUIRYiQ8UroD8CPY7PKZkOZMDOSry3XKNaGmrSfB7lfaC6QLQW5hrlY7M9fq8F NZsMQ6bZhxfFsBLeWNq8djVh2mcUuHaJRZLMVOHp942diMaMFoRkx5gBTAEnl+ddgsy+F4 VFMj6czIgpwKYSJy86ZYixP9+1dOxM/WLgN3EDgBglLi04/Kw8NbYjHsMhTF+dpjInZHCB dC+qvLXIrniFj1TgoeBJRmGXMsPtDAW1fUoE039iOq0Ot76/aQx3vQTsO59bWwOhDZhFH0 gF9nDcV+Og5XG6LKFztuBks9UbMSlJLwAvGqSwL8YOGLRByyyP/QA/SwWVvqPQ== 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 4YpjF21T5YzmCL; Thu, 06 Feb 2025 16:27:34 +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 516GRYto095414; Thu, 6 Feb 2025 16:27:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516GRYUg095412; Thu, 6 Feb 2025 16:27:34 GMT (envelope-from git) Date: Thu, 6 Feb 2025 16:27:34 GMT Message-Id: <202502061627.516GRYUg095412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: ca94f92c23fd - main - inpcb: Move the definition of struct inpcblbgroup to in_pcb_var.h 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca94f92c23fd09b28ac3398657ae2ae9367bcdf5 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ca94f92c23fd09b28ac3398657ae2ae9367bcdf5 commit ca94f92c23fd09b28ac3398657ae2ae9367bcdf5 Author: Mark Johnston AuthorDate: 2025-01-23 16:20:55 +0000 Commit: Mark Johnston CommitDate: 2025-02-06 16:25:24 +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 --- sys/netinet/in_pcb.h | 23 ----------------------- sys/netinet/in_pcb_var.h | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 50137bb552b2..dae34e94d6f9 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -423,29 +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; - LIST_HEAD(, inpcb) il_pending; /* PCBs waiting for listen() */ - 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 90239cbb98cd..1101199f6b64 100644 --- a/sys/netinet/in_pcb_var.h +++ b/sys/netinet/in_pcb_var.h @@ -62,4 +62,27 @@ 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; + LIST_HEAD(, inpcb) il_pending; /* PCBs waiting for listen() */ + 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_ */