From nobody Thu Jan 11 14:32:38 2024 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 4T9nFM4phTz5680H; Thu, 11 Jan 2024 14:32:39 +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 4T9nFM1XXSz4T7K; Thu, 11 Jan 2024 14:32:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704983559; 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=4mass2c0fCDrjxjqVzVLrOxaR97g3YljGYV4Dq1pFtk=; b=oMfiK412bhx81sREvffY7XpZmDKyWaXhtjwY3L87JBrIUDzKutMf4AIr6QeliMl65TxIBv 8c5CV6WOgrvjQY4oa0mi8r9UOfTuKqFraIkL3dkqfiOmvbaVRk416xgDHSk6P+lIlx34TO fcLRLqHeL+noA4An6pK51Hg73zUMDzXAjtzwgzknzJHcYosoQBqiv+jw6sgyS7NUIkTGa6 FworjLGUn3hKhHo1gbQnoRrW6F1Bw1Urp44CEVX1isAUT8sniHtFkcz67uqUKln0GUrmkc wOgpX48hVD8m6vVKg1ybbu9jTW/lN8NIucY7uB037AckWngaaVMRj+mxf5WtXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704983559; 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=4mass2c0fCDrjxjqVzVLrOxaR97g3YljGYV4Dq1pFtk=; b=fiDs0UzixLQDWzDsgSAEtohSCJgBA3RAIcMAaofEExh5joBKY8iP2qwNhGF2glwO2Pu6td HjFGn9nTzr5RS3xy6Th1HB5K/QeXci3eCc57KMXdAymcPWQhSx7jujTE/Um7ySQuDxXtQG 051vcoKKUtdXwLhG3u7K4BB0oTWeWE4uE72GGgqXrRi39FkpXmQdKjSuTG+/RuwY5IWYQQ 8TUPSB/PUPWTEcgA3u68+svAQ8XvRKLRoiysUufOYWebboj79MWyxA8nImwrUb2hwfzIW6 kGvSoJH9fLjQ9ZoXv0VJ742QyXxwlXMTXQScFlRTKNj2jZXC1bBm0S8TrbFSlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704983559; a=rsa-sha256; cv=none; b=GMJDjAOVcBiYh1q1aBg8s1pwxXRIBRAGLCoQHhcKwVRvRwCrbwm4SJizbPKco6XL8bnLAP FHti6uInbscPiENgrN9UhoD1KgAR13mJC5UNoBi3b6fDCJoSK1BVqTBsOx/eT+YIv3lMRQ xwXoxgJliZIOM9IYeEOw2wyze8LgWJPeSUnj7Hz+voLzLPyiIm5VpKfMxaxf4YtncIfUZY iSNDAbgYRDysdysTE1/p08vAAkV6ZgccB4ba7X8/63oScjgoGsBOhAhchYzettbFFuQtbu eMxIZAGyn0HkZ/i59k5VAIsG/xRFoTYFU7vISCDypJShi6Cv1tXojIEwf1FhZA== 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 4T9nFM0ZHczMvl; Thu, 11 Jan 2024 14:32:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40BEWcCu024362; Thu, 11 Jan 2024 14:32:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BEWcm6024359; Thu, 11 Jan 2024 14:32:38 GMT (envelope-from git) Date: Thu, 11 Jan 2024 14:32:38 GMT Message-Id: <202401111432.40BEWcm6024359@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: e4db787bb86b - stable/14 - frag6: Add another use of frag6_rmqueue() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e4db787bb86b2d7b26ed241df47e6ea03dded2ef Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e4db787bb86b2d7b26ed241df47e6ea03dded2ef commit e4db787bb86b2d7b26ed241df47e6ea03dded2ef Author: Mark Johnston AuthorDate: 2024-01-04 13:11:19 +0000 Commit: Mark Johnston CommitDate: 2024-01-11 14:22:14 +0000 frag6: Add another use of frag6_rmqueue() No functional change intended. Reviewed by: kp, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43256 (cherry picked from commit 8d01ecd8e9da5192a8b2dfb6c7d58b4aae9ea358) --- sys/netinet6/frag6.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index fbdbc3ef2f28..e976298bf984 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -862,10 +862,6 @@ postinsert: ip6->ip6_flow |= htonl(IPTOS_ECN_CE << 20); nxt = q6->ip6q_nxt; - TAILQ_REMOVE(head, q6, ip6q_tq); - V_ip6qb[bucket].count--; - atomic_subtract_int(&frag6_nfrags, q6->ip6q_nfrag); - ip6_deletefraghdr(m, offset, M_NOWAIT); /* Set nxt(-hdr field value) to the original value. */ @@ -874,10 +870,9 @@ postinsert: #ifdef MAC mac_ip6q_reassemble(q6, m); - mac_ip6q_destroy(q6); #endif - free(q6, M_FRAG6); - atomic_subtract_int(&V_frag6_nfragpackets, 1); + atomic_subtract_int(&frag6_nfrags, q6->ip6q_nfrag); + frag6_rmqueue(q6, bucket); if (m->m_flags & M_PKTHDR) { /* Isn't it always true? */