From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stephen@networkplumber.org>
Received: from mail-pd0-f170.google.com (mail-pd0-f170.google.com
[209.85.192.170]) by dpdk.org (Postfix) with ESMTP id B5C653F9
for <dev@dpdk.org>; Wed, 17 Dec 2014 06:13:49 +0100 (CET)
Received: by mail-pd0-f170.google.com with SMTP id v10so15429905pde.1
for <dev@dpdk.org>; Tue, 16 Dec 2014 21:13:49 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20130820;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references;
bh=Ux9NcjGULd3ZZSrDufKO5GFHLlp+jHB2DzFHpguaorc=;
b=T5EPMq3s0degbV1GPzaklaxE/bFuD6YgfIvEvumm4KAEBRzrecNJ/2jo3BNX7slsC6
hyt/Zc+Wv8eRWNxH/W108i8xF1b499g9GX1/lIPRU/FzvgcinU113JIuRXabee1vm2S8
/lCBy34DsSXcr4Th7bBRplF+p6D7fhspgECKVIwJkdqBHnke0Xd0SbZ4AxZwhz7pcS/F
Ksn6p3v358/x743+hJRfbtJtL/XSjD6I0LZml7JbCkKoGyPdkGuoV8CXUrw+VK7IzR1x
1y1ET+x0H7m/Q8mbYmztCEsPQ+N35XMf3gZzBA4s37djYEGj/UU2CXaqGwv8Oh/Yz74Y
YRRQ==
X-Gm-Message-State: ALoCoQk+YUSeoF65v+gkBsZph0wR7xl3qie+U3MDnH02Vr8uUJx1gKaVzCH0inz1A9IOVVy2sIg1
X-Received: by 10.70.48.166 with SMTP id m6mr68073572pdn.22.1418793229041;
Tue, 16 Dec 2014 21:13:49 -0800 (PST)
Received: from urahara.brocade.com
(static-50-53-82-155.bvtn.or.frontiernet.net. [50.53.82.155])
by mx.google.com with ESMTPSA id gd1sm2518208pbd.67.2014.12.16.21.13.46
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
Tue, 16 Dec 2014 21:13:48 -0800 (PST)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Date: Tue, 16 Dec 2014 21:13:15 -0800
Message-Id: <1418793196-17953-7-git-send-email-stephen@networkplumber.org>
X-Mailer: git-send-email 2.1.3
In-Reply-To: <1418793196-17953-1-git-send-email-stephen@networkplumber.org>
References: <1418793196-17953-1-git-send-email-stephen@networkplumber.org>
Cc: Bill Hong <bhong@brocade.com>, Stephen Hemminger <shemming@brocade.com>
Subject: [dpdk-dev] [PATCH 6/7] vmxnet3: support RSS and refactor offload
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Dec 2014 05:13:51 -0000
From: Stephen Hemminger <shemming@brocade.com>
Refactor the logic to compute receive offload flags to a simpler
function. Andd add support for putting RSS flow hash into packet.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Bill Hong <bhong@brocade.com>
---
lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c | 69 ++++++++++++++++++++---------------
1 file changed, 40 insertions(+), 29 deletions(-)
diff --git a/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c b/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c
index bd47c6c..53ddb2c 100644
--- a/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c
+++ b/lib/librte_pmd_vmxnet3/vmxnet3_rxtx.c
@@ -488,6 +488,43 @@ vmxnet3_post_rx_bufs(vmxnet3_rx_queue_t *rxq, uint8_t ring_id)
return i;
}
+
+/* Receive side checksum and other offloads */
+static void
+vmxnet3_rx_offload(const Vmxnet3_RxCompDesc *rcd, struct rte_mbuf *rxm)
+{
+ /* Check for hardware stripped VLAN tag */
+ if (rcd->ts) {
+ rxm->ol_flags |= PKT_RX_VLAN_PKT;
+ rxm->vlan_tci = rte_le_to_cpu_16((uint16_t)rcd->tci);
+ }
+
+ /* Check for RSS */
+ if (rcd->rssType != VMXNET3_RCD_RSS_TYPE_NONE) {
+ rxm->ol_flags |= PKT_RX_RSS_HASH;
+ rxm->hash.rss = rcd->rssHash;
+ }
+
+ /* Check packet type, checksum errors, etc. Only support IPv4 for now. */
+ if (rcd->v4) {
+ struct ether_hdr *eth = rte_pktmbuf_mtod(rxm, struct ether_hdr *);
+ struct ipv4_hdr *ip = (struct ipv4_hdr *)(eth + 1);
+
+ if (((ip->version_ihl & 0xf) << 2) > (int)sizeof(struct ipv4_hdr))
+ rxm->ol_flags |= PKT_RX_IPV4_HDR_EXT;
+ else
+ rxm->ol_flags |= PKT_RX_IPV4_HDR;
+
+ if (!rcd->cnc) {
+ if (!rcd->ipc)
+ rxm->ol_flags |= PKT_RX_IP_CKSUM_BAD;
+
+ if ((rcd->tcp || rcd->udp) && !rcd->tuc)
+ rxm->ol_flags |= PKT_RX_L4_CKSUM_BAD;
+ }
+ }
+}
+
/*
* Process the Rx Completion Ring of given vmxnet3_rx_queue
* for nb_pkts burst and return the number of packets received
@@ -583,17 +620,6 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
goto rcd_done;
}
- /* Check for hardware stripped VLAN tag */
- if (rcd->ts) {
- PMD_RX_LOG(DEBUG, "Received packet with vlan ID: %d.",
- rcd->tci);
- rxm->ol_flags = PKT_RX_VLAN_PKT;
- /* Copy vlan tag in packet buffer */
- rxm->vlan_tci = rte_le_to_cpu_16((uint16_t)rcd->tci);
- } else {
- rxm->ol_flags = 0;
- rxm->vlan_tci = 0;
- }
/* Initialize newly received packet buffer */
rxm->port = rxq->port_id;
@@ -602,25 +628,10 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
rxm->pkt_len = (uint16_t)rcd->len;
rxm->data_len = (uint16_t)rcd->len;
rxm->data_off = RTE_PKTMBUF_HEADROOM;
+ rxm->ol_flags = 0;
+ rxm->vlan_tci = 0;
- /* Check packet type, checksum errors, etc. Only support IPv4 for now. */
- if (rcd->v4) {
- struct ether_hdr *eth = rte_pktmbuf_mtod(rxm, struct ether_hdr *);
- struct ipv4_hdr *ip = (struct ipv4_hdr *)(eth + 1);
-
- if (((ip->version_ihl & 0xf) << 2) > (int)sizeof(struct ipv4_hdr))
- rxm->ol_flags |= PKT_RX_IPV4_HDR_EXT;
- else
- rxm->ol_flags |= PKT_RX_IPV4_HDR;
-
- if (!rcd->cnc) {
- if (!rcd->ipc)
- rxm->ol_flags |= PKT_RX_IP_CKSUM_BAD;
-
- if ((rcd->tcp || rcd->udp) && !rcd->tuc)
- rxm->ol_flags |= PKT_RX_L4_CKSUM_BAD;
- }
- }
+ vmxnet3_rx_offload(rcd, rxm);
rx_pkts[nb_rx++] = rxm;
rcd_done:
--
2.1.3