From 49d3978d5723a3a71c348e1623cd10d489c0d4c0 Mon Sep 17 00:00:00 2001 From: Shahed Shaikh Date: Mon, 12 Nov 2018 18:19:38 +0000 Subject: [PATCH] net/qede: fix Tx tunnel offload support mask Tunneling offloads are represented by multi-bit values. So, feature wise tunneling offload can only be entirely supported/unsupported using PKT_TX_TUNNEL_MASK. Its upon PMDs to further isolate which of the tunneling offload types are supported by respective PMD. Using subset of bits from PKT_TX_TUNNEL_MASK to indicate supported vs unsupported offloads can lead to undesired result. Use PKT_TX_TUNNEL_MASK in QEDE_TX_OFFLOAD_MASK and use independent value of supported PKT_TX_TUNNEL_* in .tx_pkt_prepare() to mark supported tunnel offloads. Fixes: 44346c24b790 ("net/qede: fix VXLAN tunnel Tx offload flag setting") Cc: stable@dpdk.org Suggested-by: Ferruh Yigit Signed-off-by: Shahed Shaikh Reviewed-by: Rasesh Mody --- drivers/net/qede/qede_rxtx.c | 12 ++++++++++++ drivers/net/qede/qede_rxtx.h | 5 +---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c index 2961891071..0e33be1a3c 100644 --- a/drivers/net/qede/qede_rxtx.c +++ b/drivers/net/qede/qede_rxtx.c @@ -1761,6 +1761,18 @@ qede_xmit_prep_pkts(__rte_unused void *p_txq, struct rte_mbuf **tx_pkts, } } if (ol_flags & QEDE_TX_OFFLOAD_NOTSUP_MASK) { + /* We support only limited tunnel protocols */ + if (ol_flags & PKT_TX_TUNNEL_MASK) { + uint64_t temp; + + temp = ol_flags & PKT_TX_TUNNEL_MASK; + if (temp == PKT_TX_TUNNEL_VXLAN || + temp == PKT_TX_TUNNEL_GENEVE || + temp == PKT_TX_TUNNEL_MPLSINUDP || + temp == PKT_TX_TUNNEL_GRE) + break; + } + rte_errno = -ENOTSUP; break; } diff --git a/drivers/net/qede/qede_rxtx.h b/drivers/net/qede/qede_rxtx.h index d3a41e92e8..0afadd8da3 100644 --- a/drivers/net/qede/qede_rxtx.h +++ b/drivers/net/qede/qede_rxtx.h @@ -153,10 +153,7 @@ #define QEDE_TX_OFFLOAD_MASK (QEDE_TX_CSUM_OFFLOAD_MASK | \ PKT_TX_VLAN_PKT | \ - PKT_TX_TUNNEL_VXLAN | \ - PKT_TX_TUNNEL_GENEVE | \ - PKT_TX_TUNNEL_MPLSINUDP | \ - PKT_TX_TUNNEL_GRE) + PKT_TX_TUNNEL_MASK) #define QEDE_TX_OFFLOAD_NOTSUP_MASK \ (PKT_TX_OFFLOAD_MASK ^ QEDE_TX_OFFLOAD_MASK) -- 2.20.1