net/enic: fix size check in Tx prepare handler

The current code wrongly assumes that packets are non-TSO and ends up
rejecting large TSO packets. Check non-TSO and TSO max packet sizes
separately.

Fixes: 5a12c38740 ("net/enic: check maximum packet size in Tx prepare handler")
Cc: stable@dpdk.org

Signed-off-by: Hyong Youb Kim <hyonkim@cisco.com>
Reviewed-by: John Daley <johndale@cisco.com>
This commit is contained in:
Hyong Youb Kim 2018-11-13 07:38:10 -08:00 committed by Ferruh Yigit
parent f7c8539801
commit 7ac790d63b

View File

@ -393,11 +393,22 @@ uint16_t enic_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
for (i = 0; i != nb_pkts; i++) {
m = tx_pkts[i];
if (unlikely(m->pkt_len > ENIC_TX_MAX_PKT_SIZE)) {
rte_errno = EINVAL;
return i;
}
ol_flags = m->ol_flags;
if (!(ol_flags & PKT_TX_TCP_SEG)) {
if (unlikely(m->pkt_len > ENIC_TX_MAX_PKT_SIZE)) {
rte_errno = EINVAL;
return i;
}
} else {
uint16_t header_len;
header_len = m->l2_len + m->l3_len + m->l4_len;
if (m->tso_segsz + header_len > ENIC_TX_MAX_PKT_SIZE) {
rte_errno = EINVAL;
return i;
}
}
if (ol_flags & wq->tx_offload_notsup_mask) {
rte_errno = ENOTSUP;
return i;