d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mbuf: remove Intel offload checks from generic API

Browse Source 
rte_validate_tx_offload() is used in Tx prepare callbacks
(RTE_LIBRTE_ETHDEV_DEBUG only) to check Tx offloads consistency.
Requirement that packet headers should not be fragmented is not
documented and unclear where it comes from except
rte_net_intel_cksum_prepare() functions which relies on it.

It could be NIC vendor specific driver or hardware limitation, but,
if so, it should be documented and checked in corresponding Tx
prepare callbacks.

Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
This commit is contained in:
Andrew Rybchenko 2019-03-29 13:42:14 +00:00 committed by Thomas Monjalon
parent 1e3380a2f4
commit dfc6b2fd8d
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/librte_mbuf/rte_mbuf.h
View File

@ -2257,23 +2257,11 @@ static inline int
rte_validate_tx_offload(const struct rte_mbuf *m)
{
uint64_t ol_flags = m->ol_flags;
uint64_t inner_l3_offset = m->l2_len;
/* Does packet set any of available offloads? */
if (!(ol_flags & PKT_TX_OFFLOAD_MASK))
return 0;
if (ol_flags & PKT_TX_OUTER_IP_CKSUM)
/* NB: elaborating the addition like this instead of using
* += gives the result uint64_t type instead of int,
* avoiding compiler warnings on gcc 8.1 at least */
inner_l3_offset = inner_l3_offset + m->outer_l2_len +
m->outer_l3_len;
/* Headers are fragmented */
if (rte_pktmbuf_data_len(m) < inner_l3_offset + m->l3_len + m->l4_len)
return -ENOTSUP;
/* IP checksum can be counted only for IPv4 packet */
if ((ol_flags & PKT_TX_IP_CKSUM) && (ol_flags & PKT_TX_IPV6))
return -EINVAL;

21
lib/librte_net/rte_net.h
View File

@ -118,10 +118,31 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
struct udp_hdr *udp_hdr;
uint64_t inner_l3_offset = m->l2_len;
#ifdef RTE_LIBRTE_ETHDEV_DEBUG
/*
* Does packet set any of available offloads?
* Mainly it is required to avoid fragmented headers check if
* no offloads are requested.
*/
if (!(ol_flags & PKT_TX_OFFLOAD_MASK))
return 0;
#endif
if ((ol_flags & PKT_TX_OUTER_IP_CKSUM) ||
(ol_flags & PKT_TX_OUTER_IPV6))
inner_l3_offset += m->outer_l2_len + m->outer_l3_len;
#ifdef RTE_LIBRTE_ETHDEV_DEBUG
/*
* Check if headers are fragmented.
* The check could be less strict depending on which offloads are
* requested and headers to be used, but let's keep it simple.
*/
if (unlikely(rte_pktmbuf_data_len(m) <
inner_l3_offset + m->l3_len + m->l4_len))
return -ENOTSUP;
#endif
if (ol_flags & PKT_TX_IPV4) {
ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *,
inner_l3_offset);