[dpdk-dev] [PATCH 0/7] Cisco Systems Inc. VIC Ethernet PMD - ENIC PMD
ENIC PMD is the poll-mode driver for the Cisco Systems Inc. VIC to be used with DPDK suite. Further details are provided in the ReleaseNotes.txt in the path lib/librte_pmd_enic/ Sujith Sankar (7): DPDK changes for accommodating ENIC PMD ENIC PMD License ENIC PMD Makefile VNIC common code ENIC PMD specific code DPDK-ENIC PMD interface Release notes for ENIC PMD 1.0.0.3 app/test-pmd/testpmd.c |1 + config/common_linuxapp |6 + lib/Makefile |1 + lib/librte_eal/linuxapp/eal/eal_pci_vfio.c |7 + lib/librte_eal/linuxapp/eal/include/eal_pci_init.h |1 + lib/librte_pmd_enic/LICENSE| 23 + lib/librte_pmd_enic/Makefile | 66 + lib/librte_pmd_enic/ReleaseNotes.txt | 196 +++ lib/librte_pmd_enic/src/cq_desc.h | 122 ++ lib/librte_pmd_enic/src/cq_enet_desc.h | 257 lib/librte_pmd_enic/src/enic.h | 154 +++ lib/librte_pmd_enic/src/enic_clsf.c| 240 lib/librte_pmd_enic/src/enic_compat.h | 138 ++ lib/librte_pmd_enic/src/enic_etherdev.c| 616 + lib/librte_pmd_enic/src/enic_main.c| 1325 lib/librte_pmd_enic/src/enic_res.c | 217 lib/librte_pmd_enic/src/enic_res.h | 164 +++ lib/librte_pmd_enic/src/rq_enet_desc.h | 72 ++ lib/librte_pmd_enic/src/vnic_cq.c | 113 ++ lib/librte_pmd_enic/src/vnic_cq.h | 148 +++ lib/librte_pmd_enic/src/vnic_dev.c | 1077 lib/librte_pmd_enic/src/vnic_dev.h | 198 +++ lib/librte_pmd_enic/src/vnic_devcmd.h | 770 lib/librte_pmd_enic/src/vnic_enet.h| 74 ++ lib/librte_pmd_enic/src/vnic_intr.c| 79 ++ lib/librte_pmd_enic/src/vnic_intr.h| 122 ++ lib/librte_pmd_enic/src/vnic_nic.h | 84 ++ lib/librte_pmd_enic/src/vnic_resource.h| 93 ++ lib/librte_pmd_enic/src/vnic_rq.c | 242 lib/librte_pmd_enic/src/vnic_rq.h | 278 lib/librte_pmd_enic/src/vnic_rss.c | 81 ++ lib/librte_pmd_enic/src/vnic_rss.h | 57 + lib/librte_pmd_enic/src/vnic_stats.h | 82 ++ lib/librte_pmd_enic/src/vnic_wq.c | 241 lib/librte_pmd_enic/src/vnic_wq.h | 279 + lib/librte_pmd_enic/src/wq_enet_desc.h | 110 ++ mk/rte.app.mk |4 + 37 files changed, 7738 insertions(+) create mode 100644 lib/librte_pmd_enic/LICENSE create mode 100644 lib/librte_pmd_enic/Makefile create mode 100644 lib/librte_pmd_enic/ReleaseNotes.txt create mode 100644 lib/librte_pmd_enic/src/cq_desc.h create mode 100644 lib/librte_pmd_enic/src/cq_enet_desc.h create mode 100644 lib/librte_pmd_enic/src/enic.h create mode 100644 lib/librte_pmd_enic/src/enic_clsf.c create mode 100644 lib/librte_pmd_enic/src/enic_compat.h create mode 100644 lib/librte_pmd_enic/src/enic_etherdev.c create mode 100644 lib/librte_pmd_enic/src/enic_main.c create mode 100644 lib/librte_pmd_enic/src/enic_res.c create mode 100644 lib/librte_pmd_enic/src/enic_res.h create mode 100644 lib/librte_pmd_enic/src/rq_enet_desc.h create mode 100644 lib/librte_pmd_enic/src/vnic_cq.c create mode 100644 lib/librte_pmd_enic/src/vnic_cq.h create mode 100644 lib/librte_pmd_enic/src/vnic_dev.c create mode 100644 lib/librte_pmd_enic/src/vnic_dev.h create mode 100644 lib/librte_pmd_enic/src/vnic_devcmd.h create mode 100644 lib/librte_pmd_enic/src/vnic_enet.h create mode 100644 lib/librte_pmd_enic/src/vnic_intr.c create mode 100644 lib/librte_pmd_enic/src/vnic_intr.h create mode 100644 lib/librte_pmd_enic/src/vnic_nic.h create mode 100644 lib/librte_pmd_enic/src/vnic_resource.h create mode 100644 lib/librte_pmd_enic/src/vnic_rq.c create mode 100644 lib/librte_pmd_enic/src/vnic_rq.h create mode 100644 lib/librte_pmd_enic/src/vnic_rss.c create mode 100644 lib/librte_pmd_enic/src/vnic_rss.h create mode 100644 lib/librte_pmd_enic/src/vnic_stats.h create mode 100644 lib/librte_pmd_enic/src/vnic_wq.c create mode 100644 lib/librte_pmd_enic/src/vnic_wq.h create mode 100644 lib/librte_pmd_enic/src/wq_enet_desc.h -- 1.9.1
[dpdk-dev] [PATCH 1/7] DPDK changes for accommodating ENIC PMD
Signed-off-by: Sujith Sankar
---
app/test-pmd/testpmd.c | 1 +
config/common_linuxapp | 6 ++
lib/Makefile | 1 +
lib/librte_eal/linuxapp/eal/eal_pci_vfio.c | 7 +++
lib/librte_eal/linuxapp/eal/include/eal_pci_init.h | 1 +
mk/rte.app.mk | 4
6 files changed, 20 insertions(+)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index f76406f..4857d56 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1874,6 +1874,7 @@ main(int argc, char** argv)
"check that "
"CONFIG_RTE_LIBRTE_IGB_PMD=y and that "
"CONFIG_RTE_LIBRTE_EM_PMD=y and that "
+ "CONFIG_RTE_LIBRTE_ENIC_PMD=y and that "
"CONFIG_RTE_LIBRTE_IXGBE_PMD=y in your "
"configuration file\n");
diff --git a/config/common_linuxapp b/config/common_linuxapp
index 57b61c9..6b5bac6 100644
--- a/config/common_linuxapp
+++ b/config/common_linuxapp
@@ -210,6 +210,12 @@ CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM=4
CONFIG_RTE_LIBRTE_I40E_ITR_INTERVAL=-1
#
+# Compile burst-oriented Cisco ENIC PMD driver
+#
+CONFIG_RTE_LIBRTE_ENIC_PMD=y
+CONFIG_RTE_LIBRTE_ENIC_PMD_DEBUG_TRACE=n
+
+#
# Compile burst-oriented VIRTIO PMD driver
#
CONFIG_RTE_LIBRTE_VIRTIO_PMD=y
diff --git a/lib/Makefile b/lib/Makefile
index e3237ff..1911790 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -43,6 +43,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline
DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ether
DIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += librte_pmd_e1000
DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += librte_pmd_ixgbe
+DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += librte_pmd_enic
DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += librte_pmd_i40e
DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += librte_pmd_bond
DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += librte_pmd_ring
diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c
b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c
index c776ddc..6bf8f2e 100644
--- a/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci_vfio.c
@@ -736,6 +736,7 @@ pci_vfio_map_resource(struct rte_pci_device *dev)
maps[i].offset = reg.offset;
maps[i].size = reg.size;
dev->mem_resource[i].addr = bar_addr;
+ dev->mem_resource[i].len = reg.size;
}
/* if secondary process, do not set up interrupts */
@@ -791,4 +792,10 @@ pci_vfio_is_enabled(void)
{
return vfio_cfg.vfio_enabled;
}
+
+int
+pci_vfio_container_fd(void)
+{
+ return vfio_cfg.vfio_container_fd;
+}
#endif
diff --git a/lib/librte_eal/linuxapp/eal/include/eal_pci_init.h
b/lib/librte_eal/linuxapp/eal/include/eal_pci_init.h
index d758bee..c9e9e40 100644
--- a/lib/librte_eal/linuxapp/eal/include/eal_pci_init.h
+++ b/lib/librte_eal/linuxapp/eal/include/eal_pci_init.h
@@ -71,6 +71,7 @@ int pci_uio_map_resource(struct rte_pci_device *dev);
int pci_vfio_enable(void);
int pci_vfio_is_enabled(void);
+int pci_vfio_container_fd(void);
int pci_vfio_mp_sync_setup(void);
/* map VFIO resource prototype */
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index 285b65c..95c652f 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -186,6 +186,10 @@ ifeq ($(CONFIG_RTE_LIBRTE_VMXNET3_PMD),y)
LDLIBS += -lrte_pmd_vmxnet3_uio
endif
+ifeq ($(CONFIG_RTE_LIBRTE_ENIC_PMD),y)
+LDLIBS += -lrte_pmd_enic
+endif
+
ifeq ($(CONFIG_RTE_LIBRTE_VIRTIO_PMD),y)
LDLIBS += -lrte_pmd_virtio_uio
endif
--
1.9.1
[dpdk-dev] [PATCH 2/7] ENIC PMD License
Signed-off-by: Sujith Sankar --- lib/librte_pmd_enic/LICENSE | 23 +++ 1 file changed, 23 insertions(+) create mode 100644 lib/librte_pmd_enic/LICENSE diff --git a/lib/librte_pmd_enic/LICENSE b/lib/librte_pmd_enic/LICENSE new file mode 100644 index 000..589e36f --- /dev/null +++ b/lib/librte_pmd_enic/LICENSE @@ -0,0 +1,23 @@ + * Copyright (c) 2014, Cisco Systems, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. -- 1.9.1
[dpdk-dev] [PATCH 3/7] ENIC PMD Makefile
Signed-off-by: Sujith Sankar --- lib/librte_pmd_enic/Makefile | 66 1 file changed, 66 insertions(+) create mode 100644 lib/librte_pmd_enic/Makefile diff --git a/lib/librte_pmd_enic/Makefile b/lib/librte_pmd_enic/Makefile new file mode 100644 index 000..7605a8f --- /dev/null +++ b/lib/librte_pmd_enic/Makefile @@ -0,0 +1,66 @@ +# BSD LICENSE +# +# Copyright(c) 2010-2013 Intel Corporation. All rights reserved. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +include $(RTE_SDK)/mk/rte.vars.mk + +# +# library name +# +LIB = librte_pmd_enic.a + +CFLAGS += -I$(RTE_SDK)/lib/librte_hash/ +CFLAGS += -O3 -Wno-deprecated + +VPATH += $(RTE_SDK)/lib/librte_pmd_enic/src + +# +# all source are stored in SRCS-y +# +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_main.c +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_clsf.c +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic_cq.c +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic_wq.c +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic_dev.c +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic_intr.c +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic_rq.c +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_etherdev.c +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_res.c +SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += vnic_rss.c + + +# this lib depends upon: +DEPDIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += lib/librte_eal lib/librte_ether +DEPDIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += lib/librte_mempool lib/librte_mbuf +DEPDIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += lib/librte_net lib/librte_malloc + +include $(RTE_SDK)/mk/rte.lib.mk + -- 1.9.1
[dpdk-dev] [PATCH 4/7] VNIC common code
Signed-off-by: Sujith Sankar
---
lib/librte_pmd_enic/src/cq_desc.h | 122
lib/librte_pmd_enic/src/cq_enet_desc.h | 257
lib/librte_pmd_enic/src/rq_enet_desc.h | 72 +++
lib/librte_pmd_enic/src/vnic_cq.c | 113
lib/librte_pmd_enic/src/vnic_cq.h | 148 +
lib/librte_pmd_enic/src/vnic_dev.c | 1077 +++
lib/librte_pmd_enic/src/vnic_dev.h | 198 ++
lib/librte_pmd_enic/src/vnic_devcmd.h | 770 ++
lib/librte_pmd_enic/src/vnic_enet.h | 74 +++
lib/librte_pmd_enic/src/vnic_intr.c | 79 +++
lib/librte_pmd_enic/src/vnic_intr.h | 122
lib/librte_pmd_enic/src/vnic_nic.h | 84 +++
lib/librte_pmd_enic/src/vnic_resource.h | 93 +++
lib/librte_pmd_enic/src/vnic_rq.c | 242 +++
lib/librte_pmd_enic/src/vnic_rq.h | 278
lib/librte_pmd_enic/src/vnic_rss.c | 81 +++
lib/librte_pmd_enic/src/vnic_rss.h | 57 ++
lib/librte_pmd_enic/src/vnic_stats.h| 82 +++
lib/librte_pmd_enic/src/vnic_wq.c | 241 +++
lib/librte_pmd_enic/src/vnic_wq.h | 279
lib/librte_pmd_enic/src/wq_enet_desc.h | 110
21 files changed, 4579 insertions(+)
create mode 100644 lib/librte_pmd_enic/src/cq_desc.h
create mode 100644 lib/librte_pmd_enic/src/cq_enet_desc.h
create mode 100644 lib/librte_pmd_enic/src/rq_enet_desc.h
create mode 100644 lib/librte_pmd_enic/src/vnic_cq.c
create mode 100644 lib/librte_pmd_enic/src/vnic_cq.h
create mode 100644 lib/librte_pmd_enic/src/vnic_dev.c
create mode 100644 lib/librte_pmd_enic/src/vnic_dev.h
create mode 100644 lib/librte_pmd_enic/src/vnic_devcmd.h
create mode 100644 lib/librte_pmd_enic/src/vnic_enet.h
create mode 100644 lib/librte_pmd_enic/src/vnic_intr.c
create mode 100644 lib/librte_pmd_enic/src/vnic_intr.h
create mode 100644 lib/librte_pmd_enic/src/vnic_nic.h
create mode 100644 lib/librte_pmd_enic/src/vnic_resource.h
create mode 100644 lib/librte_pmd_enic/src/vnic_rq.c
create mode 100644 lib/librte_pmd_enic/src/vnic_rq.h
create mode 100644 lib/librte_pmd_enic/src/vnic_rss.c
create mode 100644 lib/librte_pmd_enic/src/vnic_rss.h
create mode 100644 lib/librte_pmd_enic/src/vnic_stats.h
create mode 100644 lib/librte_pmd_enic/src/vnic_wq.c
create mode 100644 lib/librte_pmd_enic/src/vnic_wq.h
create mode 100644 lib/librte_pmd_enic/src/wq_enet_desc.h
diff --git a/lib/librte_pmd_enic/src/cq_desc.h
b/lib/librte_pmd_enic/src/cq_desc.h
new file mode 100644
index 000..6c14cb3
--- /dev/null
+++ b/lib/librte_pmd_enic/src/cq_desc.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2008-2010 Cisco Systems, Inc. All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc. All rights reserved.
+ *
+ * Copyright (c) 2014, Cisco Systems, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+#ident "$Id: cq_desc.h 129574 2013-04-26 22:11:14Z rfaucett $"
+
+#ifndef _CQ_DESC_H_
+#define _CQ_DESC_H_
+
+/*
+ * Completion queue descriptor types
+ */
+enum cq_desc_types {
+ CQ_DESC_TYPE_WQ_ENET = 0,
+ CQ_DESC_TYPE_DESC_COPY = 1,
+ CQ_DESC_TYPE_WQ_EXCH = 2,
+ CQ_DESC_TYPE_RQ_ENET = 3,
+ CQ_DESC_TYPE_RQ_FCP = 4,
+ CQ_DESC_TYPE_IOMMU_MISS = 5,
+ CQ_DESC_TYPE_SGL = 6,
+ CQ_DESC_TYPE_CLASSIFIER = 7,
+ CQ_DESC_TYPE_TEST = 127,
+};
+
+/* Completion queue descriptor: 16B
+ *
+ * All completion queues have this basic layout. The
+ * type_specfic area is unique for each completion
+ * queue type.
+ */
+struct cq_desc {
+ __le16 completed_index;
+ __le16 q_number;
+ u8 type_specfic[11];
+ u8 type_color;
+};
+
+#define CQ_DESC_TYPE_BITS4
+#define CQ_DESC_TYPE_MASK
[dpdk-dev] [PATCH 5/7] ENIC PMD specific code
Signed-off-by: Sujith Sankar
---
lib/librte_pmd_enic/src/enic.h| 154
lib/librte_pmd_enic/src/enic_clsf.c | 240 ++
lib/librte_pmd_enic/src/enic_compat.h | 138
lib/librte_pmd_enic/src/enic_main.c | 1325 +
lib/librte_pmd_enic/src/enic_res.c| 217 ++
lib/librte_pmd_enic/src/enic_res.h| 164
6 files changed, 2238 insertions(+)
create mode 100644 lib/librte_pmd_enic/src/enic.h
create mode 100644 lib/librte_pmd_enic/src/enic_clsf.c
create mode 100644 lib/librte_pmd_enic/src/enic_compat.h
create mode 100644 lib/librte_pmd_enic/src/enic_main.c
create mode 100644 lib/librte_pmd_enic/src/enic_res.c
create mode 100644 lib/librte_pmd_enic/src/enic_res.h
diff --git a/lib/librte_pmd_enic/src/enic.h b/lib/librte_pmd_enic/src/enic.h
new file mode 100644
index 000..fd9cdd9
--- /dev/null
+++ b/lib/librte_pmd_enic/src/enic.h
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2008-2014 Cisco Systems, Inc. All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc. All rights reserved.
+ *
+ * Copyright (c) 2014, Cisco Systems, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+#ident "$Id$"
+
+#ifndef _ENIC_H_
+#define _ENIC_H_
+
+#include "vnic_enet.h"
+#include "vnic_dev.h"
+#include "vnic_wq.h"
+#include "vnic_rq.h"
+#include "vnic_cq.h"
+#include "vnic_intr.h"
+#include "vnic_stats.h"
+#include "vnic_nic.h"
+#include "vnic_rss.h"
+#include "enic_res.h"
+
+#define DRV_NAME "enic_pmd"
+#define DRV_DESCRIPTION"Cisco VIC Ethernet NIC Poll-mode
Driver"
+#define DRV_VERSION"1.0.0.3"
+#define DRV_COPYRIGHT "Copyright 2008-2014 Cisco Systems, Inc"
+
+#define ENIC_WQ_MAX8
+#define ENIC_RQ_MAX8
+#define ENIC_CQ_MAX(ENIC_WQ_MAX + ENIC_RQ_MAX)
+#define ENIC_INTR_MAX (ENIC_CQ_MAX + 2)
+
+#define VLAN_ETH_HLEN 18
+
+#define ENICPMD_SETTING(enic, f) ((enic->config.flags & VENETF_##f) ? 1 : 0)
+
+#define ENICPMD_BDF_LENGTH 13 /* :00:00.0'\0' */
+#define PKT_TX_TCP_UDP_CKSUM0x6000
+#define ENIC_CALC_IP_CKSUM 1
+#define ENIC_CALC_TCP_UDP_CKSUM 2
+#define ENIC_MAX_MTU9000
+#define PAGE_SIZE 4096
+#define PAGE_ROUND_UP(x) \
+ unsigned long)(x)) + PAGE_SIZE-1) & (~(PAGE_SIZE-1)))
+
+#define ENICPMD_VFIO_PATH "/dev/vfio/vfio"
+/*#define ENIC_DESC_COUNT_MAKE_ODD (x) do{if ((~(x)) & 1) { (x)--; }
}while(0)*/
+
+#define PCI_DEVICE_ID_CISCO_VIC_ENET 0x0043 /* ethernet vnic */
+#define PCI_DEVICE_ID_CISCO_VIC_ENET_VF 0x0071 /* enet SRIOV VF */
+
+
+#define ENICPMD_FDIR_MAX 64
+
+struct enic_fdir_node {
+ struct rte_fdir_filter filter;
+ u16 fltr_id;
+ u16 rq_index;
+};
+
+struct enic_fdir {
+ struct rte_eth_fdir stats;
+ struct rte_hash *hash;
+ struct enic_fdir_node *nodes[ENICPMD_FDIR_MAX];
+};
+
+/* Per-instance private data structure */
+struct enic {
+ struct enic *next;
+ struct rte_pci_device *pdev;
+ struct vnic_enet_config config;
+ struct vnic_dev_bar bar0;
+ struct vnic_dev *vdev;
+
+ struct rte_eth_dev *rte_dev;
+ struct enic_fdir fdir;
+ char bdf_name[ENICPMD_BDF_LENGTH];
+ int dev_fd;
+ int iommu_group_fd;
+ int vfio_fd;
+ int iommu_groupid;
+ int eventfd;
+ u_int8_t mac_addr[ETH_ALEN];
+ pthread_t err_intr_thread;
+ int promisc;
+ int allmulti;
+ int ig_vlan_strip_en;
+ int link_status;
+ u8 hw_ip_checksum;
+
+ unsigned int flags;
+ unsigned int priv_flags;
+
+ /* work queue */
+ struct vnic_wq wq[ENIC_WQ_M
[dpdk-dev] [PATCH 6/7] DPDK-ENIC PMD interface
Signed-off-by: Sujith Sankar
---
lib/librte_pmd_enic/src/enic_etherdev.c | 616
1 file changed, 616 insertions(+)
create mode 100644 lib/librte_pmd_enic/src/enic_etherdev.c
diff --git a/lib/librte_pmd_enic/src/enic_etherdev.c
b/lib/librte_pmd_enic/src/enic_etherdev.c
new file mode 100644
index 000..e9a64f5
--- /dev/null
+++ b/lib/librte_pmd_enic/src/enic_etherdev.c
@@ -0,0 +1,616 @@
+/*
+ * Copyright 2008-2014 Cisco Systems, Inc. All rights reserved.
+ * Copyright 2007 Nuova Systems, Inc. All rights reserved.
+ *
+ * Copyright (c) 2014, Cisco Systems, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+#ident "$Id$"
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+
+#include "vnic_intr.h"
+#include "vnic_cq.h"
+#include "vnic_wq.h"
+#include "vnic_rq.h"
+#include "vnic_enet.h"
+#include "enic.h"
+
+#ifdef RTE_LIBRTE_ENIC_PMD_DEBUG_TRACE
+#define ENICPMD_FUNC_TRACE()\
+ do { \
+ dev_trace(enic, "Entering %s\n", __func__); \
+ } while (0)
+#else
+#define ENICPMD_FUNC_TRACE()
+#endif
+
+
+/*
+ * The set of PCI devices this driver supports
+ */
+static struct rte_pci_id pci_id_enic_map[] = {
+#define RTE_PCI_DEV_ID_DECL_ENIC(vend, dev) {RTE_PCI_DEVICE(vend, dev)},
+#ifndef PCI_VENDOR_ID_CISCO
+#define PCI_VENDOR_ID_CISCO0x1137
+#endif
+#include "rte_pci_dev_ids.h"
+RTE_PCI_DEV_ID_DECL_ENIC(PCI_VENDOR_ID_CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET)
+RTE_PCI_DEV_ID_DECL_ENIC(PCI_VENDOR_ID_CISCO, PCI_DEVICE_ID_CISCO_VIC_ENET_VF)
+{.vendor_id = 0, /* Sentinal */},
+};
+
+int enicpmd_fdir_remove_perfect_filter(struct rte_eth_dev *eth_dev,
+ struct rte_fdir_filter *fdir_filter,
+ uint16_t soft_id)
+{
+ struct enic *enic = pmd_priv(eth_dev);
+
+ ENICPMD_FUNC_TRACE();
+ return enic_fdir_del_fltr(enic, fdir_filter);
+}
+
+int enicpmd_fdir_add_perfect_filter(struct rte_eth_dev *eth_dev,
+ struct rte_fdir_filter *fdir_filter, uint16_t soft_id,
+ uint8_t queue, uint8_t drop)
+{
+ struct enic *enic = pmd_priv(eth_dev);
+
+ ENICPMD_FUNC_TRACE();
+ return enic_fdir_add_fltr(enic, fdir_filter, (uint16_t)queue, drop);
+}
+
+void enicpmd_fdir_info_get(struct rte_eth_dev *eth_dev,
+ struct rte_eth_fdir *fdir)
+{
+ struct enic *enic = pmd_priv(eth_dev);
+
+ ENICPMD_FUNC_TRACE();
+ *fdir = enic->fdir.stats;
+}
+
+void enicpmd_dev_tx_queue_release(void *txq)
+{
+ ENICPMD_FUNC_TRACE();
+ enic_free_wq(txq);
+}
+
+static int enicpmd_dev_setup_intr(struct enic *enic)
+{
+ int ret;
+ int index;
+
+ ENICPMD_FUNC_TRACE();
+
+ /* Are we done with the init of all the queues? */
+ for (index = 0; index < enic->cq_count; index++) {
+ if (!enic->cq[index].ctrl)
+ break;
+ }
+
+ if (enic->cq_count != index)
+ return 0;
+
+ ret = enic_alloc_intr_resources(enic);
+ if (ret) {
+ dev_err(enic, "alloc intr failed\n");
+ return ret;
+ }
+ enic_init_vnic_resources(enic);
+
+ ret = enic_setup_finish(enic);
+ if (ret)
+ dev_err(enic, "setup could not be finished\n");
+
+ return ret;
+}
+
+int enicpmd_dev_tx_queue_setup(struct rte_eth_dev *eth_dev,
+ uint16_t queue_idx,
+ uint16_t nb_desc,
+ unsigned int socket_id,
+ const struct rte_eth_txconf *tx_conf)
+{
+ int ret;
+ struct enic *enic = pmd_priv(eth_dev);
+
+ ENICPMD_FUNC_TRACE();
+ eth_dev->data->tx_queues[queue_idx] = (void *)&enic->wq[queue_idx];
+
+ ret = e
[dpdk-dev] [PATCH 7/7] Release notes for ENIC PMD 1.0.0.3
--- lib/librte_pmd_enic/ReleaseNotes.txt | 196 +++ 1 file changed, 196 insertions(+) create mode 100644 lib/librte_pmd_enic/ReleaseNotes.txt diff --git a/lib/librte_pmd_enic/ReleaseNotes.txt b/lib/librte_pmd_enic/ReleaseNotes.txt new file mode 100644 index 000..9d9ef3b --- /dev/null +++ b/lib/librte_pmd_enic/ReleaseNotes.txt @@ -0,0 +1,196 @@ + + DPDK Poll-mode Driver for Cisco Systems Inc. VIC Ethernet NIC + Release Notes +Version 1.0.0.3 + + ENIC PMD is the poll-mode driver for the Cisco System Inc. VIC Ethernet NIC + to be used with DPDK suite. + + If you are running/would like to run your applications on Intel DPDK software + suite on Cisco UCS servers that use Cisco VIC adapters, please read the + information provided in this document. + +How to obtain ENIC PMD integrated DPDK? +--- + The source tarball of the whole DPDK suite, dpdk-.tar.gz could be + downloaded from www.dpdk.org + + Alternatively, the same could be downloaded from www.cisco.com. + + +Software License + + Please read the file LICENSE in lib/librte_pmd_enic/ directory in DPDK + source tree. + + The License terms are also present at the top of the source files. + + +Configuration information +- + In order to ensure that ENIC PMD will also be built by DPDK build scripts, + ensure that CONFIG_RTE_LIBRTE_ENIC_PMD=y is there in the following file in + DPDK suite. + + - config/common_linuxapp + + If CONFIG_RTE_EAL_VFIO is y in config/common/linuxapp in the DPDK source + tree, ENIC PMD will try to get initialized using VFIO. If + CONFIG_RTE_EAL_VFIO is n, it will try to use UIO framework. + + No matter how many receive/transmit queues are configured in the service + profile, only one interrupt per vNIC interface needs to be configured. + ENIC PMD uses this interrupt to get information about errors in the fast path. + + +How to build the suite? +--- + The build instruction of DPDK suite should be followed and that would build + ENIC PMD library as well. + + Typically, a user would execute the following commands to build the suite + - tar -xzf dpdk-.tar.gz + - cd dpdk- + - make install T=x86_64-native-linuxapp-gcc + + +Version Information +--- + The version of ENIC driver will be printed by ENIC PMD during the + intialization. + + This release notes is a part of version number 1.0.0.3 + +Directory Structure +--- +librte_pmd_enic +|-- LICENSE +| License terms +| +|-- Makefile +| Makefile to build ENIC PMD as a part of building DPDK +| +|-- scripts +| |-- bind_to_vfio +| | Script which binds a vNIC to VFIO +| | +| `-- unbind_from_vfio +| Script which unbinds a vNIC from VFIO +| +`-- src + Source code of ENIC PMD + + +Dependencies + + - If the user wants to use DPDK with VFIO, the Linux kernel used + should have support for Linux VFIO. Linux kernels post 3.6.0 supports VFIO + + The header file vfio.h should be present in /usr/include/linux/ + + For kernels post 3.6.0, this file should be present in + /usr/include/linux/ + + In the case of Ubuntu, if the file is not present, install the + package linux_libc_dev + + - This version of ENIC PMD has been tested with DPDK suite version 1.7.1 + + - For using UIO framework, please refer the documentation that comes with + DPDK suite + + +Supported Cisco VIC adapters + + - ENIC PMD could be used with all the generations of Cisco VIC adapters. + - Flow director feature is not supported on generation 1 Cisco VIC adapters + (M81KR and P81E) + + +Supported Operating Systems +--- +Any Linux distribution fulfilling the conditions described in Dependencies +section of this document. + +Supported features in this release + + - Unicast, multicast and broadcast transmission and reception + - Receive queue polling + - Statistics + - Hardware VLAN acceleration + - IP checksum offload + - Receive side header-split + - Receive side VLAN stripping + - Multiple receive and transmit queues + - Perfect filters for flow direction (supported on all adapters except M81KR + and P81E) + - Promiscuous mode + - Setting RX VLAN (supported via UCSM/CIMC only) + - VLAN filtering (supported via UCSM/CIMC only) + - Execution of application by unprivileged system users + + +Known bugs and Unsupported features in this release +--- + - Signature filters + - Drop feature of perfect filters + - VLAN based flow direction + - Flexbytes based flow direction + - Setting of extended VLAN + + +Prereq
[dpdk-dev] [PATCH] eal: map PCI memory resources after hugepages
A multiple process DPDK application must mmap hugepages and pci resources into
same virtual addresses. By default the virtual addresses chosen by the primary
process automatically when calling the mmap. But sometime the chosen virtual
addresses isn't usable at secondary process. Such as the secondary process
linked with more libraries than primary process. The library has been mapped
into this virtual address. The command line parameter 'base-virtaddr' has been
added for this situation. If it's configured, the hugepages will be mapped into
this base address. But the virtual address of pci resources mapped still does
not refer to the parameter. In that case "EAL: pci_map_resource(): cannot mmap"
will be got.
This patch try to map pci resources after hugepages. So the error can be
resolved by set base-virtaddr into free virtual address space.
Signed-off-by: Liang Xu
---
lib/librte_eal/linuxapp/eal/eal_pci.c | 32 +++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c
b/lib/librte_eal/linuxapp/eal/eal_pci.c
index ddb0535..502eef2 100644
--- a/lib/librte_eal/linuxapp/eal/eal_pci.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci.c
@@ -97,14 +97,42 @@ error:
return -1;
}
+static void *
+pci_find_max_end_va(void)
+{
+ const struct rte_memseg *seg = rte_eal_get_physmem_layout();
+ const struct rte_memseg *last = seg;
+ unsigned i = 0;
+
+ for (i = 0; i < RTE_MAX_MEMSEG; i++, seg++) {
+ if (seg->addr == NULL)
+ break;
+
+ if (seg->addr > last->addr)
+ last = seg;
+
+ }
+ return RTE_PTR_ADD(last->addr, last->len);
+}
+
/* map a particular resource from a file */
void *
pci_map_resource(void *requested_addr, int fd, off_t offset, size_t size)
{
void *mapaddr;
+ /* By default the PCI memory resource will be mapped after hugepages */
+ static void *default_map_addr;
+ if (NULL == requested_addr) {
+ if (NULL == default_map_addr)
+ default_map_addr = pci_find_max_end_va();
+ mapaddr = default_map_addr;
+ } else {
+ mapaddr = requested_addr;
+ }
+
/* Map the PCI memory resource of device */
- mapaddr = mmap(requested_addr, size, PROT_READ | PROT_WRITE,
+ mapaddr = mmap(mapaddr, size, PROT_READ | PROT_WRITE,
MAP_SHARED, fd, offset);
if (mapaddr == MAP_FAILED ||
(requested_addr != NULL && mapaddr != requested_addr)) {
@@ -114,6 +142,8 @@ pci_map_resource(void *requested_addr, int fd, off_t
offset, size_t size)
strerror(errno), mapaddr);
goto fail;
}
+ if (NULL == requested_addr)
+ default_map_addr = RTE_PTR_ADD(mapaddr, size);
RTE_LOG(DEBUG, EAL, " PCI memory mapped at %p\n", mapaddr);
--
1.9.1
[dpdk-dev] [PATCH v4 0/5] Support virtio multicast feature
-V1 change: This patch series support multicast feature in virtio and vhost. The vhost backend enables the promiscuous mode and config ETH_VMDQ_ACCEPT_BROADCAST and ETH_VMDQ_ACCEPT_MULTICAST in VMDQ offload register to receive the multicast and broadcast packets. The virtio frontend provides the functionality of enabling and disabling the multicast and promiscuous mode. -V2 change: Rework the patch basing on new vhost library and new vhost application. -V3 change: Rework the patch for comments, split commits. -V4 change: Rework for refining code comment and patch titles, fatorizing codes, and resolving conflicts. Changchun Ouyang (5): ethdev: Add vmdq rx mode igb: Config VM offload register ixgbe: Configure Rx mode for VMDQ virtio: Support promiscuous and allmulticast vhost: Enable promisc mode and multicast examples/vhost/main.c | 24 -- lib/librte_ether/rte_ethdev.h | 1 + lib/librte_pmd_e1000/igb_rxtx.c | 20 lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 31 lib/librte_pmd_ixgbe/ixgbe_ethdev.h | 1 + lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 6 +++ lib/librte_pmd_virtio/virtio_ethdev.c | 90 ++- lib/librte_vhost/virtio-net.c | 3 +- 8 files changed, 161 insertions(+), 15 deletions(-) -- 1.8.4.2
[dpdk-dev] [PATCH v4 1/5] ethdev: Add vmdq rx mode
Add vmdq rx mode field into rx config struct, it is flag from ETH_VMDQ_ACCEPT_*.
Signed-off-by: Changchun Ouyang
---
lib/librte_ether/rte_ethdev.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 7e4c998..c29525b 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -593,6 +593,7 @@ struct rte_eth_vmdq_rx_conf {
uint8_t default_pool; /**< The default pool, if applicable */
uint8_t enable_loop_back; /**< Enable VT loop back */
uint8_t nb_pool_maps; /**< We can have up to 64 filters/mappings */
+ uint32_t rx_mode; /**< Flags from ETH_VMDQ_ACCEPT_* */
struct {
uint16_t vlan_id; /**< The vlan id of the received frame */
uint64_t pools; /**< Bitmask of pools for packet rx */
--
1.8.4.2
[dpdk-dev] [PATCH v4 2/5] igb: Config VM offload register
Config VM offload register in igb PMD to enable it receive broadcast and
multicast packets.
Signed-off-by: Changchun Ouyang
---
lib/librte_pmd_e1000/igb_rxtx.c | 20
1 file changed, 20 insertions(+)
diff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c
index f09c525..0dca7b7 100644
--- a/lib/librte_pmd_e1000/igb_rxtx.c
+++ b/lib/librte_pmd_e1000/igb_rxtx.c
@@ -1779,6 +1779,26 @@ igb_vmdq_rx_hw_configure(struct rte_eth_dev *dev)
vt_ctl |= E1000_VT_CTL_IGNORE_MAC;
E1000_WRITE_REG(hw, E1000_VT_CTL, vt_ctl);
+ for (i = 0; i < E1000_VMOLR_SIZE; i++) {
+ vmolr = E1000_READ_REG(hw, E1000_VMOLR(i));
+ vmolr &= ~(E1000_VMOLR_AUPE | E1000_VMOLR_ROMPE |
+ E1000_VMOLR_ROPE | E1000_VMOLR_BAM |
+ E1000_VMOLR_MPME);
+
+ if (cfg->rx_mode & ETH_VMDQ_ACCEPT_UNTAG)
+ vmolr |= E1000_VMOLR_AUPE;
+ if (cfg->rx_mode & ETH_VMDQ_ACCEPT_HASH_MC)
+ vmolr |= E1000_VMOLR_ROMPE;
+ if (cfg->rx_mode & ETH_VMDQ_ACCEPT_HASH_UC)
+ vmolr |= E1000_VMOLR_ROPE;
+ if (cfg->rx_mode & ETH_VMDQ_ACCEPT_BROADCAST)
+ vmolr |= E1000_VMOLR_BAM;
+ if (cfg->rx_mode & ETH_VMDQ_ACCEPT_MULTICAST)
+ vmolr |= E1000_VMOLR_MPME;
+
+ E1000_WRITE_REG(hw, E1000_VMOLR(i), vmolr);
+ }
+
/*
* VMOLR: set STRVLAN as 1 if IGMAC in VTCTL is set as 1
* Both 82576 and 82580 support it
--
1.8.4.2
[dpdk-dev] [PATCH v4 3/5] ixgbe: Configure Rx mode for VMDQ
Config PFVML2FLT register in ixgbe PMD to enable it receive broadcast and
multicast packets;
also factorize the common logic with ixgbe_set_pool_rx_mode.
Signed-off-by: Changchun Ouyang
---
lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 31 +--
lib/librte_pmd_ixgbe/ixgbe_ethdev.h | 1 +
lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 6 ++
3 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
index 9c73a30..fb7ed3d 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.c
@@ -3123,6 +3123,26 @@ ixgbe_uc_all_hash_table_set(struct rte_eth_dev *dev,
uint8_t on)
return 0;
}
+
+uint32_t
+ixgbe_convert_vm_rx_mask_to_val(uint16_t rx_mask, uint32_t orig_val)
+{
+ uint32_t new_val = orig_val;
+
+ if (rx_mask & ETH_VMDQ_ACCEPT_UNTAG)
+ new_val |= IXGBE_VMOLR_AUPE;
+ if (rx_mask & ETH_VMDQ_ACCEPT_HASH_MC)
+ new_val |= IXGBE_VMOLR_ROMPE;
+ if (rx_mask & ETH_VMDQ_ACCEPT_HASH_UC)
+ new_val |= IXGBE_VMOLR_ROPE;
+ if (rx_mask & ETH_VMDQ_ACCEPT_BROADCAST)
+ new_val |= IXGBE_VMOLR_BAM;
+ if (rx_mask & ETH_VMDQ_ACCEPT_MULTICAST)
+ new_val |= IXGBE_VMOLR_MPE;
+
+ return new_val;
+}
+
static int
ixgbe_set_pool_rx_mode(struct rte_eth_dev *dev, uint16_t pool,
uint16_t rx_mask, uint8_t on)
@@ -3141,16 +3161,7 @@ ixgbe_set_pool_rx_mode(struct rte_eth_dev *dev, uint16_t
pool,
if (ixgbe_vmdq_mode_check(hw) < 0)
return (-ENOTSUP);
- if (rx_mask & ETH_VMDQ_ACCEPT_UNTAG )
- val |= IXGBE_VMOLR_AUPE;
- if (rx_mask & ETH_VMDQ_ACCEPT_HASH_MC )
- val |= IXGBE_VMOLR_ROMPE;
- if (rx_mask & ETH_VMDQ_ACCEPT_HASH_UC)
- val |= IXGBE_VMOLR_ROPE;
- if (rx_mask & ETH_VMDQ_ACCEPT_BROADCAST)
- val |= IXGBE_VMOLR_BAM;
- if (rx_mask & ETH_VMDQ_ACCEPT_MULTICAST)
- val |= IXGBE_VMOLR_MPE;
+ val = ixgbe_convert_vm_rx_mask_to_val(rx_mask, val);
if (on)
vmolr |= val;
diff --git a/lib/librte_pmd_ixgbe/ixgbe_ethdev.h
b/lib/librte_pmd_ixgbe/ixgbe_ethdev.h
index a5159e5..ca99170 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_ethdev.h
+++ b/lib/librte_pmd_ixgbe/ixgbe_ethdev.h
@@ -340,4 +340,5 @@ void ixgbe_pf_mbx_process(struct rte_eth_dev *eth_dev);
int ixgbe_pf_host_configure(struct rte_eth_dev *eth_dev);
+uint32_t ixgbe_convert_vm_rx_mask_to_val(uint16_t rx_mask, uint32_t orig_val);
#endif /* _IXGBE_ETHDEV_H_ */
diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
index 3a5a8ff..f9b3fe3 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
@@ -3123,6 +3123,7 @@ ixgbe_vmdq_rx_hw_configure(struct rte_eth_dev *dev)
struct ixgbe_hw *hw;
enum rte_eth_nb_pools num_pools;
uint32_t mrqc, vt_ctl, vlanctrl;
+ uint32_t vmolr = 0;
int i;
PMD_INIT_FUNC_TRACE();
@@ -3145,6 +3146,11 @@ ixgbe_vmdq_rx_hw_configure(struct rte_eth_dev *dev)
IXGBE_WRITE_REG(hw, IXGBE_VT_CTL, vt_ctl);
+ for (i = 0; i < (int)num_pools; i++) {
+ vmolr = ixgbe_convert_vm_rx_mask_to_val(cfg->rx_mode, vmolr);
+ IXGBE_WRITE_REG(hw, IXGBE_VMOLR(i), vmolr);
+ }
+
/* VLNCTRL: enable vlan filtering and allow all vlan tags through */
vlanctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
vlanctrl |= IXGBE_VLNCTRL_VFE ; /* enable vlan filters */
--
1.8.4.2
[dpdk-dev] [PATCH v4 5/5] vhost: Enable promisc mode and multicast
This is to enable user space vhost receiving and forwarding broadcast and
multicast packets: Use new option in command line to enable promisc mode;
Enable 2 bits in VMDQ RX mode: ETH_VMDQ_ACCEPT_BROADCAST and
ETH_VMDQ_ACCEPT_MULTICAST.
Signed-off-by: Changchun Ouyang
---
examples/vhost/main.c | 24 +---
lib/librte_vhost/virtio-net.c | 3 ++-
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index a93f7a0..1f1edbe 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -161,6 +161,9 @@
/* mask of enabled ports */
static uint32_t enabled_port_mask = 0;
+/* Promiscuous mode */
+static uint32_t promiscuous;
+
/*Number of switching cores enabled*/
static uint32_t num_switching_cores = 0;
@@ -364,13 +367,15 @@ static inline int
get_eth_conf(struct rte_eth_conf *eth_conf, uint32_t num_devices)
{
struct rte_eth_vmdq_rx_conf conf;
+ struct rte_eth_vmdq_rx_conf *def_conf =
+ &vmdq_conf_default.rx_adv_conf.vmdq_rx_conf;
unsigned i;
memset(&conf, 0, sizeof(conf));
conf.nb_queue_pools = (enum rte_eth_nb_pools)num_devices;
conf.nb_pool_maps = num_devices;
- conf.enable_loop_back =
- vmdq_conf_default.rx_adv_conf.vmdq_rx_conf.enable_loop_back;
+ conf.enable_loop_back = def_conf->enable_loop_back;
+ conf.rx_mode = def_conf->rx_mode;
for (i = 0; i < conf.nb_pool_maps; i++) {
conf.pool_map[i].vlan_id = vlan_tags[ i ];
@@ -468,6 +473,9 @@ port_init(uint8_t port)
return retval;
}
+ if (promiscuous)
+ rte_eth_promiscuous_enable(port);
+
rte_eth_macaddr_get(port, &vmdq_ports_eth_addr[port]);
RTE_LOG(INFO, VHOST_PORT, "Max virtio devices supported: %u\n",
num_devices);
RTE_LOG(INFO, VHOST_PORT, "Port %u MAC: %02"PRIx8" %02"PRIx8" %02"PRIx8
@@ -598,7 +606,8 @@ us_vhost_parse_args(int argc, char **argv)
};
/* Parse command line */
- while ((opt = getopt_long(argc, argv, "p:",long_option, &option_index))
!= EOF) {
+ while ((opt = getopt_long(argc, argv, "p:P",
+ long_option, &option_index)) != EOF) {
switch (opt) {
/* Portmask */
case 'p':
@@ -610,6 +619,15 @@ us_vhost_parse_args(int argc, char **argv)
}
break;
+ case 'P':
+ promiscuous = 1;
+ vmdq_conf_default.rx_adv_conf.vmdq_rx_conf.rx_mode =
+ ETH_VMDQ_ACCEPT_BROADCAST |
+ ETH_VMDQ_ACCEPT_MULTICAST;
+ rte_vhost_feature_enable(1ULL << VIRTIO_NET_F_CTRL_RX);
+
+ break;
+
case 0:
/* Enable/disable vm2vm comms. */
if (!strncmp(long_option[option_index].name, "vm2vm",
diff --git a/lib/librte_vhost/virtio-net.c b/lib/librte_vhost/virtio-net.c
index 6d8de09..852b6d1 100644
--- a/lib/librte_vhost/virtio-net.c
+++ b/lib/librte_vhost/virtio-net.c
@@ -68,7 +68,8 @@ static struct virtio_net_device_ops const *notify_ops;
static struct virtio_net_config_ll *ll_root;
/* Features supported by this lib. */
-#define VHOST_SUPPORTED_FEATURES (1ULL << VIRTIO_NET_F_MRG_RXBUF)
+#define VHOST_SUPPORTED_FEATURES ((1ULL << VIRTIO_NET_F_MRG_RXBUF) | \
+ (1ULL << VIRTIO_NET_F_CTRL_RX))
static uint64_t VHOST_FEATURES = VHOST_SUPPORTED_FEATURES;
/* Line size for reading maps file. */
--
1.8.4.2
[dpdk-dev] [PATCH v4 4/5] virtio: Support promiscuous and allmulticast
Add codes for supporting promiscuous and allmulticast enable and disable.
Signed-off-by: Changchun Ouyang
---
lib/librte_pmd_virtio/virtio_ethdev.c | 90 ++-
1 file changed, 89 insertions(+), 1 deletion(-)
diff --git a/lib/librte_pmd_virtio/virtio_ethdev.c
b/lib/librte_pmd_virtio/virtio_ethdev.c
index 19930c0..c009f2a 100644
--- a/lib/librte_pmd_virtio/virtio_ethdev.c
+++ b/lib/librte_pmd_virtio/virtio_ethdev.c
@@ -66,6 +66,10 @@ static int eth_virtio_dev_init(struct eth_driver *eth_drv,
static int virtio_dev_configure(struct rte_eth_dev *dev);
static int virtio_dev_start(struct rte_eth_dev *dev);
static void virtio_dev_stop(struct rte_eth_dev *dev);
+static void virtio_dev_promiscuous_enable(struct rte_eth_dev *dev);
+static void virtio_dev_promiscuous_disable(struct rte_eth_dev *dev);
+static void virtio_dev_allmulticast_enable(struct rte_eth_dev *dev);
+static void virtio_dev_allmulticast_disable(struct rte_eth_dev *dev);
static void virtio_dev_info_get(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info);
static int virtio_dev_link_update(struct rte_eth_dev *dev,
@@ -403,6 +407,86 @@ virtio_dev_close(struct rte_eth_dev *dev)
virtio_dev_stop(dev);
}
+static void
+virtio_dev_promiscuous_enable(struct rte_eth_dev *dev)
+{
+ struct virtio_hw *hw
+ = VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct virtio_pmd_ctrl ctrl;
+ int dlen[1];
+ int ret;
+
+ ctrl.hdr.class = VIRTIO_NET_CTRL_RX;
+ ctrl.hdr.cmd = VIRTIO_NET_CTRL_RX_PROMISC;
+ ctrl.data[0] = 1;
+ dlen[0] = 1;
+
+ ret = virtio_send_command(hw->cvq, &ctrl, dlen, 1);
+
+ if (ret)
+ PMD_INIT_LOG(ERR, "Failed to enable promisc");
+}
+
+static void
+virtio_dev_promiscuous_disable(struct rte_eth_dev *dev)
+{
+ struct virtio_hw *hw
+ = VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct virtio_pmd_ctrl ctrl;
+ int dlen[1];
+ int ret;
+
+ ctrl.hdr.class = VIRTIO_NET_CTRL_RX;
+ ctrl.hdr.cmd = VIRTIO_NET_CTRL_RX_PROMISC;
+ ctrl.data[0] = 0;
+ dlen[0] = 1;
+
+ ret = virtio_send_command(hw->cvq, &ctrl, dlen, 1);
+
+ if (ret)
+ PMD_INIT_LOG(ERR, "Failed to disable promisc");
+}
+
+static void
+virtio_dev_allmulticast_enable(struct rte_eth_dev *dev)
+{
+ struct virtio_hw *hw
+ = VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct virtio_pmd_ctrl ctrl;
+ int dlen[1];
+ int ret;
+
+ ctrl.hdr.class = VIRTIO_NET_CTRL_RX;
+ ctrl.hdr.cmd = VIRTIO_NET_CTRL_RX_ALLMULTI;
+ ctrl.data[0] = 1;
+ dlen[0] = 1;
+
+ ret = virtio_send_command(hw->cvq, &ctrl, dlen, 1);
+
+ if (ret)
+ PMD_INIT_LOG(ERR, "Failed to enable allmulticast");
+}
+
+static void
+virtio_dev_allmulticast_disable(struct rte_eth_dev *dev)
+{
+ struct virtio_hw *hw
+ = VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct virtio_pmd_ctrl ctrl;
+ int dlen[1];
+ int ret;
+
+ ctrl.hdr.class = VIRTIO_NET_CTRL_RX;
+ ctrl.hdr.cmd = VIRTIO_NET_CTRL_RX_ALLMULTI;
+ ctrl.data[0] = 0;
+ dlen[0] = 1;
+
+ ret = virtio_send_command(hw->cvq, &ctrl, dlen, 1);
+
+ if (ret)
+ PMD_INIT_LOG(ERR, "Failed to disable allmulticast");
+}
+
/*
* dev_ops for virtio, bare necessities for basic operation
*/
@@ -411,6 +495,10 @@ static struct eth_dev_ops virtio_eth_dev_ops = {
.dev_start = virtio_dev_start,
.dev_stop= virtio_dev_stop,
.dev_close = virtio_dev_close,
+ .promiscuous_enable = virtio_dev_promiscuous_enable,
+ .promiscuous_disable = virtio_dev_promiscuous_disable,
+ .allmulticast_enable = virtio_dev_allmulticast_enable,
+ .allmulticast_disable= virtio_dev_allmulticast_disable,
.dev_infos_get = virtio_dev_info_get,
.stats_get = virtio_dev_stats_get,
@@ -561,7 +649,7 @@ virtio_negotiate_features(struct virtio_hw *hw)
{
uint32_t host_features, mask;
- mask = VIRTIO_NET_F_CTRL_RX | VIRTIO_NET_F_CTRL_VLAN;
+ mask = VIRTIO_NET_F_CTRL_VLAN;
mask |= VIRTIO_NET_F_CSUM | VIRTIO_NET_F_GUEST_CSUM;
/* TSO and LRO are only available when their corresponding
--
1.8.4.2
[dpdk-dev] [PATCH v3 1/5] ethdev: add vmdq rx mode
Hi Thomas,
> -Original Message-
> From: Thomas Monjalon [mailto:thomas.monjalon at 6wind.com]
> Sent: Thursday, November 6, 2014 9:56 PM
> To: Ouyang, Changchun
> Cc: dev at dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v3 1/5] ethdev: add vmdq rx mode
>
> 2014-10-31 13:19, Ouyang Changchun:
> > --- a/lib/librte_ether/rte_ethdev.h
> > +++ b/lib/librte_ether/rte_ethdev.h
> > @@ -577,6 +577,7 @@ struct rte_eth_vmdq_rx_conf {
> > uint8_t default_pool; /**< The default pool, if applicable */
> > uint8_t enable_loop_back; /**< Enable VT loop back */
> > uint8_t nb_pool_maps; /**< We can have up to 64 filters/mappings
> */
> > + uint32_t rx_mode; /**< RX mode for vmdq */
>
> You are adding the field rx_mode in struct rte_eth_vmdq_rx_conf.
> So the comment "RX mode for vmdq" is not really informative :) It would be
> more interesting to explain which kind of value this field must contain.
> Something like "flags from ETH_VMDQ_ACCEPT_*".
>
Thanks for your comments, I will update it.
Changchun
[dpdk-dev] [PATCH v5 0/8] support of multiple sizes of redirection table
Tested-by: Erlu Chen - Tested Commit: 6630bc42449aebba33b0817ae830cbdf3a83a1b6 - OS: Linux fc20 3.11.10-301.fc20.x86_64 - CPU: Intel(R) Xeon(R) CPU E5-2680 v2 @ 2.80GHz - GCC: gcc version 4.8.3 20140624 - NIC: Intel Corporation Ethernet Controller X710 for 10GbE SFP+ [8086:1572] Intel Corporation Ethernet Controller XL710 for 40GbE QSFP+ [8086:1584] Intel Corporation Ethernet Controller XL710 for 40GbE QSFP+ [8086:1583] - Default x86_64-native-linuxapp-gcc configuration - Total 1 cases, 1 passed, 0 failed - Case: pmdrss_reta Description: pmdrss_reta is designed to improve networking performance by load balancing the packets received from a NIC port to multiple NIC RX queues, with each queue handled by a different logical core. Command / instruction: #1. set up testpmd with fortville NICs:: ./testpmd -c f -n %d -- -i --coremask=0xe --rxq=16 --txq=16 #2. verbose configuration:: testpmd command: set verbose 8 #3. PMD fwd only receive the packets:: testpmd command: set fwd rxonly #4. Reta Configuration. 128 or 512 reta entries configuration:: testpmd command: port config 0 rss reta (hash_index,queue_id) #5. start packet receive:: testpmd command: start tester Configuration --- #1. set up scapy #2. send packets with different type ipv4/ipv4 with tcp/ipv4 with udp/ipv6/ipv6 with tcp/ipv6 with udp:: sendp([Ether(dst="90:e2:ba:36:99:3c")/IP(src="192.168.0.4", dst="192.168.0.5")], iface="eth3") Expected test result: The testpmd will print the hash value and actual queue of every packet. #1. Calaute the queue id: hash value%128or512, then refer to the redirection table to get the theoretical queue id. #2. The theoretical queue id is the same with the actual queue id. -Original Message- From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Helin Zhang Sent: Thursday, November 06, 2014 10:25 PM To: dev at dpdk.org Subject: [dpdk-dev] [PATCH v5 0/8] support of multiple sizes of redirection table As e1000, ixgbe and i40e hardware use different sizes of redirection table in PF or VF, ethdev and PMDs need to be reworked to support multiple sizes of that table. In addition, commands in testpmd also need to be reworked to support these changes. v2 changes: * Reorganized the patches. * Added code style fixes. * Added support of reta updating/querying in i40e VF. v3 changes: * Reorganized the patch set. * Added returning default RX/TX configurations in VF (igb/ixgbe/i40e), as the patch set of it for PF has been accepted recently. v4 changes: * Renamed RTE_BIT_WIDTH_64 to RTE_RETA_GROUP_SIZE. * Added more comments to rte_eth_dev_rss_reta_update() and rte_eth_dev_rss_reta_query(). v5 changes: * Reworked the annotations of macros of RETA sizes in rte_ethdev.h. Helin Zhang (8): app/testpmd: code style fix i40evf: code style fix i40e: support of setting hash lookup table size igb: implement ops of 'dev_infos_get' for PF and VF respectively ixgbe: implement ops of 'dev_infos_get' for PF and VF respectively i40e: rework of ops of 'dev_infos_get' for both PF and VF ethdev: support of multiple sizes of redirection table i40evf: support of updating/querying redirection table app/test-pmd/cmdline.c | 166 + app/test-pmd/config.c| 37 --- app/test-pmd/testpmd.h | 4 +- lib/librte_ether/rte_ethdev.c| 116 lib/librte_ether/rte_ethdev.h| 51 ++--- lib/librte_pmd_e1000/igb_ethdev.c| 170 +++--- lib/librte_pmd_i40e/i40e_ethdev.c| 122 +++-- lib/librte_pmd_i40e/i40e_ethdev.h| 25 - lib/librte_pmd_i40e/i40e_ethdev_vf.c | 124 +- lib/librte_pmd_ixgbe/ixgbe_ethdev.c | 198 ++- 10 files changed, 694 insertions(+), 319 deletions(-) -- 1.8.1.4
