Page MenuHomeFreeBSD

D61518.1795237995.diff
No OneTemporary

Authored By
Unknown
Size
2 KB
Referenced Files
None
Subscribers
None

D61518.1795237995.diff

diff --git a/FreeBSD/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c b/FreeBSD/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
--- a/FreeBSD/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
+++ b/FreeBSD/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
@@ -323,7 +323,7 @@
static inline void
mlx5e_build_rx_mbuf(struct mlx5_cqe64 *cqe, struct mlx5e_rq *rq,
- struct mbuf *mb, struct mlx5e_rq_mbuf *mr, u32 cqe_bcnt)
+ struct mbuf *mb, struct mlx5e_rq_mbuf *mr, u32 cqe_bcnt, bool *tcp)
{
if_t ifp = rq->ifp;
struct mlx5e_channel *c;
@@ -463,6 +463,17 @@
break;
}
+ switch (get_cqe_l4_hdr_type(cqe)) {
+ case CQE_L4_HDR_TYPE_TCP_NO_ACK:
+ case CQE_L4_HDR_TYPE_TCP_ACK_NO_DATA:
+ case CQE_L4_HDR_TYPE_TCP_ACK_AND_DATA:
+ *tcp = true;
+ break;
+ default:
+ *tcp = false;
+ break;
+ }
+
mlx5e_accel_ipsec_handle_rx(ifp, mb, cqe, mr);
}
@@ -544,6 +555,7 @@
{
struct pfil_head *pfil;
int i, rv;
+ bool tcp;
CURVNET_SET_QUIET(if_getvnet(rq->ifp));
pfil = rq->channel->priv->pfil;
@@ -634,17 +646,22 @@
}
rx_common:
mlx5e_build_rx_mbuf(cqe, rq, mb, &rq->mbuf[wqe_counter],
- byte_cnt);
+ byte_cnt, &tcp);
rq->stats.bytes += byte_cnt;
rq->stats.packets++;
#ifdef NUMA
mb->m_pkthdr.numa_domain = if_getnumadomain(rq->ifp);
#endif
+ tcp |= (mb->m_pkthdr.csum_flags & CSUM_INNER_GOOD) ==
+ CSUM_INNER_GOOD;
#if !defined(HAVE_TCP_LRO_RX)
- tcp_lro_queue_mbuf(&rq->lro, mb);
+ if (tcp)
+ tcp_lro_queue_mbuf(&rq->lro, mb);
+ else
+ if_input(rq->ifp, mb);
#else
- if (mb->m_pkthdr.csum_flags == 0 ||
+ if (mb->m_pkthdr.csum_flags == 0 || !tcp ||
(if_getcapenable(rq->ifp) & IFCAP_LRO) == 0 ||
rq->lro.lro_cnt == 0 ||
tcp_lro_rx(&rq->lro, mb, 0) != 0) {
diff --git a/FreeBSD/sys/netinet/tcp_lro.c b/FreeBSD/sys/netinet/tcp_lro.c
--- a/FreeBSD/sys/netinet/tcp_lro.c
+++ b/FreeBSD/sys/netinet/tcp_lro.c
@@ -393,9 +393,6 @@
return (NULL);
}
-static const int vxlan_csum = CSUM_INNER_L3_CALC | CSUM_INNER_L3_VALID |
- CSUM_INNER_L4_CALC | CSUM_INNER_L4_VALID;
-
static inline struct lro_parser *
tcp_lro_parser(struct mbuf *m, struct lro_parser *po, struct lro_parser *pi, bool update_data)
{
@@ -422,7 +419,8 @@
case LRO_TYPE_IPV4_UDP:
case LRO_TYPE_IPV6_UDP:
/* Check for VXLAN headers. */
- if ((m->m_pkthdr.csum_flags & vxlan_csum) != vxlan_csum)
+ if ((m->m_pkthdr.csum_flags & CSUM_INNER_GOOD) !=
+ CSUM_INNER_GOOD)
break;
/* Try to parse inner headers. */
diff --git a/FreeBSD/sys/sys/mbuf.h b/FreeBSD/sys/sys/mbuf.h
--- a/FreeBSD/sys/sys/mbuf.h
+++ b/FreeBSD/sys/sys/mbuf.h
@@ -759,6 +759,9 @@
#define CSUM_SCTP_IPV6 CSUM_IP6_SCTP
#define CSUM_TLS_MASK (CSUM_L5_CALC|CSUM_L5_VALID)
#define CSUM_TLS_DECRYPTED CSUM_L5_CALC
+#define CSUM_INNER_CHECKED (CSUM_INNER_L3_CALC|CSUM_INNER_L4_CALC)
+#define CSUM_INNER_VALID (CSUM_INNER_L4_VALID|CSUM_INNER_L4_VALID)
+#define CSUM_INNER_GOOD (CSUM_INNER_CHECKED|CSUM_INNER_VALID)
/*
* mbuf types describing the content of the mbuf (including external storage).

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 21, 5:13 AM (10 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41772696
Default Alt Text
D61518.1795237995.diff (2 KB)

Event Timeline