From nobody Thu Feb 5 21:54:16 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 4f6WG10QhCz6RGPd for ; Thu, 05 Feb 2026 21:54:17 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6WG04vWHz3SMJ for ; Thu, 05 Feb 2026 21:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770328456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fANTFl7p3mXapfdMvPDlbviBx5pepscgZKvMGSefs30=; b=T4I1N9WqXtdvPMp+85a+a7ltFZwG54dD6wzHv9r+QkYBk44964LxBpittpBgL8QuYdVeys TNmoggt+mNBmYJ3451Ri/6MBL3wMHUVVWj7ndBCBmuFKnUNloAf6AjRheC9TiB8DC6Avnx qn6BsCMhLJGfmrY6xHzp02LUDFhgyujJcdGchfRj5pk/I7tHfN59moyxrM2Z4PeIQJvtjQ QjTthlIgb02JcA/L4RaBg83WXz38O5NoCtu/kI9u7jpj3hXm1n+ea6T2rym04oFobnCTUk ZmM/j0iguIfYXHsAVPvhp12fy74xjzHaiXMGMV4XNujhyEPxSD00gi8gMnDxBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770328456; a=rsa-sha256; cv=none; b=OUC7HgzKVSBX0vchubmNsVgPBVl16Ho7QO6eYkD4vsZ0csfO+aI16TQ256dd3CVn6Aa17o V0iUgb+AxNUHG9lrliMPpwgW7yWzIk7GJXPuK3PxUb94e3YBnvpCazo4FFsSZB40UB7avr 6VwtRLta4Yxui0cFmMVFRuRpk5Ca1Q0qwAjba7b98jVjeL2kl6DLs+Pl6SS2UWiv3ABBBg ufuw1Dk4j0Wi8S6KiYvwehwHifNWwe3S7C3d1+p8D02G8Iml5UVfUQyX9gkYBF/xmT9vqy PJvZ8CZ4rJ8RLMEG7nxoKa0b3zqr3100ke3FCmZkvFh6soLfDkFx/nj7BF0SLw== 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=1770328456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fANTFl7p3mXapfdMvPDlbviBx5pepscgZKvMGSefs30=; b=NS2J5jFwD9FPi3RLpiyBvMys1kxCFh6oTxVr2P0h9f3FxF5asJ4QFz+ctjDIXTGDz1XQQ0 RhZ2xasNaZr1FYd/vmKIRDOyUR8ZvunE4ScuOzIcVtivdNcZU0J81DYiKWhQgN6hb+k4Ra OP7a+QwgTkwpMJzfT3A0QqWM3qwMrju+zt1APk01WJ+pjx6XF5m/wmS2TAWTBKawIm53yc QAVZzHGqXvSxtaVREvsby9/82MXRp5RN3cv7GTNixZI+//zeoNQGM/7/sXh2cyVH+LsMvU O1Nro21LVYtFGPPpywbf+M16IrfxTBzmN5h2ZiXw7IHuvwUlmHfG5ZNrFAPdJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6WG04Hl0znTt for ; Thu, 05 Feb 2026 21:54:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18b71 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 21:54:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Richard Scheffenegger From: Marius Strobl Subject: git: 55204a088b3b - stable/14 - siftr: refactor batch log processing 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: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 55204a088b3b23a19b008780d8f9c3cbb1b09721 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 21:54:16 +0000 Message-Id: <69851188.18b71.34b68c2a@gitrepo.freebsd.org> The branch stable/14 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=55204a088b3b23a19b008780d8f9c3cbb1b09721 commit 55204a088b3b23a19b008780d8f9c3cbb1b09721 Author: Richard Scheffenegger AuthorDate: 2023-12-07 13:43:03 +0000 Commit: Marius Strobl CommitDate: 2026-02-05 21:54:06 +0000 siftr: refactor batch log processing Refactoring to perform the batch processing of log messaged in two phases. First cycling through a limited number of collected packets, and only thereafter freeing the processed packets. This prevents any chance of calling free while in a critical / spinlocked section. Reviewed By: tuexen Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D42949 (cherry picked from commit a95cd6e4870b79178860e03366c4327e533ecf1e) --- sys/netinet/siftr.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/sys/netinet/siftr.c b/sys/netinet/siftr.c index 9709ced92fd6..b714bfef780d 100644 --- a/sys/netinet/siftr.c +++ b/sys/netinet/siftr.c @@ -135,6 +135,7 @@ * data fields such that the line length could exceed the below value. */ #define MAX_LOG_MSG_LEN 300 +#define MAX_LOG_BATCH_SIZE 3 /* XXX: Make this a sysctl tunable. */ #define SIFTR_ALQ_BUFLEN (1000*MAX_LOG_MSG_LEN) @@ -447,10 +448,10 @@ siftr_pkt_manager_thread(void *arg) { STAILQ_HEAD(pkthead, pkt_node) tmp_pkt_queue = STAILQ_HEAD_INITIALIZER(tmp_pkt_queue); - struct pkt_node *pkt_node, *pkt_node_temp; + struct pkt_node *pkt_node; uint8_t draining; struct ale *log_buf; - int ret_sz, cnt; + int ret_sz, cnt = 0; char *bufp; draining = 2; @@ -487,17 +488,12 @@ siftr_pkt_manager_thread(void *arg) */ mtx_unlock(&siftr_pkt_mgr_mtx); -try_again: - pkt_node = STAILQ_FIRST(&tmp_pkt_queue); - if (pkt_node != NULL) { - if (STAILQ_NEXT(pkt_node, nodes) != NULL) { - cnt = 3; - } else { - cnt = 1; - } + while ((pkt_node = STAILQ_FIRST(&tmp_pkt_queue)) != NULL) { - log_buf = alq_getn(siftr_alq, MAX_LOG_MSG_LEN * cnt, - ALQ_WAITOK); + log_buf = alq_getn(siftr_alq, MAX_LOG_MSG_LEN * + ((STAILQ_NEXT(pkt_node, nodes) != NULL) ? + MAX_LOG_BATCH_SIZE : 1), + ALQ_WAITOK); if (log_buf != NULL) { log_buf->ae_bytesused = 0; @@ -511,27 +507,24 @@ try_again: } /* Flush all pkt_nodes to the log file. */ - STAILQ_FOREACH_SAFE(pkt_node, &tmp_pkt_queue, nodes, - pkt_node_temp) { + STAILQ_FOREACH(pkt_node, &tmp_pkt_queue, nodes) { if (log_buf != NULL) { ret_sz = siftr_process_pkt(pkt_node, bufp); bufp += ret_sz; log_buf->ae_bytesused += ret_sz; - cnt--; - } - - STAILQ_REMOVE_HEAD(&tmp_pkt_queue, nodes); - free(pkt_node, M_SIFTR_PKTNODE); - - if (cnt <= 0 && !STAILQ_EMPTY(&tmp_pkt_queue)) { - alq_post_flags(siftr_alq, log_buf, 0); - goto try_again; } + if (++cnt >= MAX_LOG_BATCH_SIZE) + break; } if (log_buf != NULL) { alq_post_flags(siftr_alq, log_buf, 0); } + for (;cnt > 0; cnt--) { + pkt_node = STAILQ_FIRST(&tmp_pkt_queue); + STAILQ_REMOVE_HEAD(&tmp_pkt_queue, nodes); + free(pkt_node, M_SIFTR_PKTNODE); + } } KASSERT(STAILQ_EMPTY(&tmp_pkt_queue),