Attachment 223304 Details for Bug 254244 – Patch to try #2

[patch] Patch to try #2

iflib.diff (text/plain), 1.52 KB, created by Hans Petter Selasky on 2021-03-15 19:22:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans Petter Selasky

Created: 2021-03-15 19:22:38 UTC

Size: 1.52 KB

patch

obsolete

>diff --git a/sys/net/iflib.c b/sys/net/iflib.c
>index 05e99ba318d..c6a8ec9e25e 100644
>--- a/sys/net/iflib.c
>+++ b/sys/net/iflib.c
>@@ -2901,7 +2901,7 @@ iflib_rxeof(iflib_rxq_t rxq, qidx_t budget)
> 
> 	NET_EPOCH_ASSERT();
> 
>-	lro_possible = v4_forwarding = v6_forwarding = false;
>+	v4_forwarding = v6_forwarding = false;
> 	ifp = ctx->ifc_ifp;
> 	mh = mt = NULL;
> 	MPASS(budget > 0);
>@@ -2988,27 +2988,25 @@ iflib_rxeof(iflib_rxq_t rxq, qidx_t budget)
> #endif
> #if defined(INET6) || defined(INET)
> 		if (lro_enabled) {
>-			if (!lro_possible) {
>-				lro_possible = iflib_check_lro_possible(m, v4_forwarding, v6_forwarding);
>-				if (lro_possible && mf != NULL) {
>+			lro_possible = iflib_check_lro_possible(m, v4_forwarding, v6_forwarding);
>+			if (lro_possible) {
>+				if (mf != NULL) {
> 					ifp->if_input(ifp, mf);
> 					DBG_COUNTER_INC(rx_if_input);
> 					mt = mf = NULL;
> 				}
>-			}
>-			if ((m->m_pkthdr.csum_flags & (CSUM_L4_CALC|CSUM_L4_VALID)) ==
>-			    (CSUM_L4_CALC|CSUM_L4_VALID)) {
>-				if (lro_possible && tcp_lro_rx(&rxq->ifr_lc, m, 0) == 0)
>-					continue;
>+				if ((m->m_pkthdr.csum_flags & (CSUM_L4_CALC|CSUM_L4_VALID)) ==
>+				    (CSUM_L4_CALC|CSUM_L4_VALID)) {
>+					tcp_lro_queue_mbuf(&rxq->ifr_lc, m);
>+				} else {
>+					/* Input packet AS-IS when checksum is not valid */
>+					ifp->if_input(ifp, m);
>+					DBG_COUNTER_INC(rx_if_input);
>+				}
>+				continue;
> 			}
> 		}
> #endif
>-		if (lro_possible) {
>-			ifp->if_input(ifp, m);
>-			DBG_COUNTER_INC(rx_if_input);
>-			continue;
>-		}
>-
> 		if (mf == NULL)
> 			mf = m;
> 		if (mt != NULL)

Actions: View | Diff

Attachments on bug 254244: 223220 | 223294 | 223301 | 223304 | 223325