From patchwork Wed Nov 4 08:35:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jijiang Liu X-Patchwork-Id: 8643 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id A46A891C1; Wed, 4 Nov 2015 09:35:56 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 131728E8A for ; Wed, 4 Nov 2015 09:35:52 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP; 04 Nov 2015 00:35:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,242,1444719600"; d="scan'208";a="842232373" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga002.jf.intel.com with ESMTP; 04 Nov 2015 00:35:52 -0800 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id tA48ZoLY018905; Wed, 4 Nov 2015 16:35:50 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id tA48ZkVX027591; Wed, 4 Nov 2015 16:35:48 +0800 Received: (from jijiangl@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id tA48Zkjo027587; Wed, 4 Nov 2015 16:35:46 +0800 From: Jijiang Liu To: dev@dpdk.org Date: Wed, 4 Nov 2015 16:35:29 +0800 Message-Id: <1446626131-27513-7-git-send-email-jijiang.liu@intel.com> X-Mailer: git-send-email 1.7.12.2 In-Reply-To: <1446626131-27513-1-git-send-email-jijiang.liu@intel.com> References: <1446626131-27513-1-git-send-email-jijiang.liu@intel.com> Subject: [dpdk-dev] [PATCH v3 6/8] driver/virtio:enqueue vhost TX offload X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Enqueue vhost TX checksum and TSO4/6 offload in virtio-net lib. Signed-off-by: Jijiang Liu --- drivers/net/virtio/virtio_rxtx.c | 61 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index c5b53bb..b99f5b5 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -50,6 +50,10 @@ #include #include #include +#include +#include +#include +#include #include "virtio_logs.h" #include "virtio_ethdev.h" @@ -199,6 +203,58 @@ virtqueue_enqueue_recv_refill(struct virtqueue *vq, struct rte_mbuf *cookie) } static int +virtqueue_enqueue_offload(struct virtqueue *txvq, struct rte_mbuf *m, + uint16_t idx, uint16_t hdr_sz) +{ + struct virtio_net_hdr *hdr = (struct virtio_net_hdr *)(uintptr_t) + (txvq->virtio_net_hdr_addr + idx * hdr_sz); + + hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM; + + /* if vhost TX checksum offload is required */ + if (m->ol_flags & PKT_TX_IP_CKSUM) { + hdr->csum_start = m->l2_len; + hdr->csum_offset = offsetof(struct ipv4_hdr, hdr_checksum); + } else if (m->ol_flags & PKT_TX_L4_MASK) { + hdr->csum_start = m->l2_len + m->l3_len; + switch (m->ol_flags & PKT_TX_L4_MASK) { + case PKT_TX_TCP_CKSUM: + hdr->csum_offset = offsetof(struct tcp_hdr, cksum); + break; + case PKT_TX_UDP_CKSUM: + hdr->csum_offset = offsetof(struct udp_hdr, + dgram_cksum); + break; + case PKT_TX_SCTP_CKSUM: + hdr->csum_offset = offsetof(struct sctp_hdr, cksum); + break; + default: + break; + } + } else + hdr->flags = 0; + + /* if vhost TSO offload is required */ + if (m->tso_segsz != 0 && m->ol_flags & PKT_TX_TCP_SEG) { + if (m->ol_flags & PKT_TX_IPV4) { + if (!vtpci_with_feature(txvq->hw, + VIRTIO_NET_F_HOST_TSO4)) + return -1; + hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV4; + } else if (m->ol_flags & PKT_TX_IPV6) { + if (!vtpci_with_feature(txvq->hw, + VIRTIO_NET_F_HOST_TSO6)) + return -1; + hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV6; + } + hdr->gso_size = m->tso_segsz; + hdr->hdr_len = m->l2_len + m->l3_len + m->l4_len; + } else + hdr->gso_type = VIRTIO_NET_HDR_GSO_NONE; + return 0; +} + +static int virtqueue_enqueue_xmit(struct virtqueue *txvq, struct rte_mbuf *cookie) { struct vq_desc_extra *dxp; @@ -221,6 +277,11 @@ virtqueue_enqueue_xmit(struct virtqueue *txvq, struct rte_mbuf *cookie) dxp->cookie = (void *)cookie; dxp->ndescs = needed; + if (vtpci_with_feature(txvq->hw, VIRTIO_NET_F_CSUM)) { + if (virtqueue_enqueue_offload(txvq, cookie, idx, head_size) < 0) + return -EPERM; + } + start_dp = txvq->vq_ring.desc; start_dp[idx].addr = txvq->virtio_net_hdr_mem + idx * head_size;