From: Jijiang Liu <jijiang.liu@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 5/8] driver/virtio:enqueue vhost TX offload
Date: Wed, 21 Oct 2015 12:46:38 +0800 [thread overview]
Message-ID: <1445402801-27806-6-git-send-email-jijiang.liu@intel.com> (raw)
In-Reply-To: <1445402801-27806-1-git-send-email-jijiang.liu@intel.com>
Enqueue vhost TX checksum and TSO4/6 offload in virtio-net lib.
Signed-off-by: Jijiang Liu <jijiang.liu@intel.com>
---
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 <rte_string_fns.h>
#include <rte_errno.h>
#include <rte_byteorder.h>
+#include <rte_tcp.h>
+#include <rte_ip.h>
+#include <rte_udp.h>
+#include <rte_sctp.h>
#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;
--
1.7.7.6
next prev parent reply other threads:[~2015-10-21 4:47 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-21 4:46 [dpdk-dev] [PATCH 0/8] add vhost TX offload support Jijiang Liu
2015-10-21 4:46 ` [dpdk-dev] [PATCH 1/8] driver/virtio:add virtual addr for virtio net header Jijiang Liu
2015-10-26 7:07 ` Tan, Jianfeng
2015-10-21 4:46 ` [dpdk-dev] [PATCH 2/8] driver/virtio: record virtual address of " Jijiang Liu
2015-10-21 4:46 ` [dpdk-dev] [PATCH 3/8] driver/virtio:add vhost TX offload support capability in virtio-net Jijiang Liu
2015-10-29 12:44 ` David Marchand
2015-10-30 8:15 ` Liu, Jijiang
2015-10-21 4:46 ` [dpdk-dev] [PATCH 4/8] driver/virtio:add vhost TX offload support capability Jijiang Liu
2015-10-21 4:46 ` Jijiang Liu [this message]
2015-10-29 14:15 ` [dpdk-dev] [PATCH 5/8] driver/virtio:enqueue vhost TX offload David Marchand
2015-10-30 11:45 ` Liu, Jijiang
2015-10-30 12:14 ` David Marchand
2015-10-30 12:21 ` Liu, Jijiang
2015-10-21 4:46 ` [dpdk-dev] [PATCH 6/8] lib/librte_vhost:dequeue " Jijiang Liu
2015-10-21 4:46 ` [dpdk-dev] [PATCH 7/8] examples/vhost:support TX offload in vhost sample Jijiang Liu
2015-10-21 4:46 ` [dpdk-dev] [PATCH 8/8] app/testpmd:modify MAC address of csum forwarding Jijiang Liu
2015-10-26 6:45 ` [dpdk-dev] [PATCH 0/8] add vhost TX offload support Liu, Jijiang
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=1445402801-27806-6-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).