svn commit: r297389 - head/sys/dev/vnic

[Zbigniew Bodek]

Author: zbb
Date: Tue Mar 29 13:31:09 2016
New Revision: 297389
URL: https://svnweb.freebsd.org/changeset/base/297389

Log:
  Improve HW checksums support in VNIC
  
  - Do not mark CSUM_IP_CHECKED and CSUM_IP_VALID on IPv6 packets.
    IPv6 does not have checksums by definition.
  - Set SCTP packets csum_flags CSUM_SCTP_VALID instead of
    CSUM_DATA_VALID and skip csum_data
  - Set csum_data simply as 0xffff without byteswap
  
  Pointed out by: yongari
  Reviewed by:    yongari, wma
  Obtained from:  Semihalf
  Sponsored by:   Cavium
  Differential Revision: https://reviews.freebsd.org/D5537

Modified:
  head/sys/dev/vnic/nicvf_queues.c

Modified: head/sys/dev/vnic/nicvf_queues.c
==============================================================================
--- head/sys/dev/vnic/nicvf_queues.c	Tue Mar 29 13:28:13 2016	(r297388)
+++ head/sys/dev/vnic/nicvf_queues.c	Tue Mar 29 13:31:09 2016	(r297389)
@@ -1771,7 +1771,6 @@ nicvf_sq_add_hdr_subdesc(struct snd_queu
 		}
 
 		ip = (struct ip *)(mbuf->m_data + ehdrlen);
-		ip->ip_sum = 0;
 		iphlen = ip->ip_hl << 2;
 		poff = ehdrlen + iphlen;
 
@@ -1984,19 +1983,23 @@ nicvf_get_rcv_mbuf(struct nicvf *nic, st
 			/*
 			 * HW by default verifies IP & TCP/UDP/SCTP checksums
 			 */
-
-			/* XXX: Do we need to include IP with options too? */
-			if (__predict_true(cqe_rx->l3_type == L3TYPE_IPV4 ||
-			    cqe_rx->l3_type == L3TYPE_IPV6)) {
+			if (__predict_true(cqe_rx->l3_type == L3TYPE_IPV4)) {
 				mbuf->m_pkthdr.csum_flags =
 				    (CSUM_IP_CHECKED | CSUM_IP_VALID);
 			}
-			if (cqe_rx->l4_type == L4TYPE_TCP ||
-			    cqe_rx->l4_type == L4TYPE_UDP ||
-			    cqe_rx->l4_type == L4TYPE_SCTP) {
+
+			switch (cqe_rx->l4_type) {
+			case L4TYPE_UDP:
+			case L4TYPE_TCP: /* fall through */
 				mbuf->m_pkthdr.csum_flags |=
 				    (CSUM_DATA_VALID | CSUM_PSEUDO_HDR);
-				mbuf->m_pkthdr.csum_data = htons(0xffff);
+				mbuf->m_pkthdr.csum_data = 0xffff;
+				break;
+			case L4TYPE_SCTP:
+				mbuf->m_pkthdr.csum_flags |= CSUM_SCTP_VALID;
+				break;
+			default:
+				break;
 			}
 		}
 	}