From: Ouyang Changchun <changchun.ouyang@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 13/22] virtio: Add support for vlan filtering
Date: Thu, 15 Jan 2015 13:15:21 +0800 [thread overview]
Message-ID: <1421298930-15210-14-git-send-email-changchun.ouyang@intel.com> (raw)
In-Reply-To: <1421298930-15210-1-git-send-email-changchun.ouyang@intel.com>
Virtio supports vlan filtering.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Changchun Ouyang <changchun.ouyang@intel.com>
---
lib/librte_pmd_virtio/virtio_ethdev.c | 31 +++++++++++++++++++++++++++++--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/lib/librte_pmd_virtio/virtio_ethdev.c b/lib/librte_pmd_virtio/virtio_ethdev.c
index 13feda5..ec5a51e 100644
--- a/lib/librte_pmd_virtio/virtio_ethdev.c
+++ b/lib/librte_pmd_virtio/virtio_ethdev.c
@@ -84,6 +84,8 @@ static void virtio_dev_tx_queue_release(__rte_unused void *txq);
static void virtio_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats);
static void virtio_dev_stats_reset(struct rte_eth_dev *dev);
static void virtio_dev_free_mbufs(struct rte_eth_dev *dev);
+static int virtio_vlan_filter_set(struct rte_eth_dev *dev,
+ uint16_t vlan_id, int on);
static int virtio_dev_queue_stats_mapping_set(
__rte_unused struct rte_eth_dev *eth_dev,
@@ -511,6 +513,7 @@ static struct eth_dev_ops virtio_eth_dev_ops = {
.tx_queue_release = virtio_dev_tx_queue_release,
/* collect stats per queue */
.queue_stats_mapping_set = virtio_dev_queue_stats_mapping_set,
+ .vlan_filter_set = virtio_vlan_filter_set,
};
static inline int
@@ -640,14 +643,31 @@ virtio_get_hwaddr(struct virtio_hw *hw)
}
}
+static int
+virtio_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
+{
+ struct virtio_hw *hw = dev->data->dev_private;
+ struct virtio_pmd_ctrl ctrl;
+ int len;
+
+ if (!vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_VLAN))
+ return -ENOTSUP;
+
+ ctrl.hdr.class = VIRTIO_NET_CTRL_VLAN;
+ ctrl.hdr.cmd = on ? VIRTIO_NET_CTRL_VLAN_ADD : VIRTIO_NET_CTRL_VLAN_DEL;
+ memcpy(ctrl.data, &vlan_id, sizeof(vlan_id));
+ len = sizeof(vlan_id);
+
+ return virtio_send_command(hw->cvq, &ctrl, &len, 1);
+}
static void
virtio_negotiate_features(struct virtio_hw *hw)
{
uint32_t host_features, mask;
- mask = VIRTIO_NET_F_CTRL_VLAN;
- mask |= VIRTIO_NET_F_CSUM | VIRTIO_NET_F_GUEST_CSUM;
+ /* checksum offload not implemented */
+ mask = VIRTIO_NET_F_CSUM | VIRTIO_NET_F_GUEST_CSUM;
/* TSO and LRO are only available when their corresponding
* checksum offload feature is also negotiated.
@@ -1058,6 +1078,13 @@ virtio_dev_configure(struct rte_eth_dev *dev)
hw->vlan_strip = rxmode->hw_vlan_strip;
+ if (rxmode->hw_vlan_filter
+ && !vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_VLAN)) {
+ PMD_DRV_LOG(NOTICE,
+ "vlan filtering not available on this host");
+ return -ENOTSUP;
+ }
+
if (vtpci_irq_config(hw, 0) == VIRTIO_MSI_NO_VECTOR) {
PMD_DRV_LOG(ERR, "failed to set config vector");
return -EBUSY;
--
1.8.4.2
next prev parent reply other threads:[~2015-01-15 5:16 UTC|newest]
Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-15 5:15 [dpdk-dev] [PATCH 00/22] Single virtio implementation Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 01/22] virtio: Rearrange resource initialization Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 02/22] virtio: Use weaker barriers Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 03/22] virtio: Allow starting with link down Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 04/22] virtio: Add support for Link State interrupt Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 05/22] ether: Add soft vlan encap/decap functions Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 06/22] virtio: Use software vlan stripping Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 07/22] virtio: Remove unnecessary adapter structure Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 08/22] virtio: Remove redundant vq_alignment Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 09/22] virtio: Fix how states are handled during initialization Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 10/22] virtio: Make vtpci_get_status local Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 11/22] virtio: Check for packet headroom at compile time Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 12/22] virtio: Move allocation before initialization Ouyang Changchun
2015-01-15 5:15 ` Ouyang Changchun [this message]
2015-01-15 5:15 ` [dpdk-dev] [PATCH 14/22] virtio: Add suport for multiple mac addresses Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 15/22] virtio: Add ability to set MAC address Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 16/22] virtio: Free mbuf's with threshold Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 17/22] virtio: Use port IO to get PCI resource Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 18/22] virtio: Fix descriptor index issue Ouyang Changchun
2015-01-15 16:54 ` Stephen Hemminger
2015-01-16 0:55 ` Ouyang, Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 19/22] ether: Fix vlan strip/insert issue Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 20/22] example/vhost: Avoid inserting vlan twice Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 21/22] example/vhost: Add vlan-strip cmd line option Ouyang Changchun
2015-01-15 5:15 ` [dpdk-dev] [PATCH 22/22] virtio: Use soft vlan strip in mergeable Rx path Ouyang Changchun
2015-01-15 16:55 ` Stephen Hemminger
2015-01-16 0:56 ` Ouyang, Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 00/24] Single virtio implementation Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 01/24] virtio: Rearrange resource initialization Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 02/24] virtio: Use weaker barriers Ouyang Changchun
2015-01-27 7:03 ` Xie, Huawei
2015-01-27 9:58 ` Stephen Hemminger
2015-01-27 16:16 ` Xie, Huawei
2015-01-28 6:12 ` Ouyang, Changchun
2015-01-27 7:56 ` Xie, Huawei
2015-01-27 8:04 ` Ouyang, Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 03/24] virtio: Allow starting with link down Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 04/24] virtio: Add support for Link State interrupt Ouyang Changchun
2015-01-27 9:04 ` Xie, Huawei
2015-01-27 10:00 ` Stephen Hemminger
2015-01-28 3:03 ` Ouyang, Changchun
2015-01-28 15:11 ` Stephen Hemminger
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 05/24] ether: Add soft vlan encap/decap functions Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 06/24] virtio: Use software vlan stripping Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 07/24] virtio: Remove unnecessary adapter structure Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 08/24] virtio: Remove redundant vq_alignment Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 09/24] virtio: Fix how states are handled during initialization Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 10/24] virtio: Make vtpci_get_status local Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 11/24] virtio: Check for packet headroom at compile time Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 12/24] virtio: Move allocation before initialization Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 13/24] virtio: Add support for vlan filtering Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 14/24] virtio: Add suport for multiple mac addresses Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 15/24] virtio: Add ability to set MAC address Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 16/24] virtio: Free mbuf's with threshold Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 17/24] virtio: Use port IO to get PCI resource Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 18/24] virtio: Fix descriptor index issue Ouyang Changchun
2015-01-27 2:35 ` [dpdk-dev] [PATCH v2 19/24] ether: Fix vlan strip/insert issue Ouyang Changchun
2015-01-27 2:36 ` [dpdk-dev] [PATCH v2 20/24] example/vhost: Avoid inserting vlan twice Ouyang Changchun
2015-01-27 2:36 ` [dpdk-dev] [PATCH v2 21/24] example/vhost: Add vlan-strip cmd line option Ouyang Changchun
2015-01-27 2:36 ` [dpdk-dev] [PATCH v2 22/24] virtio: Use soft vlan strip in mergeable Rx path Ouyang Changchun
2015-01-27 2:36 ` [dpdk-dev] [PATCH v2 23/24] virtio: Fix zero copy break issue Ouyang Changchun
2015-01-27 2:36 ` [dpdk-dev] [PATCH v2 24/24] virtio: Remove hotspots Ouyang Changchun
2015-01-27 3:06 ` [dpdk-dev] [PATCH v2 00/24] Single virtio implementation Matthew Hall
2015-01-27 3:42 ` Wiles, Keith
2015-01-27 9:41 ` Matthew Hall
2015-01-27 10:02 ` Stephen Hemminger
2015-01-27 18:59 ` Matthew Hall
2015-01-29 7:23 ` [dpdk-dev] [PATCH v3 00/25] " Ouyang Changchun
2015-01-29 7:23 ` [dpdk-dev] [PATCH v3 01/25] virtio: Rearrange resource initialization Ouyang Changchun
2015-01-29 7:23 ` [dpdk-dev] [PATCH v3 02/25] virtio: Use weaker barriers Ouyang Changchun
2015-01-29 7:23 ` [dpdk-dev] [PATCH v3 03/25] virtio: Allow starting with link down Ouyang Changchun
2015-01-29 7:23 ` [dpdk-dev] [PATCH v3 04/25] virtio: Add support for Link State interrupt Ouyang Changchun
2015-01-29 7:23 ` [dpdk-dev] [PATCH v3 05/25] ether: Add soft vlan encap/decap functions Ouyang Changchun
2015-01-29 7:23 ` [dpdk-dev] [PATCH v3 06/25] virtio: Use software vlan stripping Ouyang Changchun
2015-01-29 7:23 ` [dpdk-dev] [PATCH v3 07/25] virtio: Remove unnecessary adapter structure Ouyang Changchun
2015-01-29 7:23 ` [dpdk-dev] [PATCH v3 08/25] virtio: Remove redundant vq_alignment Ouyang Changchun
2015-01-29 7:23 ` [dpdk-dev] [PATCH v3 09/25] virtio: Fix how states are handled during initialization Ouyang Changchun
2015-01-29 7:23 ` [dpdk-dev] [PATCH v3 10/25] virtio: Make vtpci_get_status local Ouyang Changchun
2015-01-29 7:23 ` [dpdk-dev] [PATCH v3 11/25] virtio: Check for packet headroom at compile time Ouyang Changchun
2015-01-29 7:23 ` [dpdk-dev] [PATCH v3 12/25] virtio: Move allocation before initialization Ouyang Changchun
2015-01-29 7:23 ` [dpdk-dev] [PATCH v3 13/25] virtio: Add support for vlan filtering Ouyang Changchun
2015-01-29 7:23 ` [dpdk-dev] [PATCH v3 14/25] virtio: Add suport for multiple mac addresses Ouyang Changchun
2015-01-29 7:23 ` [dpdk-dev] [PATCH v3 15/25] virtio: Add ability to set MAC address Ouyang Changchun
2015-01-29 7:24 ` [dpdk-dev] [PATCH v3 16/25] virtio: Free mbuf's with threshold Ouyang Changchun
2015-01-29 7:24 ` [dpdk-dev] [PATCH v3 17/25] virtio: Use port IO to get PCI resource Ouyang Changchun
2015-01-29 23:14 ` Thomas Monjalon
2015-02-04 1:31 ` Ouyang, Changchun
2015-01-29 7:24 ` [dpdk-dev] [PATCH v3 18/25] virtio: Fix descriptor index issue Ouyang Changchun
2015-01-29 7:24 ` [dpdk-dev] [PATCH v3 19/25] ether: Fix vlan strip/insert issue Ouyang Changchun
2015-02-04 10:54 ` Xie, Huawei
2015-02-05 0:54 ` Ouyang, Changchun
2015-01-29 7:24 ` [dpdk-dev] [PATCH v3 20/25] example/vhost: Avoid inserting vlan twice Ouyang Changchun
2015-01-29 7:24 ` [dpdk-dev] [PATCH v3 21/25] example/vhost: Add vlan-strip cmd line option Ouyang Changchun
2015-01-29 7:24 ` [dpdk-dev] [PATCH v3 22/25] virtio: Use soft vlan strip in mergeable Rx path Ouyang Changchun
2015-01-29 7:24 ` [dpdk-dev] [PATCH v3 23/25] virtio: Fix zero copy break issue Ouyang Changchun
2015-01-29 7:24 ` [dpdk-dev] [PATCH v3 24/25] virtio: Remove hotspots Ouyang Changchun
2015-01-29 7:24 ` [dpdk-dev] [PATCH v3 25/25] virtio: Fix wmb issue Ouyang Changchun
2015-02-09 1:13 ` [dpdk-dev] [PATCH v4 00/26] Single virtio implementation Ouyang Changchun
2015-02-09 1:13 ` [dpdk-dev] [PATCH v4 01/26] virtio: Rearrange resource initialization Ouyang Changchun
2015-02-09 1:13 ` [dpdk-dev] [PATCH v4 02/26] virtio: Use weaker barriers Ouyang Changchun
2015-02-09 1:13 ` [dpdk-dev] [PATCH v4 03/26] virtio: Allow starting with link down Ouyang Changchun
2015-02-09 1:13 ` [dpdk-dev] [PATCH v4 04/26] virtio: Add support for Link State interrupt Ouyang Changchun
2015-02-09 1:13 ` [dpdk-dev] [PATCH v4 05/26] ether: Add soft vlan encap/decap functions Ouyang Changchun
2015-02-09 1:13 ` [dpdk-dev] [PATCH v4 06/26] virtio: Use software vlan stripping Ouyang Changchun
2015-02-09 1:13 ` [dpdk-dev] [PATCH v4 07/26] virtio: Remove unnecessary adapter structure Ouyang Changchun
2015-02-09 1:13 ` [dpdk-dev] [PATCH v4 08/26] virtio: Remove redundant vq_alignment Ouyang Changchun
2015-02-09 1:13 ` [dpdk-dev] [PATCH v4 09/26] virtio: Fix how states are handled during initialization Ouyang Changchun
2015-02-09 1:13 ` [dpdk-dev] [PATCH v4 10/26] virtio: Make vtpci_get_status local Ouyang Changchun
2015-02-09 1:14 ` [dpdk-dev] [PATCH v4 11/26] virtio: Check for packet headroom at compile time Ouyang Changchun
2015-02-09 1:14 ` [dpdk-dev] [PATCH v4 12/26] virtio: Move allocation before initialization Ouyang Changchun
2015-02-09 1:14 ` [dpdk-dev] [PATCH v4 13/26] virtio: Add support for vlan filtering Ouyang Changchun
2015-02-09 1:14 ` [dpdk-dev] [PATCH v4 14/26] virtio: Add suport for multiple mac addresses Ouyang Changchun
2015-02-09 1:14 ` [dpdk-dev] [PATCH v4 15/26] virtio: Add ability to set MAC address Ouyang Changchun
2015-02-09 1:14 ` [dpdk-dev] [PATCH v4 16/26] virtio: Free mbuf's with threshold Ouyang Changchun
2015-02-09 1:14 ` [dpdk-dev] [PATCH v4 17/26] virtio: Use port IO to get PCI resource Ouyang Changchun
2015-02-11 4:32 ` Stephen Hemminger
2015-02-11 4:50 ` Ouyang, Changchun
2015-02-11 7:29 ` Vincent JARDIN
2015-02-11 13:50 ` Stephen Hemminger
2015-02-11 14:16 ` Thomas Monjalon
2015-02-12 0:52 ` Ouyang, Changchun
2015-02-09 1:14 ` [dpdk-dev] [PATCH v4 18/26] virtio: Fix descriptor index issue Ouyang Changchun
2015-02-09 1:14 ` [dpdk-dev] [PATCH v4 19/26] ether: Fix vlan strip/insert issue Ouyang Changchun
2015-02-09 1:14 ` [dpdk-dev] [PATCH v4 20/26] example/vhost: Avoid inserting vlan twice Ouyang Changchun
2015-02-09 1:14 ` [dpdk-dev] [PATCH v4 21/26] example/vhost: Add vlan-strip cmd line option Ouyang Changchun
2015-02-09 1:14 ` [dpdk-dev] [PATCH v4 22/26] virtio: Use soft vlan strip in mergeable Rx path Ouyang Changchun
2015-02-09 1:14 ` [dpdk-dev] [PATCH v4 23/26] virtio: Fix zero copy break issue Ouyang Changchun
2015-02-09 1:14 ` [dpdk-dev] [PATCH v4 24/26] virtio: Remove hotspots Ouyang Changchun
2015-02-09 1:14 ` [dpdk-dev] [PATCH v4 25/26] virtio: Fix wmb issue Ouyang Changchun
2015-02-09 1:14 ` [dpdk-dev] [PATCH v4 26/26] virtio: Fix updating vring descriptor index issue Ouyang Changchun
2015-02-17 6:04 ` [dpdk-dev] [PATCH v4 00/26] Single virtio implementation Xie, Huawei
2015-02-20 18:06 ` 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=1421298930-15210-14-git-send-email-changchun.ouyang@intel.com \
--to=changchun.ouyang@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).