From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id C54A5A0547;
Wed, 29 Sep 2021 16:08:30 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 39BED410EC;
Wed, 29 Sep 2021 16:08:30 +0200 (CEST)
Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com
[209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id 60DA5410EB
for <dev@dpdk.org>; Wed, 29 Sep 2021 16:08:29 +0200 (CEST)
Received: by mail-wm1-f45.google.com with SMTP id
t16-20020a1c7710000000b003049690d882so5367234wmi.5
for <dev@dpdk.org>; Wed, 29 Sep 2021 07:08:29 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=from:to:cc:subject:date:message-id:in-reply-to:references;
bh=hTUsf6ATzO7c39vycu5LrGT/faQ3McVwn8LSwC90n8E=;
b=T+ookBmC7KiJlodFPwoSJyONm7KqyQYuFntkfBamYHtwYb7/bEwhi/Xl4KupEMVG1V
erZJ24bdHyFkht/IMwa68ZD05BfA4bouw84h849W6bXSKQ9o7KV5gzIGSk0KkfI1SbR2
bupNoc2BAyjl9QXbcIvIh6ZQoS32fouXZo72YA+DI7ZxpdAsEyhcxTfSTyE1kYutYANw
PEKymg3y7UoorTXwX67g+2p0bLhfKU7niC/U+3w7+G6mGFWPv+824KdKQ+npcmBHd963
i0btg6toTb0hQlgB3zNdSrNkpFpROURdtkbX/iryXrLO+I5tYZASbWp8Fv6ZPeT9ixrs
J1JA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references;
bh=hTUsf6ATzO7c39vycu5LrGT/faQ3McVwn8LSwC90n8E=;
b=VoMTUBaeWYOG7bbh8UrOoXzfHOafIEZgD6zdCsST3MOTEAI3kCGGeJ3/2/O2gyv5Uc
7azA3gd7RvAnAPtAfjFaTt+kjzdwxdyr5dl8cB8qVErt2R2pT4oEmRZxlaBfmqciwaCy
HmUrNFRDM463MS2qvlGQuShp1P+GLlBO/G/q6qdqVy4aO20+GtIk4RRQs90arWqxd9Sw
NE+N7Ie60YVHk82NVxfqmT4goIasakyVKbfGUinIwjoMcmCtQdNSy4NFnvoMZwReSRRW
YXdzxos9KXaURJHbVcPz4fU6JZ7GvM1JsULOuUEejHiabvWtsLUKlrgOXKY2GFNb/yfG
GTZw==
X-Gm-Message-State: AOAM533c0ixqO+lVsR+9XLqg2nqDV3rfK/BQ6rS1vDF5YlBnjnwpjAec
i26ejtaM1nosD6holPY9Kps=
X-Google-Smtp-Source: ABdhPJw6B0GXuP1poJPsmxnroGgwpPQmKCWzoeDSyb3gK13qEvcDcnR9L4A9B6aOy3ejL9U6JmiBow==
X-Received: by 2002:a05:600c:350a:: with SMTP id
h10mr10283331wmq.163.1632924509011;
Wed, 29 Sep 2021 07:08:29 -0700 (PDT)
Received: from tucornea-dev-machine.localdomain ([193.226.172.44])
by smtp.gmail.com with ESMTPSA id a8sm1465wrp.61.2021.09.29.07.08.27
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Wed, 29 Sep 2021 07:08:28 -0700 (PDT)
From: Tudor Cornea <tudor.cornea@gmail.com>
To: stephen@networkplumber.org,
ferruh.yigit@intel.com
Cc: linville@tuxdriver.com, andrew.rybchenko@oktetlabs.ru, thomas@monjalon.net,
jerinj@marvell.com, dev@dpdk.org, Tudor Cornea <tudor.cornea@gmail.com>
Date: Wed, 29 Sep 2021 17:08:17 +0300
Message-Id: <1632924497-60394-1-git-send-email-tudor.cornea@gmail.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1632483885-84732-1-git-send-email-tudor.cornea@gmail.com>
References: <1632483885-84732-1-git-send-email-tudor.cornea@gmail.com>
Subject: [dpdk-dev] [PATCH v4] net/af_packet: reinsert the stripped vlan tag
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
The af_packet pmd driver binds to a raw socket and allows
sending and receiving of packets through the kernel.
Since commit [1], the kernel strips the vlan tags early in
__netif_receive_skb_core(), so we receive untagged packets while
running with the af_packet pmd.
Luckily for us, the skb vlan-related fields are still populated from the
stripped vlan tags, so we end up having all the information
that we need in the mbuf.
Having the pmd driver support DEV_RX_OFFLOAD_VLAN_STRIP allows the
application to control the desired vlan stripping behavior,
until we have a way to describe offloads that can't be disabled by
pmd drivers.
This patch will cause a change in the default way that the af_packet
pmd treats received vlan-tagged frames. While previously, the
application was required to check the PKT_RX_VLAN_STRIPPED flag, after
this patch, the pmd will re-insert the vlan tag transparently to the
user, unless the DEV_RX_OFFLOAD_VLAN_STRIP is enabled in
rxmode.offloads.
I've attempted a preliminary benchmark to understand if the change could
cause a sizable performance hit.
Setup:
Two virtual machines running on top of an ESXi hypervisor
Tx: DPDK app (running on top of vmxnet3 PMD)
Rx: af_packet (running on top of a kernel vmxnet3 interface)
Packet size :68 (packet contains a vlan tag)
Rates:
Tx - 1.419 Mpps
Rx (without vlan insertion) - 1227636 pps
Rx (with vlan insertion) - 1220081 pps
At a first glance, we don't seem to have a large degradation in terms
of packet rate.
[1] https://github.com/torvalds/linux/commit/bcc6d47903612c3861201cc3a866fb604f26b8b2
Signed-off-by: Tudor Cornea <tudor.cornea@gmail.com>
---
v4:
* Updated the af_packet documentation
v3:
* Updated release note and documentation
* Updated commit with performance measurements
v2:
* Added DEV_RX_OFFLOAD_VLAN_STRIP to rxmode->offloads
---
doc/guides/nics/af_packet.rst | 5 +++++
doc/guides/rel_notes/release_21_11.rst | 4 ++++
drivers/net/af_packet/rte_eth_af_packet.c | 12 ++++++++++++
3 files changed, 21 insertions(+)
diff --git a/doc/guides/nics/af_packet.rst b/doc/guides/nics/af_packet.rst
index efd6f1c..c87310b 100644
--- a/doc/guides/nics/af_packet.rst
+++ b/doc/guides/nics/af_packet.rst
@@ -65,3 +65,8 @@ framecnt=512):
.. code-block:: console
--vdev=eth_af_packet0,iface=tap0,blocksz=4096,framesz=2048,framecnt=512,qpairs=1,qdisc_bypass=0
+
+Features and Limitations of the af_packet PMD
+---------------------------------------------
+
+Af_packet PMD now works with VLAN's on Linux
diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst
index ad7c1af..095fd5b 100644
--- a/doc/guides/rel_notes/release_21_11.rst
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -66,6 +66,10 @@ New Features
* Added rte_flow support for dual VLAN insert and strip actions.
+* **Updated af_packet ethdev driver.**
+
+ * Added DEV_RX_OFFLOAD_VLAN_STRIP capability.
+
* **Updated Marvell cnxk crypto PMD.**
* Added AES-CBC SHA1-HMAC support in lookaside protocol (IPsec) for CN10K.
diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index b73b211..5ed9dd6 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -48,6 +48,7 @@ struct pkt_rx_queue {
struct rte_mempool *mb_pool;
uint16_t in_port;
+ uint8_t vlan_strip;
volatile unsigned long rx_pkts;
volatile unsigned long rx_bytes;
@@ -78,6 +79,7 @@ struct pmd_internals {
struct pkt_rx_queue *rx_queue;
struct pkt_tx_queue *tx_queue;
+ uint8_t vlan_strip;
};
static const char *valid_arguments[] = {
@@ -148,6 +150,9 @@ eth_af_packet_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
if (ppd->tp_status & TP_STATUS_VLAN_VALID) {
mbuf->vlan_tci = ppd->tp_vlan_tci;
mbuf->ol_flags |= (PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED);
+
+ if (!pkt_q->vlan_strip && rte_vlan_insert(&mbuf))
+ PMD_LOG(ERR, "Failed to reinsert VLAN tag");
}
/* release incoming frame and advance ring buffer */
@@ -302,6 +307,11 @@ eth_dev_stop(struct rte_eth_dev *dev)
static int
eth_dev_configure(struct rte_eth_dev *dev __rte_unused)
{
+ struct rte_eth_conf *dev_conf = &dev->data->dev_conf;
+ const struct rte_eth_rxmode *rxmode = &dev_conf->rxmode;
+ struct pmd_internals *internals = dev->data->dev_private;
+
+ internals->vlan_strip = !!(rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP);
return 0;
}
@@ -318,6 +328,7 @@ eth_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
dev_info->min_rx_bufsize = 0;
dev_info->tx_offload_capa = DEV_TX_OFFLOAD_MULTI_SEGS |
DEV_TX_OFFLOAD_VLAN_INSERT;
+ dev_info->rx_offload_capa = DEV_RX_OFFLOAD_VLAN_STRIP;
return 0;
}
@@ -448,6 +459,7 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,
dev->data->rx_queues[rx_queue_id] = pkt_q;
pkt_q->in_port = dev->data->port_id;
+ pkt_q->vlan_strip = internals->vlan_strip;
return 0;
}
--
2.7.4