hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-24 17:44:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

tcp: define tcp_lro_log() only when TCP_BLACKBOX is defined

Browse Source 
Reviewed by:		rrs, Peter Lei
MFC after:		1 week
Sponsored by:		Netflix, Inc.
Differential Revision:	https://reviews.freebsd.org/D47401
This commit is contained in:
Michael Tuexen 2024-11-17 19:16:27 +01:00
parent 8c8d36b9d1
commit 8caa2f5351
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/netinet/tcp_lro_hpts.c
View File

@ -62,7 +62,9 @@
#include <netinet/tcp_lro.h> #include <netinet/tcp_lro.h>
#include <netinet/tcp_var.h> #include <netinet/tcp_var.h>
#include <netinet/tcp_hpts.h> #include <netinet/tcp_hpts.h>
#ifdef TCP_BLACKBOX
#include <netinet/tcp_log_buf.h> #include <netinet/tcp_log_buf.h>
#endif
static void static void
build_ack_entry(struct tcp_ackent *ae, struct tcphdr *th, struct mbuf *m, build_ack_entry(struct tcp_ackent *ae, struct tcphdr *th, struct mbuf *m,
@ -148,6 +150,7 @@ tcp_lro_check_wake_status(struct tcpcb *tp)
return (false); return (false);
} }
#ifdef TCP_BLACKBOX
static void static void
tcp_lro_log(struct tcpcb *tp, const struct lro_ctrl *lc, tcp_lro_log(struct tcpcb *tp, const struct lro_ctrl *lc,
const struct lro_entry *le, const struct mbuf *m, const struct lro_entry *le, const struct mbuf *m,
@ -197,6 +200,7 @@ tcp_lro_log(struct tcpcb *tp, const struct lro_ctrl *lc,
TCP_LOG_LRO, 0, 0, &log, false, &tv); TCP_LOG_LRO, 0, 0, &log, false, &tv);
} }
} }
#endif
static struct mbuf * static struct mbuf *
tcp_lro_get_last_if_ackcmp(struct lro_ctrl *lc, struct lro_entry *le, tcp_lro_get_last_if_ackcmp(struct lro_ctrl *lc, struct lro_entry *le,
@ -209,7 +213,9 @@ tcp_lro_get_last_if_ackcmp(struct lro_ctrl *lc, struct lro_entry *le,
m = STAILQ_LAST(&tp->t_inqueue, mbuf, m_stailqpkt); m = STAILQ_LAST(&tp->t_inqueue, mbuf, m_stailqpkt);
if (m != NULL && (m->m_flags & M_ACKCMP) != 0) { if (m != NULL && (m->m_flags & M_ACKCMP) != 0) {
if (M_TRAILINGSPACE(m) >= sizeof(struct tcp_ackent)) { if (M_TRAILINGSPACE(m) >= sizeof(struct tcp_ackent)) {
#ifdef TCP_BLACKBOX
tcp_lro_log(tp, lc, le, NULL, 23, 0, 0, 0, 0); tcp_lro_log(tp, lc, le, NULL, 23, 0, 0, 0, 0);
#endif
*new_m = 0; *new_m = 0;
counter_u64_add(tcp_extra_mbuf, 1); counter_u64_add(tcp_extra_mbuf, 1);
return (m); return (m);
@ -220,7 +226,9 @@ tcp_lro_get_last_if_ackcmp(struct lro_ctrl *lc, struct lro_entry *le,
} }
} }
/* Decide mbuf size. */ /* Decide mbuf size. */
#ifdef TCP_BLACKBOX
tcp_lro_log(tp, lc, le, NULL, 21, 0, 0, 0, 0); tcp_lro_log(tp, lc, le, NULL, 21, 0, 0, 0, 0);
#endif
if (tp->t_flags2 & TF2_MBUF_L_ACKS) if (tp->t_flags2 & TF2_MBUF_L_ACKS)
m = m_getcl(M_NOWAIT, MT_DATA, M_ACKCMP | M_PKTHDR); m = m_getcl(M_NOWAIT, MT_DATA, M_ACKCMP | M_PKTHDR);
else else
@ -612,13 +620,19 @@ _tcp_lro_flush_tcphpts(struct lro_ctrl *lc, struct lro_entry *le)
* ack will be required. * ack will be required.
*/ */
cmp = NULL; cmp = NULL;
#ifdef TCP_BLACKBOX
tcp_lro_log(tp, lc, le, NULL, 25, 0, 0, 0, 0); tcp_lro_log(tp, lc, le, NULL, 25, 0, 0, 0, 0);
#endif
} else if (mv_to != NULL) { } else if (mv_to != NULL) {
/* We are asked to move pp up */ /* We are asked to move pp up */
pp = &mv_to->m_nextpkt; pp = &mv_to->m_nextpkt;
#ifdef TCP_BLACKBOX
tcp_lro_log(tp, lc, le, NULL, 24, 0, 0, 0, 0); tcp_lro_log(tp, lc, le, NULL, 24, 0, 0, 0, 0);
} else } else
tcp_lro_log(tp, lc, le, NULL, 26, 0, 0, 0, 0); tcp_lro_log(tp, lc, le, NULL, 26, 0, 0, 0, 0);
#else
}
#endif
} }
/* Update "m_last_mbuf", if any. */ /* Update "m_last_mbuf", if any. */
if (pp == &le->m_head) if (pp == &le->m_head)
@ -629,7 +643,9 @@ _tcp_lro_flush_tcphpts(struct lro_ctrl *lc, struct lro_entry *le)
/* Check if any data mbufs left. */ /* Check if any data mbufs left. */
if (le->m_head != NULL) { if (le->m_head != NULL) {
counter_u64_add(tcp_inp_lro_direct_queue, 1); counter_u64_add(tcp_inp_lro_direct_queue, 1);
#ifdef TCP_BLACKBOX
tcp_lro_log(tp, lc, le, NULL, 22, 1, tp->t_flags2, 0, 1); tcp_lro_log(tp, lc, le, NULL, 22, 1, tp->t_flags2, 0, 1);
#endif
tcp_queue_pkts(tp, le); tcp_queue_pkts(tp, le);
} }
if (should_wake) { if (should_wake) {