On Wed, Jan 12, 2022 at 05:54:07PM +0100, Mark Kettenis wrote: > > Date: Wed, 12 Jan 2022 17:45:57 +0100 > > From: Jan Klemkow <j.klem...@wemelug.de> > > > > On Wed, Jan 12, 2022 at 05:36:01PM +0100, Mark Kettenis wrote: > > > > Date: Wed, 12 Jan 2022 17:02:03 +0100 > > > > From: Jan Klemkow <j.klem...@wemelug.de> > > > > > > > > Hi, > > > > > > > > This diff enables TCP and UDP checksum offloading in ix(4) for IPv6. > > > > > > > > IPv6 extension headers aren't a problem in this case. > > > > in6_proto_cksum_out() in netinet6/ip6_output.c disables checksum > > > > offloading if ip6_nxt is not TCP or UDP. Thus, we can just use this > > > > field. > > > > > > > > Tested with: > > > > ix0 at pci5 dev 0 function 0 "Intel 82599" rev 0x01, msix, 8 queues, > > > > address 00:1b:21:94:4c:48 > > > > > > > > OK? > > > > > > Isn't this the same disaster as the ixl(4) diff you sent earlier? We > > > have sparc64 machines with onboard ix(4)... > > > > Yes, but we don't parse the TCP header here. As bluhm@ figured out: > > The access to ip_hl does not generate an alignment problem on sparc64. > > Because, the bits of ip_hl are on the other of the byte, as bits of > > th_off. > > > > This diff just touches the IPv6 case, where we don't have this kind of > > problem, anyway. > > But you're still using m_getptr(), casting the result to a struct and > then look at a member of the struct, which may access data beyond the > end of the mbuf.
We use the same pattern in re(4), vio(4) and the IPv4 case in ix(4). And we check for this case with the KASSERT(), except re(4). For me, it looks as this assumption is safe. > > > > Index: dev/pci/if_ix.c > > > > =================================================================== > > > > RCS file: /mount/openbsd/cvs/src/sys/dev/pci/if_ix.c,v > > > > retrieving revision 1.180 > > > > diff -u -p -r1.180 if_ix.c > > > > --- dev/pci/if_ix.c 27 Jul 2021 01:44:55 -0000 1.180 > > > > +++ dev/pci/if_ix.c 12 Jan 2022 14:53:14 -0000 > > > > @@ -1879,7 +1879,8 @@ ixgbe_setup_interface(struct ix_softc *s > > > > ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING; > > > > #endif > > > > > > > > - ifp->if_capabilities |= IFCAP_CSUM_TCPv4 | IFCAP_CSUM_UDPv4; > > > > + ifp->if_capabilities |= IFCAP_CSUM_TCPv4 | IFCAP_CSUM_UDPv4 > > > > + | IFCAP_CSUM_TCPv6 | IFCAP_CSUM_UDPv6; > > > > > > > > /* > > > > * Specify the media types supported by this sc and register > > > > @@ -2438,9 +2439,7 @@ ixgbe_tx_ctx_setup(struct tx_ring *txr, > > > > struct ether_header *eh; > > > > #endif > > > > struct ip *ip; > > > > -#ifdef notyet > > > > struct ip6_hdr *ip6; > > > > -#endif > > > > struct mbuf *m; > > > > int ipoff; > > > > uint32_t vlan_macip_lens = 0, type_tucmd_mlhl = 0; > > > > @@ -2521,19 +2520,16 @@ ixgbe_tx_ctx_setup(struct tx_ring *txr, > > > > ipproto = ip->ip_p; > > > > type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4; > > > > break; > > > > -#ifdef notyet > > > > case ETHERTYPE_IPV6: > > > > if (mp->m_pkthdr.len < ehdrlen + sizeof(*ip6)) > > > > return (-1); > > > > m = m_getptr(mp, ehdrlen, &ipoff); > > > > KASSERT(m != NULL && m->m_len - ipoff >= sizeof(*ip6)); > > > > - ip6 = (struct ip6 *)(m->m_data + ipoff); > > > > + ip6 = (struct ip6_hdr *)(m->m_data + ipoff); > > > > ip_hlen = sizeof(*ip6); > > > > - /* XXX-BZ this will go badly in case of ext hdrs. */ > > > > ipproto = ip6->ip6_nxt; > > > > type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV6; > > > > break; > > > > -#endif > > > > default: > > > > offload = FALSE; > > > > break; > > > > Index: dev/pci/ixgbe.h > > > > =================================================================== > > > > RCS file: /mount/openbsd/cvs/src/sys/dev/pci/ixgbe.h,v > > > > retrieving revision 1.32 > > > > diff -u -p -r1.32 ixgbe.h > > > > --- dev/pci/ixgbe.h 18 Jul 2020 07:18:22 -0000 1.32 > > > > +++ dev/pci/ixgbe.h 12 Jan 2022 14:57:13 -0000 > > > > @@ -65,6 +65,7 @@ > > > > #include <netinet/in.h> > > > > #include <netinet/if_ether.h> > > > > #include <netinet/ip.h> > > > > +#include <netinet/ip6.h> > > > > > > > > #if NBPFILTER > 0 > > > > #include <net/bpf.h> > > > > > > > > > > > > > >
