git: ca81bcbbf118 - stable/13 - Add missing chunks after cherry-picking 9ca874cf740ee68c5742df8b5f9e20910085c011 from main to stable/13: Add TCP LRO support for VLAN and VxLAN.

Hans Petter Selasky hselasky at FreeBSD.org
Fri Jun 11 14:18:01 UTC 2021


The branch stable/13 has been updated by hselasky:

URL: https://cgit.FreeBSD.org/src/commit/?id=ca81bcbbf1182b725d2f7c1eada932731a9d6432

commit ca81bcbbf1182b725d2f7c1eada932731a9d6432
Author:     Hans Petter Selasky <hselasky at FreeBSD.org>
AuthorDate: 2021-06-11 13:48:28 +0000
Commit:     Hans Petter Selasky <hselasky at FreeBSD.org>
CommitDate: 2021-06-11 13:51:05 +0000

    Add missing chunks after cherry-picking 9ca874cf740ee68c5742df8b5f9e20910085c011
    from main to stable/13: Add TCP LRO support for VLAN and VxLAN.
    
    Make sure all counters are allocated.
    
    This is a direct commit.
    
    Reported by:    Herbert J. Skuhra <herbert at gojira.at>
    Sponsored by:   Mellanox Technologies // NVIDIA Networking
---
 sys/netinet/tcp_subr.c | 4 ++++
 sys/netinet/tcp_var.h  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index bb2c35c76fde..ec162d889902 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1509,6 +1509,10 @@ tcp_init(void)
 	tcp_inp_lro_wokeup_queue = counter_u64_alloc(M_WAITOK);
 	tcp_inp_lro_compressed = counter_u64_alloc(M_WAITOK);
 	tcp_inp_lro_locks_taken = counter_u64_alloc(M_WAITOK);
+	tcp_extra_mbuf = counter_u64_alloc(M_WAITOK);
+	tcp_would_have_but = counter_u64_alloc(M_WAITOK);
+	tcp_comp_total = counter_u64_alloc(M_WAITOK);
+	tcp_uncomp_total = counter_u64_alloc(M_WAITOK);
 #ifdef TCPPCAP
 	tcp_pcap_init();
 #endif
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 7b51afbb42b6..1858d0146ce5 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -1010,6 +1010,10 @@ extern counter_u64_t tcp_inp_lro_direct_queue;
 extern counter_u64_t tcp_inp_lro_wokeup_queue;
 extern counter_u64_t tcp_inp_lro_compressed;
 extern counter_u64_t tcp_inp_lro_locks_taken;
+extern counter_u64_t tcp_extra_mbuf;
+extern counter_u64_t tcp_would_have_but;
+extern counter_u64_t tcp_comp_total;
+extern counter_u64_t tcp_uncomp_total;
 
 #ifdef NETFLIX_EXP_DETECTION
 /* Various SACK attack thresholds */


More information about the dev-commits-src-all mailing list