Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Jan 2019 19:32:49 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r342789 - stable/11/sys/dev/e1000
Message-ID:  <201901051932.x05JWnLr065183@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marius
Date: Sat Jan  5 19:32:48 2019
New Revision: 342789
URL: https://svnweb.freebsd.org/changeset/base/342789

Log:
  MFC: r336610 (partial), r339207, r339267
  
  - Or in the DMA coalescing Rx threshold so the other bits set in E1000_DMACR
    remain intact as intended in igb_init_dmac(). [1]
  
  - Fix igb corrupting checksums with BPF and VLAN
    In stable/11, this merely syncs the code with head as the problem was
    introduced with r311849 in the latter and then fixed by r339207 with
    a different approach than the code used pre-r311849 and in stable/11.
  
  - Use mbuf defines to construct csum offload masks rather than literals
  
  Reported by:	Coverity
  CID:		1304929 [1]

Modified:
  stable/11/sys/dev/e1000/if_em.h
  stable/11/sys/dev/e1000/if_igb.c
  stable/11/sys/dev/e1000/if_lem.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/e1000/if_em.h
==============================================================================
--- stable/11/sys/dev/e1000/if_em.h	Sat Jan  5 16:05:39 2019	(r342788)
+++ stable/11/sys/dev/e1000/if_em.h	Sat Jan  5 19:32:48 2019	(r342789)
@@ -277,7 +277,7 @@
 #define EM_MSIX_LINK		0x01000000 /* For 82574 use */
 #define ETH_ZLEN		60
 #define ETH_ADDR_LEN		6
-#define CSUM_OFFLOAD		7	/* Offload bits in mbuf flag */
+#define CSUM_OFFLOAD		(CSUM_IP | CSUM_IP_UDP | CSUM_IP_TCP) /* Offload bits in mbuf flag */
 
 /*
  * 82574 has a nonstandard address for EIAC

Modified: stable/11/sys/dev/e1000/if_igb.c
==============================================================================
--- stable/11/sys/dev/e1000/if_igb.c	Sat Jan  5 16:05:39 2019	(r342788)
+++ stable/11/sys/dev/e1000/if_igb.c	Sat Jan  5 19:32:48 2019	(r342789)
@@ -2957,7 +2957,7 @@ igb_init_dmac(struct adapter *adapter, u32 pba)
 			dmac = pba - 10;
 		reg = E1000_READ_REG(hw, E1000_DMACR);
 		reg &= ~E1000_DMACR_DMACTHR_MASK;
-		reg = ((dmac << E1000_DMACR_DMACTHR_SHIFT)
+		reg |= ((dmac << E1000_DMACR_DMACTHR_SHIFT)
 		    & E1000_DMACR_DMACTHR_MASK);
 
 		/* transition to L0x or L1 if available..*/
