diff options
Diffstat (limited to 'usr/src/uts/common/io')
| -rw-r--r-- | usr/src/uts/common/io/dld/dld_proto.c | 22 | ||||
| -rw-r--r-- | usr/src/uts/common/io/i40e/i40e_gld.c | 7 | ||||
| -rw-r--r-- | usr/src/uts/common/io/i40e/i40e_stats.c | 19 | ||||
| -rw-r--r-- | usr/src/uts/common/io/i40e/i40e_sw.h | 6 | ||||
| -rw-r--r-- | usr/src/uts/common/io/i40e/i40e_transceiver.c | 227 | ||||
| -rw-r--r-- | usr/src/uts/common/io/overlay/overlay.c | 11 | ||||
| -rw-r--r-- | usr/src/uts/common/io/overlay/plugins/overlay_vxlan.c | 9 |
7 files changed, 249 insertions, 52 deletions
diff --git a/usr/src/uts/common/io/dld/dld_proto.c b/usr/src/uts/common/io/dld/dld_proto.c index d6f57091b4..56de77bc60 100644 --- a/usr/src/uts/common/io/dld/dld_proto.c +++ b/usr/src/uts/common/io/dld/dld_proto.c @@ -1493,6 +1493,17 @@ dld_capab_poll(dld_str_t *dsp, void *data, uint_t flags) return (ENOTSUP); } +static void +dld_capab_lso_fill_vxlan(mac_capab_lso_t *mac, dld_capab_lso_t *lso) +{ + lso->lso_vxlan_cksum = mac->lso_vxlan_tcp.lso_oudp_cksum; + + if (mac->lso_vxlan_tcp.lso_tcp_max > 0) { + lso->lso_flags |= DLD_LSO_VXLAN_TCP_IPV4 | DLD_LSO_VXLAN_TCP_IPV6; + lso->lso_vxlan_tcp_max = mac->lso_vxlan_tcp.lso_tcp_max; + } +} + static int dld_capab_lso(dld_str_t *dsp, void *data, uint_t flags) { @@ -1514,14 +1525,9 @@ dld_capab_lso(dld_str_t *dsp, void *data, uint_t flags) /* translate the flag for mac clients */ if ((mac_lso.lso_flags & LSO_TX_BASIC_TCP_IPV4) != 0) lso->lso_flags |= DLD_LSO_BASIC_TCP_IPV4; - /* XXX We should probably not rely on equality */ - if ((mac_lso.lso_flags & LSO_TX_VXLAN_TCP) != 0 && - mac_lso.lso_vxlan_tcp.lso_tcpv4_max == lso->lso_max) { - lso->lso_flags |= DLD_LSO_VXLAN_TCP_IPV4; - } - if ((mac_lso.lso_flags & LSO_TX_VXLAN_TCP) != 0 && - mac_lso.lso_vxlan_tcp.lso_tcpv6_max == lso->lso_max) { - lso->lso_flags |= DLD_LSO_VXLAN_TCP_IPV6; + + if ((mac_lso.lso_flags & LSO_TX_VXLAN_TCP) != 0) { + dld_capab_lso_fill_vxlan(&mac_lso, lso); } dsp->ds_lso = B_TRUE; dsp->ds_lso_max = lso->lso_max; diff --git a/usr/src/uts/common/io/i40e/i40e_gld.c b/usr/src/uts/common/io/i40e/i40e_gld.c index 5e488c4606..c59988601e 100644 --- a/usr/src/uts/common/io/i40e/i40e_gld.c +++ b/usr/src/uts/common/io/i40e/i40e_gld.c @@ -747,8 +747,13 @@ i40e_m_getcapab(void *arg, mac_capab_t cap, void *cap_data) mac_capab_lso_t *cap_lso = cap_data; if (i40e->i40e_tx_lso_enable == B_TRUE) { - cap_lso->lso_flags = LSO_TX_BASIC_TCP_IPV4; + cap_lso->lso_flags = LSO_TX_BASIC_TCP_IPV4 | + LSO_TX_VXLAN_TCP; cap_lso->lso_basic_tcp_ipv4.lso_max = I40E_LSO_MAXLEN; + /* XXX This is not the case for the X722 */ + cap_lso->lso_vxlan_tcp.lso_oudp_cksum = + LSO_VXLAN_OUDP_CSUM_NONE; + cap_lso->lso_vxlan_tcp.lso_tcp_max = I40E_LSO_MAXLEN; } else { return (B_FALSE); } diff --git a/usr/src/uts/common/io/i40e/i40e_stats.c b/usr/src/uts/common/io/i40e/i40e_stats.c index 7a4f0faedd..44be3749c4 100644 --- a/usr/src/uts/common/io/i40e/i40e_stats.c +++ b/usr/src/uts/common/io/i40e/i40e_stats.c @@ -1234,6 +1234,10 @@ i40e_stats_trqpair_init(i40e_trqpair_t *itrq) kstat_named_init(&tsp->itxs_hck_meoifail, "tx_hck_meoifail", KSTAT_DATA_UINT64); tsp->itxs_hck_meoifail.value.ui64 = 0; + kstat_named_init(&tsp->itxs_hck_badttype, "tx_hck_bad_tunnel_type", + KSTAT_DATA_UINT64); + tsp->itxs_hck_badttype.value.ui64 = 0; + kstat_named_init(&tsp->itxs_hck_nol2info, "tx_hck_nol2info", KSTAT_DATA_UINT64); tsp->itxs_hck_nol2info.value.ui64 = 0; @@ -1243,12 +1247,27 @@ i40e_stats_trqpair_init(i40e_trqpair_t *itrq) kstat_named_init(&tsp->itxs_hck_nol4info, "tx_hck_nol4info", KSTAT_DATA_UINT64); tsp->itxs_hck_nol4info.value.ui64 = 0; + kstat_named_init(&tsp->itxs_hck_notunl2info, "tx_hck_notunl2info", + KSTAT_DATA_UINT64); + tsp->itxs_hck_notunl2info.value.ui64 = 0; + kstat_named_init(&tsp->itxs_hck_notunl3info, "tx_hck_notunl3info", + KSTAT_DATA_UINT64); + tsp->itxs_hck_notunl3info.value.ui64 = 0; + kstat_named_init(&tsp->itxs_hck_notunl4info, "tx_hck_notunl4info", + KSTAT_DATA_UINT64); + tsp->itxs_hck_notunl4info.value.ui64 = 0; kstat_named_init(&tsp->itxs_hck_badl3, "tx_hck_badl3", KSTAT_DATA_UINT64); tsp->itxs_hck_badl3.value.ui64 = 0; kstat_named_init(&tsp->itxs_hck_badl4, "tx_hck_badl4", KSTAT_DATA_UINT64); tsp->itxs_hck_badl4.value.ui64 = 0; + kstat_named_init(&tsp->itxs_hck_outer, "tx_hck_outer", + KSTAT_DATA_UINT64); + tsp->itxs_hck_outer.value.ui64 = 0; + kstat_named_init(&tsp->itxs_hck_badtso, "tx_hck_badtso", + KSTAT_DATA_UINT64); + tsp->itxs_hck_badtso.value.ui64 = 0; kstat_named_init(&tsp->itxs_err_notcb, "tx_err_notcb", KSTAT_DATA_UINT64); tsp->itxs_err_notcb.value.ui64 = 0; diff --git a/usr/src/uts/common/io/i40e/i40e_sw.h b/usr/src/uts/common/io/i40e/i40e_sw.h index 87c4421971..0beb4900b2 100644 --- a/usr/src/uts/common/io/i40e/i40e_sw.h +++ b/usr/src/uts/common/io/i40e/i40e_sw.h @@ -536,11 +536,17 @@ typedef struct i40e_txq_stat { * Various failure conditions. */ kstat_named_t itxs_hck_meoifail; /* ether offload failures */ + kstat_named_t itxs_hck_badttype; /* bad tunnel type */ kstat_named_t itxs_hck_nol2info; /* Missing l2 info */ kstat_named_t itxs_hck_nol3info; /* Missing l3 info */ kstat_named_t itxs_hck_nol4info; /* Missing l4 info */ + kstat_named_t itxs_hck_notunl2info; /* Missing tunnel l2 info */ + kstat_named_t itxs_hck_notunl3info; /* Missing tunnel l3 info */ + kstat_named_t itxs_hck_notunl4info; /* Missing tunnel l4 info */ kstat_named_t itxs_hck_badl3; /* Not IPv4/IPv6 */ kstat_named_t itxs_hck_badl4; /* Bad L4 Paylaod */ + kstat_named_t itxs_hck_outer; /* requested outer tunnel */ + kstat_named_t itxs_hck_badtso; /* Bad checksums for TSO */ kstat_named_t itxs_err_notcb; /* No tcb's available */ kstat_named_t itxs_err_nodescs; /* No tcb's available */ diff --git a/usr/src/uts/common/io/i40e/i40e_transceiver.c b/usr/src/uts/common/io/i40e/i40e_transceiver.c index 2d177b6c71..69a4f94242 100644 --- a/usr/src/uts/common/io/i40e/i40e_transceiver.c +++ b/usr/src/uts/common/io/i40e/i40e_transceiver.c @@ -1682,13 +1682,15 @@ i40e_ring_rx_poll(void *arg, int poll_bytes) * consider adding this to MAC. */ typedef enum mac_ether_offload_flags { - MEOI_L2INFO_SET = 0x01, - MEOI_VLAN_TAGGED = 0x02, - MEOI_L3INFO_SET = 0x04, - MEOI_L3CKSUM_SET = 0x08, - MEOI_L4INFO_SET = 0x10, - MEOI_L4CKSUM_SET = 0x20, - MEOI_TUNNEL_INFO_SET = 0x40, + MEOI_L2INFO_SET = 0x001, + MEOI_VLAN_TAGGED = 0x002, + MEOI_L3INFO_SET = 0x004, + MEOI_L4INFO_SET = 0x010, + MEOI_TUN_INFO_SET = 0x020, + MEOI_TUN_L2INFO_SET = 0x040, + MEOI_TUN_VLAN_TAGGED = 0x080, + MEOI_TUN_L3INFO_SET = 0x100, + MEOI_TUN_L4INFO_SET = 0x200, } mac_ether_offload_flags_t; #define MEOI_L2_L3_L4 (MEOI_L2INFO_SET | MEOI_L3INFO_SET | MEOI_L4INFO_SET) @@ -1709,13 +1711,6 @@ typedef struct mac_ether_offload_info { uint8_t meoi_tun_l3hlen; /* How long is the header? */ uint8_t meoi_tun_l4proto; /* What is the payload type? */ uint8_t meoi_tun_l4hlen; /* How long is the L4 header */ - /* - * The following members are currently not used - */ - mblk_t *meoi_l3ckmp; /* Which mblk has the l3 checksum */ - off_t meoi_l3ckoff; /* What's the offset to it */ - mblk_t *meoi_l4ckmp; /* Which mblk has the L4 checksum */ - off_t meoi_l4ckoff; /* What is the offset to it? */ } mac_ether_offload_info_t; /* @@ -1791,6 +1786,41 @@ i40e_meoi_get_uint16(mblk_t *mp, off_t off, uint16_t *out) } static int +i40e_meoi_zero_uint16(mblk_t *mp, off_t off) +{ + size_t mpsize; + uint8_t *bp; + + mpsize = msgsize(mp); + /* Check for overflow */ + if (off + sizeof (uint16_t) > mpsize) + return (-1); + + mpsize = MBLKL(mp); + while (off >= mpsize) { + mp = mp->b_cont; + off -= mpsize; + mpsize = MBLKL(mp); + } + + /* + * Data is in network order. Note the second byte of data might be in + * the next mp. + */ + bp = mp->b_rptr + off; + *bp = 0; + if (off + 1 == mpsize) { + mp = mp->b_cont; + bp = mp->b_rptr; + } else { + bp++; + } + *bp = 0; + + return (0); +} + +static int mac_ether_offload_info(mblk_t *mp, mac_ether_offload_info_t *meoi, uint32_t ttype, size_t starting_off) { @@ -1895,23 +1925,128 @@ mac_ether_offload_info(mblk_t *mp, mac_ether_offload_info_t *meoi, if (ret != 0) return (ret); - if ((meo.meoi_flags & MEOI_L2_L3_L4) != MEOI_L2_L3_L4) - return (-1); - meoi->meoi_tun_protlen = VXLAN_HDR_LEN; - meoi->meoi_tun_l2hlen = meo.meoi_l2hlen; - meoi->meoi_tun_l3proto = meo.meoi_l3proto; - meoi->meoi_tun_l3hlen = meo.meoi_l3hlen; - meoi->meoi_tun_l4proto = meo.meoi_l4proto; - meoi->meoi_tun_l4hlen = meo.meoi_l4hlen; + meoi->meoi_flags |= MEOI_TUN_INFO_SET; + + if (meo.meoi_flags & MEOI_L2INFO_SET) { + meoi->meoi_flags |= MEOI_TUN_L2INFO_SET; + meoi->meoi_tun_l2hlen = meo.meoi_l2hlen; + } + + if (meo.meoi_flags & MEOI_VLAN_TAGGED) { + meoi->meoi_flags |= MEOI_TUN_VLAN_TAGGED; + } + + if (meo.meoi_flags & MEOI_L3INFO_SET) { + meoi->meoi_flags |= MEOI_TUN_L3INFO_SET; + meoi->meoi_tun_l3proto = meo.meoi_l3proto; + meoi->meoi_tun_l3hlen = meo.meoi_l3hlen; + } + + if (meo.meoi_flags & MEOI_L4INFO_SET) { + meoi->meoi_flags |= MEOI_TUN_L4INFO_SET; + meoi->meoi_tun_l4proto = meo.meoi_l4proto; + meoi->meoi_tun_l4hlen = meo.meoi_l4hlen; + } - meoi->meoi_flags |= MEOI_TUNNEL_INFO_SET; } return (0); } /* + * Determine if we have sufficient checksum flags to perform TSO. This varies + * based on the tunnel type. If we have normal TSO traffic, we need both the + * IPv4 header checksum and the L4 checksum. For VXLAN encoded traffic, we need + * the outer IPv4 checksum and inner checksums. + * + * At this time the networking stack only supports TSO on IPv4 and the X710 + * hardware can't support VXLAN aware TSO on IPv6 due to the fact that it can't + * perform the UDP checksum. + */ +static inline boolean_t +i40e_tx_tso_have_cksums(uint32_t chkflags, uint32_t ttype) +{ + if (ttype == TTYPE_NONE) { + if ((chkflags & HCK_IPV4_HDRCKSUM) == 0) + return (B_FALSE); + if ((chkflags & HCK_PARTIALCKSUM) == 0) + return (B_FALSE); + } else if (ttype == TTYPE_VXLAN) { + if ((chkflags & HCK_IPV4_HDRCKSUM) == 0) + return (B_FALSE); + /* + * We can't perform LSO if we need an outer checksum, so that's + * an error. + */ + if ((chkflags & HCK_PARTIALCKSUM) != 0) + return (B_FALSE); + /* + * When the networking stack supports TSO over IPv6, this check + * will need to be conditional on protocol. + */ + if ((chkflags & HCK_INNER_IPV4_HDRCKSUM_NEEDED) == 0) + return (B_FALSE); + if ((chkflags & HCK_INNER_PSEUDO_NEEDED) == 0) + return (B_FALSE); + } else { + return (B_FALSE); + } + + return (B_TRUE); +} + +/* + * Fix up the message block for TSO to match what hardware expects. The hardware + * requires that the length and checksum for all IP headers be zero. It requires + * that the outer UDP checksum be zero and that the length field be zero. The + * networking stack will have taken care of making sure that the inner (or + * single) TCP header is OK. What we have to do is make sure that: + * + * 1. Outer IP length is zero + * 2. Outer UDP length (if it exists) is zero + * 3. Inner IP length (if it exists) is zero + */ +static boolean_t +i40e_tx_tso_fix_mp(mblk_t *mp, uint32_t ttype, mac_ether_offload_info_t *infop) +{ + off_t off = infop->meoi_l2hlen; + + if (infop->meoi_l3proto == ETHERTYPE_IP) { + i40e_meoi_zero_uint16(mp, off + offsetof(ipha_t, ipha_length)); + } else if (infop->meoi_l3proto == ETHERTYPE_IPV6) { + i40e_meoi_zero_uint16(mp, off + offsetof(ip6_t, ip6_plen)); + } else { + return (B_FALSE); + } + + if (ttype == TTYPE_NONE) { + return (B_TRUE); + } else if (ttype != TTYPE_VXLAN) { + return (B_FALSE); + } + + off += infop->meoi_l3hlen; + if (infop->meoi_l4proto != IPPROTO_UDP) { + return (B_FALSE); + } + +#if 0 + i40e_meoi_zero_uint16(mp, off + offsetof(struct udphdr, uh_ulen)); +#endif + off += infop->meoi_l4hlen + infop->meoi_tun_protlen + + infop->meoi_tun_l2hlen; + if (infop->meoi_tun_l3proto == ETHERTYPE_IP) { + i40e_meoi_zero_uint16(mp, off + offsetof(ipha_t, ipha_length)); + } else if (infop->meoi_tun_l3proto == ETHERTYPE_IPV6) { + i40e_meoi_zero_uint16(mp, off + offsetof(ip6_t, ip6_plen)); + } else { + return (B_FALSE); + } + return (B_TRUE); +} + +/* * Attempt to put togther the information we'll need to feed into a descriptor * to properly program the hardware for checksum offload as well as the * generally required flags. @@ -1952,7 +2087,7 @@ i40e_tx_context(i40e_t *i40e, i40e_trqpair_t *itrq, mblk_t *mp, tunneled = (chkflags & (HCK_INNER_IPV4_HDRCKSUM_NEEDED | HCK_INNER_PSEUDO_NEEDED)) != 0; if (tunneled && ttype != TTYPE_VXLAN) { - /* XXX kstat */ + txs->itxs_hck_badttype.value.ui64++; return (-1); } @@ -1994,7 +2129,11 @@ i40e_tx_context(i40e_t *i40e, i40e_trqpair_t *itrq, mblk_t *mp, /* * The MAC ether offload logic should have verified that we have * the right information for calculating the checksums here. - * Make sure that this is the case. + * Make sure that this is the case. We'll check that we have + * what we need for the checksum types as appropriate. We always + * requiere having the inner L2/L3 information. We only require + * Inner L4 info if we've been asked to do something in + * particular. */ if ((meo.meoi_flags & MEOI_L2INFO_SET) == 0) { txs->itxs_hck_nol2info.value.ui64++; @@ -2011,17 +2150,18 @@ i40e_tx_context(i40e_t *i40e, i40e_trqpair_t *itrq, mblk_t *mp, return (-1); } - if ((meo.meoi_flags & MEOI_TUNNEL_INFO_SET) == 0) { - /* XXX Missing kstat */ + if ((meo.meoi_flags & MEOI_TUN_L2INFO_SET) == 0) { + txs->itxs_hck_notunl2info.value.ui64++; + return (-1); + } + + if ((meo.meoi_flags & MEOI_TUN_L3INFO_SET) == 0) { + txs->itxs_hck_notunl3info.value.ui64++; return (-1); } if ((chkflags & HCK_PARTIALCKSUM) != 0) { - /* - * There is no HW support for outer checksum other than - * the (outer) HCK_IPV4_HDRCKSUM. - * XXX missing kstat - */ + txs->itxs_hck_outer.value.ui64++; return (-1); } @@ -2050,10 +2190,11 @@ i40e_tx_context(i40e_t *i40e, i40e_trqpair_t *itrq, mblk_t *mp, } } + /* XXX make comment for L4TUNT */ tctx->itc_ctx_tunnel_fld = I40E_TXD_TNL_SET_EIPT(eipt) | I40E_TXD_TNL_SET_EIPLEN(meo.meoi_l3hlen >> 2) | - I40E_TXD_TNL_SET_L4TUNT(I40E_TX_DESC_TNL_L4TUNT_UDP) | + I40E_TXD_TNL_SET_L4TUNT(1) | I40E_TXD_TNL_SET_L4TUNLEN(l4tunlen >> 1) | I40E_TXD_TNL_SET_DECTTL(0); @@ -2088,6 +2229,11 @@ i40e_tx_context(i40e_t *i40e, i40e_trqpair_t *itrq, mblk_t *mp, I40E_TX_DESC_LENGTH_IPLEN_SHIFT; if (chkflags & HCK_INNER_PSEUDO_NEEDED) { + if ((meo.meoi_flags & MEOI_TUN_L4INFO_SET) == 0) { + txs->itxs_hck_notunl4info.value.ui64++; + return (-1); + } + /* L4T */ switch (meo.meoi_tun_l4proto) { case IPPROTO_TCP: @@ -2213,14 +2359,25 @@ i40e_tx_context(i40e_t *i40e, i40e_trqpair_t *itrq, mblk_t *mp, * LSO requires that checksum offloads are enabled. If for * some reason they're not we bail out with an error. */ - if (!((chkflags & HCK_IPV4_HDRCKSUM) && - (chkflags & HCK_PARTIALCKSUM))) { + if (!i40e_tx_tso_have_cksums(chkflags, ttype)) { + txs->itxs_hck_badtso.value.ui64++; return (-1); } + if (!i40e_tx_tso_fix_mp(mp, ttype, &meo)) { + txs->itxs_hck_badtso.value.ui64++; + return (-1); + } + tctx->itc_ctx_cmdflags |= I40E_TX_CTX_DESC_TSO; tctx->itc_ctx_mss = mss; tctx->itc_ctx_tsolen = msgsize(mp) - (meo.meoi_l2hlen + meo.meoi_l3hlen + meo.meoi_l4hlen); + if (tunneled) { + tctx->itc_ctx_tsolen -= meo.meoi_tun_protlen + + meo.meoi_tun_l2hlen + meo.meoi_tun_l3hlen + + meo.meoi_tun_l4hlen; + } + } return (0); diff --git a/usr/src/uts/common/io/overlay/overlay.c b/usr/src/uts/common/io/overlay/overlay.c index 7aba941fd6..73c3c1ebb7 100644 --- a/usr/src/uts/common/io/overlay/overlay.c +++ b/usr/src/uts/common/io/overlay/overlay.c @@ -1066,6 +1066,16 @@ overlay_tx_checksum_shift(mblk_t *mp, uint16_t flags) } } +static inline void +overlay_tx_lso_copy(const mblk_t *src, mblk_t *dst) +{ + uint16_t flags = DB_LSOFLAGS(src) & HW_LSO_FLAGS; + if (flags == 0) + return; + DB_LSOFLAGS(dst) |= flags; + DB_LSOMSS(dst) = DB_LSOMSS(src); +} + mblk_t * overlay_m_tx(void *arg, mblk_t *mp_chain) { @@ -1123,6 +1133,7 @@ overlay_m_tx(void *arg, mblk_t *mp_chain) */ overlay_tx_checksum_shift(ep, DB_CKSUMFLAGS(mp)); if (ep != mp) { + overlay_tx_lso_copy(mp, ep); ep->b_cont = mp; } diff --git a/usr/src/uts/common/io/overlay/plugins/overlay_vxlan.c b/usr/src/uts/common/io/overlay/plugins/overlay_vxlan.c index 60659ade8c..30568873a5 100644 --- a/usr/src/uts/common/io/overlay/plugins/overlay_vxlan.c +++ b/usr/src/uts/common/io/overlay/plugins/overlay_vxlan.c @@ -385,10 +385,6 @@ vxlan_o_mac_capab(void *arg, mac_capab_t capab, void *cap_data, ksocket_t ksock) switch (capab) { case MAC_CAPAB_HCKSUM: - /* - * XXX Almost certainly some things are going to need the right - * psuedo-header on transmit. - */ if ((vxl->vxl_utunnel.uto_cksum_flags & (HCKSUM_VXLAN_FULL | HCKSUM_VXLAN_PSEUDO | HCKSUM_VXLAN_PSEUDO_NO_OL4)) != 0) { uint32_t *hck = cap_data; @@ -404,18 +400,15 @@ vxlan_o_mac_capab(void *arg, mac_capab_t capab, void *cap_data, ksocket_t ksock) hcapab = B_TRUE; } break; -#if 0 case MAC_CAPAB_LSO: if ((vxl->vxl_utunnel.uto_lso_flags & DLD_LSO_VXLAN_TCP_IPV4) != 0) { mac_capab_lso_t *lso = cap_data; lso->lso_flags = LSO_TX_BASIC_TCP_IPV4; - /* XXX Check value */ lso->lso_basic_tcp_ipv4.lso_max = - vxl->vxl_utunnel.uto_lso_max - 100; + vxl->vxl_utunnel.uto_lso_tcp_max - 1024; hcapab = B_TRUE; } break; -#endif default: hcapab = B_FALSE; break; |