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 C3C8FA0C53; Thu, 14 Oct 2021 08:45:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B1DD940E50; Thu, 14 Oct 2021 08:45:49 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 9C8B040041; Thu, 14 Oct 2021 08:45:48 +0200 (CEST) Received: from [192.168.38.17] (aros.oktetlabs.ru [192.168.38.17]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by shelob.oktetlabs.ru (Postfix) with ESMTPSA id EACF97F514; Thu, 14 Oct 2021 09:45:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru EACF97F514 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=oktetlabs.ru; s=default; t=1634193948; bh=87ghyyy9Lq/37F8pVeFLyjfbLcCibF9QZGIKe/M6rMI=; h=Subject:To:Cc:References:From:Date:In-Reply-To; b=ODvfEUmrGHoZWoIJWhE3cfmIXer7r+UAOvP+RN1eahX/H4dy1drxDXFkb1mZJvmKi wQDnQ4FFcQjJl/b0ppryLKaQw6ex0TgC2IneQfkjhOS+QKLn/WC8sQnHnRA2Ye7+qV oBv/8cAgR52OUvl37iMedRWhoahfbL4pL7SsMF6Q= To: Chenbo Xia , Maxime Coquelin Cc: stable@dpdk.org, Yuanhan Liu , Olivier Matz , dev@dpdk.org, Ivan Malov References: <20210830142655.18373-1-ivan.malov@oktetlabs.ru> <20210916184955.2755-1-ivan.malov@oktetlabs.ru> From: Andrew Rybchenko Organization: OKTET Labs Message-ID: <7915abeb-8fcb-5a81-5aca-27420c3f1f83@oktetlabs.ru> Date: Thu, 14 Oct 2021 09:45:47 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20210916184955.2755-1-ivan.malov@oktetlabs.ru> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v2] net/virtio: handle Tx checksums correctly for tunnel packets 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" Hi Maxime, Chenbo, is the any problem with the patch below? Thanks, Andrew. On 9/16/21 9:49 PM, Ivan Malov wrote: > Tx prepare method calls rte_net_intel_cksum_prepare(), which > handles tunnel packets correctly, but Tx burst path does not > take tunnel presence into account when computing the offsets. > > Fixes: 58169a9c8153 ("net/virtio: support Tx checksum offload") > Cc: stable@dpdk.org > > Signed-off-by: Ivan Malov > Reviewed-by: Andrew Rybchenko > --- > drivers/net/virtio/virtqueue.h | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h > index 03957b2bd0..b83ff32efb 100644 > --- a/drivers/net/virtio/virtqueue.h > +++ b/drivers/net/virtio/virtqueue.h > @@ -620,19 +620,21 @@ static inline void > virtqueue_xmit_offload(struct virtio_net_hdr *hdr, struct rte_mbuf *cookie) > { > uint64_t csum_l4 = cookie->ol_flags & PKT_TX_L4_MASK; > + uint16_t o_l23_len = (cookie->ol_flags & PKT_TX_TUNNEL_MASK) ? > + cookie->outer_l2_len + cookie->outer_l3_len : 0; > > if (cookie->ol_flags & PKT_TX_TCP_SEG) > csum_l4 |= PKT_TX_TCP_CKSUM; > > switch (csum_l4) { > case PKT_TX_UDP_CKSUM: > - hdr->csum_start = cookie->l2_len + cookie->l3_len; > + hdr->csum_start = o_l23_len + cookie->l2_len + cookie->l3_len; > hdr->csum_offset = offsetof(struct rte_udp_hdr, dgram_cksum); > hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM; > break; > > case PKT_TX_TCP_CKSUM: > - hdr->csum_start = cookie->l2_len + cookie->l3_len; > + hdr->csum_start = o_l23_len + cookie->l2_len + cookie->l3_len; > hdr->csum_offset = offsetof(struct rte_tcp_hdr, cksum); > hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM; > break; > @@ -650,7 +652,8 @@ virtqueue_xmit_offload(struct virtio_net_hdr *hdr, struct rte_mbuf *cookie) > VIRTIO_NET_HDR_GSO_TCPV6 : > VIRTIO_NET_HDR_GSO_TCPV4; > hdr->gso_size = cookie->tso_segsz; > - hdr->hdr_len = cookie->l2_len + cookie->l3_len + cookie->l4_len; > + hdr->hdr_len = o_l23_len + cookie->l2_len + cookie->l3_len + > + cookie->l4_len; > } else { > ASSIGN_UNLESS_EQUAL(hdr->gso_type, 0); > ASSIGN_UNLESS_EQUAL(hdr->gso_size, 0); >