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

app/testpmd: add SW L4 checksum in multi-segments

Browse Source 
Csum forwarding mode only supports software UDP/TCP csum calculation
for single segment packets when hardware offload is not enabled.
This patch enables software UDP/TCP csum calculation over multiple
segments.

Signed-off-by: Xiaoyun Li <xiaoyun.li@intel.com>
Tested-by: Sunil Pai G <sunil.pai.g@intel.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
Xiaoyun Li 2022-01-24 20:28:57 +08:00 committed by Ferruh Yigit
parent d178f693bb
commit e6b9d6411e
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/test-pmd/csumonly.c
View File

@ -96,12 +96,13 @@ struct simple_gre_hdr {
} __rte_packed; } __rte_packed;
static uint16_t static uint16_t
get_udptcp_checksum(void *l3_hdr, void *l4_hdr, uint16_t ethertype) get_udptcp_checksum(struct rte_mbuf *m, void *l3_hdr, uint16_t l4_off,
uint16_t ethertype)
{ {
if (ethertype == _htons(RTE_ETHER_TYPE_IPV4)) if (ethertype == _htons(RTE_ETHER_TYPE_IPV4))
return rte_ipv4_udptcp_cksum(l3_hdr, l4_hdr); return rte_ipv4_udptcp_cksum_mbuf(m, l3_hdr, l4_off);
else /* assume ethertype == RTE_ETHER_TYPE_IPV6 */ else /* assume ethertype == RTE_ETHER_TYPE_IPV6 */
return rte_ipv6_udptcp_cksum(l3_hdr, l4_hdr); return rte_ipv6_udptcp_cksum_mbuf(m, l3_hdr, l4_off);
} }
/* Parse an IPv4 header to fill l3_len, l4_len, and l4_proto */ /* Parse an IPv4 header to fill l3_len, l4_len, and l4_proto */
@ -460,7 +461,7 @@ parse_encap_ip(void *encap_ip, struct testpmd_offload_info *info)
* depending on the testpmd command line configuration */ * depending on the testpmd command line configuration */
static uint64_t static uint64_t
process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
uint64_t tx_offloads) uint64_t tx_offloads, struct rte_mbuf *m)
{ {
struct rte_ipv4_hdr *ipv4_hdr = l3_hdr; struct rte_ipv4_hdr *ipv4_hdr = l3_hdr;
struct rte_udp_hdr *udp_hdr; struct rte_udp_hdr *udp_hdr;
@ -468,6 +469,7 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
struct rte_sctp_hdr *sctp_hdr; struct rte_sctp_hdr *sctp_hdr;
uint64_t ol_flags = 0; uint64_t ol_flags = 0;
uint32_t max_pkt_len, tso_segsz = 0; uint32_t max_pkt_len, tso_segsz = 0;
uint16_t l4_off;
/* ensure packet is large enough to require tso */ /* ensure packet is large enough to require tso */
if (!info->is_tunnel) { if (!info->is_tunnel) {
@ -510,9 +512,15 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
if (tx_offloads & RTE_ETH_TX_OFFLOAD_UDP_CKSUM) { if (tx_offloads & RTE_ETH_TX_OFFLOAD_UDP_CKSUM) {
ol_flags |= RTE_MBUF_F_TX_UDP_CKSUM; ol_flags |= RTE_MBUF_F_TX_UDP_CKSUM;
} else { } else {
if (info->is_tunnel)
l4_off = info->l2_len +
info->outer_l3_len +
info->l2_len + info->l3_len;
else
l4_off = info->l2_len + info->l3_len;
udp_hdr->dgram_cksum = 0; udp_hdr->dgram_cksum = 0;
udp_hdr->dgram_cksum = udp_hdr->dgram_cksum =
get_udptcp_checksum(l3_hdr, udp_hdr, get_udptcp_checksum(m, l3_hdr, l4_off,
info->ethertype); info->ethertype);
} }
} }
@ -527,9 +535,14 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
else if (tx_offloads & RTE_ETH_TX_OFFLOAD_TCP_CKSUM) { else if (tx_offloads & RTE_ETH_TX_OFFLOAD_TCP_CKSUM) {
ol_flags |= RTE_MBUF_F_TX_TCP_CKSUM; ol_flags |= RTE_MBUF_F_TX_TCP_CKSUM;
} else { } else {
if (info->is_tunnel)
l4_off = info->l2_len + info->outer_l3_len +
info->l2_len + info->l3_len;
else
l4_off = info->l2_len + info->l3_len;
tcp_hdr->cksum = 0; tcp_hdr->cksum = 0;
tcp_hdr->cksum = tcp_hdr->cksum =
get_udptcp_checksum(l3_hdr, tcp_hdr, get_udptcp_checksum(m, l3_hdr, l4_off,
info->ethertype); info->ethertype);
} }
#ifdef RTE_LIB_GSO #ifdef RTE_LIB_GSO
@ -557,7 +570,7 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
/* Calculate the checksum of outer header */ /* Calculate the checksum of outer header */
static uint64_t static uint64_t
process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info, process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info,
uint64_t tx_offloads, int tso_enabled) uint64_t tx_offloads, int tso_enabled, struct rte_mbuf *m)
{ {
struct rte_ipv4_hdr *ipv4_hdr = outer_l3_hdr; struct rte_ipv4_hdr *ipv4_hdr = outer_l3_hdr;
struct rte_ipv6_hdr *ipv6_hdr = outer_l3_hdr; struct rte_ipv6_hdr *ipv6_hdr = outer_l3_hdr;
@ -611,12 +624,9 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info,
/* do not recalculate udp cksum if it was 0 */ /* do not recalculate udp cksum if it was 0 */
if (udp_hdr->dgram_cksum != 0) { if (udp_hdr->dgram_cksum != 0) {
udp_hdr->dgram_cksum = 0; udp_hdr->dgram_cksum = 0;
if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPV4)) udp_hdr->dgram_cksum = get_udptcp_checksum(m, outer_l3_hdr,
udp_hdr->dgram_cksum = info->l2_len + info->outer_l3_len,
rte_ipv4_udptcp_cksum(ipv4_hdr, udp_hdr); info->outer_ethertype);
else
udp_hdr->dgram_cksum =
rte_ipv6_udptcp_cksum(ipv6_hdr, udp_hdr);
} }
return ol_flags; return ol_flags;
@ -957,7 +967,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
/* process checksums of inner headers first */ /* process checksums of inner headers first */
tx_ol_flags |= process_inner_cksums(l3_hdr, &info, tx_ol_flags |= process_inner_cksums(l3_hdr, &info,
tx_offloads); tx_offloads, m);
/* Then process outer headers if any. Note that the software /* Then process outer headers if any. Note that the software
* checksum will be wrong if one of the inner checksums is * checksum will be wrong if one of the inner checksums is
@ -965,7 +975,8 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
if (info.is_tunnel == 1) { if (info.is_tunnel == 1) {
tx_ol_flags |= process_outer_cksums(outer_l3_hdr, &info, tx_ol_flags |= process_outer_cksums(outer_l3_hdr, &info,
tx_offloads, tx_offloads,
!!(tx_ol_flags & RTE_MBUF_F_TX_TCP_SEG)); !!(tx_ol_flags & RTE_MBUF_F_TX_TCP_SEG),
m);
} }
/* step 3: fill the mbuf meta data (flags and header lengths) */ /* step 3: fill the mbuf meta data (flags and header lengths) */

5
doc/guides/rel_notes/release_22_03.rst
View File

@ -94,6 +94,11 @@ New Features
The new API ``rte_event_eth_rx_adapter_event_port_get()`` was added. The new API ``rte_event_eth_rx_adapter_event_port_get()`` was added.
* **Updated testpmd.**
* Called ``rte_ipv4/6_udptcp_cksum_mbuf()`` functions in testpmd csum mode
to support software UDP/TCP checksum over multiple segments.
Removed Items Removed Items
------------- -------------