* [dpdk-dev] [RFC PATCHv3 0/7] add OSv support
@ 2015-04-06 18:58 Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 1/7] mk: support compiling C++ code Takuya ASADA
` (7 more replies)
0 siblings, 8 replies; 11+ messages in thread
From: Takuya ASADA @ 2015-04-06 18:58 UTC (permalink / raw)
To: dev
This is 3rd version of OSv support patchset.
Changelist:
- sync with latest master
- updated Capstan build script for OSv v0.19
- rte_eal_version.map fix
- CONFIG_RTE_BUILD_SHARED_LIB=y and CONFIG_RTE_BUILD_COMBINE_LIBS=y by default
- Check OSv NIC driver is loaded for each device, attach PMD only if OSv driver is not loaded
- Use --maxnic on cmdline to skip loading OSv NIC driver
- Don't enable MSI-X on virtio, since it's not enable when OSv NIC driver is not loaded
Takuya ASADA (7):
mk: support compiling C++ code
eal: Add extern C on eal_hugepages.h
eal: Add extern C on eal_thread.h
eal: Add extern C on eal_private.h
add OSv support
app/test: support OSv
doc: Add Getting Started Guide for OSv
app/test/test_eal_flags.c | 34 +--
app/test/test_timer_perf.c | 2 +-
config/{common_linuxapp => common_osvapp} | 29 +-
...xapp-gcc => defconfig_x86_64-native-osvapp-gcc} | 2 +-
doc/guides/index.rst | 1 +
doc/guides/osv_gsg/build_dpdk.rst | 282 +++++++++++++++++++
doc/guides/osv_gsg/build_sample_apps.rst | 123 ++++++++
doc/guides/{freebsd_gsg => osv_gsg}/index.rst | 3 +-
doc/guides/{freebsd_gsg => osv_gsg}/intro.rst | 15 +-
lib/librte_eal/Makefile | 2 +
lib/librte_eal/common/eal_hugepages.h | 8 +
lib/librte_eal/common/eal_private.h | 8 +
lib/librte_eal/common/eal_thread.h | 8 +
Makefile => lib/librte_eal/osvapp/Makefile | 5 +-
lib/librte_eal/osvapp/capstan/Capstanfile | 6 +
lib/librte_eal/osvapp/capstan/GET | 22 ++
lib/librte_eal/osvapp/eal/Makefile | 115 ++++++++
lib/librte_eal/{linuxapp => osvapp}/eal/eal.c | 123 +-------
.../{linuxapp => osvapp}/eal/eal_alarm.c | 0
.../{linuxapp => osvapp}/eal/eal_debug.c | 0
lib/librte_eal/osvapp/eal/eal_hugepage_info.cc | 63 +++++
.../{bsdapp => osvapp}/eal/eal_interrupts.c | 0
.../eal/eal_lcore.c => osvapp/eal/eal_lcore.cc} | 53 ++--
lib/librte_eal/{bsdapp => osvapp}/eal/eal_log.c | 0
lib/librte_eal/osvapp/eal/eal_memory.cc | 148 ++++++++++
lib/librte_eal/osvapp/eal/eal_pci.cc | 312 +++++++++++++++++++++
.../{linuxapp => osvapp}/eal/eal_thread.c | 0
lib/librte_eal/osvapp/eal/eal_timer.c | 130 +++++++++
.../eal/include/exec-env/rte_interrupts.h | 0
.../{bsdapp => osvapp}/eal/rte_eal_version.map | 6 -
mk/exec-env/{linuxapp => osvapp}/rte.app.mk | 0
mk/exec-env/{linuxapp => osvapp}/rte.vars.mk | 6 +-
mk/internal/rte.compile-pre.mk | 41 ++-
mk/target/generic/rte.vars.mk | 4 +
mk/toolchain/gcc/rte.vars.mk | 5 +-
35 files changed, 1345 insertions(+), 211 deletions(-)
copy config/{common_linuxapp => common_osvapp} (95%)
copy config/{defconfig_x86_64-native-linuxapp-gcc => defconfig_x86_64-native-osvapp-gcc} (98%)
create mode 100644 doc/guides/osv_gsg/build_dpdk.rst
create mode 100644 doc/guides/osv_gsg/build_sample_apps.rst
copy doc/guides/{freebsd_gsg => osv_gsg}/index.rst (96%)
copy doc/guides/{freebsd_gsg => osv_gsg}/intro.rst (84%)
copy Makefile => lib/librte_eal/osvapp/Makefile (93%)
create mode 100644 lib/librte_eal/osvapp/capstan/Capstanfile
create mode 100755 lib/librte_eal/osvapp/capstan/GET
create mode 100644 lib/librte_eal/osvapp/eal/Makefile
copy lib/librte_eal/{linuxapp => osvapp}/eal/eal.c (87%)
copy lib/librte_eal/{linuxapp => osvapp}/eal/eal_alarm.c (100%)
copy lib/librte_eal/{linuxapp => osvapp}/eal/eal_debug.c (100%)
create mode 100644 lib/librte_eal/osvapp/eal/eal_hugepage_info.cc
copy lib/librte_eal/{bsdapp => osvapp}/eal/eal_interrupts.c (100%)
copy lib/librte_eal/{bsdapp/eal/eal_lcore.c => osvapp/eal/eal_lcore.cc} (80%)
copy lib/librte_eal/{bsdapp => osvapp}/eal/eal_log.c (100%)
create mode 100644 lib/librte_eal/osvapp/eal/eal_memory.cc
create mode 100644 lib/librte_eal/osvapp/eal/eal_pci.cc
copy lib/librte_eal/{linuxapp => osvapp}/eal/eal_thread.c (100%)
create mode 100644 lib/librte_eal/osvapp/eal/eal_timer.c
copy lib/librte_eal/{bsdapp => osvapp}/eal/include/exec-env/rte_interrupts.h (100%)
copy lib/librte_eal/{bsdapp => osvapp}/eal/rte_eal_version.map (92%)
copy mk/exec-env/{linuxapp => osvapp}/rte.app.mk (100%)
copy mk/exec-env/{linuxapp => osvapp}/rte.vars.mk (95%)
--
2.1.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [dpdk-dev] [RFC PATCHv3 1/7] mk: support compiling C++ code
2015-04-06 18:58 [dpdk-dev] [RFC PATCHv3 0/7] add OSv support Takuya ASADA
@ 2015-04-06 18:58 ` Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 2/7] eal: Add extern C on eal_hugepages.h Takuya ASADA
` (6 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Takuya ASADA @ 2015-04-06 18:58 UTC (permalink / raw)
To: dev
Since OSv is written in C++, we need to write OSv EAL in C++.
To do so, we need to compile .cc files by $(CXX).
This patch does not contain diff for clang and icc, but OSv EAL does not supported these toolchain, this is enough for now.
Signed-off-by: Takuya ASADA <syuu@cloudius-systems.com>
---
mk/internal/rte.compile-pre.mk | 41 ++++++++++++++++++++++++++++++++++++++---
mk/target/generic/rte.vars.mk | 4 ++++
mk/toolchain/gcc/rte.vars.mk | 5 ++++-
3 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/mk/internal/rte.compile-pre.mk b/mk/internal/rte.compile-pre.mk
index b9bff4a..142f996 100644
--- a/mk/internal/rte.compile-pre.mk
+++ b/mk/internal/rte.compile-pre.mk
@@ -37,7 +37,7 @@ SRCS-all := $(SRCS-y) $(SRCS-n) $(SRCS-)
# convert source to obj file
src2obj = $(strip $(patsubst %.c,%.o,\
- $(patsubst %.S,%_s.o,$(1))))
+ $(patsubst %.S,%_s.o,$(patsubst %.cc,%.o,$(1)))))
# add a dot in front of the file name
dotfile = $(strip $(foreach f,$(1),\
@@ -46,12 +46,12 @@ dotfile = $(strip $(foreach f,$(1),\
# convert source/obj files into dot-dep filename (does not
# include .S files)
src2dep = $(strip $(call dotfile,$(patsubst %.c,%.o.d, \
- $(patsubst %.S,,$(1)))))
+ $(patsubst %.S,,$(patsubst %.cc,%.o.d,$(1))))))
obj2dep = $(strip $(call dotfile,$(patsubst %.o,%.o.d,$(1))))
# convert source/obj files into dot-cmd filename
src2cmd = $(strip $(call dotfile,$(patsubst %.c,%.o.cmd, \
- $(patsubst %.S,%_s.o.cmd,$(1)))))
+ $(patsubst %.S,%_s.o.cmd,$(patsubst %.cc,%.o.cmd,$(1))))))
obj2cmd = $(strip $(call dotfile,$(patsubst %.o,%.o.cmd,$(1))))
OBJS-y := $(call src2obj,$(SRCS-y))
@@ -78,11 +78,19 @@ C_TO_O = $(HOSTCC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(HOST_CFLAGS) \
$(CFLAGS_$(@)) $(HOST_EXTRA_CFLAGS) -o $@ -c $<
C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight
C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," HOSTCC $(@)")
+CXX_TO_O = $(HOSTCXX) -Wp,-MD,$(call obj2dep,$(@)).tmp $(HOST_CXXFLAGS) \
+ $(CXXFLAGS_$(@)) $(HOST_EXTRA_CXXFLAGS) -o $@ -c $<
+CXX_TO_O_STR = $(subst ','\'',$(CXX_TO_O)) #'# fix syntax highlight
+CXX_TO_O_DISP = $(if $(V),"$(CXX_TO_O_STR)"," HOSTCXX $(@)")
else
C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CFLAGS) \
$(CFLAGS_$(@)) $(EXTRA_CFLAGS) -o $@ -c $<
C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight
C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," CC $(@)")
+CXX_TO_O = $(CXX) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CXXFLAGS) \
+ $(CXXFLAGS_$(@)) $(EXTRA_CXXFLAGS) -o $@ -c $<
+CXX_TO_O_STR = $(subst ','\'',$(CXX_TO_O)) #'# fix syntax highlight
+CXX_TO_O_DISP = $(if $(V),"$(CXX_TO_O_STR)"," CXX $(@)")
endif
C_TO_O_CMD = 'cmd_$@ = $(C_TO_O_STR)'
C_TO_O_DO = @set -e; \
@@ -91,6 +99,13 @@ C_TO_O_DO = @set -e; \
echo $(C_TO_O_CMD) > $(call obj2cmd,$(@)) && \
sed 's,'$@':,dep_'$@' =,' $(call obj2dep,$(@)).tmp > $(call obj2dep,$(@)) && \
rm -f $(call obj2dep,$(@)).tmp
+CXX_TO_O_CMD = 'cmd_$@ = $(CXX_TO_O_STR)'
+CXX_TO_O_DO = @set -e; \
+ echo $(CXX_TO_O_DISP); \
+ $(CXX_TO_O) && \
+ echo $(CXX_TO_O_CMD) > $(call obj2cmd,$(@)) && \
+ sed 's,'$@':,dep_'$@' =,' $(call obj2dep,$(@)).tmp > $(call obj2dep,$(@)) && \
+ rm -f $(call obj2dep,$(@)).tmp
# return an empty string if string are equal
compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1)))
@@ -136,6 +151,26 @@ boolean = $(if $1,1,0)
$(depfile_missing),\
$(depfile_newer)),\
$(C_TO_O_DO))
+#
+# Compile .cc file if needed
+# Note: dep_$$@ is from the .d file and DEP_$$@ can be specified by
+# user (by default it is empty)
+#
+.SECONDEXPANSION:
+%.o: %.cc $$(wildcard $$(dep_$$@)) $$(DEP_$$(@)) FORCE
+ @[ -d $(dir $@) ] || mkdir -p $(dir $@)
+ $(if $(D),\
+ @echo -n "$< -> $@ " ; \
+ echo -n "file_missing=$(call boolean,$(file_missing)) " ; \
+ echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(CXX_TO_O))) " ; \
+ echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \
+ echo "depfile_newer=$(call boolean,$(depfile_newer))")
+ $(if $(or \
+ $(file_missing),\
+ $(call cmdline_changed,$(CXX_TO_O)),\
+ $(depfile_missing),\
+ $(depfile_newer)),\
+ $(CXX_TO_O_DO))
# command to assemble a .S file to generate an object
ifeq ($(USE_HOST),1)
diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk
index 53650c3..47d845b 100644
--- a/mk/target/generic/rte.vars.mk
+++ b/mk/target/generic/rte.vars.mk
@@ -146,7 +146,11 @@ endif
LDFLAGS += -L$(RTE_SDK_BIN)/lib
endif
+# copy CFLAGS to CXXFLAGS
+CXXFLAGS := $(CFLAGS)
+
export CFLAGS
export LDFLAGS
+export CXXFLAGS
endif
diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk
index 88f235c..4bdf2eb 100644
--- a/mk/toolchain/gcc/rte.vars.mk
+++ b/mk/toolchain/gcc/rte.vars.mk
@@ -39,6 +39,7 @@
#
CC = $(CROSS)gcc
+CXX = $(CROSS)g++
KERNELCC = $(CROSS)gcc
CPP = $(CROSS)cpp
# for now, we don't use as but nasm.
@@ -54,8 +55,10 @@ GCOV = $(CROSS)gcov
ifeq ("$(origin CC)", "command line")
HOSTCC = $(CC)
+HOSTCXX = $(CXX)
else
HOSTCC = gcc
+HOSTCXX = gxx
endif
HOSTAS = as
@@ -80,5 +83,5 @@ WERROR_FLAGS += -Wundef -Wwrite-strings
# process cpu flags
include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk
-export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF
+export CC CXX AS AR LD OBJCOPY OBJDUMP STRIP READELF
export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS
--
2.1.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [dpdk-dev] [RFC PATCHv3 2/7] eal: Add extern C on eal_hugepages.h
2015-04-06 18:58 [dpdk-dev] [RFC PATCHv3 0/7] add OSv support Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 1/7] mk: support compiling C++ code Takuya ASADA
@ 2015-04-06 18:58 ` Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 3/7] eal: Add extern C on eal_thread.h Takuya ASADA
` (5 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Takuya ASADA @ 2015-04-06 18:58 UTC (permalink / raw)
To: dev
This is required to link with OSv EAL.
Signed-off-by: Takuya ASADA <syuu@cloudius-systems.com>
---
lib/librte_eal/common/eal_hugepages.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/lib/librte_eal/common/eal_hugepages.h b/lib/librte_eal/common/eal_hugepages.h
index 38edac0..b722aee 100644
--- a/lib/librte_eal/common/eal_hugepages.h
+++ b/lib/librte_eal/common/eal_hugepages.h
@@ -34,6 +34,10 @@
#ifndef EAL_HUGEPAGES_H
#define EAL_HUGEPAGES_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <stddef.h>
#include <stdint.h>
#include <limits.h>
@@ -64,4 +68,8 @@ struct hugepage_file {
*/
int eal_hugepage_info_init(void);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* EAL_HUGEPAGES_H */
--
2.1.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [dpdk-dev] [RFC PATCHv3 3/7] eal: Add extern C on eal_thread.h
2015-04-06 18:58 [dpdk-dev] [RFC PATCHv3 0/7] add OSv support Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 1/7] mk: support compiling C++ code Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 2/7] eal: Add extern C on eal_hugepages.h Takuya ASADA
@ 2015-04-06 18:58 ` Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 4/7] eal: Add extern C on eal_private.h Takuya ASADA
` (4 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Takuya ASADA @ 2015-04-06 18:58 UTC (permalink / raw)
To: dev
This is required to link with OSv EAL.
Signed-off-by: Takuya ASADA <syuu@cloudius-systems.com>
---
lib/librte_eal/common/eal_thread.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/lib/librte_eal/common/eal_thread.h b/lib/librte_eal/common/eal_thread.h
index e4e76b9..794137f 100644
--- a/lib/librte_eal/common/eal_thread.h
+++ b/lib/librte_eal/common/eal_thread.h
@@ -34,6 +34,10 @@
#ifndef EAL_THREAD_H
#define EAL_THREAD_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <rte_lcore.h>
/**
@@ -97,4 +101,8 @@ int eal_cpuset_socket_id(rte_cpuset_t *cpusetp);
int
eal_thread_dump_affinity(char *str, unsigned size);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* EAL_THREAD_H */
--
2.1.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [dpdk-dev] [RFC PATCHv3 4/7] eal: Add extern C on eal_private.h
2015-04-06 18:58 [dpdk-dev] [RFC PATCHv3 0/7] add OSv support Takuya ASADA
` (2 preceding siblings ...)
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 3/7] eal: Add extern C on eal_thread.h Takuya ASADA
@ 2015-04-06 18:58 ` Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 5/7] add OSv support Takuya ASADA
` (3 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Takuya ASADA @ 2015-04-06 18:58 UTC (permalink / raw)
To: dev
This is required to link with OSv EAL.
Signed-off-by: Takuya ASADA <syuu@cloudius-systems.com>
---
lib/librte_eal/common/eal_private.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h
index 4acf5a0..80b3d44 100644
--- a/lib/librte_eal/common/eal_private.h
+++ b/lib/librte_eal/common/eal_private.h
@@ -34,6 +34,10 @@
#ifndef _EAL_PRIVATE_H_
#define _EAL_PRIVATE_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <stdio.h>
/**
@@ -232,4 +236,8 @@ int rte_eal_dev_init(void);
*/
int rte_eal_check_module(const char *module_name);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _EAL_PRIVATE_H_ */
--
2.1.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [dpdk-dev] [RFC PATCHv3 5/7] add OSv support
2015-04-06 18:58 [dpdk-dev] [RFC PATCHv3 0/7] add OSv support Takuya ASADA
` (3 preceding siblings ...)
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 4/7] eal: Add extern C on eal_private.h Takuya ASADA
@ 2015-04-06 18:58 ` Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 6/7] app/test: support OSv Takuya ASADA
` (2 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Takuya ASADA @ 2015-04-06 18:58 UTC (permalink / raw)
To: dev
Adding OSv support.
Based on Linux/FreeBSD EAL, but calling OSv kernel APIs to access devices, allocate contiguous memory, etc.
Signed-off-by: Takuya ASADA <syuu@cloudius-systems.com>
---
config/{common_linuxapp => common_osvapp} | 29 +-
...xapp-gcc => defconfig_x86_64-native-osvapp-gcc} | 2 +-
lib/librte_eal/Makefile | 2 +
Makefile => lib/librte_eal/osvapp/Makefile | 5 +-
lib/librte_eal/osvapp/capstan/Capstanfile | 6 +
lib/librte_eal/osvapp/capstan/GET | 22 ++
lib/librte_eal/osvapp/eal/Makefile | 115 ++++++++
lib/librte_eal/{linuxapp => osvapp}/eal/eal.c | 123 +-------
.../{linuxapp => osvapp}/eal/eal_alarm.c | 0
.../{linuxapp => osvapp}/eal/eal_debug.c | 0
lib/librte_eal/osvapp/eal/eal_hugepage_info.cc | 63 +++++
.../{bsdapp => osvapp}/eal/eal_interrupts.c | 0
.../eal/eal_lcore.c => osvapp/eal/eal_lcore.cc} | 53 ++--
lib/librte_eal/{bsdapp => osvapp}/eal/eal_log.c | 0
lib/librte_eal/osvapp/eal/eal_memory.cc | 148 ++++++++++
lib/librte_eal/osvapp/eal/eal_pci.cc | 312 +++++++++++++++++++++
.../{linuxapp => osvapp}/eal/eal_thread.c | 0
lib/librte_eal/osvapp/eal/eal_timer.c | 130 +++++++++
.../eal/include/exec-env/rte_interrupts.h | 0
.../{bsdapp => osvapp}/eal/rte_eal_version.map | 6 -
mk/exec-env/{linuxapp => osvapp}/rte.app.mk | 0
mk/exec-env/{linuxapp => osvapp}/rte.vars.mk | 6 +-
22 files changed, 847 insertions(+), 175 deletions(-)
copy config/{common_linuxapp => common_osvapp} (95%)
copy config/{defconfig_x86_64-native-linuxapp-gcc => defconfig_x86_64-native-osvapp-gcc} (98%)
copy Makefile => lib/librte_eal/osvapp/Makefile (93%)
create mode 100644 lib/librte_eal/osvapp/capstan/Capstanfile
create mode 100755 lib/librte_eal/osvapp/capstan/GET
create mode 100644 lib/librte_eal/osvapp/eal/Makefile
copy lib/librte_eal/{linuxapp => osvapp}/eal/eal.c (87%)
copy lib/librte_eal/{linuxapp => osvapp}/eal/eal_alarm.c (100%)
copy lib/librte_eal/{linuxapp => osvapp}/eal/eal_debug.c (100%)
create mode 100644 lib/librte_eal/osvapp/eal/eal_hugepage_info.cc
copy lib/librte_eal/{bsdapp => osvapp}/eal/eal_interrupts.c (100%)
copy lib/librte_eal/{bsdapp/eal/eal_lcore.c => osvapp/eal/eal_lcore.cc} (80%)
copy lib/librte_eal/{bsdapp => osvapp}/eal/eal_log.c (100%)
create mode 100644 lib/librte_eal/osvapp/eal/eal_memory.cc
create mode 100644 lib/librte_eal/osvapp/eal/eal_pci.cc
copy lib/librte_eal/{linuxapp => osvapp}/eal/eal_thread.c (100%)
create mode 100644 lib/librte_eal/osvapp/eal/eal_timer.c
copy lib/librte_eal/{bsdapp => osvapp}/eal/include/exec-env/rte_interrupts.h (100%)
copy lib/librte_eal/{bsdapp => osvapp}/eal/rte_eal_version.map (92%)
copy mk/exec-env/{linuxapp => osvapp}/rte.app.mk (100%)
copy mk/exec-env/{linuxapp => osvapp}/rte.vars.mk (95%)
diff --git a/config/common_linuxapp b/config/common_osvapp
similarity index 95%
copy from config/common_linuxapp
copy to config/common_osvapp
index 0b25f34..e26762c 100644
--- a/config/common_linuxapp
+++ b/config/common_osvapp
@@ -35,8 +35,8 @@
#
# CONFIG_RTE_EXEC_ENV can be linuxapp, bsdapp
#
-CONFIG_RTE_EXEC_ENV="linuxapp"
-CONFIG_RTE_EXEC_ENV_LINUXAPP=y
+CONFIG_RTE_EXEC_ENV="osvapp"
+CONFIG_RTE_EXEC_ENV_OSVAPP=y
##
## machine can define specific variables or action for a specific board
@@ -76,12 +76,12 @@ CONFIG_RTE_FORCE_INTRINSICS=n
#
# Compile to share library
#
-CONFIG_RTE_BUILD_SHARED_LIB=n
+CONFIG_RTE_BUILD_SHARED_LIB=y
#
# Combine to one single library
#
-CONFIG_RTE_BUILD_COMBINE_LIBS=n
+CONFIG_RTE_BUILD_COMBINE_LIBS=y
CONFIG_RTE_LIBNAME="intel_dpdk"
#
@@ -89,7 +89,7 @@ CONFIG_RTE_LIBNAME="intel_dpdk"
#
CONFIG_RTE_LIBRTE_EAL=y
CONFIG_RTE_MAX_LCORE=128
-CONFIG_RTE_MAX_NUMA_NODES=8
+CONFIG_RTE_MAX_NUMA_NODES=1
CONFIG_RTE_MAX_MEMSEG=256
CONFIG_RTE_MAX_MEMZONE=2560
CONFIG_RTE_MAX_TAILQ=32
@@ -98,8 +98,8 @@ CONFIG_RTE_LOG_HISTORY=256
CONFIG_RTE_LIBEAL_USE_HPET=n
CONFIG_RTE_EAL_ALLOW_INV_SOCKET_ID=n
CONFIG_RTE_EAL_ALWAYS_PANIC_ON_ERROR=n
-CONFIG_RTE_EAL_IGB_UIO=y
-CONFIG_RTE_EAL_VFIO=y
+CONFIG_RTE_EAL_IGB_UIO=n
+CONFIG_RTE_EAL_VFIO=n
#
# Special configurations in PCI Config Space for high performance
@@ -111,7 +111,13 @@ CONFIG_RTE_PCI_MAX_READ_REQUEST_SIZE=0
#
# Compile Environment Abstraction Layer for linux
#
-CONFIG_RTE_LIBRTE_EAL_LINUXAPP=y
+CONFIG_RTE_LIBRTE_EAL_OSVAPP=y
+
+#
+# Compile OSv specific parameters
+#
+CONFIG_RTE_CONTIGUOUS_CHUNK_SIZE=32M
+CONFIG_RTE_DEFAULT_NUM_CHUNKS=4
#
# Compile Environment Abstraction Layer to support hotplug
@@ -235,7 +241,7 @@ CONFIG_RTE_LIBRTE_VMXNET3_DEBUG_DRIVER=n
#
# Compile example software rings based PMD
#
-CONFIG_RTE_LIBRTE_PMD_RING=y
+CONFIG_RTE_LIBRTE_PMD_RING=n
CONFIG_RTE_PMD_RING_MAX_RX_RINGS=16
CONFIG_RTE_PMD_RING_MAX_TX_RINGS=16
@@ -247,7 +253,7 @@ CONFIG_RTE_LIBRTE_PMD_PCAP=n
#
# Compile link bonding PMD library
#
-CONFIG_RTE_LIBRTE_PMD_BOND=y
+CONFIG_RTE_LIBRTE_PMD_BOND=n
CONFIG_RTE_LIBRTE_BOND_DEBUG_ALB=n
CONFIG_RTE_LIBRTE_BOND_DEBUG_ALB_L1=n
@@ -403,7 +409,7 @@ CONFIG_RTE_LIBRTE_PIPELINE=y
#
# Compile librte_kni
#
-CONFIG_RTE_LIBRTE_KNI=y
+CONFIG_RTE_LIBRTE_KNI=n
CONFIG_RTE_KNI_PREEMPT_DEFAULT=y
CONFIG_RTE_KNI_KO_DEBUG=n
CONFIG_RTE_KNI_VHOST=n
@@ -416,7 +422,6 @@ CONFIG_RTE_KNI_VHOST_DEBUG_TX=n
# Compile vhost library
# fuse-devel is needed to run vhost-cuse.
# fuse-devel enables user space char driver development
-# vhost-user is turned on by default.
#
CONFIG_RTE_LIBRTE_VHOST=n
CONFIG_RTE_LIBRTE_VHOST_USER=y
diff --git a/config/defconfig_x86_64-native-linuxapp-gcc b/config/defconfig_x86_64-native-osvapp-gcc
similarity index 98%
copy from config/defconfig_x86_64-native-linuxapp-gcc
copy to config/defconfig_x86_64-native-osvapp-gcc
index 60baf5b..2134270 100644
--- a/config/defconfig_x86_64-native-linuxapp-gcc
+++ b/config/defconfig_x86_64-native-osvapp-gcc
@@ -30,7 +30,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-#include "common_linuxapp"
+#include "common_osvapp"
CONFIG_RTE_MACHINE="native"
diff --git a/lib/librte_eal/Makefile b/lib/librte_eal/Makefile
index 69003cf..c555587 100644
--- a/lib/librte_eal/Makefile
+++ b/lib/librte_eal/Makefile
@@ -35,5 +35,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += common
DIRS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += linuxapp
DIRS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += common
DIRS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += bsdapp
+DIRS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += common
+DIRS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += osvapp
include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/Makefile b/lib/librte_eal/osvapp/Makefile
similarity index 93%
copy from Makefile
copy to lib/librte_eal/osvapp/Makefile
index f4b807e..15badb3 100644
--- a/Makefile
+++ b/lib/librte_eal/osvapp/Makefile
@@ -29,5 +29,8 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.error Error please compile using GNU Make (gmake)
+include $(RTE_SDK)/mk/rte.vars.mk
+DIRS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal
+
+include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/lib/librte_eal/osvapp/capstan/Capstanfile b/lib/librte_eal/osvapp/capstan/Capstanfile
new file mode 100644
index 0000000..e612419
--- /dev/null
+++ b/lib/librte_eal/osvapp/capstan/Capstanfile
@@ -0,0 +1,6 @@
+base: cloudius/osv-base
+
+cmdline: --maxnic=0 /test -c 1 -n 1 --no-shconf
+
+build: ./GET
+
diff --git a/lib/librte_eal/osvapp/capstan/GET b/lib/librte_eal/osvapp/capstan/GET
new file mode 100755
index 0000000..8c11e58
--- /dev/null
+++ b/lib/librte_eal/osvapp/capstan/GET
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+export RTE_SDK=`readlink -f ../../../..`
+export RTE_TARGET=x86_64-native-osvapp-gcc
+OSV_SDK=`readlink -f osv`
+OSV_VER=v0.19
+
+if [ ! -e $OSV_SDK ]; then
+ git clone -b $OSV_VER --depth 1 https://github.com/cloudius-systems/osv
+fi
+cd $RTE_SDK
+make install T=$RTE_TARGET OSV_SDK=$OSV_SDK
+(cd examples/cmdline; make)
+(cd examples/helloworld; make)
+(cd examples/ip_fragmentation; make)
+(cd examples/l2fwd; make)
+(cd examples/l3fwd; make)
+cd -
+mkdir -p ROOTFS
+find $RTE_SDK/x86_64-native-osvapp-gcc/app/ -executable -readable -type f -exec cp -a {} ROOTFS/ \;
+find $RTE_SDK/examples/*/build/app -executable -readable -type f -exec cp -a {} ROOTFS/ \;
+cp -fa $RTE_SDK/x86_64-native-osvapp-gcc/lib/libintel_dpdk.so ROOTFS/
diff --git a/lib/librte_eal/osvapp/eal/Makefile b/lib/librte_eal/osvapp/eal/Makefile
new file mode 100644
index 0000000..571e04c
--- /dev/null
+++ b/lib/librte_eal/osvapp/eal/Makefile
@@ -0,0 +1,115 @@
+# BSD LICENSE
+#
+# Copyright(c) 2010-2014 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
+
+LIB = librte_eal.a
+
+EXPORT_MAP := rte_eal_version.map
+
+LIBABIVER := 1
+
+VPATH += $(RTE_SDK)/lib/librte_eal/common
+
+INC_FLAGS := -I$(SRCDIR)/include
+INC_FLAGS += -I$(RTE_SDK)/lib/librte_eal/common
+INC_FLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include
+INC_FLAGS += -I$(RTE_SDK)/lib/librte_ring
+INC_FLAGS += -I$(RTE_SDK)/lib/librte_mempool
+INC_FLAGS += -I$(RTE_SDK)/lib/librte_malloc
+INC_FLAGS += -I$(RTE_SDK)/lib/librte_ether
+INC_FLAGS += -I$(RTE_SDK)/lib/librte_pmd_ring
+INC_FLAGS += -I$(RTE_SDK)/lib/librte_pmd_pcap
+INC_FLAGS += -I$(RTE_SDK)/lib/librte_pmd_af_packet
+INC_FLAGS += -I$(RTE_SDK)/lib/librte_pmd_xenvirt
+INC_FLAGS += -I$(OSV_SDK)
+INC_FLAGS += -I$(OSV_SDK)/arch/x64
+INC_FLAGS += -I$(OSV_SDK)/arch/common
+INC_FLAGS += -I$(OSV_SDK)/include
+
+CFLAGS += $(INC_FLAGS) $(WERROR_FLAGS) -O3
+CXXFLAGS += $(INC_FLAGS) -std=gnu++11 -O3
+
+# specific to osvapp exec-env
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) := eal.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_hugepage_info.cc
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_memory.cc
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_thread.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_log.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_pci.cc
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_debug.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_lcore.cc
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_timer.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_interrupts.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_alarm.c
+
+# from common dir
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_common_memzone.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_common_log.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_common_launch.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_common_pci.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_common_memory.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_common_tailqs.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_common_errno.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_common_cpuflags.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_common_string_fns.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_common_hexdump.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_common_devargs.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_common_dev.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_common_options.c
+SRCS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += eal_common_thread.c
+
+CFLAGS_eal.o := -D_GNU_SOURCE
+CFLAGS_eal_lcore.o := -D_GNU_SOURCE
+CFLAGS_eal_thread.o := -D_GNU_SOURCE
+CFLAGS_eal_log.o := -D_GNU_SOURCE
+CFLAGS_eal_common_log.o := -D_GNU_SOURCE
+CFLAGS_eal_hugepage_info.o := -D_GNU_SOURCE
+CFLAGS_eal_pci.o := -D_GNU_SOURCE
+CFLAGS_eal_common_whitelist.o := -D_GNU_SOURCE
+CFLAGS_eal_common_options.o := -D_GNU_SOURCE
+CFLAGS_eal_common_thread.o := -D_GNU_SOURCE
+
+# workaround for a gcc bug with noreturn attribute
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
+ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
+CFLAGS_eal_thread.o += -Wno-return-type
+endif
+
+INC := rte_interrupts.h
+
+SYMLINK-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP)-include/exec-env := \
+ $(addprefix include/exec-env/,$(INC))
+
+DEPDIRS-$(CONFIG_RTE_LIBRTE_EAL_OSVAPP) += lib/librte_eal/common
+
+include $(RTE_SDK)/mk/rte.lib.mk
+
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/osvapp/eal/eal.c
similarity index 87%
copy from lib/librte_eal/linuxapp/eal/eal.c
copy to lib/librte_eal/osvapp/eal/eal.c
index bd770cf..b6e2143 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/osvapp/eal/eal.c
@@ -50,9 +50,7 @@
#include <errno.h>
#include <sys/mman.h>
#include <sys/queue.h>
-#if defined(RTE_ARCH_X86_64) || defined(RTE_ARCH_I686)
#include <sys/io.h>
-#endif
#include <rte_common.h>
#include <rte_debug.h>
@@ -351,14 +349,9 @@ eal_usage(const char *prgname)
printf("\nUsage: %s ", prgname);
eal_common_usage();
printf("EAL Linux options:\n"
- " -d LIB.so Add driver (can be used multiple times)\n"
- " --"OPT_SOCKET_MEM" Memory to allocate on sockets (comma separated values)\n"
- " --"OPT_HUGE_DIR" Directory where hugetlbfs is mounted\n"
- " --"OPT_FILE_PREFIX" Prefix for hugepage filenames\n"
- " --"OPT_BASE_VIRTADDR" Base virtual address\n"
- " --"OPT_CREATE_UIO_DEV" Create /dev/uioX (usually done by hotplug)\n"
- " --"OPT_VFIO_INTR" Interrupt mode for VFIO (legacy|msi|msix)\n"
- " --"OPT_XEN_DOM0" Support running on Xen dom0 without hugetlbfs\n"
+ " -d LIB.so : add driver (can be used multiple times)\n"
+ " --"OPT_SOCKET_MEM" : memory to allocate on specific\n"
+ " sockets (use comma separated values)\n"
"\n");
/* Allow the application to print its usage message too if hook is set */
if ( rte_application_usage_hook ) {
@@ -444,10 +437,8 @@ eal_parse_base_virtaddr(const char *arg)
return -1;
/* make sure we don't exceed 32-bit boundary on 32-bit target */
-#ifndef RTE_ARCH_64
if (addr >= UINTPTR_MAX)
return -1;
-#endif
/* align the addr on 16M boundary, 16MB is the minimum huge page
* size on IBM Power architecture. If the addr is aligned to 16MB,
@@ -459,28 +450,6 @@ eal_parse_base_virtaddr(const char *arg)
return 0;
}
-static int
-eal_parse_vfio_intr(const char *mode)
-{
- unsigned i;
- static struct {
- const char *name;
- enum rte_intr_mode value;
- } map[] = {
- { "legacy", RTE_INTR_MODE_LEGACY },
- { "msi", RTE_INTR_MODE_MSI },
- { "msix", RTE_INTR_MODE_MSIX },
- };
-
- for (i = 0; i < RTE_DIM(map); i++) {
- if (!strcmp(mode, map[i].name)) {
- internal_config.vfio_intr_mode = map[i].value;
- return 0;
- }
- }
- return -1;
-}
-
static inline size_t
eal_get_hugepage_mem_size(void)
{
@@ -552,26 +521,6 @@ eal_parse_args(int argc, char **argv)
TAILQ_INSERT_TAIL(&solib_list, solib, next);
break;
- /* long options */
- case OPT_XEN_DOM0_NUM:
-#ifdef RTE_LIBRTE_XEN_DOM0
- internal_config.xen_dom0_support = 1;
-#else
- RTE_LOG(ERR, EAL, "Can't support DPDK app "
- "running on Dom0, please configure"
- " RTE_LIBRTE_XEN_DOM0=y\n");
- return -1;
-#endif
- break;
-
- case OPT_HUGE_DIR_NUM:
- internal_config.hugepage_dir = optarg;
- break;
-
- case OPT_FILE_PREFIX_NUM:
- internal_config.hugefile_prefix = optarg;
- break;
-
case OPT_SOCKET_MEM_NUM:
if (eal_parse_socket_mem(optarg) < 0) {
RTE_LOG(ERR, EAL, "invalid parameters for --"
@@ -590,19 +539,6 @@ eal_parse_args(int argc, char **argv)
}
break;
- case OPT_VFIO_INTR_NUM:
- if (eal_parse_vfio_intr(optarg) < 0) {
- RTE_LOG(ERR, EAL, "invalid parameters for --"
- OPT_VFIO_INTR "\n");
- eal_usage(prgname);
- return -1;
- }
- break;
-
- case OPT_CREATE_UIO_DEV_NUM:
- internal_config.create_uio_dev = 1;
- break;
-
default:
if (opt < OPT_LONG_MIN_NUM && isprint(opt)) {
RTE_LOG(ERR, EAL, "Option %c is not supported "
@@ -630,14 +566,6 @@ eal_parse_args(int argc, char **argv)
return -1;
}
- /* --xen-dom0 doesn't make sense with --socket-mem */
- if (internal_config.xen_dom0_support && internal_config.force_sockets == 1) {
- RTE_LOG(ERR, EAL, "Options --"OPT_SOCKET_MEM" cannot be specified "
- "together with --"OPT_XEN_DOM0"\n");
- eal_usage(prgname);
- return -1;
- }
-
if (optind >= 0)
argv[optind-1] = prgname;
ret = optind-1;
@@ -686,13 +614,7 @@ rte_eal_mcfg_complete(void)
int
rte_eal_iopl_init(void)
{
-#if defined(RTE_ARCH_X86_64) || defined(RTE_ARCH_I686)
- if (iopl(3) != 0)
- return -1;
return 0;
-#else
- return -1;
-#endif
}
/* Launch threads, called at application init(). */
@@ -729,7 +651,6 @@ rte_eal_init(int argc, char **argv)
if (internal_config.no_hugetlbfs == 0 &&
internal_config.process_type != RTE_PROC_SECONDARY &&
- internal_config.xen_dom0_support == 0 &&
eal_hugepage_info_init() < 0)
rte_panic("Cannot get hugepage information\n");
@@ -758,11 +679,6 @@ rte_eal_init(int argc, char **argv)
if (rte_eal_pci_init() < 0)
rte_panic("Cannot init PCI\n");
-#ifdef RTE_LIBRTE_IVSHMEM
- if (rte_eal_ivshmem_init() < 0)
- rte_panic("Cannot init IVSHMEM\n");
-#endif
-
if (rte_eal_memory_init() < 0)
rte_panic("Cannot init memory\n");
@@ -775,11 +691,6 @@ rte_eal_init(int argc, char **argv)
if (rte_eal_tailqs_init() < 0)
rte_panic("Cannot init tail queues for objects\n");
-#ifdef RTE_LIBRTE_IVSHMEM
- if (rte_eal_ivshmem_obj_init() < 0)
- rte_panic("Cannot init IVSHMEM objects\n");
-#endif
-
if (rte_eal_log_init(logid, internal_config.syslog_facility) < 0)
rte_panic("Cannot init logs\n");
@@ -865,31 +776,3 @@ int rte_eal_has_hugepages(void)
{
return ! internal_config.no_hugetlbfs;
}
-
-int
-rte_eal_check_module(const char *module_name)
-{
- char mod_name[30]; /* Any module names can be longer than 30 bytes? */
- int ret = 0;
- int n;
-
- if (NULL == module_name)
- return -1;
-
- FILE *fd = fopen("/proc/modules", "r");
- if (NULL == fd) {
- RTE_LOG(ERR, EAL, "Open /proc/modules failed!"
- " error %i (%s)\n", errno, strerror(errno));
- return -1;
- }
- while (!feof(fd)) {
- n = fscanf(fd, "%29s %*[^\n]", mod_name);
- if ((n == 1) && !strcmp(mod_name, module_name)) {
- ret = 1;
- break;
- }
- }
- fclose(fd);
-
- return ret;
-}
diff --git a/lib/librte_eal/linuxapp/eal/eal_alarm.c b/lib/librte_eal/osvapp/eal/eal_alarm.c
similarity index 100%
copy from lib/librte_eal/linuxapp/eal/eal_alarm.c
copy to lib/librte_eal/osvapp/eal/eal_alarm.c
diff --git a/lib/librte_eal/linuxapp/eal/eal_debug.c b/lib/librte_eal/osvapp/eal/eal_debug.c
similarity index 100%
copy from lib/librte_eal/linuxapp/eal/eal_debug.c
copy to lib/librte_eal/osvapp/eal/eal_debug.c
diff --git a/lib/librte_eal/osvapp/eal/eal_hugepage_info.cc b/lib/librte_eal/osvapp/eal/eal_hugepage_info.cc
new file mode 100644
index 0000000..779e992
--- /dev/null
+++ b/lib/librte_eal/osvapp/eal/eal_hugepage_info.cc
@@ -0,0 +1,63 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 2010-2014 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_log.h>
+#include <rte_common.h>
+#include "eal_internal_cfg.h"
+#include "eal_hugepages.h"
+
+#define CONTIGUOUS_CHUNK_SIZE RTE_STR(RTE_CONTIGUOUS_CHUNK_SIZE)
+
+static inline size_t
+get_contiguous_chunk_size(void)
+{
+ return rte_str_to_size(CONTIGUOUS_CHUNK_SIZE);
+}
+
+int
+eal_hugepage_info_init(void)
+{
+ struct hugepage_info *hpi = &internal_config.hugepage_info[0];
+
+ internal_config.num_hugepage_sizes = 1;
+ /* size of contiguous chunk size for eal_memory.cc */
+ hpi->hugepage_sz = get_contiguous_chunk_size();
+ /* this will ignored */
+ hpi->hugedir = "/";
+ /* only used when -m is not specified */
+ hpi->num_pages[0] = RTE_DEFAULT_NUM_CHUNKS;
+ /* this will ignored */
+ hpi->lock_descriptor = -1;
+
+ return 0;
+}
diff --git a/lib/librte_eal/bsdapp/eal/eal_interrupts.c b/lib/librte_eal/osvapp/eal/eal_interrupts.c
similarity index 100%
copy from lib/librte_eal/bsdapp/eal/eal_interrupts.c
copy to lib/librte_eal/osvapp/eal/eal_interrupts.c
diff --git a/lib/librte_eal/bsdapp/eal/eal_lcore.c b/lib/librte_eal/osvapp/eal/eal_lcore.cc
similarity index 80%
copy from lib/librte_eal/bsdapp/eal/eal_lcore.c
copy to lib/librte_eal/osvapp/eal/eal_lcore.cc
index 162fb4f..5ff10e7 100644
--- a/lib/librte_eal/bsdapp/eal/eal_lcore.c
+++ b/lib/librte_eal/osvapp/eal/eal_lcore.cc
@@ -31,38 +31,35 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <unistd.h>
-#include <sys/sysctl.h>
-
#include <rte_log.h>
#include <rte_eal.h>
#include <rte_lcore.h>
#include <rte_common.h>
#include <rte_debug.h>
+#include <osv/sched.hh>
+
#include "eal_private.h"
#include "eal_thread.h"
-/* No topology information available on FreeBSD including NUMA info */
-#define cpu_core_id(X) 0
-#define cpu_socket_id(X) 0
-
static int
-get_ncpus(void)
+cpu_detected(unsigned lcore_id)
{
- int mib[2] = {CTL_HW, HW_NCPU};
- int ncpu;
- size_t len = sizeof(ncpu);
+ return lcore_id < sched::cpus.size() ? 1 : 0;
+}
- sysctl(mib, 2, &ncpu, &len, NULL, 0);
- RTE_LOG(INFO, EAL, "Sysctl reports %d cpus\n", ncpu);
- return ncpu;
+unsigned
+eal_cpu_socket_id(unsigned lcore_id)
+{
+ return 0;
+}
+
+static unsigned
+cpu_core_id(unsigned lcore_id)
+{
+ return lcore_id;
}
-/*
- * fill the cpu_info structure with as much info as we can get.
- * code is similar to linux version, but sadly available info is less.
- */
int
rte_eal_cpu_init(void)
{
@@ -71,7 +68,6 @@ rte_eal_cpu_init(void)
unsigned lcore_id;
unsigned count = 0;
- const unsigned ncpus = get_ncpus();
/*
* Parse the maximum set of logical cores, detect the subset of running
* ones and enable them by default.
@@ -80,7 +76,8 @@ rte_eal_cpu_init(void)
/* init cpuset for per lcore config */
CPU_ZERO(&lcore_config[lcore_id].cpuset);
- lcore_config[lcore_id].detected = (lcore_id < ncpus);
+ /* in 1:1 mapping, record related cpu detected state */
+ lcore_config[lcore_id].detected = cpu_detected(lcore_id);
if (lcore_config[lcore_id].detected == 0) {
config->lcore_role[lcore_id] = ROLE_OFF;
continue;
@@ -92,7 +89,7 @@ rte_eal_cpu_init(void)
/* By default, each detected core is enabled */
config->lcore_role[lcore_id] = ROLE_RTE;
lcore_config[lcore_id].core_id = cpu_core_id(lcore_id);
- lcore_config[lcore_id].socket_id = cpu_socket_id(lcore_id);
+ lcore_config[lcore_id].socket_id = eal_cpu_socket_id(lcore_id);
if (lcore_config[lcore_id].socket_id >= RTE_MAX_NUMA_NODES)
#ifdef RTE_EAL_ALLOW_INV_SOCKET_ID
lcore_config[lcore_id].socket_id = 0;
@@ -101,9 +98,11 @@ rte_eal_cpu_init(void)
"RTE_MAX_NUMA_NODES (%d)\n",
lcore_config[lcore_id].socket_id, RTE_MAX_NUMA_NODES);
#endif
- RTE_LOG(DEBUG, EAL, "Detected lcore %u\n",
- lcore_id);
- count++;
+ RTE_LOG(DEBUG, EAL, "Detected lcore %u as core %u on socket %u\n",
+ lcore_id,
+ lcore_config[lcore_id].core_id,
+ lcore_config[lcore_id].socket_id);
+ count ++;
}
/* Set the count of enabled logical cores of the EAL configuration */
config->lcore_count = count;
@@ -113,9 +112,3 @@ rte_eal_cpu_init(void)
return 0;
}
-
-unsigned
-eal_cpu_socket_id(__rte_unused unsigned cpu_id)
-{
- return cpu_socket_id(cpu_id);
-}
diff --git a/lib/librte_eal/bsdapp/eal/eal_log.c b/lib/librte_eal/osvapp/eal/eal_log.c
similarity index 100%
copy from lib/librte_eal/bsdapp/eal/eal_log.c
copy to lib/librte_eal/osvapp/eal/eal_log.c
diff --git a/lib/librte_eal/osvapp/eal/eal_memory.cc b/lib/librte_eal/osvapp/eal/eal_memory.cc
new file mode 100644
index 0000000..fa4a49d
--- /dev/null
+++ b/lib/librte_eal/osvapp/eal/eal_memory.cc
@@ -0,0 +1,148 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 2010-2014 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 <sys/mman.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <inttypes.h>
+#include <fcntl.h>
+
+#include <rte_eal.h>
+#include <rte_eal_memconfig.h>
+#include <rte_log.h>
+#include <rte_string_fns.h>
+#include "eal_private.h"
+#include "eal_internal_cfg.h"
+#include "eal_filesystem.h"
+
+#include <osv/contiguous_alloc.hh>
+#include <osv/virt_to_phys.hh>
+#include <assert.h>
+#include <osv/types.h>
+#include <osv/mmu-defs.hh>
+
+/*
+ * Get physical address of any mapped virtual address in the current process.
+ */
+phys_addr_t
+rte_mem_virt2phy(const void *virtaddr)
+{
+ /* XXX not implemented. This function is only used by
+ * rte_mempool_virt2phy() when hugepages are disabled. */
+ (void)virtaddr;
+ return RTE_BAD_PHYS_ADDR;
+}
+
+static int
+rte_eal_hugepage_init(void)
+{
+ struct rte_mem_config *mcfg;
+ uint64_t total_mem = 0;
+ void *addr;
+ unsigned i, j, seg_idx = 0;
+
+ /* get pointer to global configuration */
+ mcfg = rte_eal_get_configuration()->mem_config;
+
+ /* for debug purposes, hugetlbfs can be disabled */
+ if (internal_config.no_hugetlbfs) {
+ addr = malloc(internal_config.memory);
+ mcfg->memseg[0].phys_addr = (phys_addr_t)(uintptr_t)addr;
+ mcfg->memseg[0].addr = addr;
+ mcfg->memseg[0].len = internal_config.memory;
+ mcfg->memseg[0].socket_id = 0;
+ return 0;
+ }
+
+ /* allocate all contiguous chunks */
+ for (i = 0; i < internal_config.num_hugepage_sizes; i ++){
+ struct hugepage_info *hpi;
+ size_t alloc_size = 0;
+
+ hpi = &internal_config.hugepage_info[i];
+ hpi->num_pages[0] = 0;
+ for (j = 0; ; j++) {
+ struct rte_memseg *seg;
+ uint64_t physaddr;
+
+ addr = memory::alloc_phys_contiguous_aligned(hpi->hugepage_sz, mmu::huge_page_size);
+ seg = &mcfg->memseg[seg_idx++];
+ seg->addr = addr;
+ seg->phys_addr = mmu::virt_to_phys(addr);
+ seg->hugepage_sz = hpi->hugepage_sz;
+ seg->len = hpi->hugepage_sz;
+ seg->nchannel = mcfg->nchannel;
+ seg->nrank = mcfg->nrank;
+ seg->socket_id = 0;
+ total_mem += hpi->hugepage_sz;
+ hpi->num_pages[0]++;
+ RTE_LOG(INFO, EAL, "Mapped memory segment %u @ %p: physaddr:0x%"
+ PRIx64", len %zu\n",
+ 0, seg->addr, seg->phys_addr, seg->len);
+ if (total_mem >= internal_config.memory ||
+ seg_idx >= RTE_MAX_MEMSEG)
+ break;
+ }
+ }
+ return 0;
+}
+
+static int
+rte_eal_memdevice_init(void)
+{
+ struct rte_config *config;
+
+ if (rte_eal_process_type() == RTE_PROC_SECONDARY)
+ return 0;
+
+ config = rte_eal_get_configuration();
+ config->mem_config->nchannel = internal_config.force_nchannel;
+ config->mem_config->nrank = internal_config.force_nrank;
+
+ return 0;
+}
+
+/* init memory subsystem */
+int
+rte_eal_memory_init(void)
+{
+ RTE_LOG(INFO, EAL, "Setting up memory...\n");
+ const int retval = rte_eal_hugepage_init();
+ if (retval < 0)
+ return -1;
+
+ if (internal_config.no_shconf == 0 && rte_eal_memdevice_init() < 0)
+ return -1;
+
+ return 0;
+}
diff --git a/lib/librte_eal/osvapp/eal/eal_pci.cc b/lib/librte_eal/osvapp/eal/eal_pci.cc
new file mode 100644
index 0000000..3facf32
--- /dev/null
+++ b/lib/librte_eal/osvapp/eal/eal_pci.cc
@@ -0,0 +1,312 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 2010-2014 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 <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <inttypes.h>
+#include <stdarg.h>
+#include <errno.h>
+#include <limits.h>
+
+#include <rte_interrupts.h>
+#include <rte_log.h>
+#include <rte_pci.h>
+#include <rte_common.h>
+#include <rte_launch.h>
+#include <rte_memory.h>
+#include <rte_memzone.h>
+#include <rte_eal.h>
+#include <rte_eal_memconfig.h>
+#include <rte_per_lcore.h>
+#include <rte_lcore.h>
+#include <rte_malloc.h>
+#include <rte_string_fns.h>
+#include <rte_debug.h>
+#include <rte_devargs.h>
+
+#include "rte_pci_dev_ids.h"
+#include "eal_filesystem.h"
+#include "eal_private.h"
+
+#include <drivers/device.hh>
+#include <drivers/pci-device.hh>
+
+/**
+ * @file
+ * PCI probing under linux
+ *
+ * This code is used to simulate a PCI probe by parsing information in
+ * sysfs. Moreover, when a registered driver matches a device, the
+ * kernel driver currently using it is unloaded and replaced by
+ * igb_uio module, which is a very minimal userland driver for Intel
+ * network card, only providing access to PCI BAR to applications, and
+ * enabling bus master.
+ */
+
+struct uio_map {
+ void *addr;
+ uint64_t offset;
+ uint64_t size;
+ uint64_t phaddr;
+};
+
+/*
+ * For multi-process we need to reproduce all PCI mappings in secondary
+ * processes, so save them in a tailq.
+ */
+struct uio_resource {
+ TAILQ_ENTRY(uio_resource) next;
+
+ struct rte_pci_addr pci_addr;
+ char path[PATH_MAX];
+ size_t nb_maps;
+ struct uio_map maps[PCI_MAX_RESOURCE];
+};
+
+TAILQ_HEAD(uio_res_list, uio_resource);
+
+static struct uio_res_list *uio_res_list = NULL;
+
+static struct rte_tailq_elem rte_pci_tailq = {
+ NULL,
+ { NULL, NULL, },
+ "PCI_RESOURCE_LIST",
+};
+EAL_REGISTER_TAILQ(rte_pci_tailq)
+
+/* unbind kernel driver for this device */
+static int
+pci_unbind_kernel_driver(struct rte_pci_device *dev __rte_unused)
+{
+ RTE_LOG(ERR, EAL, "RTE_PCI_DRV_FORCE_UNBIND flag is not implemented "
+ "for OSv\n");
+ return -ENOTSUP;
+}
+
+/* Scan one pci entry, and fill the devices list from it. */
+static int
+pci_scan_one(hw::hw_device* dev)
+{
+ u8 bus, device, func;
+ auto pci_dev = static_cast<pci::device*>(dev);
+ auto rte_dev = new rte_pci_device();
+
+ /* get bus id, device id, function no */
+ pci_dev->get_bdf(bus, device, func);
+ rte_dev->addr.domain = 0;
+ rte_dev->addr.bus = bus;
+ rte_dev->addr.devid = device;
+ rte_dev->addr.function = func;
+
+ /* get vendor id */
+ rte_dev->id.vendor_id = pci_dev->get_vendor_id();
+
+ /* get device id */
+ rte_dev->id.device_id = pci_dev->get_device_id();
+
+ /* get subsystem_vendor id */
+ rte_dev->id.subsystem_vendor_id = pci_dev->get_subsystem_vid();
+
+ /* get subsystem_device id */
+ rte_dev->id.subsystem_device_id = pci_dev->get_subsystem_id();
+
+ /* TODO: get max_vfs */
+ rte_dev->max_vfs = 0;
+
+ /* OSv has no NUMA support (yet) */
+ rte_dev->numa_node = -1;
+
+ /* Disable interrupt */
+ rte_dev->intr_handle.fd = -1;
+ rte_dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
+
+ for (int i = 0; ; i++) {
+ auto bar = pci_dev->get_bar(i+1);
+ if (bar == nullptr) {
+ RTE_LOG(DEBUG, EAL, " bar%d not available\n", i);
+ break;
+ }
+ if (bar->is_mmio()) {
+ rte_dev->mem_resource[i].len = bar->get_size();
+ rte_dev->mem_resource[i].phys_addr = bar->get_addr64();
+ bar->map();
+ rte_dev->mem_resource[i].addr = const_cast<void *>(bar->get_mmio());
+ } else {
+ rte_dev->mem_resource[i].len = bar->get_size();
+ rte_dev->mem_resource[i].phys_addr = 0;
+ rte_dev->mem_resource[i].addr = reinterpret_cast<void *>(bar->get_addr_lo());
+ }
+ }
+
+ /* device is valid, add in list (sorted) */
+ if (TAILQ_EMPTY(&pci_device_list)) {
+ TAILQ_INSERT_TAIL(&pci_device_list, rte_dev, next);
+ }
+ else {
+ struct rte_pci_device *dev2 = NULL;
+ int ret;
+
+ TAILQ_FOREACH(dev2, &pci_device_list, next) {
+ ret = rte_eal_compare_pci_addr(&rte_dev->addr, &dev2->addr);
+ if (ret > 0)
+ continue;
+ else if (ret < 0) {
+ TAILQ_INSERT_BEFORE(dev2, rte_dev, next);
+ return 1;
+ } else { /* already registered */
+ dev2->kdrv = rte_dev->kdrv;
+ dev2->max_vfs = rte_dev->max_vfs;
+ memmove(dev2->mem_resource,
+ rte_dev->mem_resource,
+ sizeof(rte_dev->mem_resource));
+ delete rte_dev;
+ return 0;
+ }
+ }
+ TAILQ_INSERT_TAIL(&pci_device_list, rte_dev, next);
+ }
+
+ return 1;
+}
+
+/*
+ * Scan the content of the PCI bus, and add the devices in the devices
+ * list. Call pci_scan_one() for each pci entry found.
+ */
+static int
+pci_scan(void)
+{
+ unsigned dev_count = 0;
+ int err = 0;
+
+ auto dm = hw::device_manager::instance();
+ dm->for_each_device([&dev_count, &err] (hw::hw_device* dev) {
+ if (dev->is_attached())
+ return;
+ int ret = pci_scan_one(dev);
+ if (ret < 0) {
+ err++;
+ } else {
+ dev_count += ret;
+ }
+ });
+
+ if (err)
+ return -1;
+
+ RTE_LOG(ERR, EAL, "PCI scan found %u devices\n", dev_count);
+ return 0;
+}
+
+/*
+ * If vendor/device ID match, call the devinit() function of the
+ * driver.
+ */
+int
+rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *dev)
+{
+ struct rte_pci_id *id_table;
+ int ret;
+
+ for (id_table = dr->id_table ; id_table->vendor_id != 0; id_table++) {
+
+ /* check if device's identifiers match the driver's ones */
+ if (id_table->vendor_id != dev->id.vendor_id &&
+ id_table->vendor_id != PCI_ANY_ID)
+ continue;
+ if (id_table->device_id != dev->id.device_id &&
+ id_table->device_id != PCI_ANY_ID)
+ continue;
+ if (id_table->subsystem_vendor_id != dev->id.subsystem_vendor_id &&
+ id_table->subsystem_vendor_id != PCI_ANY_ID)
+ continue;
+ if (id_table->subsystem_device_id != dev->id.subsystem_device_id &&
+ id_table->subsystem_device_id != PCI_ANY_ID)
+ continue;
+
+ struct rte_pci_addr *loc = &dev->addr;
+
+ RTE_LOG(DEBUG, EAL, "PCI device " PCI_PRI_FMT " on NUMA socket %i\n",
+ loc->domain, loc->bus, loc->devid, loc->function,
+ dev->numa_node);
+
+ RTE_LOG(DEBUG, EAL, " probe driver: %x:%x %s\n", dev->id.vendor_id,
+ dev->id.device_id, dr->name);
+
+ /* no initialization when blacklisted, return without error */
+ if (dev->devargs != NULL &&
+ dev->devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI) {
+
+ RTE_LOG(DEBUG, EAL, " Device is blacklisted, not initializing\n");
+ return 0;
+ }
+
+ if (dr->drv_flags & RTE_PCI_DRV_FORCE_UNBIND &&
+ rte_eal_process_type() == RTE_PROC_PRIMARY) {
+ /* unbind current driver */
+ if (pci_unbind_kernel_driver(dev) < 0)
+ return -1;
+ }
+
+ /* reference driver structure */
+ dev->driver = dr;
+
+ /* call the driver devinit() function */
+ return dr->devinit(dr, dev);
+ }
+ /* return positive value if driver is not found */
+ return 1;
+}
+
+/* Init the PCI EAL subsystem */
+int
+rte_eal_pci_init(void)
+{
+ TAILQ_INIT(&pci_driver_list);
+ TAILQ_INIT(&pci_device_list);
+ uio_res_list = RTE_TAILQ_CAST(rte_pci_tailq.head, uio_res_list);
+
+ /* for debug purposes, PCI can be disabled */
+ if (internal_config.no_pci)
+ return 0;
+
+ if (pci_scan() < 0) {
+ RTE_LOG(ERR, EAL, "%s(): Cannot scan PCI bus\n", __func__);
+ return -1;
+ }
+ return 0;
+}
diff --git a/lib/librte_eal/linuxapp/eal/eal_thread.c b/lib/librte_eal/osvapp/eal/eal_thread.c
similarity index 100%
copy from lib/librte_eal/linuxapp/eal/eal_thread.c
copy to lib/librte_eal/osvapp/eal/eal_thread.c
diff --git a/lib/librte_eal/osvapp/eal/eal_timer.c b/lib/librte_eal/osvapp/eal/eal_timer.c
new file mode 100644
index 0000000..86bdd84
--- /dev/null
+++ b/lib/librte_eal/osvapp/eal/eal_timer.c
@@ -0,0 +1,130 @@
+/*-
+ * BSD LICENSE
+ *
+ * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2012-2013 6WIND S.A.
+ * 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 <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <inttypes.h>
+#include <errno.h>
+
+#include <rte_common.h>
+#include <rte_log.h>
+#include <rte_cycles.h>
+#include <rte_memory.h>
+#include <rte_memzone.h>
+#include <rte_eal.h>
+#include <rte_debug.h>
+
+#include "eal_private.h"
+#include "eal_internal_cfg.h"
+
+#ifdef RTE_LIBEAL_USE_HPET
+#error "HPET is not supported in OSv"
+#endif
+
+enum timer_source eal_timer_source = EAL_TIMER_TSC;
+
+/* The frequency of the RDTSC timer resolution */
+static uint64_t eal_tsc_resolution_hz = 0;
+
+void
+rte_delay_us(unsigned us)
+{
+ const uint64_t start = rte_get_timer_cycles();
+ const uint64_t ticks = (uint64_t)us * rte_get_timer_hz() / 1E6;
+ while ((rte_get_timer_cycles() - start) < ticks)
+ rte_pause();
+}
+
+uint64_t
+rte_get_tsc_hz(void)
+{
+ return eal_tsc_resolution_hz;
+}
+
+static int
+set_tsc_freq_from_clock(void)
+{
+#define NS_PER_SEC 1E9
+
+ struct timespec sleeptime;
+ sleeptime.tv_sec = 0;
+ sleeptime.tv_nsec = 5E8; /* 1/2 second */
+
+ struct timespec t_start, t_end;
+
+ if (clock_gettime(CLOCK_MONOTONIC, &t_start) == 0) {
+ uint64_t ns, end, start = rte_rdtsc();
+ nanosleep(&sleeptime,NULL);
+ clock_gettime(CLOCK_MONOTONIC_RAW, &t_end);
+ end = rte_rdtsc();
+ ns = ((t_end.tv_sec - t_start.tv_sec) * NS_PER_SEC);
+ ns += (t_end.tv_nsec - t_start.tv_nsec);
+
+ double secs = (double)ns/NS_PER_SEC;
+ eal_tsc_resolution_hz = (uint64_t)((end - start)/secs);
+ return 0;
+ }
+ return -1;
+}
+
+static void
+set_tsc_freq_fallback(void)
+{
+ RTE_LOG(WARNING, EAL, "WARNING: clock_gettime cannot use "
+ "CLOCK_MONOTONIC_RAW and HPET is not available"
+ " - clock timings may be less accurate.\n");
+ /* assume that the sleep(1) will sleep for 1 second */
+ uint64_t start = rte_rdtsc();
+ sleep(1);
+ eal_tsc_resolution_hz = rte_rdtsc() - start;
+}
+
+static void
+set_tsc_freq(void)
+{
+ if (set_tsc_freq_from_clock() < 0)
+ set_tsc_freq_fallback();
+
+ RTE_LOG(INFO, EAL, "TSC frequency is ~%" PRIu64 " KHz\n",
+ eal_tsc_resolution_hz/1000);
+}
+
+int
+rte_eal_timer_init(void)
+{
+ set_tsc_freq();
+ return 0;
+}
diff --git a/lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h b/lib/librte_eal/osvapp/eal/include/exec-env/rte_interrupts.h
similarity index 100%
copy from lib/librte_eal/bsdapp/eal/include/exec-env/rte_interrupts.h
copy to lib/librte_eal/osvapp/eal/include/exec-env/rte_interrupts.h
diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/osvapp/eal/rte_eal_version.map
similarity index 92%
copy from lib/librte_eal/bsdapp/eal/rte_eal_version.map
copy to lib/librte_eal/osvapp/eal/rte_eal_version.map
index 67b6a6c..2c49f94 100644
--- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map
+++ b/lib/librte_eal/osvapp/eal/rte_eal_version.map
@@ -31,7 +31,6 @@ DPDK_2.0 {
rte_eal_get_physmem_layout;
rte_eal_get_physmem_size;
rte_eal_has_hugepages;
- rte_eal_hpet_init;
rte_eal_init;
rte_eal_iopl_init;
rte_eal_lcore_role;
@@ -47,8 +46,6 @@ DPDK_2.0 {
rte_eal_tailq_register;
rte_eal_wait_lcore;
rte_exit;
- rte_get_hpet_cycles;
- rte_get_hpet_hz;
rte_get_tsc_hz;
rte_hexdump;
rte_intr_callback_register;
@@ -86,9 +83,6 @@ DPDK_2.0 {
rte_thread_get_affinity;
rte_thread_set_affinity;
rte_vlog;
- rte_xen_dom0_memory_attach;
- rte_xen_dom0_memory_init;
- test_mp_secondary;
local: *;
};
diff --git a/mk/exec-env/linuxapp/rte.app.mk b/mk/exec-env/osvapp/rte.app.mk
similarity index 100%
copy from mk/exec-env/linuxapp/rte.app.mk
copy to mk/exec-env/osvapp/rte.app.mk
diff --git a/mk/exec-env/linuxapp/rte.vars.mk b/mk/exec-env/osvapp/rte.vars.mk
similarity index 95%
copy from mk/exec-env/linuxapp/rte.vars.mk
copy to mk/exec-env/osvapp/rte.vars.mk
index e5af318..db0f115 100644
--- a/mk/exec-env/linuxapp/rte.vars.mk
+++ b/mk/exec-env/osvapp/rte.vars.mk
@@ -39,11 +39,7 @@
#
# examples for RTE_EXEC_ENV: linuxapp, bsdapp
#
-ifeq ($(RTE_BUILD_SHARED_LIB),y)
-EXECENV_CFLAGS = -pthread -fPIC
-else
-EXECENV_CFLAGS = -pthread
-endif
+EXECENV_CFLAGS = -pthread -fPIC -shared
# Workaround lack of DT_NEEDED entry
EXECENV_LDFLAGS = --no-as-needed
--
2.1.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [dpdk-dev] [RFC PATCHv3 6/7] app/test: support OSv
2015-04-06 18:58 [dpdk-dev] [RFC PATCHv3 0/7] add OSv support Takuya ASADA
` (4 preceding siblings ...)
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 5/7] add OSv support Takuya ASADA
@ 2015-04-06 18:58 ` Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 7/7] doc: Add Getting Started Guide for OSv Takuya ASADA
2015-04-20 18:37 ` [dpdk-dev] [RFC PATCHv3 0/7] add OSv support Takuya ASADA
7 siblings, 0 replies; 11+ messages in thread
From: Takuya ASADA @ 2015-04-06 18:58 UTC (permalink / raw)
To: dev
Add support OSv EAL.
Signed-off-by: Takuya ASADA <syuu@cloudius-systems.com>
---
app/test/test_eal_flags.c | 34 +++++++++++++++++-----------------
app/test/test_timer_perf.c | 2 +-
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index 0352f87..40a5c7e 100644
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -287,7 +287,7 @@ static int
test_whitelist_flag(void)
{
unsigned i;
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
/* BSD target doesn't support prefixes at this point */
const char * prefix = "";
#else
@@ -353,7 +353,7 @@ test_whitelist_flag(void)
static int
test_invalid_b_flag(void)
{
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
/* BSD target doesn't support prefixes at this point */
const char * prefix = "";
#else
@@ -400,7 +400,7 @@ test_invalid_b_flag(void)
static int
test_invalid_vdev_flag(void)
{
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
/* BSD target doesn't support prefixes at this point, and we also need to
* run another primary process here */
const char * prefix = no_shconf;
@@ -454,7 +454,7 @@ test_invalid_vdev_flag(void)
static int
test_invalid_r_flag(void)
{
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
/* BSD target doesn't support prefixes at this point */
const char * prefix = "";
#else
@@ -498,7 +498,7 @@ test_invalid_r_flag(void)
static int
test_missing_c_flag(void)
{
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
/* BSD target doesn't support prefixes at this point */
const char * prefix = "";
#else
@@ -629,7 +629,7 @@ test_missing_c_flag(void)
static int
test_master_lcore_flag(void)
{
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
/* BSD target doesn't support prefixes at this point */
const char *prefix = "";
#else
@@ -677,7 +677,7 @@ test_master_lcore_flag(void)
static int
test_missing_n_flag(void)
{
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
/* BSD target doesn't support prefixes at this point */
const char * prefix = "";
#else
@@ -722,7 +722,7 @@ test_no_hpet_flag(void)
{
char prefix[PATH_MAX], tmp[PATH_MAX];
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
return 0;
#endif
if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
@@ -754,7 +754,7 @@ test_no_hpet_flag(void)
static int
test_no_huge_flag(void)
{
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
/* BSD target doesn't support prefixes at this point, and we also need to
* run another primary process here */
const char * prefix = no_shconf;
@@ -782,7 +782,7 @@ test_no_huge_flag(void)
printf("Error - process run ok with --no-huge and -m flags\n");
return -1;
}
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
/* BSD target does not support NUMA, hence no --socket-mem tests */
return 0;
#endif
@@ -870,7 +870,7 @@ static int
test_misc_flags(void)
{
char hugepath[PATH_MAX] = {0};
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
/* BSD target doesn't support prefixes at this point */
const char * prefix = "";
const char * nosh_prefix = "";
@@ -942,7 +942,7 @@ test_misc_flags(void)
const char *argv6[] = {prgname, "-c", "1", "-n", "2", "-m", DEFAULT_MEM_SIZE,
no_shconf, nosh_prefix };
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
return 0;
#endif
/* With --huge-dir */
@@ -1007,7 +1007,7 @@ test_misc_flags(void)
printf("Error - process did not run ok with --no-shconf flag\n");
return -1;
}
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
return 0;
#endif
if (launch_proc(argv7) != 0) {
@@ -1068,7 +1068,7 @@ test_file_prefix(void)
* 7. check that only memtest2 hugefiles are present in the hugedir
*/
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
return 0;
#endif
@@ -1175,7 +1175,7 @@ test_file_prefix(void)
static int
test_memory_flags(void)
{
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
/* BSD target doesn't support prefixes at this point */
const char * prefix = "";
#else
@@ -1228,7 +1228,7 @@ test_memory_flags(void)
char invalid_socket_mem[SOCKET_MEM_STRLEN];
char buf[SOCKET_MEM_STRLEN]; /* to avoid copying string onto itself */
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
int i, num_sockets = 1;
#else
int i, num_sockets = get_number_of_sockets();
@@ -1281,7 +1281,7 @@ test_memory_flags(void)
return -1;
}
-#ifdef RTE_EXEC_ENV_BSDAPP
+#if defined(RTE_EXEC_ENV_BSDAPP) || defined(RTE_EXEC_ENV_OSVAPP)
/* no other tests are applicable to BSD */
return 0;
#endif
diff --git a/app/test/test_timer_perf.c b/app/test/test_timer_perf.c
index 3f7ddd3..1edffa8 100644
--- a/app/test/test_timer_perf.c
+++ b/app/test/test_timer_perf.c
@@ -55,7 +55,7 @@ timer_cb(struct rte_timer *t __rte_unused, void *param __rte_unused)
#define DELAY_SECONDS 1
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#if defined(RTE_EXEC_ENV_LINUXAPP) || defined(RTE_EXEC_ENV_OSVAPP)
#define do_delay() usleep(10)
#else
#define do_delay() rte_pause()
--
2.1.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [dpdk-dev] [RFC PATCHv3 7/7] doc: Add Getting Started Guide for OSv
2015-04-06 18:58 [dpdk-dev] [RFC PATCHv3 0/7] add OSv support Takuya ASADA
` (5 preceding siblings ...)
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 6/7] app/test: support OSv Takuya ASADA
@ 2015-04-06 18:58 ` Takuya ASADA
2015-06-18 14:09 ` Mcnamara, John
2015-04-20 18:37 ` [dpdk-dev] [RFC PATCHv3 0/7] add OSv support Takuya ASADA
7 siblings, 1 reply; 11+ messages in thread
From: Takuya ASADA @ 2015-04-06 18:58 UTC (permalink / raw)
To: dev
Described how to build DPDK for OSv, using "Capstan".
Signed-off-by: Takuya ASADA <syuu@cloudius-systems.com>
---
doc/guides/index.rst | 1 +
doc/guides/osv_gsg/build_dpdk.rst | 282 ++++++++++++++++++++++++++
doc/guides/osv_gsg/build_sample_apps.rst | 123 +++++++++++
doc/guides/{freebsd_gsg => osv_gsg}/index.rst | 3 +-
doc/guides/{freebsd_gsg => osv_gsg}/intro.rst | 15 +-
5 files changed, 410 insertions(+), 14 deletions(-)
create mode 100644 doc/guides/osv_gsg/build_dpdk.rst
create mode 100644 doc/guides/osv_gsg/build_sample_apps.rst
copy doc/guides/{freebsd_gsg => osv_gsg}/index.rst (96%)
copy doc/guides/{freebsd_gsg => osv_gsg}/intro.rst (84%)
diff --git a/doc/guides/index.rst b/doc/guides/index.rst
index 44e8432..3b45ca3 100644
--- a/doc/guides/index.rst
+++ b/doc/guides/index.rst
@@ -40,6 +40,7 @@ Contents:
linux_gsg/index
freebsd_gsg/index
xen/index
+ osv_gsg/index
prog_guide/index
nics/index
sample_app_ug/index
diff --git a/doc/guides/osv_gsg/build_dpdk.rst b/doc/guides/osv_gsg/build_dpdk.rst
new file mode 100644
index 0000000..4eadb68
--- /dev/null
+++ b/doc/guides/osv_gsg/build_dpdk.rst
@@ -0,0 +1,282 @@
+.. BSD LICENSE
+ Copyright(c) 2010-2014 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.
+
+.. _building_from_source:
+
+Compiling the DPDK Target from Source
+=====================================
+
+System Requirements
+-------------------
+
+To building DPDK for OSv, you will need to use Linux/x86_64 with g++ 4.8 or later.
+
+Install the DPDK and Browse Sources
+-----------------------------------
+
+First, uncompress the archive and move to the DPDK source directory:
+
+.. code-block:: console
+
+ [user@host ~]$ unzip DPDK-<version>zip
+ [user@host ~]$ cd DPDK-<version>
+ [user@host DPDK]$ ls
+ app/ config/ examples/ lib/ LICENSE.GPL LICENSE.LGPL Makefile mk/ scripts/ tools/
+
+The DPDK is composed of several directories:
+
+* lib: Source code of DPDK libraries
+
+* app: Source code of DPDK applications (automatic tests)
+
+* examples: Source code of DPDK applications
+
+* config, tools, scripts, mk: Framework-related makefiles, scripts and configuration
+
+Install Capstan
+--------------------------------------------
+
+Before start building VM image, you need to install Capstan*:
+
+`http://osv.io/capstan/`
+
+.. code-block:: console
+
+ [user@host ~]$ curl https://raw.githubusercontent.com/cloudius-systems/capstan/master/scripts/download | bash
+
+Build DPDK for OSv VM image
+--------------------------------------------
+
+Build VM image using Capstan:
+
+.. code-block:: console
+
+ [user@host ~]$ cd DPDK-<version>/lib/librte_eal/osvapp/capstan/
+ [user@host capstan]$ capstan build osv-dpdk
+ Building osv-dpdk...
+ Downloading cloudius/osv-base/index.yaml...
+ 145 B / 145 B [======================================================] 100.00 %
+ Downloading cloudius/osv-base/osv-base.qemu.gz...
+ 20.09 MB / 20.09 MB [================================================] 100.00 %
+ Uploading files...
+ 10 / 10 [============================================================] 100.00 %
+
+Run DPDK for OSv VM image
+--------------------------------------------
+
+Run VM image using Capstan:
+
+.. code-block:: console
+
+ [user@host ~]$ capstan run osv-dpdk
+ Created instance: osv-dpdk
+ OSv v0.19
+ eth0: 192.168.122.15
+ EAL: Detected lcore 0 as core 0 on socket 0
+ EAL: Detected lcore 1 as core 1 on socket 0
+ EAL: Support maximum 128 logical core(s) by configuration.
+ EAL: Detected 2 lcore(s)
+ EAL: bar2 not available
+ EAL: bar2 not available
+ EAL: bar2 not available
+ EAL: bar0 not available
+ EAL: bar0 not available
+ EAL: bar0 not available
+ EAL: bar0 not available
+ EAL: PCI scan found 7 devices
+ EAL: Setting up memory...
+ EAL: Mapped memory segment 0 @ 0xffff80003de00000: physaddr:0x3de00000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff80003bc00000: physaddr:0x3bc00000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800039a00000: physaddr:0x39a00000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800037800000: physaddr:0x37800000, len 33554432
+ EAL: TSC frequency is ~438348 KHz
+ EAL: Master lcore 0 is ready (tid=57f7040;cpuset=[0])
+ PMD: ENICPMD trace: rte_enic_pmd_init
+ EAL: PCI device 0000:00:04.0 on NUMA socket -1
+ EAL: probe driver: 1af4:1000 rte_virtio_pmd
+ APP: HPET is not enabled, using TSC as default timer
+ RTE>>
+
+Run another sample applications
+--------------------------------------------
+
+Delete osv-dpdk instance at first if you already deployed it on Capstan:
+
+.. code-block:: console
+
+ [user@host ~]$ cd DPDK-<version>/lib/librte_eal/osvapp/capstan/
+ [user@host capstan]$ capstan delete osv-dpdk
+ Deleted instance: osv-dpdk
+
+Then you need to open Capstanfile on a editor, modify cmdline field:
+
+.. code-block:: console
+
+ base: cloudius/osv-base
+
+ cmdline: --maxnic=0 /l2fwd --no-shconf -c 3 -n 2 --log-level 8 -m 768 -- -p 3
+
+ build: ./GET
+
+.. note::
+
+ To control OSv instance via REST API, you'll need to specify '--maxnic=1'
+ on cmdline, then attach one more NIC on virt-install.
+ eth0 will exclusively use for REST server, DPDK uses other NICs.
+
+Build VM image again:
+
+.. code-block:: console
+
+ [user@host capstan]$ capstan build osv-dpdk
+ Building osv-dpdk...
+ Downloading cloudius/osv-base/index.yaml...
+ 145 B / 145 B [======================================================] 100.00 %
+ Downloading cloudius/osv-base/osv-base.qemu.gz...
+ 20.09 MB / 20.09 MB [================================================] 100.00 %
+ Uploading files...
+ 10 / 10 [============================================================] 100.00 %
+
+.. note::
+
+ You can use another name for new VM instance.
+ On that case, you don't have to delete existing instance.
+
+Export VM image to libvirt
+--------------------------------------------
+
+Packet forwarding application(such as l2fwd or l3fwd) requires multiple vNICs with multiple bridges, but Capstan does not have a way to configure such network.
+
+To do so, you can export VM image to libvirt by using virt-install:
+
+.. code-block:: console
+
+ [user@host ~]$ sudo virt-install --import --noreboot --name=osv-dpdk --ram=4096 --vcpus=2 --disk path=/home/user/.capstan/repository/osv-dpdk/osv-dpdk.qemu,bus=virtio --os-variant=none --accelerate --network=network:default,model=virtio --network=network:net2,model=virtio --serial pty --cpu host --rng=/dev/random
+
+ WARNING Graphics requested but DISPLAY is not set. Not running virt-viewer.
+ WARNING No console to launch for the guest, defaulting to --wait -1
+
+ Starting install...
+ Creating domain... | 0 B 00:00
+ Domain creation completed. You can restart your domain by running:
+ virsh --connect qemu:///system start osv-dpdk
+
+ [user@host ~]$ sudo virsh start osv-dpdk;sudo virsh console osv-dpdkDomain osv-dpdk started
+
+ Connected to domain osv-dpdk
+ Escape character is ^]
+ OSv v0.19
+ eth1: 192.168.123.63
+ EAL: Detected lcore 0 as core 0 on socket 0
+ EAL: Detected lcore 1 as core 1 on socket 0
+ EAL: Support maximum 128 logical core(s) by configuration.
+ EAL: Detected 2 lcore(s)
+ EAL: bar2 not available
+ EAL: bar2 not available
+ EAL: bar2 not available
+ EAL: bar1 not available
+ EAL: bar2 not available
+ EAL: bar1 not available
+ EAL: bar4 not available
+ EAL: bar0 not available
+ EAL: bar1 not available
+ EAL: bar0 not available
+ EAL: bar0 not available
+ EAL: bar0 not available
+ EAL: bar1 not available
+ EAL: bar0 not available
+ EAL: bar0 not available
+ EAL: bar0 not available
+ EAL: PCI scan found 16 devices
+ EAL: Setting up memory...
+ EAL: Mapped memory segment 0 @ 0xffff80013e000000: physaddr:0x13e000000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff80013be00000: physaddr:0x13be00000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800139c00000: physaddr:0x139c00000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800137a00000: physaddr:0x137a00000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800135800000: physaddr:0x135800000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800133600000: physaddr:0x133600000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800131400000: physaddr:0x131400000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff80012f200000: physaddr:0x12f200000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff80012d000000: physaddr:0x12d000000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff80012ae00000: physaddr:0x12ae00000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800128c00000: physaddr:0x128c00000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800126a00000: physaddr:0x126a00000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800124800000: physaddr:0x124800000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800122600000: physaddr:0x122600000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800120400000: physaddr:0x120400000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff80011e200000: physaddr:0x11e200000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff80011c000000: physaddr:0x11c000000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800119e00000: physaddr:0x119e00000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800117c00000: physaddr:0x117c00000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800115a00000: physaddr:0x115a00000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800113800000: physaddr:0x113800000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff800111600000: physaddr:0x111600000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff80010f400000: physaddr:0x10f400000, len 33554432
+ EAL: Mapped memory segment 0 @ 0xffff8000bde00000: physaddr:0xbde00000, len 33554432
+ EAL: TSC frequency is ~1575941 KHz
+ EAL: Master lcore 0 is ready (tid=4b76040;cpuset=[0])
+ PMD: ENICPMD trace: rte_enic_pmd_init
+ EAL: lcore 1 is ready (tid=52fe040;cpuset=[1])
+ EAL: PCI device 0000:00:03.0 on NUMA socket -1
+ EAL: probe driver: 1af4:1000 rte_virtio_pmd
+ EAL: PCI device 0000:00:04.0 on NUMA socket -1
+ EAL: probe driver: 1af4:1000 rte_virtio_pmd
+ Lcore 0: RX port 0
+ Lcore 1: RX port 1
+ Initializing port 0... done:
+ Port 0, MAC address: 52:54:00:05:59:A9
+
+ Initializing port 1... done:
+ Port 1, MAC address: 52:54:00:38:65:DA
+
+
+ Checking link statusdone
+ Port 0 Link Up - speed 10000 Mbps - full-duplex
+ Port 1 Link Up - speed 10000 Mbps - full-duplex
+ L2FWD: entering main loop on lcore 1
+ L2FWD: entering main loop on lcore 0
+ L2FWD: -- lcoreid=1 portid=1
+ L2FWD: -- lcoreid=0 portid=0
+
+ Port statistics ====================================
+ Statistics for port 0 ------------------------------
+ Packets sent: 0
+ Packets received: 0
+ Packets dropped: 0
+ Statistics for port 1 ------------------------------
+ Packets sent: 0
+ Packets received: 0
+ Packets dropped: 0
+ Aggregate statistics ===============================
+ Total packets sent: 0
+ Total packets received: 0
+ Total packets dropped: 0
+ ====================================================
+
diff --git a/doc/guides/osv_gsg/build_sample_apps.rst b/doc/guides/osv_gsg/build_sample_apps.rst
new file mode 100644
index 0000000..3d29a48
--- /dev/null
+++ b/doc/guides/osv_gsg/build_sample_apps.rst
@@ -0,0 +1,123 @@
+.. BSD LICENSE
+ Copyright(c) 2010-2014 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.
+
+.. _compiling_sample_apps:
+
+Compiling and Running Sample Applications
+=========================================
+
+The chapter describes how to compile and run applications in a DPDK
+environment. It also provides a pointer to where sample applications are stored.
+
+Running a Sample Application
+----------------------------
+
+The following is the list of options that can be given to the EAL:
+
+.. code-block:: console
+
+ ./rte-app -c COREMASK -n NUM [-b <domain:bus:devid.func>] [-r NUM] [-v] [--proc-type <primary|secondary|auto>]
+
+.. note::
+
+ EAL has a common interface between all operating systems and is based on the
+ Linux* notation for PCI devices. For example, a FreeBSD* device selector of
+ pci0:2:0:1 is referred to as 02:00.1 in EAL.
+
+The EAL options for FreeBSD* are as follows:
+
+* -c COREMASK
+ : A hexadecimal bit mask of the cores to run on. Note that core numbering
+ can change between platforms and should be determined beforehand.
+
+* -n NUM
+ : Number of memory channels per processor socket.
+
+* -b <domain:bus:devid.func>
+ : blacklisting of ports; prevent EAL from using specified PCI device
+ (multiple -b options are allowed).
+
+* --use-device
+ : use the specified ethernet device(s) only. Use comma-separate
+ <[domain:]bus:devid.func> values. Cannot be used with -b option.
+
+* -r NUM
+ : Number of memory ranks.
+
+* -v
+ : Display version information on startup.
+
+* --proc-type
+ : The type of process instance.
+
+Other options, specific to Linux* and are not supported under FreeBSD* are as follows:
+
+* socket-mem
+ : Memory to allocate from hugepages on specific sockets.
+
+* --huge-dir
+ : The directory where hugetlbfs is mounted.
+
+* --file-prefix
+ : The prefix text used for hugepage filenames.
+
+* -m MB
+ : Memory to allocate from hugepages, regardless of processor socket.
+ It is recommended that --socket-mem be used instead of this option.
+
+The -c and the -n options are mandatory; the others are optional.
+
+Edit cmdline on Capstanfile, then rebuild and run VM instance as follows
+(assuming the platform has four memory channels, and that cores 0-3
+are present and are to be used for running the application):
+
+.. code-block:: console
+
+ [user@host ~]$ cd DPDK-<version>/lib/librte_eal/osvapp/capstan/
+ [user@host ~]$ vi Capstanfile # edit cmdline
+ [user@host capstan]$ capstan delete osv-dpdk
+ Deleted instance: osv-dpdk
+ [user@host capstan]$ capstan build osv-dpdk
+ Building osv-dpdk...
+ Downloading cloudius/osv-base/index.yaml...
+ 145 B / 145 B [======================================================] 100.00 %
+ Downloading cloudius/osv-base/osv-base.qemu.gz...
+ 20.09 MB / 20.09 MB [================================================] 100.00 %
+ Uploading files...
+ 10 / 10 [============================================================] 100.00 %
+ [user@host ~]$ capstan run osv-dpdk
+
+.. note::
+
+ The --proc-type and --file-prefix EAL options are used for running multiple
+ DPDK processes. See the “Multi-process Sample Application” chapter
+ in the *DPDK Sample Applications User Guide and the DPDK
+ Programmers Guide* for more details.
+
diff --git a/doc/guides/freebsd_gsg/index.rst b/doc/guides/osv_gsg/index.rst
similarity index 96%
copy from doc/guides/freebsd_gsg/index.rst
copy to doc/guides/osv_gsg/index.rst
index 1b4cd3b..46ffb3e 100644
--- a/doc/guides/freebsd_gsg/index.rst
+++ b/doc/guides/osv_gsg/index.rst
@@ -28,7 +28,7 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Getting Started Guide for FreeBSD
+Getting Started Guide for OSv
=================================
|today|
@@ -40,6 +40,5 @@ Getting Started Guide for FreeBSD
:numbered:
intro
- install_from_ports
build_dpdk
build_sample_apps
diff --git a/doc/guides/freebsd_gsg/intro.rst b/doc/guides/osv_gsg/intro.rst
similarity index 84%
copy from doc/guides/freebsd_gsg/intro.rst
copy to doc/guides/osv_gsg/intro.rst
index 176358a..bc7c3ba 100644
--- a/doc/guides/freebsd_gsg/intro.rst
+++ b/doc/guides/osv_gsg/intro.rst
@@ -34,20 +34,11 @@ Introduction
This document contains instructions for installing and configuring the
Data Plane Development Kit (DPDK) software. It is designed to get customers
up and running quickly and describes how to compile and run a
-DPDK application in a FreeBSD* application (bsdapp) environment, without going
+DPDK application in a OSv* application (osvapp) environment, without going
deeply into detail.
-For a comprehensive guide to installing and using FreeBSD*, the following
-handbook is available from the FreeBSD* Documentation Project:
-
-`http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/index.html <http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/index.html>`_
-
-.. note::
-
- The DPDK is now available as part of the FreeBSD ports collection.
- Installing via the ports collection infrastructure is now the recommended
- way to install the DPDK on FreeBSD, and is documented in the
- next chapter, :ref:`install_from_ports`.
+For a comprehensive guide to installing and using OSv*, the following
+handbook is available from the OSv* Documentation Project:
Documentation Roadmap
---------------------
--
2.1.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [dpdk-dev] [RFC PATCHv3 0/7] add OSv support
2015-04-06 18:58 [dpdk-dev] [RFC PATCHv3 0/7] add OSv support Takuya ASADA
` (6 preceding siblings ...)
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 7/7] doc: Add Getting Started Guide for OSv Takuya ASADA
@ 2015-04-20 18:37 ` Takuya ASADA
2015-07-08 23:35 ` Thomas Monjalon
7 siblings, 1 reply; 11+ messages in thread
From: Takuya ASADA @ 2015-04-20 18:37 UTC (permalink / raw)
To: dev
Any comments/suggestions?
On Tue, Apr 7, 2015 at 3:58 AM, Takuya ASADA <syuu@cloudius-systems.com>
wrote:
> This is 3rd version of OSv support patchset.
>
> Changelist:
> - sync with latest master
> - updated Capstan build script for OSv v0.19
> - rte_eal_version.map fix
> - CONFIG_RTE_BUILD_SHARED_LIB=y and CONFIG_RTE_BUILD_COMBINE_LIBS=y by
> default
> - Check OSv NIC driver is loaded for each device, attach PMD only if OSv
> driver is not loaded
> - Use --maxnic on cmdline to skip loading OSv NIC driver
> - Don't enable MSI-X on virtio, since it's not enable when OSv NIC driver
> is not loaded
>
> Takuya ASADA (7):
> mk: support compiling C++ code
> eal: Add extern C on eal_hugepages.h
> eal: Add extern C on eal_thread.h
> eal: Add extern C on eal_private.h
> add OSv support
> app/test: support OSv
> doc: Add Getting Started Guide for OSv
>
> app/test/test_eal_flags.c | 34 +--
> app/test/test_timer_perf.c | 2 +-
> config/{common_linuxapp => common_osvapp} | 29 +-
> ...xapp-gcc => defconfig_x86_64-native-osvapp-gcc} | 2 +-
> doc/guides/index.rst | 1 +
> doc/guides/osv_gsg/build_dpdk.rst | 282
> +++++++++++++++++++
> doc/guides/osv_gsg/build_sample_apps.rst | 123 ++++++++
> doc/guides/{freebsd_gsg => osv_gsg}/index.rst | 3 +-
> doc/guides/{freebsd_gsg => osv_gsg}/intro.rst | 15 +-
> lib/librte_eal/Makefile | 2 +
> lib/librte_eal/common/eal_hugepages.h | 8 +
> lib/librte_eal/common/eal_private.h | 8 +
> lib/librte_eal/common/eal_thread.h | 8 +
> Makefile => lib/librte_eal/osvapp/Makefile | 5 +-
> lib/librte_eal/osvapp/capstan/Capstanfile | 6 +
> lib/librte_eal/osvapp/capstan/GET | 22 ++
> lib/librte_eal/osvapp/eal/Makefile | 115 ++++++++
> lib/librte_eal/{linuxapp => osvapp}/eal/eal.c | 123 +-------
> .../{linuxapp => osvapp}/eal/eal_alarm.c | 0
> .../{linuxapp => osvapp}/eal/eal_debug.c | 0
> lib/librte_eal/osvapp/eal/eal_hugepage_info.cc | 63 +++++
> .../{bsdapp => osvapp}/eal/eal_interrupts.c | 0
> .../eal/eal_lcore.c => osvapp/eal/eal_lcore.cc} | 53 ++--
> lib/librte_eal/{bsdapp => osvapp}/eal/eal_log.c | 0
> lib/librte_eal/osvapp/eal/eal_memory.cc | 148 ++++++++++
> lib/librte_eal/osvapp/eal/eal_pci.cc | 312
> +++++++++++++++++++++
> .../{linuxapp => osvapp}/eal/eal_thread.c | 0
> lib/librte_eal/osvapp/eal/eal_timer.c | 130 +++++++++
> .../eal/include/exec-env/rte_interrupts.h | 0
> .../{bsdapp => osvapp}/eal/rte_eal_version.map | 6 -
> mk/exec-env/{linuxapp => osvapp}/rte.app.mk | 0
> mk/exec-env/{linuxapp => osvapp}/rte.vars.mk | 6 +-
> mk/internal/rte.compile-pre.mk | 41 ++-
> mk/target/generic/rte.vars.mk | 4 +
> mk/toolchain/gcc/rte.vars.mk | 5 +-
> 35 files changed, 1345 insertions(+), 211 deletions(-)
> copy config/{common_linuxapp => common_osvapp} (95%)
> copy config/{defconfig_x86_64-native-linuxapp-gcc =>
> defconfig_x86_64-native-osvapp-gcc} (98%)
> create mode 100644 doc/guides/osv_gsg/build_dpdk.rst
> create mode 100644 doc/guides/osv_gsg/build_sample_apps.rst
> copy doc/guides/{freebsd_gsg => osv_gsg}/index.rst (96%)
> copy doc/guides/{freebsd_gsg => osv_gsg}/intro.rst (84%)
> copy Makefile => lib/librte_eal/osvapp/Makefile (93%)
> create mode 100644 lib/librte_eal/osvapp/capstan/Capstanfile
> create mode 100755 lib/librte_eal/osvapp/capstan/GET
> create mode 100644 lib/librte_eal/osvapp/eal/Makefile
> copy lib/librte_eal/{linuxapp => osvapp}/eal/eal.c (87%)
> copy lib/librte_eal/{linuxapp => osvapp}/eal/eal_alarm.c (100%)
> copy lib/librte_eal/{linuxapp => osvapp}/eal/eal_debug.c (100%)
> create mode 100644 lib/librte_eal/osvapp/eal/eal_hugepage_info.cc
> copy lib/librte_eal/{bsdapp => osvapp}/eal/eal_interrupts.c (100%)
> copy lib/librte_eal/{bsdapp/eal/eal_lcore.c => osvapp/eal/eal_lcore.cc}
> (80%)
> copy lib/librte_eal/{bsdapp => osvapp}/eal/eal_log.c (100%)
> create mode 100644 lib/librte_eal/osvapp/eal/eal_memory.cc
> create mode 100644 lib/librte_eal/osvapp/eal/eal_pci.cc
> copy lib/librte_eal/{linuxapp => osvapp}/eal/eal_thread.c (100%)
> create mode 100644 lib/librte_eal/osvapp/eal/eal_timer.c
> copy lib/librte_eal/{bsdapp =>
> osvapp}/eal/include/exec-env/rte_interrupts.h (100%)
> copy lib/librte_eal/{bsdapp => osvapp}/eal/rte_eal_version.map (92%)
> copy mk/exec-env/{linuxapp => osvapp}/rte.app.mk (100%)
> copy mk/exec-env/{linuxapp => osvapp}/rte.vars.mk (95%)
>
> --
> 2.1.0
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [dpdk-dev] [RFC PATCHv3 7/7] doc: Add Getting Started Guide for OSv
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 7/7] doc: Add Getting Started Guide for OSv Takuya ASADA
@ 2015-06-18 14:09 ` Mcnamara, John
0 siblings, 0 replies; 11+ messages in thread
From: Mcnamara, John @ 2015-06-18 14:09 UTC (permalink / raw)
To: Takuya ASADA, dev
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Takuya ASADA
> Sent: Monday, April 6, 2015 7:58 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [RFC PATCHv3 7/7] doc: Add Getting Started Guide for
> OSv
>
> Described how to build DPDK for OSv, using "Capstan".
Hi,
A few minor issues:
* The patch has some whitespace issues.
* The introduction could make it a little clearer what OSv is.
* The introduction mentions a handbook but there isn't a link.
* The OSv guide should follow the FreeBSD guide in the index.rst file.
* "make doc-guides-html" generates the following warnings due to conflict with the FreeBSD docs. Unique labels should be provided.
WARNING: duplicate label building_from_source
WARNING: duplicate label compiling_sample_apps
John
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [dpdk-dev] [RFC PATCHv3 0/7] add OSv support
2015-04-20 18:37 ` [dpdk-dev] [RFC PATCHv3 0/7] add OSv support Takuya ASADA
@ 2015-07-08 23:35 ` Thomas Monjalon
0 siblings, 0 replies; 11+ messages in thread
From: Thomas Monjalon @ 2015-07-08 23:35 UTC (permalink / raw)
To: Takuya ASADA; +Cc: dev
Hi Takuya,
It has been difficult to receive comments on this series during 2.1 cycle.
I see 3 reasons:
- few people know OSv
- the series is mixing C++ support and OSv environment
- you are adding a third system to support while some work is in progress
to reduce differences between Linux and BSD support.
I suggest to:
- fix doc with John's help
- split C++ and OSv patches
- help to merge Linux and BSD common code
- introduce a common config file for every environments
- re-send OSv support series at the beginning of 2.2 cycle without RFC keyword
Thanks for your work
2015-04-21 03:37, Takuya ASADA:
> Any comments/suggestions?
>
> On Tue, Apr 7, 2015 at 3:58 AM, Takuya ASADA <syuu@cloudius-systems.com>
> wrote:
>
> > This is 3rd version of OSv support patchset.
> >
> > Changelist:
> > - sync with latest master
> > - updated Capstan build script for OSv v0.19
> > - rte_eal_version.map fix
> > - CONFIG_RTE_BUILD_SHARED_LIB=y and CONFIG_RTE_BUILD_COMBINE_LIBS=y by
> > default
> > - Check OSv NIC driver is loaded for each device, attach PMD only if OSv
> > driver is not loaded
> > - Use --maxnic on cmdline to skip loading OSv NIC driver
> > - Don't enable MSI-X on virtio, since it's not enable when OSv NIC driver
> > is not loaded
> >
> > Takuya ASADA (7):
> > mk: support compiling C++ code
> > eal: Add extern C on eal_hugepages.h
> > eal: Add extern C on eal_thread.h
> > eal: Add extern C on eal_private.h
> > add OSv support
> > app/test: support OSv
> > doc: Add Getting Started Guide for OSv
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2015-07-08 23:36 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-06 18:58 [dpdk-dev] [RFC PATCHv3 0/7] add OSv support Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 1/7] mk: support compiling C++ code Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 2/7] eal: Add extern C on eal_hugepages.h Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 3/7] eal: Add extern C on eal_thread.h Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 4/7] eal: Add extern C on eal_private.h Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 5/7] add OSv support Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 6/7] app/test: support OSv Takuya ASADA
2015-04-06 18:58 ` [dpdk-dev] [RFC PATCHv3 7/7] doc: Add Getting Started Guide for OSv Takuya ASADA
2015-06-18 14:09 ` Mcnamara, John
2015-04-20 18:37 ` [dpdk-dev] [RFC PATCHv3 0/7] add OSv support Takuya ASADA
2015-07-08 23:35 ` Thomas Monjalon
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).