From nobody Fri Sep 9 16:19:51 2022 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 4MPLml706zz4bm7m; Fri, 9 Sep 2022 16:19:51 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MPLml6TMXz40P8; Fri, 9 Sep 2022 16:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662740391; 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=SczbPfiSKMJahAN1iPswvF/zkHVaG6N28vsu5SsHuZY=; b=dj3f/xd69ZyOnZJs/q0pZk912zUcbSYtsQdcqeFCQjFr2YI2F3TKkL0eD/aIfS7v+syv1m nV7oMB07x+vLiawx4MDiRtiLIB86InZDj5d35oOSs4Kve/jkCsLpFUHqjD+pQTg3VzTZNl wOU/pO+WEv8RXeT1qt8pPLKIsahQnn01AiNQUkx0vZsvMeae71Q9nV4WfJ/3A6r8z+mQ67 mgAzzOrcdNyFY8MDzii1WlPVdhW7xJP2tGHfpWBO6mDf1prNwYq6tTIihiHg3ff/r/q1w6 D7db+Fkgpe94TMfFto5zj1/3VG3DgTKt0vHWs/di5qkMFx2tPccer1lAnp6E9g== 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 4MPLml5PTcz1GC5; Fri, 9 Sep 2022 16:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 289GJpxo070961; Fri, 9 Sep 2022 16:19:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 289GJp5j070960; Fri, 9 Sep 2022 16:19:51 GMT (envelope-from git) Date: Fri, 9 Sep 2022 16:19:51 GMT Message-Id: <202209091619.289GJp5j070960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: c8bc87417203 - main - ip_reass: fixup the just added tunable 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: c8bc874172033ad2a67c60b70d578fc20f616243 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662740391; 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=SczbPfiSKMJahAN1iPswvF/zkHVaG6N28vsu5SsHuZY=; b=qpoApti8m1Lk3T6gSEQMALxD6Kv1ftDdOTVuBhOGBQE+bfzLYc2t2Qt9G8oFGzOxKfuQoF vQ8S0oF7enrDqf6UtDVN3F3CD7HyXiGq9f/xRBU5niaa4GnJF/fA/dr0+rpjco8XPfbhl8 Tj+d2ddXP7SdUff3G50Ez9n6Q5DJgy5O/6FrfDy4NXvWeDqvfiPOe0MolGYa01X39CkQA5 igfTFWkjTIVmb7Pw+xLwu/kVjMHZSfNDAYRwrZcgWo3OSeQiuCzGy8yDPYsfP90jVr08od SKh/LvvlzliYj3zLLVwwLjsH3smP8e8vHqCNi6fYEbDgsBsm8dzP5leEa8PLaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662740391; a=rsa-sha256; cv=none; b=aQpCDbSAlEkX1l92yHSbCfI9BfqJoEONukax55qGJDjyfJlgoB77k2z+re14na7mAoGSva 8CFKR4dFJhdqV5k71TGEplSYEJS5VNtAAJnF1jB/ebtVIHOQ3NwwuzBeNb7FBbnQiSZAcX j64ufCsxurLl8LPMstDI2lncHsSdR+qoI5mn12QeQA4gbE4kYxX1vqIdrYtWras9zXNp3b RlPeM0W3OKR+IFkJGh3lojMJe7xLAvvE0qG/pOJt+292Je2rJQpeJM5VkGOFdE8Yw8MPp5 oGmxC9BJ90dPbw3IsHFXUywHm7uhsfycBqL6SevyOLsY4nsFOwbVCPJ/Zaj7FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=c8bc874172033ad2a67c60b70d578fc20f616243 commit c8bc874172033ad2a67c60b70d578fc20f616243 Author: Gleb Smirnoff AuthorDate: 2022-09-09 16:18:04 +0000 Commit: Gleb Smirnoff CommitDate: 2022-09-09 16:19:39 +0000 ip_reass: fixup the just added tunable - Don't use hardcoded hash mask - free the memory on VNET destroy Fixes: 1494f4776af32b49e3c5bbdf09d6b2995b374614 --- sys/netinet/ip_reass.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/ip_reass.c b/sys/netinet/ip_reass.c index 88ba74ace4d6..5227b1387c69 100644 --- a/sys/netinet/ip_reass.c +++ b/sys/netinet/ip_reass.c @@ -70,7 +70,7 @@ SYSCTL_DECL(_net_inet_ip); */ #define IPREASS_NHASH_LOG2 10 #define IPREASS_NHASH (1 << IPREASS_NHASH_LOG2) -#define IPREASS_HMASK (IPREASS_NHASH - 1) +#define IPREASS_HMASK (V_ipq_hashsize - 1) struct ipqbucket { TAILQ_HEAD(ipqhead, ipq) head; @@ -759,6 +759,7 @@ ipreass_destroy(void) V_ipq_zone = NULL; for (int i = 0; i < V_ipq_hashsize; i++) mtx_destroy(&V_ipq[i].lock); + free(V_ipq, M_IPREASS_HASH); } #endif