svn commit: r347208 - stable/11/sys/net

[Eric Joyner]

Author: erj
Date: Mon May  6 20:41:56 2019
New Revision: 347208
URL: https://svnweb.freebsd.org/changeset/base/347208

Log:
  MFC r340435: Prevent POLA violation with TSO/CSUM offload
  
  Sponsored by:	Intel Corporation

Modified:
  stable/11/sys/net/iflib.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/net/iflib.c
==============================================================================
--- stable/11/sys/net/iflib.c	Mon May  6 20:20:21 2019	(r347207)
+++ stable/11/sys/net/iflib.c	Mon May  6 20:41:56 2019	(r347208)
@@ -2844,9 +2844,6 @@ iflib_parse_header(iflib_txq_t txq, if_pkt_info_t pi, 
 		pi->ipi_ipproto = ip->ip_p;
 		pi->ipi_flags |= IPI_TX_IPV4;
 
-		if ((sctx->isc_flags & IFLIB_NEED_ZERO_CSUM) && (pi->ipi_csum_flags & CSUM_IP))
-                       ip->ip_sum = 0;
-
 		/* TCP checksum offload may require TCP header length */
 		if (IS_TX_OFFLOAD4(pi)) {
 			if (__predict_true(pi->ipi_ipproto == IPPROTO_TCP)) {
@@ -2863,6 +2860,10 @@ iflib_parse_header(iflib_txq_t txq, if_pkt_info_t pi, 
 			if (IS_TSO4(pi)) {
 				if (__predict_false(ip->ip_p != IPPROTO_TCP))
 					return (ENXIO);
+				/*
+				 * TSO always requires hardware checksum offload.
+				 */
+				pi->ipi_csum_flags |= (CSUM_IP_TCP | CSUM_IP);
 				th->th_sum = in_pseudo(ip->ip_src.s_addr,
 						       ip->ip_dst.s_addr, htons(IPPROTO_TCP));
 				pi->ipi_tso_segsz = m->m_pkthdr.tso_segsz;
@@ -2872,6 +2873,9 @@ iflib_parse_header(iflib_txq_t txq, if_pkt_info_t pi, 
 				}
 			}
 		}
+		if ((sctx->isc_flags & IFLIB_NEED_ZERO_CSUM) && (pi->ipi_csum_flags & CSUM_IP))
+                       ip->ip_sum = 0;
+
 		break;
 	}
 #endif
@@ -2908,9 +2912,7 @@ iflib_parse_header(iflib_txq_t txq, if_pkt_info_t pi, 
 				if (__predict_false(ip6->ip6_nxt != IPPROTO_TCP))
 					return (ENXIO);
 				/*
-				 * The corresponding flag is set by the stack in the IPv4
-				 * TSO case, but not in IPv6 (at least in FreeBSD 10.2).
-				 * So, set it here because the rest of the flow requires it.
+				 * TSO always requires hardware checksum offload.
 				 */
 				pi->ipi_csum_flags |= CSUM_IP6_TCP;
 				th->th_sum = in6_cksum_pseudo(ip6, 0, IPPROTO_TCP, 0);