From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f177.google.com (mail-pd0-f177.google.com [209.85.192.177]) by dpdk.org (Postfix) with ESMTP id 10C6A5A72 for ; Thu, 9 Jul 2015 20:24:14 +0200 (CEST) Received: by pdrg1 with SMTP id g1so37603738pdr.2 for ; Thu, 09 Jul 2015 11:24:13 -0700 (PDT) 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=koOdj3c7sPRnqTcP/U0XVrhkfi/mi42ARMzTL/PBGOY=; b=b1kAzg+UfSO9xH1g49b2pVTN5LUONFHE4/9inNdtX0T9d7psIeu5CQvlP6m85zCVEP HpboploPlOSwt8i/CMYc/Hy8gRezFSoBn4eaX7fC79nAb5GJ82v6ad3atO7wIfO/m0Qy VQNpa99qA/Z0JMlxAuK0wFEly2N6uDrpK/cQnAJNM8M9HSs8Ej3DTFm/l0aHP3rPgtU0 cJNr8qnawouSGBQn7odplg45S1nlN1acDi2Ck+c9TgSfbYlfeuPN4Yl5B9vIukzoRQly gzmx+MUIJEGeydLVDq4so/CBFxPtVwm0cmln5P4YTY61XokmeWwiUVBCt1iigoVF1Qpd bG7Q== X-Gm-Message-State: ALoCoQmC66K2gSZysz1WD5Y77Fb+fL/LuH5XpAXSSimyg+pwrkTaILEF36b3C0+7oa8n/ChrUGEi X-Received: by 10.70.38.33 with SMTP id d1mr33367211pdk.99.1436466253448; Thu, 09 Jul 2015 11:24:13 -0700 (PDT) Received: from urahara.home.lan (static-50-53-82-155.bvtn.or.frontiernet.net. [50.53.82.155]) by smtp.gmail.com with ESMTPSA id ff10sm6741567pab.13.2015.07.09.11.24.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Jul 2015 11:24:12 -0700 (PDT) From: stephen@networkplumber.org X-Google-Original-From: stephen@networplumber.org To: dev@dpdk.org Date: Thu, 9 Jul 2015 11:24:14 -0700 Message-Id: <1436466256-17442-7-git-send-email-stephen@networplumber.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436466256-17442-1-git-send-email-stephen@networplumber.org> References: <1436466256-17442-1-git-send-email-stephen@networplumber.org> Cc: Bill Hong Subject: [dpdk-dev] [PATCH 6/8] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jul 2015 18:24:14 -0000 From: Stephen Hemminger Refactor the logic to compute receive offload flags to a simpler function. And add support for putting RSS flow hash into packet. Signed-off-by: Stephen Hemminger Signed-off-by: Bill Hong --- drivers/net/vmxnet3/vmxnet3_rxtx.c | 69 ++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index 1fc6843..63d3bab 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -499,6 +499,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 @@ -599,17 +636,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; @@ -618,25 +644,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.4