From nobody Sun Apr 12 17:40:01 2026 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 4ftyVB39hhz6YR3P for ; Sun, 12 Apr 2026 17:40:02 +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 4ftyV96mmJz3LHS for ; Sun, 12 Apr 2026 17:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776015602; 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=HRCSG1GAO+NsS2smcpgFE8NaMusIRHcQ8SBw83XL3Mo=; b=QR5pWY804TrZ1u0C0tAW3IpLm6ugvkbwvWYAZ7fZwwbruO7cwrJqIPtlmI1EXwXzHM56dY FDDCceZFdOL+o1DWmtn2ImjD7XyyabRoNvIMcfmHv6uy66hqS01oQwfjJBD4FdRvMJq0wo noT/DD7dOuTUMV2iax8lewzqitTf4kcSYTbY2Fg83F99J18ZgY6oZBvG5bEPQnp7ywtPl+ /Sm2tE9BRiqdPImAqRwXK85Rg03a6xdJRaB5FyS3aZg8SjHnr4U2l8dLVAbProSIijQwF9 5vfzh8wLcVNVoe5B2/F9iMe97Ucvt87DYUdv79UFHfhHm1B9Cc/6qOTlmhFbWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776015602; a=rsa-sha256; cv=none; b=ldB2B0QJ4f7Z+cjXUdPE+0ni/UFo81uWCrFMRg7VZjj6QXD4ryMxkGLjkDxOg/gstGqPsa hfgmKdt0PKb/PYRAbupMK3ifFRYkEd1PbwHBRoLyLjP7ZYCbn77fRDX+FqxyKleBZQzs6h MR2fK0eDpaG8VxqFm0gGIrV9MMooURG5OV9vunORnDf1v5FBddQPB4ykTmayBda8cZ8HlA m5inbF9h7IUyEL6MPN2Hs+25BFdsCZARFVvoPvpoJpxIhu0E9yCVyjBSezizIY3pgVyyiN uLj3PiNQYdUyGZZT8uTlqx13UzQQAqigfWwgBIRcNBCJ1WrBnd3Q7TnGuRLu2w== 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=1776015602; 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=HRCSG1GAO+NsS2smcpgFE8NaMusIRHcQ8SBw83XL3Mo=; b=JSNeqpTvJIFIy0vPpzJaAMeqdWKwS9r4Ptne/FAphl42ernIN8zGoCptXvqwuWLTaYOTvR T4R1TRdi2GAFUvXKwZ5OBVEHQ5j1h/NBwM38LjIzn8bjzIcGpqJ17zhlC895jKYjCU12qc u+cGdJUQXRqYv+hOQ04K6FuorA7Xmb+Hkh4uv2iFA0mBH7hh2nnUW1h6km6vMEy3auAp/5 2OLPtaGXDyxkvrBo9BcJ8U99b6vKsp2UCLJLHfLo8Ff/JZQd79Mt1Hx/lH29/vwZyqF0Pq JJAdowsReGwzJbW2jAQ5L+14D5ZpDrnUSYdzdBIRiRMZeR1eSXFHHHmF27NUxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftyV960FvzBjW for ; Sun, 12 Apr 2026 17:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34294 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 17:40:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 87ef3067acbd - main - tcp lro: use hashalloc(9) 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87ef3067acbddbf85f0bdef6d53bdde2b51cbc50 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 17:40:01 +0000 Message-Id: <69dbd8f1.34294.1d588e0c@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=87ef3067acbddbf85f0bdef6d53bdde2b51cbc50 commit 87ef3067acbddbf85f0bdef6d53bdde2b51cbc50 Author: Gleb Smirnoff AuthorDate: 2026-04-12 17:26:12 +0000 Commit: Gleb Smirnoff CommitDate: 2026-04-12 17:26:12 +0000 tcp lro: use hashalloc(9) Reviewed by: tuexen, rrs Differential Revision: https://reviews.freebsd.org/D56177 --- sys/netinet/tcp_lro.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/sys/netinet/tcp_lro.c b/sys/netinet/tcp_lro.c index 59358db6ecf9..06280bce2279 100644 --- a/sys/netinet/tcp_lro.c +++ b/sys/netinet/tcp_lro.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -190,13 +191,19 @@ tcp_lro_init_args(struct lro_ctrl *lc, struct ifnet *ifp, LIST_INIT(&lc->lro_free); LIST_INIT(&lc->lro_active); - /* create hash table to accelerate entry lookup */ - lc->lro_hash = phashinit_flags(lro_entries, M_LRO, &lc->lro_hashsz, - HASH_NOWAIT); + /* Create hash table to accelerate entry lookup. */ + struct hashalloc_args ha = { + .size = lro_entries, + .mtype = M_LRO, + .mflags = M_NOWAIT, + .type = HASH_TYPE_PRIME, + }; + lc->lro_hash = hashalloc(&ha); if (lc->lro_hash == NULL) { memset(lc, 0, sizeof(*lc)); return (ENOMEM); } + lc->lro_hashsz = ha.size; /* compute size to allocate */ size = (lro_mbufs * sizeof(struct lro_mbuf_sort)) + @@ -206,7 +213,11 @@ tcp_lro_init_args(struct lro_ctrl *lc, struct ifnet *ifp, /* check for out of memory */ if (lc->lro_mbuf_data == NULL) { - free(lc->lro_hash, M_LRO); + struct hashalloc_args ha = { + .size = lc->lro_hashsz, + .mtype = M_LRO, + }; + hashfree(lc->lro_hash, &ha); memset(lc, 0, sizeof(*lc)); return (ENOMEM); } @@ -503,8 +514,11 @@ tcp_lro_free(struct lro_ctrl *lc) lro_free_mbuf_chain(le->m_head); } - /* free hash table */ - free(lc->lro_hash, M_LRO); + struct hashalloc_args ha = { + .size = lc->lro_hashsz, + .mtype = M_LRO, + }; + hashfree(lc->lro_hash, &ha); lc->lro_hash = NULL; lc->lro_hashsz = 0;