From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by dpdk.org (Postfix) with ESMTP id 126E6276C for ; Sat, 15 Jul 2017 13:18:09 +0200 (CEST) Received: by mail-pf0-f195.google.com with SMTP id k24so131400pfj.3 for ; Sat, 15 Jul 2017 04:18:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1/I3ZXSTsc7Nun5JYNnZ73vS+Zq21GWi376PE9/8Q3s=; b=RyZqfCvmpnDMBNWnFpKgK3HOmXQPs/ILJSVE8OH9n+1mvIGSGb0M+SiqWjxk5xjmjH ssPIYARu/XB4DOk0+BuJ7j8QT3o57iE0fMTjXZuqyqqKAxL0jYGrHCwJcEYYC8O7QaKf ++y1hJE2Z134m+984Nigm1T5DmCkPRMSKn9EyRhrbLw/h4K1QsgqT53JlB/hqClp0QDc PPiR66E2cnUVAjGCyIDffzplkL4nWiiVOQ0cg8qjH/lQ1RBWmVB+6CELm/ju4RGJ1Oha z2J8+chLGZ/QLSqgRGVAe0km302Uy77GlEICrBQuiiEaUSHe4YeVOlNxDrxMDU3+4r/+ Rg/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1/I3ZXSTsc7Nun5JYNnZ73vS+Zq21GWi376PE9/8Q3s=; b=dmDtR0Fh1oYslzgSaKvdbXMz03svkF756lO9GUOqCEMYqTOzzkw0io7fcjFD87M7M6 olv+KH5dPv+MsTReVLF5+nJ0z58vum/JT9e2dPDlBJlD2pMXWGEuvUQ6I//DEnF+fWMl uWUzm6EZQUh2JHzX99lNMJyO31x2Gb7LZDGIkOiixpwI3e50QzL2U7iUNEypBKcaTzI6 G6JIcxsGUDc6wrZQox1S/mlsKo+RaTpj/isZ/GXYrj4+0UpIwhTQf5X9Yy2EBbQY13gd uwQpmOO+1Pfc9wwjlo082DMZ8U1Yp6KzVRY/8Qf2rCOI+vr6fsiImLzOSobcuE1wCyXX wVeA== X-Gm-Message-State: AIVw110JNmipPTBwt2roV5sDubrzncBXqcnjvQ7vonCBZYNc/0A4yUI4 T4WkVVlSgVO5TsRpkHLflw== X-Received: by 10.84.232.135 with SMTP id i7mr20703014plk.300.1500117488273; Sat, 15 Jul 2017 04:18:08 -0700 (PDT) Received: from localhost.localdomain ([45.63.61.64]) by smtp.gmail.com with ESMTPSA id k194sm19000874pgc.31.2017.07.15.04.18.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 15 Jul 2017 04:18:07 -0700 (PDT) From: Yuanhan Liu To: Jianfeng Tan Cc: Maxime Coquelin , dpdk stable Date: Sat, 15 Jul 2017 19:17:10 +0800 Message-Id: <1500117433-28932-4-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500117433-28932-1-git-send-email-yliu@fridaylinux.org> References: <1500117433-28932-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'vhost: fix TCP checksum' has been queued to LTS release 16.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Jul 2017 11:18:09 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/19/17. So please shout if anyone has objections. Thanks. --yliu --- >>From 310bd050e94476991a2a627d6e4a83081b55d50c Mon Sep 17 00:00:00 2001 From: Jianfeng Tan Date: Wed, 7 Jun 2017 06:41:36 +0000 Subject: [PATCH] vhost: fix TCP checksum [ upstream commit 46b7a8372d42506c6ed5e2a3940e7881090c3c90 ] As PKT_TX_TCP_SEG flag in mbuf->ol_flags implies PKT_TX_TCP_CKSUM, applications, e.g., testpmd, don't set PKT_TX_TCP_CKSUM when TSO is set. This leads to that packets get dropped in VM tcp stack layer because of bad TCP csum. To fix this, we make sure TCP NEEDS_CSUM info is set into virtio net header when PKT_TX_TCP_SEG is set, so that VM tcp stack will not check the TCP csum. Fixes: 859b480d5afd ("vhost: add guest offload setting") Signed-off-by: Jianfeng Tan Reviewed-by: Maxime Coquelin Acked-by: Yuanhan Liu --- lib/librte_vhost/virtio_net.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c index ea027f1..5d793de 100644 --- a/lib/librte_vhost/virtio_net.c +++ b/lib/librte_vhost/virtio_net.c @@ -144,11 +144,16 @@ update_shadow_used_ring(struct vhost_virtqueue *vq, static void virtio_enqueue_offload(struct rte_mbuf *m_buf, struct virtio_net_hdr *net_hdr) { - if (m_buf->ol_flags & PKT_TX_L4_MASK) { + uint64_t csum_l4 = m_buf->ol_flags & PKT_TX_L4_MASK; + + if (m_buf->ol_flags & PKT_TX_TCP_SEG) + csum_l4 |= PKT_TX_TCP_CKSUM; + + if (csum_l4) { net_hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM; net_hdr->csum_start = m_buf->l2_len + m_buf->l3_len; - switch (m_buf->ol_flags & PKT_TX_L4_MASK) { + switch (csum_l4) { case PKT_TX_TCP_CKSUM: net_hdr->csum_offset = (offsetof(struct tcp_hdr, cksum)); -- 2.7.4