@@ -3908,7 +3908,6 @@ igb_tx_ctx_setup(struct tx_ring *txr, struct mbuf *mp,
 	int	ehdrlen, ip_hlen = 0;
 	u16	etype;
 	u8	ipproto = 0;
-	int	offload = TRUE;
 	int	ctxd = txr->next_avail_desc;
 	u16	vtag = 0;
 
@@ -3916,9 +3915,6 @@ igb_tx_ctx_setup(struct tx_ring *txr, struct mbuf *mp,
 	if (mp->m_pkthdr.csum_flags & CSUM_TSO)
 		return (igb_tso_setup(txr, mp, cmd_type_len, olinfo_status));
 
-	if ((mp->m_pkthdr.csum_flags & CSUM_OFFLOAD) == 0)
-		offload = FALSE;
-
 	/* Indicate the whole packet as payload when not doing TSO */
        	*olinfo_status |= mp->m_pkthdr.len << E1000_ADVTXD_PAYLEN_SHIFT;
 
@@ -3933,8 +3929,9 @@ igb_tx_ctx_setup(struct tx_ring *txr, struct mbuf *mp,
 	if (mp->m_flags & M_VLANTAG) {
 		vtag = htole16(mp->m_pkthdr.ether_vtag);
 		vlan_macip_lens |= (vtag << E1000_ADVTXD_VLAN_SHIFT);
-	} else if (offload == FALSE) /* ... no offload to do */
+	} else if ((mp->m_pkthdr.csum_flags & CSUM_OFFLOAD) == 0) {
 		return (0);
+	}
 
 	/*
 	 * Determine where frame payload starts.
@@ -3968,7 +3965,6 @@ igb_tx_ctx_setup(struct tx_ring *txr, struct mbuf *mp,
 			type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_IPV6;
 			break;
 		default:
-			offload = FALSE;
 			break;
 	}
 
@@ -3978,38 +3974,40 @@ igb_tx_ctx_setup(struct tx_ring *txr, struct mbuf *mp,
 	switch (ipproto) {
 		case IPPROTO_TCP:
 #if __FreeBSD_version >= 1000000
-			if (mp->m_pkthdr.csum_flags & (CSUM_IP_TCP | CSUM_IP6_TCP))
+			if (mp->m_pkthdr.csum_flags & (CSUM_IP_TCP | CSUM_IP6_TCP)) {
 #else
-			if (mp->m_pkthdr.csum_flags & CSUM_TCP)
+			if (mp->m_pkthdr.csum_flags & CSUM_TCP) {
 #endif
 				type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_L4T_TCP;
+				*olinfo_status |= E1000_TXD_POPTS_TXSM << 8;
+			}
 			break;
 		case IPPROTO_UDP:
 #if __FreeBSD_version >= 1000000
-			if (mp->m_pkthdr.csum_flags & (CSUM_IP_UDP | CSUM_IP6_UDP))
+			if (mp->m_pkthdr.csum_flags & (CSUM_IP_UDP | CSUM_IP6_UDP)) {
 #else
-			if (mp->m_pkthdr.csum_flags & CSUM_UDP)
+			if (mp->m_pkthdr.csum_flags & CSUM_UDP) {
 #endif
 				type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_L4T_UDP;
+				*olinfo_status |= E1000_TXD_POPTS_TXSM << 8;
+			}
 			break;
 
 #if __FreeBSD_version >= 800000
 		case IPPROTO_SCTP:
 #if __FreeBSD_version >= 1000000
-			if (mp->m_pkthdr.csum_flags & (CSUM_IP_SCTP | CSUM_IP6_SCTP))
+			if (mp->m_pkthdr.csum_flags & (CSUM_IP_SCTP | CSUM_IP6_SCTP)) {
 #else
-			if (mp->m_pkthdr.csum_flags & CSUM_SCTP)
+			if (mp->m_pkthdr.csum_flags & CSUM_SCTP) {
 #endif
 				type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_L4T_SCTP;
+				*olinfo_status |= E1000_TXD_POPTS_TXSM << 8;
+			}
 			break;
 #endif
 		default:
-			offload = FALSE;
 			break;
 	}
-
-	if (offload) /* For the TX descriptor setup */
-		*olinfo_status |= E1000_TXD_POPTS_TXSM << 8;
 
 	/* 82575 needs the queue index added */
 	if (adapter->hw.mac.type == e1000_82575)

Modified: stable/11/sys/dev/e1000/if_lem.h
==============================================================================
--- stable/11/sys/dev/e1000/if_lem.h	Sat Jan  5 16:05:39 2019	(r342788)
+++ stable/11/sys/dev/e1000/if_lem.h	Sat Jan  5 19:32:48 2019	(r342789)
@@ -241,7 +241,7 @@
 #define EM_MSIX_MASK		0x01F00000 /* For 82574 use */
 #define ETH_ZLEN		60
 #define ETH_ADDR_LEN		6
-#define CSUM_OFFLOAD		7	/* Offload bits in mbuf flag */
+#define CSUM_OFFLOAD		(CSUM_IP | CSUM_IP_UDP | CSUM_IP_TCP) /* Offload bits in mbuf flag */
 
 /*
  * 82574 has a nonstandard address for EIAC



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901051932.x05JWnLr065183>