From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B09A8A0C4C; Fri, 15 Oct 2021 10:10:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9FE9F40692; Fri, 15 Oct 2021 10:10:03 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mails.dpdk.org (Postfix) with ESMTP id C053D40041 for ; Fri, 15 Oct 2021 10:10:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634285401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=q1sR6MSbM0YC0hZ1OB9lLzlpZ/YVyLE1/kF/ewOF5D8=; b=fH81Iw8Sxnj9EliEott5htIZ0ZxWQuFpSeX6Hkmfm0kzI7qSFWo1TnVdwsFK3w7wo4z+OD Bmhf9dYbQtnVdtIEMP+9dsv8mRRgTAFBBpeY3hX0+qTbh/bW8aHc71dD5JKwSQiuItbGA5 ERaxeyPBZFzdV/X4eWinXWQpthEjxLg= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-219-q46Sx-hEOKeep0avCUuJ-Q-1; Fri, 15 Oct 2021 04:10:00 -0400 X-MC-Unique: q46Sx-hEOKeep0avCUuJ-Q-1 Received: by mail-lf1-f69.google.com with SMTP id i6-20020a056512318600b003fd8c8c2677so6109922lfe.1 for ; Fri, 15 Oct 2021 01:09:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=q1sR6MSbM0YC0hZ1OB9lLzlpZ/YVyLE1/kF/ewOF5D8=; b=W/WuUiYaZ5yOPv9m+QpWv4pl5pJCpcPUrkG8I/geo6RJYdqNoKxglGlArijw9jGSRS jIqsVHqG2YesE8dfn7u3bR/jlFF5k4jbGUkoeXwspUeG6hFlGJ1lF6mA+TdJk3TmXJCS lzCw/1AGCf0Q6PYL6tigjyac2xyMp9d1PFyUhHj0RKtSlwAuXcgD/wsqaOnlyrRSAnPA SK5GRQIeqi6jIoojxkbRCvmz22+mXlpUdXD8WE1NvdCpLo0iXsI1D5Fh9qDnuQGRsoEt LvxLPyzpW1efz5edPZg1KrWg60cH2bo96TBT+OXcMiA78wYAgvCN8YKfMk1f+JqMUV5Q imyA== X-Gm-Message-State: AOAM531sS/ewGDtQ1D0XV6ENKC5s+mMiPPYmwFWsgyMKg6nM9l2l+2yi zYm4C8N6cAeHODQG8vg5JNGIgcKAUGLHRbY1qMJgXGhFfiPIGztrLMrR0bJyyIDG3l5cDU+yunv 45Cgm7ItBxJEcagYX9ws= X-Received: by 2002:a05:6512:3f28:: with SMTP id y40mr10247015lfa.499.1634285398548; Fri, 15 Oct 2021 01:09:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPZrU90Vwn79T74SX92+xBuV5FtF1zpqsa0K4VKCwwjkY/J9qmdfolB8lxOr/sRK5rOt+Xv+ODg3CBgpU7H0A= X-Received: by 2002:a05:6512:3f28:: with SMTP id y40mr10246989lfa.499.1634285398257; Fri, 15 Oct 2021 01:09:58 -0700 (PDT) MIME-Version: 1.0 References: <20211015051306.320328-1-xiaoyun.li@intel.com> In-Reply-To: <20211015051306.320328-1-xiaoyun.li@intel.com> From: David Marchand Date: Fri, 15 Oct 2021 10:09:46 +0200 Message-ID: To: Xiaoyun Li Cc: "Yigit, Ferruh" , dev , dpdk stable Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dmarchan@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH] app/testpmd: fix l4 sw csum over multi segments X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hello, On Fri, Oct 15, 2021 at 7:27 AM Xiaoyun Li wrote: > > In csum forwarding mode, software UDP/TCP csum calculation only takes > the first segment into account while using the whole packet length so > the calculation will read invalid memory region with multi-segments > packets and will get wrong value. > This patch fixes this issue. > > Fixes: af75078fece3 ("first public release") > Cc: stable@dpdk.org > > Signed-off-by: Xiaoyun Li > --- > app/test-pmd/csumonly.c | 31 +++++++++++++++++++++++-------- > 1 file changed, 23 insertions(+), 8 deletions(-) > > diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c > index 090797318a..5df3be0a6f 100644 > --- a/app/test-pmd/csumonly.c > +++ b/app/test-pmd/csumonly.c > @@ -18,7 +18,7 @@ > #include > #include > #include > -#include > +#include This include caught my eye. > #include > #include > #include > @@ -56,6 +56,11 @@ > #define GRE_SUPPORTED_FIELDS (GRE_CHECKSUM_PRESENT | GRE_KEY_PRESENT |\ > GRE_SEQUENCE_PRESENT) > > +/* When UDP or TCP or outer UDP csum offload is off, sw l4 csum is needed */ > +#define UDP_TCP_CSUM (DEV_TX_OFFLOAD_UDP_CKSUM |\ > + DEV_TX_OFFLOAD_TCP_CKSUM |\ > + DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) > + > /* We cannot use rte_cpu_to_be_16() on a constant in a switch/case */ > #if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN > #define _htons(x) ((uint16_t)((((x) & 0x00ffU) << 8) | (((x) & 0xff00U) >> 8))) > @@ -602,12 +607,8 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info, > /* do not recalculate udp cksum if it was 0 */ > if (udp_hdr->dgram_cksum != 0) { > udp_hdr->dgram_cksum = 0; > - if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPV4)) > - udp_hdr->dgram_cksum = > - rte_ipv4_udptcp_cksum(ipv4_hdr, udp_hdr); > - else > - udp_hdr->dgram_cksum = > - rte_ipv6_udptcp_cksum(ipv6_hdr, udp_hdr); > + udp_hdr->dgram_cksum = get_udptcp_checksum(outer_l3_hdr, > + udp_hdr, info->outer_ethertype); > } > > return ol_flags; > @@ -802,6 +803,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) > struct rte_mbuf *m, *p; > struct rte_ether_hdr *eth_hdr; > void *l3_hdr = NULL, *outer_l3_hdr = NULL; /* can be IPv4 or IPv6 */ > + uint8_t *l3_buf = NULL; > void **gro_ctx; > uint16_t gro_pkts_num; > uint8_t gro_enable; > @@ -877,7 +879,19 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) > rte_ether_addr_copy(&ports[fs->tx_port].eth_addr, > ð_hdr->src_addr); > parse_ethernet(eth_hdr, &info); > - l3_hdr = (char *)eth_hdr + info.l2_len; > + /* When sw csum is needed, multi-segs needs a buf to contain > + * the whole packet for later UDP/TCP csum calculation. > + */ > + if (m->nb_segs > 1 && !(tx_ol_flags & PKT_TX_TCP_SEG) && > + !(tx_offloads & UDP_TCP_CSUM)) { > + l3_buf = rte_zmalloc("csum l3_buf", > + info.pkt_len - info.l2_len, > + RTE_CACHE_LINE_SIZE); Rather than call a dyn allocation in datapath, can't we have a static buffer on the stack? > + rte_pktmbuf_read(m, info.l2_len, > + info.pkt_len - info.l2_len, l3_buf); > + l3_hdr = l3_buf; > + } else > + l3_hdr = (char *)eth_hdr + info.l2_len; > > /* check if it's a supported tunnel */ > if (txp->parse_tunnel) { > @@ -1051,6 +1065,7 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) > printf("tx: flags=%s", buf); > printf("\n"); > } > + rte_free(l3_buf); > } > > if (unlikely(gro_enable)) { > -- > 2.25.1 > -- David Marchand