KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

tcp lro: fix vnet handling

Browse Source 
Reported by:		Shawn Webb
Reviewed by:		glebius, rrs
Fixes:			f707cc00ed ("lro: move pkt rejection checks to leafs to avoid queueing")
Sponsored by:		Netflix, Inc.
Differential Revision:	https://reviews.freebsd.org/D56420
This commit is contained in:
Michael Tuexen
2026-04-15 22:31:48 +02:00
parent 04b994d19e
commit 2d13620c6e
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/netinet/tcp_lro.c
+12 -3
View File
@@ -1422,15 +1422,20 @@ tcp_lro_rx(struct lro_ctrl *lc, struct mbuf *m, uint32_t csum)
{ {
int error; int error;
CURVNET_SET(lc->ifp->if_vnet);
#ifdef INET #ifdef INET
/* Quickly decide if packet cannot be LRO'ed */ /* Quickly decide if packet cannot be LRO'ed */
if (__predict_false(V_ipforwarding != 0)) if (__predict_false(V_ipforwarding != 0)) {
CURVNET_RESTORE();
return (TCP_LRO_CANNOT); return (TCP_LRO_CANNOT);
}
#endif #endif
#ifdef INET6 #ifdef INET6
/* Quickly decide if packet cannot be LRO'ed */ /* Quickly decide if packet cannot be LRO'ed */
if (__predict_false(V_ip6_forwarding != 0)) if (__predict_false(V_ip6_forwarding != 0)) {
CURVNET_RESTORE();
return (TCP_LRO_CANNOT); return (TCP_LRO_CANNOT);
}
#endif #endif
if (((m->m_pkthdr.csum_flags & (CSUM_DATA_VALID | CSUM_PSEUDO_HDR)) != if (((m->m_pkthdr.csum_flags & (CSUM_DATA_VALID | CSUM_PSEUDO_HDR)) !=
@@ -1442,12 +1447,12 @@ tcp_lro_rx(struct lro_ctrl *lc, struct mbuf *m, uint32_t csum)
* a packet. * a packet.
*/ */
counter_u64_add(tcp_bad_csums, 1); counter_u64_add(tcp_bad_csums, 1);
CURVNET_RESTORE();
return (TCP_LRO_CANNOT); return (TCP_LRO_CANNOT);
} }
/* get current time */ /* get current time */
binuptime(&lc->lro_last_queue_time); binuptime(&lc->lro_last_queue_time);
CURVNET_SET(lc->ifp->if_vnet);
error = tcp_lro_rx_common(lc, m, csum, true); error = tcp_lro_rx_common(lc, m, csum, true);
if (__predict_false(error != 0)) { if (__predict_false(error != 0)) {
/* /*
@@ -1474,10 +1479,12 @@ tcp_lro_queue_mbuf(struct lro_ctrl *lc, struct mbuf *mb)
return; return;
} }
CURVNET_SET(lc->ifp->if_vnet);
#ifdef INET #ifdef INET
/* Quickly decide if packet cannot be LRO'ed */ /* Quickly decide if packet cannot be LRO'ed */
if (__predict_false(V_ipforwarding != 0)) { if (__predict_false(V_ipforwarding != 0)) {
/* input packet to network layer */ /* input packet to network layer */
CURVNET_RESTORE();
(*lc->ifp->if_input) (lc->ifp, mb); (*lc->ifp->if_input) (lc->ifp, mb);
return; return;
} }
@@ -1486,10 +1493,12 @@ tcp_lro_queue_mbuf(struct lro_ctrl *lc, struct mbuf *mb)
/* Quickly decide if packet cannot be LRO'ed */ /* Quickly decide if packet cannot be LRO'ed */
if (__predict_false(V_ip6_forwarding != 0)) { if (__predict_false(V_ip6_forwarding != 0)) {
/* input packet to network layer */ /* input packet to network layer */
CURVNET_RESTORE();
(*lc->ifp->if_input) (lc->ifp, mb); (*lc->ifp->if_input) (lc->ifp, mb);
return; return;
} }
#endif #endif
CURVNET_RESTORE();
/* check if packet is not LRO capable */ /* check if packet is not LRO capable */
if (__predict_false((lc->ifp->if_capenable & IFCAP_LRO) == 0)) { if (__predict_false((lc->ifp->if_capenable & IFCAP_LRO) == 0)) {
/* input packet to network layer */ /* input packet to network layer */