From nobody Sun Apr 12 17:39:59 2026 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 4ftyV80gqZz6YR1N for ; Sun, 12 Apr 2026 17:40:00 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftyV75nrTz3LH6 for ; Sun, 12 Apr 2026 17:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776015599; 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=xoV8t9FjZP7Jxv+MDJ7DmgcYHv/IywDlemC1QSXHUCk=; b=Gs9JpaEbkALd1FREe89b9sevgQvLqIEKdyye6vqvht+YJdjkJE/XAwUBnojeoqwk9Tdcj4 E3zXRLXhfil18/GG6KFqC/XjUxP6C0lOpl7lpUhI6XwyQ769TNRMMZvXNGmuAWUhkYMvGY fsCg1m9c4S8CPVPpvXkHDS0ithzazeG2ZucumhDAYIjoS0aIhYy9x2EyMpqu7GTqvP27u7 LPxRx28FiybcLKHRS46rWisZBusI30OO8day9cKTAMYTpNw9uLVO3wXWHyy1uBFyxYmLgI VYc0Yn63APxeHqBFiV2WoAVs8U5dlWyZUL1VeA1jrOTxBLgXAKBDNYtMzxJ1eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776015599; a=rsa-sha256; cv=none; b=deipLxTStMfGFXOjgFExVmvE3cQPDj/DWpjdgeJqprnXTMgLoEaGoAaLDUiVKeapMApPRC hZp+dOqg++T9fPeASwqXkWGW/ZoPjdcFmZjJAOVg1HTuygz4M+zNnRi3bcmDifwqBqWiQQ BdapM14aAodKyrq9MvDgUqasgvXSo/pzKkZDcyZ+oRv39t0Jtao+L3cSYFWdFOgEpqAtEB rertgpTXiqg/JBnI2ectJct8DHqlszg8xsqRe/ORxHHlNWIjux2Ne8SdV4w0FW/pzAfQ6n EZ7rVJrlBC7yLvMAl/fZin4X8DsOByrBXqNbjYt5vJBUpaH9FssDpL7jDvb8IA== 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=1776015599; 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=xoV8t9FjZP7Jxv+MDJ7DmgcYHv/IywDlemC1QSXHUCk=; b=XuPcXNASL3maP8XnBeLzx+zmQQrqo6bdXWj8jKryCSTr5yU8X//gsbTQ0+aYeF5XZvaYc0 KL1UG4noldChal3wQaSHEhBh4Cb23SH+TMs7TMKXrIQN4Ybkyw/3r0HNMWT3zuFs2Ta+Cd N5J6nBdvGFjfr0EMC+ZrfoxuY6rQ4/cVKXyzS+Iv/90V4x0JU9qpfrMKqAmoETW2l9syi8 JlFF0pVCKJ7QjpYk7ikeF8ZND6r/zlq+eGeqyjrq7MosOSX7jBJJ/JXliKwTmX2UIZIx00 f6mU3zpZ0OZYToZEui8DCR28jRqYYJdcOgVknbfjAam/ZXr75rQBxmy4xfWs3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftyV75LK3zBCs for ; Sun, 12 Apr 2026 17:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3411e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 17:39:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: adba114dfbfb - main - netinet: use hashalloc(9) for IP address hash 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: adba114dfbfb02c6f332237abf070cbcc480f914 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 17:39:59 +0000 Message-Id: <69dbd8ef.3411e.7e7cbf5a@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=adba114dfbfb02c6f332237abf070cbcc480f914 commit adba114dfbfb02c6f332237abf070cbcc480f914 Author: Gleb Smirnoff AuthorDate: 2026-04-12 17:26:03 +0000 Commit: Gleb Smirnoff CommitDate: 2026-04-12 17:26:03 +0000 netinet: use hashalloc(9) for IP address hash While here, slightly restyle ip_vnet_init() and use sparse initializer for pfil_head_args. There is no functional change wrt to pfil(9) hook registration. Differential Revision: https://reviews.freebsd.org/D56175 --- sys/netinet/ip_input.c | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 5800a0854ee5..8602cf0d5266 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -52,6 +52,7 @@ #include #include #include +#include #include #include @@ -175,9 +176,6 @@ VNET_DEFINE(struct in_ifaddrhead, in_ifaddrhead); /* first inet address */ VNET_DEFINE(struct in_ifaddrhashhead *, in_ifaddrhashtbl); /* inet addr hash table */ VNET_DEFINE(u_long, in_ifaddrhmask); /* mask for hash table */ -/* Make sure it is safe to use hashinit(9) on CK_LIST. */ -CTASSERT(sizeof(struct in_ifaddrhashhead) == sizeof(LIST_HEAD(, in_addr))); - #ifdef IPCTL_DEFMTU SYSCTL_INT(_net_inet_ip, IPCTL_DEFMTU, mtu, CTLFLAG_RW, &ip_mtu, 0, "Default MTU"); @@ -309,24 +307,32 @@ SYSCTL_PROC(_net_inet_ip, IPCTL_INTRDQDROPS, intr_direct_queue_drops, static void ip_vnet_init(void *arg __unused) { - struct pfil_head_args args; - CK_STAILQ_INIT(&V_in_ifaddrhead); - V_in_ifaddrhashtbl = hashinit(INADDR_NHASH, M_IFADDR, &V_in_ifaddrhmask); + + struct hashalloc_args ha = { + .size = INADDR_NHASH, + .mtype = M_IFADDR, + .mflags = M_WAITOK, + .head = HASH_HEAD_CK_LIST, + }; + V_in_ifaddrhashtbl = hashalloc(&ha); + V_in_ifaddrhmask = ha.size - 1; /* Initialize IP reassembly queue. */ ipreass_vnet_init(); /* Initialize packet filter hooks. */ - args.pa_version = PFIL_VERSION; - args.pa_flags = PFIL_IN | PFIL_OUT; - args.pa_type = PFIL_TYPE_IP4; - args.pa_headname = PFIL_INET_NAME; - V_inet_pfil_head = pfil_head_register(&args); - - args.pa_flags = PFIL_OUT; - args.pa_headname = PFIL_INET_LOCAL_NAME; - V_inet_local_pfil_head = pfil_head_register(&args); + struct pfil_head_args pa = { + .pa_version = PFIL_VERSION, + .pa_flags = PFIL_IN | PFIL_OUT, + .pa_type = PFIL_TYPE_IP4, + .pa_headname = PFIL_INET_NAME, + }; + V_inet_pfil_head = pfil_head_register(&pa); + + pa.pa_flags = PFIL_OUT; + pa.pa_headname = PFIL_INET_LOCAL_NAME; + V_inet_local_pfil_head = pfil_head_register(&pa); if (hhook_head_register(HHOOK_TYPE_IPSEC_IN, AF_INET, &V_ipsec_hhh_in[HHOOK_IPSEC_INET], @@ -423,7 +429,12 @@ ip_destroy(void *unused __unused) ipreass_destroy(); /* Cleanup in_ifaddr hash table; should be empty. */ - hashdestroy(V_in_ifaddrhashtbl, M_IFADDR, V_in_ifaddrhmask); + struct hashalloc_args ha = { + .mtype = M_IFADDR, + .head = HASH_HEAD_CK_LIST, + .size = V_in_ifaddrhmask + 1, + }; + hashfree(V_in_ifaddrhashtbl, &ha); } VNET_SYSUNINIT(ip, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, ip_destroy, NULL);