upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-20 00:11:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

siftr: refactor batch log processing

Browse source 
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)
This commit is contained in:
Richard Scheffenegger 2023-12-07 14:43:03 +01:00 committed by Franco Fichtner
parent b83e38491a
commit 5ee3f733dc
1 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
sys/netinet/siftr.c
View file

@ -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),