DPDK patches and discussions
 help / color / mirror / Atom feed
From: Jijiang Liu <jijiang.liu@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v4 8/8] virtio/lib:add guest offload handle
Date: Wed, 11 Nov 2015 14:40:46 +0800	[thread overview]
Message-ID: <1447224046-1169-9-git-send-email-jijiang.liu@intel.com> (raw)
In-Reply-To: <1447224046-1169-1-git-send-email-jijiang.liu@intel.com>

Enqueue guest offload(CSUM and TSO) handle.

Signed-off-by: Jijiang Liu <jijiang.liu@intel.com>
---
 lib/librte_vhost/vhost_rxtx.c |   45 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/lib/librte_vhost/vhost_rxtx.c b/lib/librte_vhost/vhost_rxtx.c
index 9e70990..468fed8 100644
--- a/lib/librte_vhost/vhost_rxtx.c
+++ b/lib/librte_vhost/vhost_rxtx.c
@@ -54,6 +54,42 @@ is_valid_virt_queue_idx(uint32_t idx, int is_tx, uint32_t qp_nb)
 	return (is_tx ^ (idx & 1)) == 0 && idx < qp_nb * VIRTIO_QNUM;
 }
 
+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) {
+		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) {
+		case PKT_TX_TCP_CKSUM:
+			net_hdr->csum_offset = (offsetof(struct tcp_hdr,
+						cksum));
+			break;
+		case PKT_TX_UDP_CKSUM:
+			net_hdr->csum_offset = (offsetof(struct udp_hdr,
+						dgram_cksum));
+			break;
+		case PKT_TX_SCTP_CKSUM:
+			net_hdr->csum_offset = (offsetof(struct sctp_hdr,
+						cksum));
+			break;
+		}
+	}
+
+	if (m_buf->ol_flags & PKT_TX_TCP_SEG) {
+		if (m_buf->ol_flags & PKT_TX_IPV4)
+			net_hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV4;
+		else
+			net_hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV6;
+		net_hdr->gso_size = m_buf->tso_segsz;
+		net_hdr->hdr_len = m_buf->l2_len + m_buf->l3_len
+					+ m_buf->l4_len;
+	}
+
+	return;
+}
+
 /**
  * This function adds buffers to the virtio devices RX virtqueue. Buffers can
  * be received from the physical port or from another virtio device. A packet
@@ -67,7 +103,7 @@ virtio_dev_rx(struct virtio_net *dev, uint16_t queue_id,
 {
 	struct vhost_virtqueue *vq;
 	struct vring_desc *desc;
-	struct rte_mbuf *buff;
+	struct rte_mbuf *buff, *first_buff;
 	/* The virtio_hdr is initialised to 0. */
 	struct virtio_net_hdr_mrg_rxbuf virtio_hdr = {{0, 0, 0, 0, 0, 0}, 0};
 	uint64_t buff_addr = 0;
@@ -139,6 +175,7 @@ virtio_dev_rx(struct virtio_net *dev, uint16_t queue_id,
 		desc = &vq->desc[head[packet_success]];
 
 		buff = pkts[packet_success];
+		first_buff = buff;
 
 		/* Convert from gpa to vva (guest physical addr -> vhost virtual addr) */
 		buff_addr = gpa_to_vva(dev, desc->addr);
@@ -221,7 +258,9 @@ virtio_dev_rx(struct virtio_net *dev, uint16_t queue_id,
 
 		if (unlikely(uncompleted_pkt == 1))
 			continue;
-
+		
+		virtio_enqueue_offload(first_buff, &virtio_hdr.hdr);
+		
 		rte_memcpy((void *)(uintptr_t)buff_hdr_addr,
 			(const void *)&virtio_hdr, vq->vhost_hlen);
 
@@ -295,6 +334,8 @@ copy_from_mbuf_to_vring(struct virtio_net *dev, uint32_t queue_id,
 	LOG_DEBUG(VHOST_DATA, "(%"PRIu64") RX: Num merge buffers %d\n",
 		dev->device_fh, virtio_hdr.num_buffers);
 
+	virtio_enqueue_offload(pkt, &virtio_hdr.hdr);	
+
 	rte_memcpy((void *)(uintptr_t)vb_hdr_addr,
 		(const void *)&virtio_hdr, vq->vhost_hlen);
 
-- 
1.7.7.6

  parent reply	other threads:[~2015-11-11  6:41 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-11  6:40 [dpdk-dev] [PATCH v4 0/8] add virtio offload support in us-vhost Jijiang Liu
2015-11-11  6:40 ` [dpdk-dev] [PATCH v4 1/8] driver/virtio:add virtual address for virtio net header Jijiang Liu
2015-11-11  6:40 ` [dpdk-dev] [PATCH v4 2/8] driver/virtio:record virtual address of " Jijiang Liu
2015-11-11  6:40 ` [dpdk-dev] [PATCH v4 3/8] virtio/lib:add vhost TX checksum support capabilities Jijiang Liu
2015-11-11  8:26   ` Yuanhan Liu
2015-11-11 17:31     ` Stephen Hemminger
2015-11-12  1:41       ` Yuanhan Liu
2015-11-11  6:40 ` [dpdk-dev] [PATCH v4 4/8] virtio/lib:dequeue vhost TX offload Jijiang Liu
2015-11-11  6:40 ` [dpdk-dev] [PATCH v4 5/8] sample/vhost:remove ip_hdr structure defination Jijiang Liu
2015-11-11  8:34   ` Yuanhan Liu
2015-11-11 10:05     ` Thomas Monjalon
2015-11-11  6:40 ` [dpdk-dev] [PATCH v4 6/8] examples/vhost:support TX offload in vhost sample Jijiang Liu
2015-11-11  6:40 ` [dpdk-dev] [PATCH v4 7/8] virtio/lib:add virtio guest offload capabilities Jijiang Liu
2015-11-11  8:31   ` Yuanhan Liu
2015-11-11  8:38     ` Liu, Jijiang
2015-11-11  8:44       ` Yuanhan Liu
2015-11-11  8:53         ` Liu, Jijiang
2015-11-11  8:57           ` Xu, Qian Q
2015-11-11 11:10             ` Liu, Jijiang
2015-11-11 10:08           ` Thomas Monjalon
2015-11-11 12:53           ` Yuanhan Liu
2015-11-11  6:40 ` Jijiang Liu [this message]
2015-11-11  8:23   ` [dpdk-dev] [PATCH v4 8/8] virtio/lib:add guest offload handle Yuanhan Liu
2015-11-11 10:19     ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1447224046-1169-9-git-send-email-jijiang.liu@intel.com \
    --to=jijiang.liu@intel.com \
    --cc=dev@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).