eal/bsd: rename bsdapp to freebsd
authorBruce Richardson <bruce.richardson@intel.com>
Wed, 6 Mar 2019 16:22:37 +0000 (16:22 +0000)
committerThomas Monjalon <thomas@monjalon.net>
Tue, 12 Mar 2019 16:30:20 +0000 (17:30 +0100)
The term "bsdapp" is a legacy one, but just calling the subdirectory
"freebsd" is just clearer for all concerned.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
39 files changed:
MAINTAINERS
devtools/build-tags.sh
doc/guides/prog_guide/env_abstraction_layer.rst
lib/librte_eal/Makefile
lib/librte_eal/bsdapp/BSDmakefile.meson [deleted file]
lib/librte_eal/bsdapp/Makefile [deleted file]
lib/librte_eal/bsdapp/eal/Makefile [deleted file]
lib/librte_eal/bsdapp/eal/eal.c [deleted file]
lib/librte_eal/bsdapp/eal/eal_alarm.c [deleted file]
lib/librte_eal/bsdapp/eal/eal_alarm_private.h [deleted file]
lib/librte_eal/bsdapp/eal/eal_cpuflags.c [deleted file]
lib/librte_eal/bsdapp/eal/eal_debug.c [deleted file]
lib/librte_eal/bsdapp/eal/eal_dev.c [deleted file]
lib/librte_eal/bsdapp/eal/eal_hugepage_info.c [deleted file]
lib/librte_eal/bsdapp/eal/eal_interrupts.c [deleted file]
lib/librte_eal/bsdapp/eal/eal_lcore.c [deleted file]
lib/librte_eal/bsdapp/eal/eal_memalloc.c [deleted file]
lib/librte_eal/bsdapp/eal/eal_memory.c [deleted file]
lib/librte_eal/bsdapp/eal/eal_thread.c [deleted file]
lib/librte_eal/bsdapp/eal/eal_timer.c [deleted file]
lib/librte_eal/bsdapp/eal/meson.build [deleted file]
lib/librte_eal/freebsd/BSDmakefile.meson [new file with mode: 0644]
lib/librte_eal/freebsd/Makefile [new file with mode: 0644]
lib/librte_eal/freebsd/eal/Makefile [new file with mode: 0644]
lib/librte_eal/freebsd/eal/eal.c [new file with mode: 0644]
lib/librte_eal/freebsd/eal/eal_alarm.c [new file with mode: 0644]
lib/librte_eal/freebsd/eal/eal_alarm_private.h [new file with mode: 0644]
lib/librte_eal/freebsd/eal/eal_cpuflags.c [new file with mode: 0644]
lib/librte_eal/freebsd/eal/eal_debug.c [new file with mode: 0644]
lib/librte_eal/freebsd/eal/eal_dev.c [new file with mode: 0644]
lib/librte_eal/freebsd/eal/eal_hugepage_info.c [new file with mode: 0644]
lib/librte_eal/freebsd/eal/eal_interrupts.c [new file with mode: 0644]
lib/librte_eal/freebsd/eal/eal_lcore.c [new file with mode: 0644]
lib/librte_eal/freebsd/eal/eal_memalloc.c [new file with mode: 0644]
lib/librte_eal/freebsd/eal/eal_memory.c [new file with mode: 0644]
lib/librte_eal/freebsd/eal/eal_thread.c [new file with mode: 0644]
lib/librte_eal/freebsd/eal/eal_timer.c [new file with mode: 0644]
lib/librte_eal/freebsd/eal/meson.build [new file with mode: 0644]
lib/librte_eal/meson.build

index 097cfb4..d1e624c 100644 (file)
@@ -113,7 +113,7 @@ F: doc/guides/prog_guide/ext_app_lib_make_help.rst
 Meson build
 M: Bruce Richardson <bruce.richardson@intel.com>
 F: meson.build
-F: lib/librte_eal/bsdapp/BSDmakefile.meson
+F: lib/librte_eal/freebsd/BSDmakefile.meson
 F: meson_options.txt
 F: config/rte_config.h
 F: buildtools/gen-pmdinfo-cfile.sh
@@ -174,7 +174,7 @@ F: lib/librte_eal/common/eal_common_fbarray.c
 F: lib/librte_eal/common/eal_common_mem*
 F: lib/librte_eal/common/eal_hugepages.h
 F: lib/librte_eal/linuxapp/eal/eal_mem*
-F: lib/librte_eal/bsdapp/eal/eal_mem*
+F: lib/librte_eal/freebsd/eal/eal_mem*
 F: doc/guides/prog_guide/env_abstraction_layer.rst
 F: app/test/test_external_mem.c
 F: app/test/test_func_reentrancy.c
@@ -260,8 +260,8 @@ F: drivers/bus/pci/linux/*vfio*
 
 FreeBSD EAL (with overlaps)
 M: Bruce Richardson <bruce.richardson@intel.com>
-F: lib/librte_eal/bsdapp/Makefile
-F: lib/librte_eal/bsdapp/eal/
+F: lib/librte_eal/freebsd/Makefile
+F: lib/librte_eal/freebsd/eal/
 F: doc/guides/freebsd_gsg/
 
 FreeBSD contigmem
index 03ba185..3a98e9b 100755 (executable)
@@ -72,7 +72,7 @@ linux_sources()
 
 bsd_sources()
 {
-       find_sources "lib/librte_eal/bsdapp" '*.[chS]'
+       find_sources "lib/librte_eal/freebsd" '*.[chS]'
 }
 
 arm_common()
index 67b45ba..73436b0 100644 (file)
@@ -349,7 +349,7 @@ EAL provides the event APIs for this event-driven thread mode.
 Taking linuxapp as an example, the implementation relies on epoll. Each thread can monitor an epoll instance
 in which all the wake-up events' file descriptors are added. The event file descriptors are created and mapped to
 the interrupt vectors according to the UIO/VFIO spec.
-From bsdapp's perspective, kqueue is the alternative way, but not implemented yet.
+From FreeBSD's perspective, kqueue is the alternative way, but not implemented yet.
 
 EAL initializes the mapping between event file descriptors and interrupt vectors, while each device initializes the mapping
 between interrupt vectors and queues. In this way, EAL actually is unaware of the interrupt cause on the specific vector.
index ccd45cb..39d64bb 100644 (file)
@@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
 DIRS-y += common
 DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linuxapp
 DEPDIRS-linuxapp := common
-DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += bsdapp
-DEPDIRS-bsdapp := common
+DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += freebsd
+DEPDIRS-freebsd := common
 
 include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/lib/librte_eal/bsdapp/BSDmakefile.meson b/lib/librte_eal/bsdapp/BSDmakefile.meson
deleted file mode 100644 (file)
index 42f5b2b..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-#   BSD LICENSE
-#
-#   Copyright(c) 2017 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.
-#
-
-# makefile for building kernel modules using meson
-# takes parameters from the environment
-
-# source file is passed via KMOD_SRC as full path, we only use final
-# component of it, as VPATH is used to find actual file, so as to
-# have the .o files placed in the build, not source directory
-VPATH = ${KMOD_SRC:H}
-SRCS = ${KMOD_SRC:T} device_if.h bus_if.h pci_if.h
-CFLAGS += $(KMOD_CFLAGS)
-
-.include <bsd.kmod.mk>
diff --git a/lib/librte_eal/bsdapp/Makefile b/lib/librte_eal/bsdapp/Makefile
deleted file mode 100644 (file)
index 5b06b21..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile
deleted file mode 100644 (file)
index bfeddaa..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2015 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-LIB = librte_eal.a
-
-ARCH_DIR ?= $(RTE_ARCH)
-VPATH += $(RTE_SDK)/lib/librte_eal/common
-VPATH += $(RTE_SDK)/lib/librte_eal/common/arch/$(ARCH_DIR)
-
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-CFLAGS += -I$(SRCDIR)/include
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include
-CFLAGS += $(WERROR_FLAGS) -O3
-
-LDLIBS += -lexecinfo
-LDLIBS += -lpthread
-LDLIBS += -lgcc_s
-LDLIBS += -lrte_kvargs
-
-EXPORT_MAP := ../../rte_eal_version.map
-
-LIBABIVER := 9
-
-# specific to bsdapp exec-env
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) := eal.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_cpuflags.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_memory.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_hugepage_info.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_thread.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_debug.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_memalloc.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_lcore.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_timer.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_interrupts.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_alarm.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_dev.c
-
-# from common dir
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_lcore.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_timer.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_memzone.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_log.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_launch.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_memalloc.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_memory.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_tailqs.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_errno.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_cpuflags.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_hypervisor.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_string_fns.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_hexdump.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_devargs.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_class.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_bus.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_dev.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_options.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_thread.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_proc.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_fbarray.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_uuid.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_malloc.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += hotplug_mp.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += malloc_elem.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += malloc_heap.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += malloc_mp.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_keepalive.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_option.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_service.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_reciprocal.c
-
-# from arch dir
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_cpuflags.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_hypervisor.c
-SRCS-$(CONFIG_RTE_ARCH_X86) += rte_spinlock.c
-SRCS-y += rte_cycles.c
-
-CFLAGS_eal_common_cpuflags.o := $(CPUFLAGS_LIST)
-
-# 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
-CFLAGS_eal_hpet.o += -Wno-return-type
-endif
-
-INC :=  # no bsdapp specific headers
-
-SYMLINK-$(CONFIG_RTE_EXEC_ENV_BSDAPP)-include/exec-env := \
-       $(addprefix include/exec-env/,$(INC))
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
deleted file mode 100644 (file)
index 4e86b10..0000000
+++ /dev/null
@@ -1,1004 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2018 Intel Corporation.
- * Copyright(c) 2014 6WIND S.A.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <pthread.h>
-#include <syslog.h>
-#include <getopt.h>
-#include <sys/file.h>
-#include <stddef.h>
-#include <errno.h>
-#include <limits.h>
-#include <sys/mman.h>
-#include <sys/queue.h>
-#include <sys/stat.h>
-
-#include <rte_compat.h>
-#include <rte_common.h>
-#include <rte_debug.h>
-#include <rte_memory.h>
-#include <rte_launch.h>
-#include <rte_eal.h>
-#include <rte_eal_memconfig.h>
-#include <rte_errno.h>
-#include <rte_per_lcore.h>
-#include <rte_lcore.h>
-#include <rte_service_component.h>
-#include <rte_log.h>
-#include <rte_random.h>
-#include <rte_cycles.h>
-#include <rte_string_fns.h>
-#include <rte_cpuflags.h>
-#include <rte_interrupts.h>
-#include <rte_bus.h>
-#include <rte_dev.h>
-#include <rte_devargs.h>
-#include <rte_version.h>
-#include <rte_vfio.h>
-#include <rte_option.h>
-#include <rte_atomic.h>
-#include <malloc_heap.h>
-
-#include "eal_private.h"
-#include "eal_thread.h"
-#include "eal_internal_cfg.h"
-#include "eal_filesystem.h"
-#include "eal_hugepages.h"
-#include "eal_options.h"
-
-#define MEMSIZE_IF_NO_HUGE_PAGE (64ULL * 1024ULL * 1024ULL)
-
-/* Allow the application to print its usage message too if set */
-static rte_usage_hook_t        rte_application_usage_hook = NULL;
-/* early configuration structure, when memory config is not mmapped */
-static struct rte_mem_config early_mem_config;
-
-/* define fd variable here, because file needs to be kept open for the
- * duration of the program, as we hold a write lock on it in the primary proc */
-static int mem_cfg_fd = -1;
-
-static struct flock wr_lock = {
-               .l_type = F_WRLCK,
-               .l_whence = SEEK_SET,
-               .l_start = offsetof(struct rte_mem_config, memsegs),
-               .l_len = sizeof(early_mem_config.memsegs),
-};
-
-/* Address of global and public configuration */
-static struct rte_config rte_config = {
-               .mem_config = &early_mem_config,
-};
-
-/* internal configuration (per-core) */
-struct lcore_config lcore_config[RTE_MAX_LCORE];
-
-/* internal configuration */
-struct internal_config internal_config;
-
-/* used by rte_rdtsc() */
-int rte_cycles_vmware_tsc_map;
-
-/* platform-specific runtime dir */
-static char runtime_dir[PATH_MAX];
-
-static const char *default_runtime_dir = "/var/run";
-
-int
-eal_create_runtime_dir(void)
-{
-       const char *directory = default_runtime_dir;
-       const char *xdg_runtime_dir = getenv("XDG_RUNTIME_DIR");
-       const char *fallback = "/tmp";
-       char tmp[PATH_MAX];
-       int ret;
-
-       if (getuid() != 0) {
-               /* try XDG path first, fall back to /tmp */
-               if (xdg_runtime_dir != NULL)
-                       directory = xdg_runtime_dir;
-               else
-                       directory = fallback;
-       }
-       /* create DPDK subdirectory under runtime dir */
-       ret = snprintf(tmp, sizeof(tmp), "%s/dpdk", directory);
-       if (ret < 0 || ret == sizeof(tmp)) {
-               RTE_LOG(ERR, EAL, "Error creating DPDK runtime path name\n");
-               return -1;
-       }
-
-       /* create prefix-specific subdirectory under DPDK runtime dir */
-       ret = snprintf(runtime_dir, sizeof(runtime_dir), "%s/%s",
-                       tmp, eal_get_hugefile_prefix());
-       if (ret < 0 || ret == sizeof(runtime_dir)) {
-               RTE_LOG(ERR, EAL, "Error creating prefix-specific runtime path name\n");
-               return -1;
-       }
-
-       /* create the path if it doesn't exist. no "mkdir -p" here, so do it
-        * step by step.
-        */
-       ret = mkdir(tmp, 0700);
-       if (ret < 0 && errno != EEXIST) {
-               RTE_LOG(ERR, EAL, "Error creating '%s': %s\n",
-                       tmp, strerror(errno));
-               return -1;
-       }
-
-       ret = mkdir(runtime_dir, 0700);
-       if (ret < 0 && errno != EEXIST) {
-               RTE_LOG(ERR, EAL, "Error creating '%s': %s\n",
-                       runtime_dir, strerror(errno));
-               return -1;
-       }
-
-       return 0;
-}
-
-int
-eal_clean_runtime_dir(void)
-{
-       /* FreeBSD doesn't need this implemented for now, because, unlike Linux,
-        * FreeBSD doesn't create per-process files, so no need to clean up.
-        */
-       return 0;
-}
-
-
-const char *
-rte_eal_get_runtime_dir(void)
-{
-       return runtime_dir;
-}
-
-/* Return user provided mbuf pool ops name */
-const char *
-rte_eal_mbuf_user_pool_ops(void)
-{
-       return internal_config.user_mbuf_pool_ops_name;
-}
-
-/* Return a pointer to the configuration structure */
-struct rte_config *
-rte_eal_get_configuration(void)
-{
-       return &rte_config;
-}
-
-enum rte_iova_mode
-rte_eal_iova_mode(void)
-{
-       return rte_eal_get_configuration()->iova_mode;
-}
-
-/* parse a sysfs (or other) file containing one integer value */
-int
-eal_parse_sysfs_value(const char *filename, unsigned long *val)
-{
-       FILE *f;
-       char buf[BUFSIZ];
-       char *end = NULL;
-
-       if ((f = fopen(filename, "r")) == NULL) {
-               RTE_LOG(ERR, EAL, "%s(): cannot open sysfs value %s\n",
-                       __func__, filename);
-               return -1;
-       }
-
-       if (fgets(buf, sizeof(buf), f) == NULL) {
-               RTE_LOG(ERR, EAL, "%s(): cannot read sysfs value %s\n",
-                       __func__, filename);
-               fclose(f);
-               return -1;
-       }
-       *val = strtoul(buf, &end, 0);
-       if ((buf[0] == '\0') || (end == NULL) || (*end != '\n')) {
-               RTE_LOG(ERR, EAL, "%s(): cannot parse sysfs value %s\n",
-                               __func__, filename);
-               fclose(f);
-               return -1;
-       }
-       fclose(f);
-       return 0;
-}
-
-
-/* create memory configuration in shared/mmap memory. Take out
- * a write lock on the memsegs, so we can auto-detect primary/secondary.
- * This means we never close the file while running (auto-close on exit).
- * We also don't lock the whole file, so that in future we can use read-locks
- * on other parts, e.g. memzones, to detect if there are running secondary
- * processes. */
-static void
-rte_eal_config_create(void)
-{
-       void *rte_mem_cfg_addr;
-       int retval;
-
-       const char *pathname = eal_runtime_config_path();
-
-       if (internal_config.no_shconf)
-               return;
-
-       if (mem_cfg_fd < 0){
-               mem_cfg_fd = open(pathname, O_RDWR | O_CREAT, 0660);
-               if (mem_cfg_fd < 0)
-                       rte_panic("Cannot open '%s' for rte_mem_config\n", pathname);
-       }
-
-       retval = ftruncate(mem_cfg_fd, sizeof(*rte_config.mem_config));
-       if (retval < 0){
-               close(mem_cfg_fd);
-               rte_panic("Cannot resize '%s' for rte_mem_config\n", pathname);
-       }
-
-       retval = fcntl(mem_cfg_fd, F_SETLK, &wr_lock);
-       if (retval < 0){
-               close(mem_cfg_fd);
-               rte_exit(EXIT_FAILURE, "Cannot create lock on '%s'. Is another primary "
-                               "process running?\n", pathname);
-       }
-
-       rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config),
-                               PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0);
-
-       if (rte_mem_cfg_addr == MAP_FAILED){
-               rte_panic("Cannot mmap memory for rte_config\n");
-       }
-       memcpy(rte_mem_cfg_addr, &early_mem_config, sizeof(early_mem_config));
-       rte_config.mem_config = rte_mem_cfg_addr;
-}
-
-/* attach to an existing shared memory config */
-static void
-rte_eal_config_attach(void)
-{
-       void *rte_mem_cfg_addr;
-       const char *pathname = eal_runtime_config_path();
-
-       if (internal_config.no_shconf)
-               return;
-
-       if (mem_cfg_fd < 0){
-               mem_cfg_fd = open(pathname, O_RDWR);
-               if (mem_cfg_fd < 0)
-                       rte_panic("Cannot open '%s' for rte_mem_config\n", pathname);
-       }
-
-       rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config),
-                               PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0);
-       close(mem_cfg_fd);
-       if (rte_mem_cfg_addr == MAP_FAILED)
-               rte_panic("Cannot mmap memory for rte_config\n");
-
-       rte_config.mem_config = rte_mem_cfg_addr;
-}
-
-/* Detect if we are a primary or a secondary process */
-enum rte_proc_type_t
-eal_proc_type_detect(void)
-{
-       enum rte_proc_type_t ptype = RTE_PROC_PRIMARY;
-       const char *pathname = eal_runtime_config_path();
-
-       /* if there no shared config, there can be no secondary processes */
-       if (!internal_config.no_shconf) {
-               /* if we can open the file but not get a write-lock we are a
-                * secondary process. NOTE: if we get a file handle back, we
-                * keep that open and don't close it to prevent a race condition
-                * between multiple opens.
-                */
-               if (((mem_cfg_fd = open(pathname, O_RDWR)) >= 0) &&
-                               (fcntl(mem_cfg_fd, F_SETLK, &wr_lock) < 0))
-                       ptype = RTE_PROC_SECONDARY;
-       }
-
-       RTE_LOG(INFO, EAL, "Auto-detected process type: %s\n",
-                       ptype == RTE_PROC_PRIMARY ? "PRIMARY" : "SECONDARY");
-
-       return ptype;
-}
-
-/* Sets up rte_config structure with the pointer to shared memory config.*/
-static void
-rte_config_init(void)
-{
-       rte_config.process_type = internal_config.process_type;
-
-       switch (rte_config.process_type){
-       case RTE_PROC_PRIMARY:
-               rte_eal_config_create();
-               break;
-       case RTE_PROC_SECONDARY:
-               rte_eal_config_attach();
-               rte_eal_mcfg_wait_complete(rte_config.mem_config);
-               break;
-       case RTE_PROC_AUTO:
-       case RTE_PROC_INVALID:
-               rte_panic("Invalid process type\n");
-       }
-}
-
-/* display usage */
-static void
-eal_usage(const char *prgname)
-{
-       printf("\nUsage: %s ", prgname);
-       eal_common_usage();
-       /* Allow the application to print its usage message too if hook is set */
-       if ( rte_application_usage_hook ) {
-               printf("===== Application Usage =====\n\n");
-               rte_application_usage_hook(prgname);
-       }
-}
-
-/* Set a per-application usage message */
-rte_usage_hook_t
-rte_set_application_usage_hook( rte_usage_hook_t usage_func )
-{
-       rte_usage_hook_t        old_func;
-
-       /* Will be NULL on the first call to denote the last usage routine. */
-       old_func                                        = rte_application_usage_hook;
-       rte_application_usage_hook      = usage_func;
-
-       return old_func;
-}
-
-static inline size_t
-eal_get_hugepage_mem_size(void)
-{
-       uint64_t size = 0;
-       unsigned i, j;
-
-       for (i = 0; i < internal_config.num_hugepage_sizes; i++) {
-               struct hugepage_info *hpi = &internal_config.hugepage_info[i];
-               if (strnlen(hpi->hugedir, sizeof(hpi->hugedir)) != 0) {
-                       for (j = 0; j < RTE_MAX_NUMA_NODES; j++) {
-                               size += hpi->hugepage_sz * hpi->num_pages[j];
-                       }
-               }
-       }
-
-       return (size < SIZE_MAX) ? (size_t)(size) : SIZE_MAX;
-}
-
-/* Parse the arguments for --log-level only */
-static void
-eal_log_level_parse(int argc, char **argv)
-{
-       int opt;
-       char **argvopt;
-       int option_index;
-       const int old_optind = optind;
-       const int old_optopt = optopt;
-       const int old_optreset = optreset;
-       char * const old_optarg = optarg;
-
-       argvopt = argv;
-       optind = 1;
-       optreset = 1;
-
-       while ((opt = getopt_long(argc, argvopt, eal_short_options,
-                                 eal_long_options, &option_index)) != EOF) {
-
-               int ret;
-
-               /* getopt is not happy, stop right now */
-               if (opt == '?')
-                       break;
-
-               ret = (opt == OPT_LOG_LEVEL_NUM) ?
-                       eal_parse_common_option(opt, optarg, &internal_config) : 0;
-
-               /* common parser is not happy */
-               if (ret < 0)
-                       break;
-       }
-
-       /* restore getopt lib */
-       optind = old_optind;
-       optopt = old_optopt;
-       optreset = old_optreset;
-       optarg = old_optarg;
-}
-
-/* Parse the argument given in the command line of the application */
-static int
-eal_parse_args(int argc, char **argv)
-{
-       int opt, ret;
-       char **argvopt;
-       int option_index;
-       char *prgname = argv[0];
-       const int old_optind = optind;
-       const int old_optopt = optopt;
-       const int old_optreset = optreset;
-       char * const old_optarg = optarg;
-
-       argvopt = argv;
-       optind = 1;
-       optreset = 1;
-       opterr = 0;
-
-       while ((opt = getopt_long(argc, argvopt, eal_short_options,
-                                 eal_long_options, &option_index)) != EOF) {
-
-               /*
-                * getopt didn't recognise the option, lets parse the
-                * registered options to see if the flag is valid
-                */
-               if (opt == '?') {
-                       ret = rte_option_parse(argv[optind-1]);
-                       if (ret == 0)
-                               continue;
-
-                       eal_usage(prgname);
-                       ret = -1;
-                       goto out;
-               }
-
-               ret = eal_parse_common_option(opt, optarg, &internal_config);
-               /* common parser is not happy */
-               if (ret < 0) {
-                       eal_usage(prgname);
-                       ret = -1;
-                       goto out;
-               }
-               /* common parser handled this option */
-               if (ret == 0)
-                       continue;
-
-               switch (opt) {
-               case OPT_MBUF_POOL_OPS_NAME_NUM:
-               {
-                       char *ops_name = strdup(optarg);
-                       if (ops_name == NULL)
-                               RTE_LOG(ERR, EAL, "Could not store mbuf pool ops name\n");
-                       else {
-                               /* free old ops name */
-                               if (internal_config.user_mbuf_pool_ops_name !=
-                                               NULL)
-                                       free(internal_config.user_mbuf_pool_ops_name);
-
-                               internal_config.user_mbuf_pool_ops_name =
-                                               ops_name;
-                       }
-                       break;
-               }
-               case 'h':
-                       eal_usage(prgname);
-                       exit(EXIT_SUCCESS);
-               default:
-                       if (opt < OPT_LONG_MIN_NUM && isprint(opt)) {
-                               RTE_LOG(ERR, EAL, "Option %c is not supported "
-                                       "on FreeBSD\n", opt);
-                       } else if (opt >= OPT_LONG_MIN_NUM &&
-                                  opt < OPT_LONG_MAX_NUM) {
-                               RTE_LOG(ERR, EAL, "Option %s is not supported "
-                                       "on FreeBSD\n",
-                                       eal_long_options[option_index].name);
-                       } else {
-                               RTE_LOG(ERR, EAL, "Option %d is not supported "
-                                       "on FreeBSD\n", opt);
-                       }
-                       eal_usage(prgname);
-                       ret = -1;
-                       goto out;
-               }
-       }
-
-       /* create runtime data directory */
-       if (internal_config.no_shconf == 0 &&
-                       eal_create_runtime_dir() < 0) {
-               RTE_LOG(ERR, EAL, "Cannot create runtime directory\n");
-               ret = -1;
-               goto out;
-       }
-
-       if (eal_adjust_config(&internal_config) != 0) {
-               ret = -1;
-               goto out;
-       }
-
-       /* sanity checks */
-       if (eal_check_common_options(&internal_config) != 0) {
-               eal_usage(prgname);
-               ret = -1;
-               goto out;
-       }
-
-       if (optind >= 0)
-               argv[optind-1] = prgname;
-       ret = optind-1;
-
-out:
-       /* restore getopt lib */
-       optind = old_optind;
-       optopt = old_optopt;
-       optreset = old_optreset;
-       optarg = old_optarg;
-
-       return ret;
-}
-
-static int
-check_socket(const struct rte_memseg_list *msl, void *arg)
-{
-       int *socket_id = arg;
-
-       if (msl->external)
-               return 0;
-
-       if (msl->socket_id == *socket_id && msl->memseg_arr.count != 0)
-               return 1;
-
-       return 0;
-}
-
-static void
-eal_check_mem_on_local_socket(void)
-{
-       int socket_id;
-
-       socket_id = rte_lcore_to_socket_id(rte_config.master_lcore);
-
-       if (rte_memseg_list_walk(check_socket, &socket_id) == 0)
-               RTE_LOG(WARNING, EAL, "WARNING: Master core has no memory on local socket!\n");
-}
-
-
-static int
-sync_func(__attribute__((unused)) void *arg)
-{
-       return 0;
-}
-
-inline static void
-rte_eal_mcfg_complete(void)
-{
-       /* ALL shared mem_config related INIT DONE */
-       if (rte_config.process_type == RTE_PROC_PRIMARY)
-               rte_config.mem_config->magic = RTE_MAGIC;
-}
-
-/* return non-zero if hugepages are enabled. */
-int rte_eal_has_hugepages(void)
-{
-       return !internal_config.no_hugetlbfs;
-}
-
-/* Abstraction for port I/0 privilege */
-int
-rte_eal_iopl_init(void)
-{
-       static int fd = -1;
-
-       if (fd < 0)
-               fd = open("/dev/io", O_RDWR);
-
-       if (fd < 0)
-               return -1;
-       /* keep fd open for iopl */
-       return 0;
-}
-
-static void rte_eal_init_alert(const char *msg)
-{
-       fprintf(stderr, "EAL: FATAL: %s\n", msg);
-       RTE_LOG(ERR, EAL, "%s\n", msg);
-}
-
-/* Launch threads, called at application init(). */
-int
-rte_eal_init(int argc, char **argv)
-{
-       int i, fctret, ret;
-       pthread_t thread_id;
-       static rte_atomic32_t run_once = RTE_ATOMIC32_INIT(0);
-       char cpuset[RTE_CPU_AFFINITY_STR_LEN];
-       char thread_name[RTE_MAX_THREAD_NAME_LEN];
-
-       /* checks if the machine is adequate */
-       if (!rte_cpu_is_supported()) {
-               rte_eal_init_alert("unsupported cpu type.");
-               rte_errno = ENOTSUP;
-               return -1;
-       }
-
-       if (!rte_atomic32_test_and_set(&run_once)) {
-               rte_eal_init_alert("already called initialization.");
-               rte_errno = EALREADY;
-               return -1;
-       }
-
-       thread_id = pthread_self();
-
-       eal_reset_internal_config(&internal_config);
-
-       /* set log level as early as possible */
-       eal_log_level_parse(argc, argv);
-
-       if (rte_eal_cpu_init() < 0) {
-               rte_eal_init_alert("Cannot detect lcores.");
-               rte_errno = ENOTSUP;
-               return -1;
-       }
-
-       fctret = eal_parse_args(argc, argv);
-       if (fctret < 0) {
-               rte_eal_init_alert("Invalid 'command line' arguments.");
-               rte_errno = EINVAL;
-               rte_atomic32_clear(&run_once);
-               return -1;
-       }
-
-       /* FreeBSD always uses legacy memory model */
-       internal_config.legacy_mem = true;
-
-       if (eal_plugins_init() < 0) {
-               rte_eal_init_alert("Cannot init plugins");
-               rte_errno = EINVAL;
-               rte_atomic32_clear(&run_once);
-               return -1;
-       }
-
-       if (eal_option_device_parse()) {
-               rte_errno = ENODEV;
-               rte_atomic32_clear(&run_once);
-               return -1;
-       }
-
-       rte_config_init();
-
-       if (rte_eal_intr_init() < 0) {
-               rte_eal_init_alert("Cannot init interrupt-handling thread");
-               return -1;
-       }
-
-       /* Put mp channel init before bus scan so that we can init the vdev
-        * bus through mp channel in the secondary process before the bus scan.
-        */
-       if (rte_mp_channel_init() < 0) {
-               rte_eal_init_alert("failed to init mp channel");
-               if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-                       rte_errno = EFAULT;
-                       return -1;
-               }
-       }
-
-       if (rte_bus_scan()) {
-               rte_eal_init_alert("Cannot scan the buses for devices");
-               rte_errno = ENODEV;
-               rte_atomic32_clear(&run_once);
-               return -1;
-       }
-
-       /* if no EAL option "--iova-mode=<pa|va>", use bus IOVA scheme */
-       if (internal_config.iova_mode == RTE_IOVA_DC) {
-               /* autodetect the IOVA mapping mode (default is RTE_IOVA_PA) */
-               rte_eal_get_configuration()->iova_mode =
-                       rte_bus_get_iommu_class();
-       } else {
-               rte_eal_get_configuration()->iova_mode =
-                       internal_config.iova_mode;
-       }
-
-       if (internal_config.no_hugetlbfs == 0) {
-               /* rte_config isn't initialized yet */
-               ret = internal_config.process_type == RTE_PROC_PRIMARY ?
-                       eal_hugepage_info_init() :
-                       eal_hugepage_info_read();
-               if (ret < 0) {
-                       rte_eal_init_alert("Cannot get hugepage information.");
-                       rte_errno = EACCES;
-                       rte_atomic32_clear(&run_once);
-                       return -1;
-               }
-       }
-
-       if (internal_config.memory == 0 && internal_config.force_sockets == 0) {
-               if (internal_config.no_hugetlbfs)
-                       internal_config.memory = MEMSIZE_IF_NO_HUGE_PAGE;
-               else
-                       internal_config.memory = eal_get_hugepage_mem_size();
-       }
-
-       if (internal_config.vmware_tsc_map == 1) {
-#ifdef RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT
-               rte_cycles_vmware_tsc_map = 1;
-               RTE_LOG (DEBUG, EAL, "Using VMWARE TSC MAP, "
-                               "you must have monitor_control.pseudo_perfctr = TRUE\n");
-#else
-               RTE_LOG (WARNING, EAL, "Ignoring --vmware-tsc-map because "
-                               "RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT is not set\n");
-#endif
-       }
-
-       rte_srand(rte_rdtsc());
-
-       /* in secondary processes, memory init may allocate additional fbarrays
-        * not present in primary processes, so to avoid any potential issues,
-        * initialize memzones first.
-        */
-       if (rte_eal_memzone_init() < 0) {
-               rte_eal_init_alert("Cannot init memzone");
-               rte_errno = ENODEV;
-               return -1;
-       }
-
-       if (rte_eal_memory_init() < 0) {
-               rte_eal_init_alert("Cannot init memory");
-               rte_errno = ENOMEM;
-               return -1;
-       }
-
-       if (rte_eal_malloc_heap_init() < 0) {
-               rte_eal_init_alert("Cannot init malloc heap");
-               rte_errno = ENODEV;
-               return -1;
-       }
-
-       if (rte_eal_tailqs_init() < 0) {
-               rte_eal_init_alert("Cannot init tail queues for objects");
-               rte_errno = EFAULT;
-               return -1;
-       }
-
-       if (rte_eal_alarm_init() < 0) {
-               rte_eal_init_alert("Cannot init interrupt-handling thread");
-               /* rte_eal_alarm_init sets rte_errno on failure. */
-               return -1;
-       }
-
-       if (rte_eal_timer_init() < 0) {
-               rte_eal_init_alert("Cannot init HPET or TSC timers");
-               rte_errno = ENOTSUP;
-               return -1;
-       }
-
-       eal_check_mem_on_local_socket();
-
-       eal_thread_init_master(rte_config.master_lcore);
-
-       ret = eal_thread_dump_affinity(cpuset, sizeof(cpuset));
-
-       RTE_LOG(DEBUG, EAL, "Master lcore %u is ready (tid=%p;cpuset=[%s%s])\n",
-               rte_config.master_lcore, thread_id, cpuset,
-               ret == 0 ? "" : "...");
-
-       RTE_LCORE_FOREACH_SLAVE(i) {
-
-               /*
-                * create communication pipes between master thread
-                * and children
-                */
-               if (pipe(lcore_config[i].pipe_master2slave) < 0)
-                       rte_panic("Cannot create pipe\n");
-               if (pipe(lcore_config[i].pipe_slave2master) < 0)
-                       rte_panic("Cannot create pipe\n");
-
-               lcore_config[i].state = WAIT;
-
-               /* create a thread for each lcore */
-               ret = pthread_create(&lcore_config[i].thread_id, NULL,
-                                    eal_thread_loop, NULL);
-               if (ret != 0)
-                       rte_panic("Cannot create thread\n");
-
-               /* Set thread_name for aid in debugging. */
-               snprintf(thread_name, sizeof(thread_name),
-                               "lcore-slave-%d", i);
-               rte_thread_setname(lcore_config[i].thread_id, thread_name);
-       }
-
-       /*
-        * Launch a dummy function on all slave lcores, so that master lcore
-        * knows they are all ready when this function returns.
-        */
-       rte_eal_mp_remote_launch(sync_func, NULL, SKIP_MASTER);
-       rte_eal_mp_wait_lcore();
-
-       /* initialize services so vdevs register service during bus_probe. */
-       ret = rte_service_init();
-       if (ret) {
-               rte_eal_init_alert("rte_service_init() failed");
-               rte_errno = ENOEXEC;
-               return -1;
-       }
-
-       /* Probe all the buses and devices/drivers on them */
-       if (rte_bus_probe()) {
-               rte_eal_init_alert("Cannot probe devices");
-               rte_errno = ENOTSUP;
-               return -1;
-       }
-
-       /* initialize default service/lcore mappings and start running. Ignore
-        * -ENOTSUP, as it indicates no service coremask passed to EAL.
-        */
-       ret = rte_service_start_with_defaults();
-       if (ret < 0 && ret != -ENOTSUP) {
-               rte_errno = ENOEXEC;
-               return -1;
-       }
-
-       /*
-        * Clean up unused files in runtime directory. We do this at the end of
-        * init and not at the beginning because we want to clean stuff up
-        * whether we are primary or secondary process, but we cannot remove
-        * primary process' files because secondary should be able to run even
-        * if primary process is dead.
-        *
-        * In no_shconf mode, no runtime directory is created in the first
-        * place, so no cleanup needed.
-        */
-       if (!internal_config.no_shconf && eal_clean_runtime_dir() < 0) {
-               rte_eal_init_alert("Cannot clear runtime directory\n");
-               return -1;
-       }
-
-       rte_eal_mcfg_complete();
-
-       /* Call each registered callback, if enabled */
-       rte_option_init();
-
-       return fctret;
-}
-
-int __rte_experimental
-rte_eal_cleanup(void)
-{
-       rte_service_finalize();
-       rte_mp_channel_cleanup();
-       eal_cleanup_config(&internal_config);
-       return 0;
-}
-
-/* get core role */
-enum rte_lcore_role_t
-rte_eal_lcore_role(unsigned lcore_id)
-{
-       return rte_config.lcore_role[lcore_id];
-}
-
-enum rte_proc_type_t
-rte_eal_process_type(void)
-{
-       return rte_config.process_type;
-}
-
-int rte_eal_has_pci(void)
-{
-       return !internal_config.no_pci;
-}
-
-int rte_eal_create_uio_dev(void)
-{
-       return internal_config.create_uio_dev;
-}
-
-enum rte_intr_mode
-rte_eal_vfio_intr_mode(void)
-{
-       return RTE_INTR_MODE_NONE;
-}
-
-int rte_vfio_setup_device(__rte_unused const char *sysfs_base,
-                     __rte_unused const char *dev_addr,
-                     __rte_unused int *vfio_dev_fd,
-                     __rte_unused struct vfio_device_info *device_info)
-{
-       return -1;
-}
-
-int rte_vfio_release_device(__rte_unused const char *sysfs_base,
-                       __rte_unused const char *dev_addr,
-                       __rte_unused int fd)
-{
-       return -1;
-}
-
-int rte_vfio_enable(__rte_unused const char *modname)
-{
-       return -1;
-}
-
-int rte_vfio_is_enabled(__rte_unused const char *modname)
-{
-       return 0;
-}
-
-int rte_vfio_noiommu_is_enabled(void)
-{
-       return 0;
-}
-
-int rte_vfio_clear_group(__rte_unused int vfio_group_fd)
-{
-       return 0;
-}
-
-int
-rte_vfio_dma_map(uint64_t __rte_unused vaddr, __rte_unused uint64_t iova,
-                 __rte_unused uint64_t len)
-{
-       return -1;
-}
-
-int
-rte_vfio_dma_unmap(uint64_t __rte_unused vaddr, uint64_t __rte_unused iova,
-                   __rte_unused uint64_t len)
-{
-       return -1;
-}
-
-int
-rte_vfio_get_group_num(__rte_unused const char *sysfs_base,
-                      __rte_unused const char *dev_addr,
-                      __rte_unused int *iommu_group_num)
-{
-       return -1;
-}
-
-int
-rte_vfio_get_container_fd(void)
-{
-       return -1;
-}
-
-int
-rte_vfio_get_group_fd(__rte_unused int iommu_group_num)
-{
-       return -1;
-}
-
-int
-rte_vfio_container_create(void)
-{
-       return -1;
-}
-
-int
-rte_vfio_container_destroy(__rte_unused int container_fd)
-{
-       return -1;
-}
-
-int
-rte_vfio_container_group_bind(__rte_unused int container_fd,
-               __rte_unused int iommu_group_num)
-{
-       return -1;
-}
-
-int
-rte_vfio_container_group_unbind(__rte_unused int container_fd,
-               __rte_unused int iommu_group_num)
-{
-       return -1;
-}
-
-int
-rte_vfio_container_dma_map(__rte_unused int container_fd,
-                       __rte_unused uint64_t vaddr,
-                       __rte_unused uint64_t iova,
-                       __rte_unused uint64_t len)
-{
-       return -1;
-}
-
-int
-rte_vfio_container_dma_unmap(__rte_unused int container_fd,
-                       __rte_unused uint64_t vaddr,
-                       __rte_unused uint64_t iova,
-                       __rte_unused uint64_t len)
-{
-       return -1;
-}
diff --git a/lib/librte_eal/bsdapp/eal/eal_alarm.c b/lib/librte_eal/bsdapp/eal/eal_alarm.c
deleted file mode 100644 (file)
index 51ea4b8..0000000
+++ /dev/null
@@ -1,314 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2018 Intel Corporation
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-
-#include <rte_alarm.h>
-#include <rte_cycles.h>
-#include <rte_common.h>
-#include <rte_errno.h>
-#include <rte_interrupts.h>
-#include <rte_spinlock.h>
-
-#include "eal_private.h"
-#include "eal_alarm_private.h"
-
-#define NS_PER_US 1000
-
-#ifdef CLOCK_MONOTONIC_RAW /* Defined in glibc bits/time.h */
-#define CLOCK_TYPE_ID CLOCK_MONOTONIC_RAW
-#else
-#define CLOCK_TYPE_ID CLOCK_MONOTONIC
-#endif
-
-struct alarm_entry {
-       LIST_ENTRY(alarm_entry) next;
-       struct rte_intr_handle handle;
-       struct timespec time;
-       rte_eal_alarm_callback cb_fn;
-       void *cb_arg;
-       volatile uint8_t executing;
-       volatile pthread_t executing_id;
-};
-
-static LIST_HEAD(alarm_list, alarm_entry) alarm_list = LIST_HEAD_INITIALIZER();
-static rte_spinlock_t alarm_list_lk = RTE_SPINLOCK_INITIALIZER;
-
-static struct rte_intr_handle intr_handle = {.fd = -1 };
-static void eal_alarm_callback(void *arg);
-
-int
-rte_eal_alarm_init(void)
-{
-       intr_handle.type = RTE_INTR_HANDLE_ALARM;
-
-       /* on FreeBSD, timers don't use fd's, and their identifiers are stored
-        * in separate namespace from fd's, so using any value is OK. however,
-        * EAL interrupts handler expects fd's to be unique, so use an actual fd
-        * to guarantee unique timer identifier.
-        */
-       intr_handle.fd = open("/dev/zero", O_RDONLY);
-
-       return 0;
-}
-
-static inline int
-timespec_cmp(const struct timespec *now, const struct timespec *at)
-{
-       if (now->tv_sec < at->tv_sec)
-               return -1;
-       if (now->tv_sec > at->tv_sec)
-               return 1;
-       if (now->tv_nsec < at->tv_nsec)
-               return -1;
-       if (now->tv_nsec > at->tv_nsec)
-               return 1;
-       return 0;
-}
-
-static inline uint64_t
-diff_ns(struct timespec *now, struct timespec *at)
-{
-       uint64_t now_ns, at_ns;
-
-       if (timespec_cmp(now, at) >= 0)
-               return 0;
-
-       now_ns = now->tv_sec * NS_PER_S + now->tv_nsec;
-       at_ns = at->tv_sec * NS_PER_S + at->tv_nsec;
-
-       return at_ns - now_ns;
-}
-
-int
-eal_alarm_get_timeout_ns(uint64_t *val)
-{
-       struct alarm_entry *ap;
-       struct timespec now;
-
-       if (clock_gettime(CLOCK_TYPE_ID, &now) < 0)
-               return -1;
-
-       if (LIST_EMPTY(&alarm_list))
-               return -1;
-
-       ap = LIST_FIRST(&alarm_list);
-
-       *val = diff_ns(&now, &ap->time);
-
-       return 0;
-}
-
-static int
-unregister_current_callback(void)
-{
-       struct alarm_entry *ap;
-       int ret = 0;
-
-       if (!LIST_EMPTY(&alarm_list)) {
-               ap = LIST_FIRST(&alarm_list);
-
-               do {
-                       ret = rte_intr_callback_unregister(&intr_handle,
-                               eal_alarm_callback, &ap->time);
-               } while (ret == -EAGAIN);
-       }
-
-       return ret;
-}
-
-static int
-register_first_callback(void)
-{
-       struct alarm_entry *ap;
-       int ret = 0;
-
-       if (!LIST_EMPTY(&alarm_list)) {
-               ap = LIST_FIRST(&alarm_list);
-
-               /* register a new callback */
-               ret = rte_intr_callback_register(&intr_handle,
-                               eal_alarm_callback, &ap->time);
-       }
-       return ret;
-}
-
-static void
-eal_alarm_callback(void *arg __rte_unused)
-{
-       struct timespec now;
-       struct alarm_entry *ap;
-
-       rte_spinlock_lock(&alarm_list_lk);
-       ap = LIST_FIRST(&alarm_list);
-
-       if (clock_gettime(CLOCK_TYPE_ID, &now) < 0)
-               return;
-
-       while (ap != NULL && timespec_cmp(&now, &ap->time) >= 0) {
-               ap->executing = 1;
-               ap->executing_id = pthread_self();
-               rte_spinlock_unlock(&alarm_list_lk);
-
-               ap->cb_fn(ap->cb_arg);
-
-               rte_spinlock_lock(&alarm_list_lk);
-
-               LIST_REMOVE(ap, next);
-               free(ap);
-
-               ap = LIST_FIRST(&alarm_list);
-       }
-
-       /* timer has been deleted from the kqueue, so recreate it if needed */
-       register_first_callback();
-
-       rte_spinlock_unlock(&alarm_list_lk);
-}
-
-
-int
-rte_eal_alarm_set(uint64_t us, rte_eal_alarm_callback cb_fn, void *cb_arg)
-{
-       struct alarm_entry *ap, *new_alarm;
-       struct timespec now;
-       uint64_t ns;
-       int ret = 0;
-
-       /* check parameters, also ensure us won't cause a uint64_t overflow */
-       if (us < 1 || us > (UINT64_MAX - US_PER_S) || cb_fn == NULL)
-               return -EINVAL;
-
-       new_alarm = calloc(1, sizeof(*new_alarm));
-       if (new_alarm == NULL)
-               return -ENOMEM;
-
-       /* use current time to calculate absolute time of alarm */
-       clock_gettime(CLOCK_TYPE_ID, &now);
-
-       ns = us * NS_PER_US;
-
-       new_alarm->cb_fn = cb_fn;
-       new_alarm->cb_arg = cb_arg;
-       new_alarm->time.tv_nsec = (now.tv_nsec + ns) % NS_PER_S;
-       new_alarm->time.tv_sec = now.tv_sec + ((now.tv_nsec + ns) / NS_PER_S);
-
-       rte_spinlock_lock(&alarm_list_lk);
-
-       if (LIST_EMPTY(&alarm_list))
-               LIST_INSERT_HEAD(&alarm_list, new_alarm, next);
-       else {
-               LIST_FOREACH(ap, &alarm_list, next) {
-                       if (timespec_cmp(&new_alarm->time, &ap->time) < 0) {
-                               LIST_INSERT_BEFORE(ap, new_alarm, next);
-                               break;
-                       }
-                       if (LIST_NEXT(ap, next) == NULL) {
-                               LIST_INSERT_AFTER(ap, new_alarm, next);
-                               break;
-                       }
-               }
-       }
-
-       /* re-register first callback just in case */
-       register_first_callback();
-
-       rte_spinlock_unlock(&alarm_list_lk);
-
-       return ret;
-}
-
-int
-rte_eal_alarm_cancel(rte_eal_alarm_callback cb_fn, void *cb_arg)
-{
-       struct alarm_entry *ap, *ap_prev;
-       int count = 0;
-       int err = 0;
-       int executing;
-
-       if (!cb_fn) {
-               rte_errno = EINVAL;
-               return -1;
-       }
-
-       do {
-               executing = 0;
-               rte_spinlock_lock(&alarm_list_lk);
-               /* remove any matches at the start of the list */
-               while (1) {
-                       ap = LIST_FIRST(&alarm_list);
-                       if (ap == NULL)
-                               break;
-                       if (cb_fn != ap->cb_fn)
-                               break;
-                       if (cb_arg != ap->cb_arg && cb_arg != (void *) -1)
-                               break;
-                       if (ap->executing == 0) {
-                               LIST_REMOVE(ap, next);
-                               free(ap);
-                               count++;
-                       } else {
-                               /* If calling from other context, mark that
-                                * alarm is executing so loop can spin till it
-                                * finish. Otherwise we are trying to cancel
-                                * ourselves - mark it by EINPROGRESS.
-                                */
-                               if (pthread_equal(ap->executing_id,
-                                               pthread_self()) == 0)
-                                       executing++;
-                               else
-                                       err = EINPROGRESS;
-
-                               break;
-                       }
-               }
-               ap_prev = ap;
-
-               /* now go through list, removing entries not at start */
-               LIST_FOREACH(ap, &alarm_list, next) {
-                       /* this won't be true first time through */
-                       if (cb_fn == ap->cb_fn &&
-                                       (cb_arg == (void *)-1 ||
-                                        cb_arg == ap->cb_arg)) {
-                               if (ap->executing == 0) {
-                                       LIST_REMOVE(ap, next);
-                                       free(ap);
-                                       count++;
-                                       ap = ap_prev;
-                               } else if (pthread_equal(ap->executing_id,
-                                                        pthread_self()) == 0) {
-                                       executing++;
-                               } else {
-                                       err = EINPROGRESS;
-                               }
-                       }
-                       ap_prev = ap;
-               }
-               rte_spinlock_unlock(&alarm_list_lk);
-       } while (executing != 0);
-
-       if (count == 0 && err == 0)
-               rte_errno = ENOENT;
-       else if (err)
-               rte_errno = err;
-
-       rte_spinlock_lock(&alarm_list_lk);
-
-       /* unregister if no alarms left, otherwise re-register first */
-       if (LIST_EMPTY(&alarm_list))
-               unregister_current_callback();
-       else
-               register_first_callback();
-
-       rte_spinlock_unlock(&alarm_list_lk);
-
-       return count;
-}
diff --git a/lib/librte_eal/bsdapp/eal/eal_alarm_private.h b/lib/librte_eal/bsdapp/eal/eal_alarm_private.h
deleted file mode 100644 (file)
index 65c7115..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018 Intel Corporation
- */
-
-#ifndef EAL_ALARM_PRIVATE_H
-#define EAL_ALARM_PRIVATE_H
-
-#include <inttypes.h>
-
-/*
- * FreeBSD needs a back-channel communication mechanism between interrupt and
- * alarm thread, because on FreeBSD, timer period is set up inside the interrupt
- * API and not inside alarm API like on Linux.
- */
-
-int
-eal_alarm_get_timeout_ns(uint64_t *val);
-
-#endif // EAL_ALARM_PRIVATE_H
diff --git a/lib/librte_eal/bsdapp/eal/eal_cpuflags.c b/lib/librte_eal/bsdapp/eal/eal_cpuflags.c
deleted file mode 100644 (file)
index 69b161e..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2018 Mellanox Technologies, Ltd
- */
-
-#include <rte_common.h>
-#include <rte_cpuflags.h>
-
-unsigned long
-rte_cpu_getauxval(unsigned long type __rte_unused)
-{
-       /* not implemented */
-       return 0;
-}
-
-int
-rte_cpu_strcmp_auxval(unsigned long type __rte_unused,
-               const char *str __rte_unused)
-{
-       /* not implemented */
-       return -1;
-}
diff --git a/lib/librte_eal/bsdapp/eal/eal_debug.c b/lib/librte_eal/bsdapp/eal/eal_debug.c
deleted file mode 100644 (file)
index 5d92500..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#ifdef RTE_BACKTRACE
-#include <execinfo.h>
-#endif
-#include <stdarg.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-
-#include <rte_log.h>
-#include <rte_debug.h>
-#include <rte_common.h>
-#include <rte_eal.h>
-
-#define BACKTRACE_SIZE 256
-
-/* dump the stack of the calling core */
-void rte_dump_stack(void)
-{
-#ifdef RTE_BACKTRACE
-       void *func[BACKTRACE_SIZE];
-       char **symb = NULL;
-       int size;
-
-       size = backtrace(func, BACKTRACE_SIZE);
-       symb = backtrace_symbols(func, size);
-
-       if (symb == NULL)
-               return;
-
-       while (size > 0) {
-               rte_log(RTE_LOG_ERR, RTE_LOGTYPE_EAL,
-                       "%d: [%s]\n", size, symb[size - 1]);
-               size --;
-       }
-
-       free(symb);
-#endif /* RTE_BACKTRACE */
-}
-
-/* not implemented in this environment */
-void rte_dump_registers(void)
-{
-       return;
-}
-
-/* call abort(), it will generate a coredump if enabled */
-void __rte_panic(const char *funcname, const char *format, ...)
-{
-       va_list ap;
-
-       rte_log(RTE_LOG_CRIT, RTE_LOGTYPE_EAL, "PANIC in %s():\n", funcname);
-       va_start(ap, format);
-       rte_vlog(RTE_LOG_CRIT, RTE_LOGTYPE_EAL, format, ap);
-       va_end(ap);
-       rte_dump_stack();
-       rte_dump_registers();
-       abort();
-}
-
-/*
- * Like rte_panic this terminates the application. However, no traceback is
- * provided and no core-dump is generated.
- */
-void
-rte_exit(int exit_code, const char *format, ...)
-{
-       va_list ap;
-
-       if (exit_code != 0)
-               RTE_LOG(CRIT, EAL, "Error - exiting with code: %d\n"
-                               "  Cause: ", exit_code);
-
-       va_start(ap, format);
-       rte_vlog(RTE_LOG_CRIT, RTE_LOGTYPE_EAL, format, ap);
-       va_end(ap);
-
-#ifndef RTE_EAL_ALWAYS_PANIC_ON_ERROR
-       if (rte_eal_cleanup() != 0)
-               RTE_LOG(CRIT, EAL,
-                       "EAL could not release all resources\n");
-       exit(exit_code);
-#else
-       rte_dump_stack();
-       rte_dump_registers();
-       abort();
-#endif
-}
diff --git a/lib/librte_eal/bsdapp/eal/eal_dev.c b/lib/librte_eal/bsdapp/eal/eal_dev.c
deleted file mode 100644 (file)
index 255d611..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018 Intel Corporation
- */
-
-#include <rte_log.h>
-#include <rte_compat.h>
-#include <rte_dev.h>
-
-int __rte_experimental
-rte_dev_event_monitor_start(void)
-{
-       RTE_LOG(ERR, EAL, "Device event is not supported for FreeBSD\n");
-       return -1;
-}
-
-int __rte_experimental
-rte_dev_event_monitor_stop(void)
-{
-       RTE_LOG(ERR, EAL, "Device event is not supported for FreeBSD\n");
-       return -1;
-}
-
-int __rte_experimental
-rte_dev_hotplug_handle_enable(void)
-{
-       RTE_LOG(ERR, EAL, "Device event is not supported for FreeBSD\n");
-       return -1;
-}
-
-int __rte_experimental
-rte_dev_hotplug_handle_disable(void)
-{
-       RTE_LOG(ERR, EAL, "Device event is not supported for FreeBSD\n");
-       return -1;
-}
diff --git a/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c b/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
deleted file mode 100644 (file)
index 1e8f5df..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <sys/mman.h>
-#include <string.h>
-
-#include <rte_log.h>
-#include <fcntl.h>
-#include "eal_hugepages.h"
-#include "eal_internal_cfg.h"
-#include "eal_filesystem.h"
-
-#define CONTIGMEM_DEV "/dev/contigmem"
-
-/*
- * Uses mmap to create a shared memory area for storage of data
- * Used in this file to store the hugepage file map on disk
- */
-static void *
-map_shared_memory(const char *filename, const size_t mem_size, int flags)
-{
-       void *retval;
-       int fd = open(filename, flags, 0666);
-       if (fd < 0)
-               return NULL;
-       if (ftruncate(fd, mem_size) < 0) {
-               close(fd);
-               return NULL;
-       }
-       retval = mmap(NULL, mem_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-       close(fd);
-       return retval;
-}
-
-static void *
-open_shared_memory(const char *filename, const size_t mem_size)
-{
-       return map_shared_memory(filename, mem_size, O_RDWR);
-}
-
-static void *
-create_shared_memory(const char *filename, const size_t mem_size)
-{
-       return map_shared_memory(filename, mem_size, O_RDWR | O_CREAT);
-}
-
-/*
- * No hugepage support on freebsd, but we dummy it, using contigmem driver
- */
-int
-eal_hugepage_info_init(void)
-{
-       size_t sysctl_size;
-       int num_buffers, fd, error;
-       int64_t buffer_size;
-       /* re-use the linux "internal config" structure for our memory data */
-       struct hugepage_info *hpi = &internal_config.hugepage_info[0];
-       struct hugepage_info *tmp_hpi;
-       unsigned int i;
-
-       internal_config.num_hugepage_sizes = 1;
-
-       sysctl_size = sizeof(num_buffers);
-       error = sysctlbyname("hw.contigmem.num_buffers", &num_buffers,
-                       &sysctl_size, NULL, 0);
-
-       if (error != 0) {
-               RTE_LOG(ERR, EAL, "could not read sysctl hw.contigmem.num_buffers\n");
-               return -1;
-       }
-
-       sysctl_size = sizeof(buffer_size);
-       error = sysctlbyname("hw.contigmem.buffer_size", &buffer_size,
-                       &sysctl_size, NULL, 0);
-
-       if (error != 0) {
-               RTE_LOG(ERR, EAL, "could not read sysctl hw.contigmem.buffer_size\n");
-               return -1;
-       }
-
-       fd = open(CONTIGMEM_DEV, O_RDWR);
-       if (fd < 0) {
-               RTE_LOG(ERR, EAL, "could not open "CONTIGMEM_DEV"\n");
-               return -1;
-       }
-
-       if (buffer_size >= 1<<30)
-               RTE_LOG(INFO, EAL, "Contigmem driver has %d buffers, each of size %dGB\n",
-                               num_buffers, (int)(buffer_size>>30));
-       else if (buffer_size >= 1<<20)
-               RTE_LOG(INFO, EAL, "Contigmem driver has %d buffers, each of size %dMB\n",
-                               num_buffers, (int)(buffer_size>>20));
-       else
-               RTE_LOG(INFO, EAL, "Contigmem driver has %d buffers, each of size %dKB\n",
-                               num_buffers, (int)(buffer_size>>10));
-
-       strlcpy(hpi->hugedir, CONTIGMEM_DEV, sizeof(hpi->hugedir));
-       hpi->hugepage_sz = buffer_size;
-       hpi->num_pages[0] = num_buffers;
-       hpi->lock_descriptor = fd;
-
-       /* for no shared files mode, do not create shared memory config */
-       if (internal_config.no_shconf)
-               return 0;
-
-       tmp_hpi = create_shared_memory(eal_hugepage_info_path(),
-                       sizeof(internal_config.hugepage_info));
-       if (tmp_hpi == NULL ) {
-               RTE_LOG(ERR, EAL, "Failed to create shared memory!\n");
-               return -1;
-       }
-
-       memcpy(tmp_hpi, hpi, sizeof(internal_config.hugepage_info));
-
-       /* we've copied file descriptors along with everything else, but they
-        * will be invalid in secondary process, so overwrite them
-        */
-       for (i = 0; i < RTE_DIM(internal_config.hugepage_info); i++) {
-               struct hugepage_info *tmp = &tmp_hpi[i];
-               tmp->lock_descriptor = -1;
-       }
-
-       if (munmap(tmp_hpi, sizeof(internal_config.hugepage_info)) < 0) {
-               RTE_LOG(ERR, EAL, "Failed to unmap shared memory!\n");
-               return -1;
-       }
-
-       return 0;
-}
-
-/* copy stuff from shared info into internal config */
-int
-eal_hugepage_info_read(void)
-{
-       struct hugepage_info *hpi = &internal_config.hugepage_info[0];
-       struct hugepage_info *tmp_hpi;
-
-       internal_config.num_hugepage_sizes = 1;
-
-       tmp_hpi = open_shared_memory(eal_hugepage_info_path(),
-                                 sizeof(internal_config.hugepage_info));
-       if (tmp_hpi == NULL) {
-               RTE_LOG(ERR, EAL, "Failed to open shared memory!\n");
-               return -1;
-       }
-
-       memcpy(hpi, tmp_hpi, sizeof(internal_config.hugepage_info));
-
-       if (munmap(tmp_hpi, sizeof(internal_config.hugepage_info)) < 0) {
-               RTE_LOG(ERR, EAL, "Failed to unmap shared memory!\n");
-               return -1;
-       }
-       return 0;
-}
diff --git a/lib/librte_eal/bsdapp/eal/eal_interrupts.c b/lib/librte_eal/bsdapp/eal/eal_interrupts.c
deleted file mode 100644 (file)
index 2feee2d..0000000
+++ /dev/null
@@ -1,561 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2018 Intel Corporation
- */
-
-#include <string.h>
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/queue.h>
-#include <unistd.h>
-
-#include <rte_errno.h>
-#include <rte_lcore.h>
-#include <rte_spinlock.h>
-#include <rte_common.h>
-#include <rte_interrupts.h>
-
-#include "eal_private.h"
-#include "eal_alarm_private.h"
-
-#define MAX_INTR_EVENTS 16
-
-/**
- * union buffer for reading on different devices
- */
-union rte_intr_read_buffer {
-       char charbuf[16];                /* for others */
-};
-
-TAILQ_HEAD(rte_intr_cb_list, rte_intr_callback);
-TAILQ_HEAD(rte_intr_source_list, rte_intr_source);
-
-struct rte_intr_callback {
-       TAILQ_ENTRY(rte_intr_callback) next;
-       rte_intr_callback_fn cb_fn;  /**< callback address */
-       void *cb_arg;                /**< parameter for callback */
-};
-
-struct rte_intr_source {
-       TAILQ_ENTRY(rte_intr_source) next;
-       struct rte_intr_handle intr_handle; /**< interrupt handle */
-       struct rte_intr_cb_list callbacks;  /**< user callbacks */
-       uint32_t active;
-};
-
-/* global spinlock for interrupt data operation */
-static rte_spinlock_t intr_lock = RTE_SPINLOCK_INITIALIZER;
-
-/* interrupt sources list */
-static struct rte_intr_source_list intr_sources;
-
-/* interrupt handling thread */
-static pthread_t intr_thread;
-
-static volatile int kq = -1;
-
-static int
-intr_source_to_kevent(const struct rte_intr_handle *ih, struct kevent *ke)
-{
-       /* alarm callbacks are special case */
-       if (ih->type == RTE_INTR_HANDLE_ALARM) {
-               uint64_t timeout_ns;
-
-               /* get soonest alarm timeout */
-               if (eal_alarm_get_timeout_ns(&timeout_ns) < 0)
-                       return -1;
-
-               ke->filter = EVFILT_TIMER;
-               /* timers are one shot */
-               ke->flags |= EV_ONESHOT;
-               ke->fflags = NOTE_NSECONDS;
-               ke->data = timeout_ns;
-       } else {
-               ke->filter = EVFILT_READ;
-       }
-       ke->ident = ih->fd;
-
-       return 0;
-}
-
-int
-rte_intr_callback_register(const struct rte_intr_handle *intr_handle,
-               rte_intr_callback_fn cb, void *cb_arg)
-{
-       struct rte_intr_callback *callback = NULL;
-       struct rte_intr_source *src = NULL;
-       int ret, add_event;
-
-       /* first do parameter checking */
-       if (intr_handle == NULL || intr_handle->fd < 0 || cb == NULL) {
-               RTE_LOG(ERR, EAL,
-                       "Registering with invalid input parameter\n");
-               return -EINVAL;
-       }
-       if (kq < 0) {
-               RTE_LOG(ERR, EAL, "Kqueue is not active: %d\n", kq);
-               return -ENODEV;
-       }
-
-       /* allocate a new interrupt callback entity */
-       callback = calloc(1, sizeof(*callback));
-       if (callback == NULL) {
-               RTE_LOG(ERR, EAL, "Can not allocate memory\n");
-               return -ENOMEM;
-       }
-       callback->cb_fn = cb;
-       callback->cb_arg = cb_arg;
-
-       rte_spinlock_lock(&intr_lock);
-
-       /* check if there is at least one callback registered for the fd */
-       TAILQ_FOREACH(src, &intr_sources, next) {
-               if (src->intr_handle.fd == intr_handle->fd) {
-                       /* we had no interrupts for this */
-                       if (TAILQ_EMPTY(&src->callbacks))
-                               add_event = 1;
-
-                       TAILQ_INSERT_TAIL(&(src->callbacks), callback, next);
-                       ret = 0;
-                       break;
-               }
-       }
-
-       /* no existing callbacks for this - add new source */
-       if (src == NULL) {
-               src = calloc(1, sizeof(*src));
-               if (src == NULL) {
-                       RTE_LOG(ERR, EAL, "Can not allocate memory\n");
-                       ret = -ENOMEM;
-                       goto fail;
-               } else {
-                       src->intr_handle = *intr_handle;
-                       TAILQ_INIT(&src->callbacks);
-                       TAILQ_INSERT_TAIL(&(src->callbacks), callback, next);
-                       TAILQ_INSERT_TAIL(&intr_sources, src, next);
-                       add_event = 1;
-                       ret = 0;
-               }
-       }
-
-       /* add events to the queue. timer events are special as we need to
-        * re-set the timer.
-        */
-       if (add_event || src->intr_handle.type == RTE_INTR_HANDLE_ALARM) {
-               struct kevent ke;
-
-               memset(&ke, 0, sizeof(ke));
-               ke.flags = EV_ADD; /* mark for addition to the queue */
-
-               if (intr_source_to_kevent(intr_handle, &ke) < 0) {
-                       RTE_LOG(ERR, EAL, "Cannot convert interrupt handle to kevent\n");
-                       ret = -ENODEV;
-                       goto fail;
-               }
-
-               /**
-                * add the intr file descriptor into wait list.
-                */
-               if (kevent(kq, &ke, 1, NULL, 0, NULL) < 0) {
-                       /* currently, nic_uio does not support interrupts, so
-                        * this error will always be triggered and output to the
-                        * user. so, don't output it unless debug log level set.
-                        */
-                       if (errno == ENODEV)
-                               RTE_LOG(DEBUG, EAL, "Interrupt handle %d not supported\n",
-                                       src->intr_handle.fd);
-                       else
-                               RTE_LOG(ERR, EAL, "Error adding fd %d "
-                                               "kevent, %s\n",
-                                               src->intr_handle.fd,
-                                               strerror(errno));
-                       ret = -errno;
-                       goto fail;
-               }
-       }
-       rte_spinlock_unlock(&intr_lock);
-
-       return ret;
-fail:
-       /* clean up */
-       if (src != NULL) {
-               TAILQ_REMOVE(&(src->callbacks), callback, next);
-               if (TAILQ_EMPTY(&(src->callbacks))) {
-                       TAILQ_REMOVE(&intr_sources, src, next);
-                       free(src);
-               }
-       }
-       free(callback);
-       rte_spinlock_unlock(&intr_lock);
-       return ret;
-}
-
-int
-rte_intr_callback_unregister(const struct rte_intr_handle *intr_handle,
-               rte_intr_callback_fn cb_fn, void *cb_arg)
-{
-       int ret;
-       struct rte_intr_source *src;
-       struct rte_intr_callback *cb, *next;
-
-       /* do parameter checking first */
-       if (intr_handle == NULL || intr_handle->fd < 0) {
-               RTE_LOG(ERR, EAL,
-               "Unregistering with invalid input parameter\n");
-               return -EINVAL;
-       }
-       if (kq < 0) {
-               RTE_LOG(ERR, EAL, "Kqueue is not active\n");
-               return -ENODEV;
-       }
-
-       rte_spinlock_lock(&intr_lock);
-
-       /* check if the insterrupt source for the fd is existent */
-       TAILQ_FOREACH(src, &intr_sources, next)
-               if (src->intr_handle.fd == intr_handle->fd)
-                       break;
-
-       /* No interrupt source registered for the fd */
-       if (src == NULL) {
-               ret = -ENOENT;
-
-       /* interrupt source has some active callbacks right now. */
-       } else if (src->active != 0) {
-               ret = -EAGAIN;
-
-       /* ok to remove. */
-       } else {
-               struct kevent ke;
-
-               ret = 0;
-
-               /* remove it from the kqueue */
-               memset(&ke, 0, sizeof(ke));
-               ke.flags = EV_DELETE; /* mark for deletion from the queue */
-
-               if (intr_source_to_kevent(intr_handle, &ke) < 0) {
-                       RTE_LOG(ERR, EAL, "Cannot convert to kevent\n");
-                       ret = -ENODEV;
-                       goto out;
-               }
-
-               /**
-                * remove intr file descriptor from wait list.
-                */
-               if (kevent(kq, &ke, 1, NULL, 0, NULL) < 0) {
-                       RTE_LOG(ERR, EAL, "Error removing fd %d kevent, %s\n",
-                               src->intr_handle.fd, strerror(errno));
-                       /* removing non-existent even is an expected condition
-                        * in some circumstances (e.g. oneshot events).
-                        */
-               }
-
-               /*walk through the callbacks and remove all that match. */
-               for (cb = TAILQ_FIRST(&src->callbacks); cb != NULL; cb = next) {
-                       next = TAILQ_NEXT(cb, next);
-                       if (cb->cb_fn == cb_fn && (cb_arg == (void *)-1 ||
-                                       cb->cb_arg == cb_arg)) {
-                               TAILQ_REMOVE(&src->callbacks, cb, next);
-                               free(cb);
-                               ret++;
-                       }
-               }
-
-               /* all callbacks for that source are removed. */
-               if (TAILQ_EMPTY(&src->callbacks)) {
-                       TAILQ_REMOVE(&intr_sources, src, next);
-                       free(src);
-               }
-       }
-out:
-       rte_spinlock_unlock(&intr_lock);
-
-       return ret;
-}
-
-int
-rte_intr_enable(const struct rte_intr_handle *intr_handle)
-{
-       if (intr_handle && intr_handle->type == RTE_INTR_HANDLE_VDEV)
-               return 0;
-
-       if (!intr_handle || intr_handle->fd < 0 || intr_handle->uio_cfg_fd < 0)
-               return -1;
-
-       switch (intr_handle->type) {
-       /* not used at this moment */
-       case RTE_INTR_HANDLE_ALARM:
-               return -1;
-       /* not used at this moment */
-       case RTE_INTR_HANDLE_DEV_EVENT:
-               return -1;
-       /* unknown handle type */
-       default:
-               RTE_LOG(ERR, EAL,
-                       "Unknown handle type of fd %d\n",
-                                       intr_handle->fd);
-               return -1;
-       }
-
-       return 0;
-}
-
-int
-rte_intr_disable(const struct rte_intr_handle *intr_handle)
-{
-       if (intr_handle && intr_handle->type == RTE_INTR_HANDLE_VDEV)
-               return 0;
-
-       if (!intr_handle || intr_handle->fd < 0 || intr_handle->uio_cfg_fd < 0)
-               return -1;
-
-       switch (intr_handle->type) {
-       /* not used at this moment */
-       case RTE_INTR_HANDLE_ALARM:
-               return -1;
-       /* not used at this moment */
-       case RTE_INTR_HANDLE_DEV_EVENT:
-               return -1;
-       /* unknown handle type */
-       default:
-               RTE_LOG(ERR, EAL,
-                       "Unknown handle type of fd %d\n",
-                                       intr_handle->fd);
-               return -1;
-       }
-
-       return 0;
-}
-
-static void
-eal_intr_process_interrupts(struct kevent *events, int nfds)
-{
-       struct rte_intr_callback active_cb;
-       union rte_intr_read_buffer buf;
-       struct rte_intr_callback *cb;
-       struct rte_intr_source *src;
-       bool call = false;
-       int n, bytes_read;
-
-       for (n = 0; n < nfds; n++) {
-               int event_fd = events[n].ident;
-
-               rte_spinlock_lock(&intr_lock);
-               TAILQ_FOREACH(src, &intr_sources, next)
-                       if (src->intr_handle.fd == event_fd)
-                               break;
-               if (src == NULL) {
-                       rte_spinlock_unlock(&intr_lock);
-                       continue;
-               }
-
-               /* mark this interrupt source as active and release the lock. */
-               src->active = 1;
-               rte_spinlock_unlock(&intr_lock);
-
-               /* set the length to be read dor different handle type */
-               switch (src->intr_handle.type) {
-               case RTE_INTR_HANDLE_ALARM:
-                       bytes_read = 0;
-                       call = true;
-                       break;
-               case RTE_INTR_HANDLE_VDEV:
-               case RTE_INTR_HANDLE_EXT:
-                       bytes_read = 0;
-                       call = true;
-                       break;
-               case RTE_INTR_HANDLE_DEV_EVENT:
-                       bytes_read = 0;
-                       call = true;
-                       break;
-               default:
-                       bytes_read = 1;
-                       break;
-               }
-
-               if (bytes_read > 0) {
-                       /**
-                        * read out to clear the ready-to-be-read flag
-                        * for epoll_wait.
-                        */
-                       bytes_read = read(event_fd, &buf, bytes_read);
-                       if (bytes_read < 0) {
-                               if (errno == EINTR || errno == EWOULDBLOCK)
-                                       continue;
-
-                               RTE_LOG(ERR, EAL, "Error reading from file "
-                                       "descriptor %d: %s\n",
-                                       event_fd,
-                                       strerror(errno));
-                       } else if (bytes_read == 0)
-                               RTE_LOG(ERR, EAL, "Read nothing from file "
-                                       "descriptor %d\n", event_fd);
-                       else
-                               call = true;
-               }
-
-               /* grab a lock, again to call callbacks and update status. */
-               rte_spinlock_lock(&intr_lock);
-
-               if (call) {
-                       /* Finally, call all callbacks. */
-                       TAILQ_FOREACH(cb, &src->callbacks, next) {
-
-                               /* make a copy and unlock. */
-                               active_cb = *cb;
-                               rte_spinlock_unlock(&intr_lock);
-
-                               /* call the actual callback */
-                               active_cb.cb_fn(active_cb.cb_arg);
-
-                               /*get the lock back. */
-                               rte_spinlock_lock(&intr_lock);
-                       }
-               }
-
-               /* we done with that interrupt source, release it. */
-               src->active = 0;
-               rte_spinlock_unlock(&intr_lock);
-       }
-}
-
-static void *
-eal_intr_thread_main(void *arg __rte_unused)
-{
-       struct kevent events[MAX_INTR_EVENTS];
-       int nfds;
-
-       /* host thread, never break out */
-       for (;;) {
-               /* do not change anything, just wait */
-               nfds = kevent(kq, NULL, 0, events, MAX_INTR_EVENTS, NULL);
-
-               /* kevent fail */
-               if (nfds < 0) {
-                       if (errno == EINTR)
-                               continue;
-                       RTE_LOG(ERR, EAL,
-                               "kevent returns with fail\n");
-                       break;
-               }
-               /* kevent timeout, will never happen here */
-               else if (nfds == 0)
-                       continue;
-
-               /* kevent has at least one fd ready to read */
-               eal_intr_process_interrupts(events, nfds);
-       }
-       close(kq);
-       kq = -1;
-       return NULL;
-}
-
-int
-rte_eal_intr_init(void)
-{
-       int ret = 0;
-
-       /* init the global interrupt source head */
-       TAILQ_INIT(&intr_sources);
-
-       kq = kqueue();
-       if (kq < 0) {
-               RTE_LOG(ERR, EAL, "Cannot create kqueue instance\n");
-               return -1;
-       }
-
-       /* create the host thread to wait/handle the interrupt */
-       ret = rte_ctrl_thread_create(&intr_thread, "eal-intr-thread", NULL,
-                       eal_intr_thread_main, NULL);
-       if (ret != 0) {
-               rte_errno = -ret;
-               RTE_LOG(ERR, EAL,
-                       "Failed to create thread for interrupt handling\n");
-       }
-
-       return ret;
-}
-
-int
-rte_intr_rx_ctl(struct rte_intr_handle *intr_handle,
-               int epfd, int op, unsigned int vec, void *data)
-{
-       RTE_SET_USED(intr_handle);
-       RTE_SET_USED(epfd);
-       RTE_SET_USED(op);
-       RTE_SET_USED(vec);
-       RTE_SET_USED(data);
-
-       return -ENOTSUP;
-}
-
-int
-rte_intr_efd_enable(struct rte_intr_handle *intr_handle, uint32_t nb_efd)
-{
-       RTE_SET_USED(intr_handle);
-       RTE_SET_USED(nb_efd);
-
-       return 0;
-}
-
-void
-rte_intr_efd_disable(struct rte_intr_handle *intr_handle)
-{
-       RTE_SET_USED(intr_handle);
-}
-
-int
-rte_intr_dp_is_en(struct rte_intr_handle *intr_handle)
-{
-       RTE_SET_USED(intr_handle);
-       return 0;
-}
-
-int
-rte_intr_allow_others(struct rte_intr_handle *intr_handle)
-{
-       RTE_SET_USED(intr_handle);
-       return 1;
-}
-
-int
-rte_intr_cap_multiple(struct rte_intr_handle *intr_handle)
-{
-       RTE_SET_USED(intr_handle);
-       return 0;
-}
-
-int
-rte_epoll_wait(int epfd, struct rte_epoll_event *events,
-               int maxevents, int timeout)
-{
-       RTE_SET_USED(epfd);
-       RTE_SET_USED(events);
-       RTE_SET_USED(maxevents);
-       RTE_SET_USED(timeout);
-
-       return -ENOTSUP;
-}
-
-int
-rte_epoll_ctl(int epfd, int op, int fd, struct rte_epoll_event *event)
-{
-       RTE_SET_USED(epfd);
-       RTE_SET_USED(op);
-       RTE_SET_USED(fd);
-       RTE_SET_USED(event);
-
-       return -ENOTSUP;
-}
-
-int
-rte_intr_tls_epfd(void)
-{
-       return -ENOTSUP;
-}
-
-void
-rte_intr_free_epoll_fd(struct rte_intr_handle *intr_handle)
-{
-       RTE_SET_USED(intr_handle);
-}
diff --git a/lib/librte_eal/bsdapp/eal/eal_lcore.c b/lib/librte_eal/bsdapp/eal/eal_lcore.c
deleted file mode 100644 (file)
index d9ef4bc..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#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 "eal_private.h"
-#include "eal_thread.h"
-
-/* No topology information available on FreeBSD including NUMA info */
-unsigned
-eal_cpu_core_id(__rte_unused unsigned lcore_id)
-{
-       return 0;
-}
-
-static int
-eal_get_ncpus(void)
-{
-       static int ncpu = -1;
-       int mib[2] = {CTL_HW, HW_NCPU};
-       size_t len = sizeof(ncpu);
-
-       if (ncpu < 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(__rte_unused unsigned cpu_id)
-{
-       return 0;
-}
-
-/* Check if a cpu is present by the presence of the
- * cpu information for it.
- */
-int
-eal_cpu_detected(unsigned lcore_id)
-{
-       const unsigned ncpus = eal_get_ncpus();
-       return lcore_id < ncpus;
-}
diff --git a/lib/librte_eal/bsdapp/eal/eal_memalloc.c b/lib/librte_eal/bsdapp/eal/eal_memalloc.c
deleted file mode 100644 (file)
index 6893448..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2017-2018 Intel Corporation
- */
-
-#include <inttypes.h>
-
-#include <rte_errno.h>
-#include <rte_log.h>
-#include <rte_memory.h>
-
-#include "eal_memalloc.h"
-
-int
-eal_memalloc_alloc_seg_bulk(struct rte_memseg **ms __rte_unused,
-               int __rte_unused n_segs, size_t __rte_unused page_sz,
-               int __rte_unused socket, bool __rte_unused exact)
-{
-       RTE_LOG(ERR, EAL, "Memory hotplug not supported on FreeBSD\n");
-       return -1;
-}
-
-struct rte_memseg *
-eal_memalloc_alloc_seg(size_t __rte_unused page_sz, int __rte_unused socket)
-{
-       RTE_LOG(ERR, EAL, "Memory hotplug not supported on FreeBSD\n");
-       return NULL;
-}
-
-int
-eal_memalloc_free_seg(struct rte_memseg *ms __rte_unused)
-{
-       RTE_LOG(ERR, EAL, "Memory hotplug not supported on FreeBSD\n");
-       return -1;
-}
-
-int
-eal_memalloc_free_seg_bulk(struct rte_memseg **ms __rte_unused,
-               int n_segs __rte_unused)
-{
-       RTE_LOG(ERR, EAL, "Memory hotplug not supported on FreeBSD\n");
-       return -1;
-}
-
-int
-eal_memalloc_sync_with_primary(void)
-{
-       RTE_LOG(ERR, EAL, "Memory hotplug not supported on FreeBSD\n");
-       return -1;
-}
-
-int
-eal_memalloc_get_seg_fd(int list_idx __rte_unused, int seg_idx __rte_unused)
-{
-       return -ENOTSUP;
-}
-
-int
-eal_memalloc_set_seg_fd(int list_idx __rte_unused, int seg_idx __rte_unused,
-               int fd __rte_unused)
-{
-       return -ENOTSUP;
-}
-
-int
-eal_memalloc_set_seg_list_fd(int list_idx __rte_unused, int fd __rte_unused)
-{
-       return -ENOTSUP;
-}
-
-int
-eal_memalloc_get_seg_fd_offset(int list_idx __rte_unused,
-               int seg_idx __rte_unused, size_t *offset __rte_unused)
-{
-       return -ENOTSUP;
-}
-
-int
-eal_memalloc_init(void)
-{
-       return 0;
-}
diff --git a/lib/librte_eal/bsdapp/eal/eal_memory.c b/lib/librte_eal/bsdapp/eal/eal_memory.c
deleted file mode 100644 (file)
index 4b092e1..0000000
+++ /dev/null
@@ -1,522 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-#include <sys/mman.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <inttypes.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-
-#include <rte_eal.h>
-#include <rte_eal_memconfig.h>
-#include <rte_errno.h>
-#include <rte_log.h>
-#include <rte_string_fns.h>
-#include "eal_private.h"
-#include "eal_internal_cfg.h"
-#include "eal_filesystem.h"
-
-#define EAL_PAGE_SIZE (sysconf(_SC_PAGESIZE))
-
-/*
- * 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_virt2iova() when hugepages are disabled. */
-       (void)virtaddr;
-       return RTE_BAD_IOVA;
-}
-rte_iova_t
-rte_mem_virt2iova(const void *virtaddr)
-{
-       return rte_mem_virt2phy(virtaddr);
-}
-
-int
-rte_eal_hugepage_init(void)
-{
-       struct rte_mem_config *mcfg;
-       uint64_t total_mem = 0;
-       void *addr;
-       unsigned int 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) {
-               struct rte_memseg_list *msl;
-               struct rte_fbarray *arr;
-               struct rte_memseg *ms;
-               uint64_t page_sz;
-               int n_segs, cur_seg;
-
-               /* create a memseg list */
-               msl = &mcfg->memsegs[0];
-
-               page_sz = RTE_PGSIZE_4K;
-               n_segs = internal_config.memory / page_sz;
-
-               if (rte_fbarray_init(&msl->memseg_arr, "nohugemem", n_segs,
-                               sizeof(struct rte_memseg))) {
-                       RTE_LOG(ERR, EAL, "Cannot allocate memseg list\n");
-                       return -1;
-               }
-
-               addr = mmap(NULL, internal_config.memory,
-                               PROT_READ | PROT_WRITE,
-                               MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-               if (addr == MAP_FAILED) {
-                       RTE_LOG(ERR, EAL, "%s: mmap() failed: %s\n", __func__,
-                                       strerror(errno));
-                       return -1;
-               }
-               msl->base_va = addr;
-               msl->page_sz = page_sz;
-               msl->len = internal_config.memory;
-               msl->socket_id = 0;
-
-               /* populate memsegs. each memseg is 1 page long */
-               for (cur_seg = 0; cur_seg < n_segs; cur_seg++) {
-                       arr = &msl->memseg_arr;
-
-                       ms = rte_fbarray_get(arr, cur_seg);
-                       if (rte_eal_iova_mode() == RTE_IOVA_VA)
-                               ms->iova = (uintptr_t)addr;
-                       else
-                               ms->iova = RTE_BAD_IOVA;
-                       ms->addr = addr;
-                       ms->hugepage_sz = page_sz;
-                       ms->len = page_sz;
-                       ms->socket_id = 0;
-
-                       rte_fbarray_set_used(arr, cur_seg);
-
-                       addr = RTE_PTR_ADD(addr, page_sz);
-               }
-               return 0;
-       }
-
-       /* map all hugepages and sort them */
-       for (i = 0; i < internal_config.num_hugepage_sizes; i ++){
-               struct hugepage_info *hpi;
-               rte_iova_t prev_end = 0;
-               int prev_ms_idx = -1;
-               uint64_t page_sz, mem_needed;
-               unsigned int n_pages, max_pages;
-
-               hpi = &internal_config.hugepage_info[i];
-               page_sz = hpi->hugepage_sz;
-               max_pages = hpi->num_pages[0];
-               mem_needed = RTE_ALIGN_CEIL(internal_config.memory - total_mem,
-                               page_sz);
-
-               n_pages = RTE_MIN(mem_needed / page_sz, max_pages);
-
-               for (j = 0; j < n_pages; j++) {
-                       struct rte_memseg_list *msl;
-                       struct rte_fbarray *arr;
-                       struct rte_memseg *seg;
-                       int msl_idx, ms_idx;
-                       rte_iova_t physaddr;
-                       int error;
-                       size_t sysctl_size = sizeof(physaddr);
-                       char physaddr_str[64];
-                       bool is_adjacent;
-
-                       /* first, check if this segment is IOVA-adjacent to
-                        * the previous one.
-                        */
-                       snprintf(physaddr_str, sizeof(physaddr_str),
-                                       "hw.contigmem.physaddr.%d", j);
-                       error = sysctlbyname(physaddr_str, &physaddr,
-                                       &sysctl_size, NULL, 0);
-                       if (error < 0) {
-                               RTE_LOG(ERR, EAL, "Failed to get physical addr for buffer %u "
-                                               "from %s\n", j, hpi->hugedir);
-                               return -1;
-                       }
-
-                       is_adjacent = prev_end != 0 && physaddr == prev_end;
-                       prev_end = physaddr + hpi->hugepage_sz;
-
-                       for (msl_idx = 0; msl_idx < RTE_MAX_MEMSEG_LISTS;
-                                       msl_idx++) {
-                               bool empty, need_hole;
-                               msl = &mcfg->memsegs[msl_idx];
-                               arr = &msl->memseg_arr;
-
-                               if (msl->page_sz != page_sz)
-                                       continue;
-
-                               empty = arr->count == 0;
-
-                               /* we need a hole if this isn't an empty memseg
-                                * list, and if previous segment was not
-                                * adjacent to current one.
-                                */
-                               need_hole = !empty && !is_adjacent;
-
-                               /* we need 1, plus hole if not adjacent */
-                               ms_idx = rte_fbarray_find_next_n_free(arr,
-                                               0, 1 + (need_hole ? 1 : 0));
-
-                               /* memseg list is full? */
-                               if (ms_idx < 0)
-                                       continue;
-
-                               if (need_hole && prev_ms_idx == ms_idx - 1)
-                                       ms_idx++;
-                               prev_ms_idx = ms_idx;
-
-                               break;
-                       }
-                       if (msl_idx == RTE_MAX_MEMSEG_LISTS) {
-                               RTE_LOG(ERR, EAL, "Could not find space for memseg. Please increase %s and/or %s in configuration.\n",
-                                       RTE_STR(CONFIG_RTE_MAX_MEMSEG_PER_TYPE),
-                                       RTE_STR(CONFIG_RTE_MAX_MEM_PER_TYPE));
-                               return -1;
-                       }
-                       arr = &msl->memseg_arr;
-                       seg = rte_fbarray_get(arr, ms_idx);
-
-                       addr = RTE_PTR_ADD(msl->base_va,
-                                       (size_t)msl->page_sz * ms_idx);
-
-                       /* address is already mapped in memseg list, so using
-                        * MAP_FIXED here is safe.
-                        */
-                       addr = mmap(addr, page_sz, PROT_READ|PROT_WRITE,
-                                       MAP_SHARED | MAP_FIXED,
-                                       hpi->lock_descriptor,
-                                       j * EAL_PAGE_SIZE);
-                       if (addr == MAP_FAILED) {
-                               RTE_LOG(ERR, EAL, "Failed to mmap buffer %u from %s\n",
-                                               j, hpi->hugedir);
-                               return -1;
-                       }
-
-                       seg->addr = addr;
-                       seg->iova = physaddr;
-                       seg->hugepage_sz = page_sz;
-                       seg->len = page_sz;
-                       seg->nchannel = mcfg->nchannel;
-                       seg->nrank = mcfg->nrank;
-                       seg->socket_id = 0;
-
-                       rte_fbarray_set_used(arr, ms_idx);
-
-                       RTE_LOG(INFO, EAL, "Mapped memory segment %u @ %p: physaddr:0x%"
-                                       PRIx64", len %zu\n",
-                                       seg_idx++, addr, physaddr, page_sz);
-
-                       total_mem += seg->len;
-               }
-               if (total_mem >= internal_config.memory)
-                       break;
-       }
-       if (total_mem < internal_config.memory) {
-               RTE_LOG(ERR, EAL, "Couldn't reserve requested memory, "
-                               "requested: %" PRIu64 "M "
-                               "available: %" PRIu64 "M\n",
-                               internal_config.memory >> 20, total_mem >> 20);
-               return -1;
-       }
-       return 0;
-}
-
-struct attach_walk_args {
-       int fd_hugepage;
-       int seg_idx;
-};
-static int
-attach_segment(const struct rte_memseg_list *msl, const struct rte_memseg *ms,
-               void *arg)
-{
-       struct attach_walk_args *wa = arg;
-       void *addr;
-
-       if (msl->external)
-               return 0;
-
-       addr = mmap(ms->addr, ms->len, PROT_READ | PROT_WRITE,
-                       MAP_SHARED | MAP_FIXED, wa->fd_hugepage,
-                       wa->seg_idx * EAL_PAGE_SIZE);
-       if (addr == MAP_FAILED || addr != ms->addr)
-               return -1;
-       wa->seg_idx++;
-
-       return 0;
-}
-
-int
-rte_eal_hugepage_attach(void)
-{
-       const struct hugepage_info *hpi;
-       int fd_hugepage = -1;
-       unsigned int i;
-
-       hpi = &internal_config.hugepage_info[0];
-
-       for (i = 0; i < internal_config.num_hugepage_sizes; i++) {
-               const struct hugepage_info *cur_hpi = &hpi[i];
-               struct attach_walk_args wa;
-
-               memset(&wa, 0, sizeof(wa));
-
-               /* Obtain a file descriptor for contiguous memory */
-               fd_hugepage = open(cur_hpi->hugedir, O_RDWR);
-               if (fd_hugepage < 0) {
-                       RTE_LOG(ERR, EAL, "Could not open %s\n",
-                                       cur_hpi->hugedir);
-                       goto error;
-               }
-               wa.fd_hugepage = fd_hugepage;
-               wa.seg_idx = 0;
-
-               /* Map the contiguous memory into each memory segment */
-               if (rte_memseg_walk(attach_segment, &wa) < 0) {
-                       RTE_LOG(ERR, EAL, "Failed to mmap buffer %u from %s\n",
-                               wa.seg_idx, cur_hpi->hugedir);
-                       goto error;
-               }
-
-               close(fd_hugepage);
-               fd_hugepage = -1;
-       }
-
-       /* hugepage_info is no longer required */
-       return 0;
-
-error:
-       if (fd_hugepage >= 0)
-               close(fd_hugepage);
-       return -1;
-}
-
-int
-rte_eal_using_phys_addrs(void)
-{
-       return 0;
-}
-
-static uint64_t
-get_mem_amount(uint64_t page_sz, uint64_t max_mem)
-{
-       uint64_t area_sz, max_pages;
-
-       /* limit to RTE_MAX_MEMSEG_PER_LIST pages or RTE_MAX_MEM_MB_PER_LIST */
-       max_pages = RTE_MAX_MEMSEG_PER_LIST;
-       max_mem = RTE_MIN((uint64_t)RTE_MAX_MEM_MB_PER_LIST << 20, max_mem);
-
-       area_sz = RTE_MIN(page_sz * max_pages, max_mem);
-
-       /* make sure the list isn't smaller than the page size */
-       area_sz = RTE_MAX(area_sz, page_sz);
-
-       return RTE_ALIGN(area_sz, page_sz);
-}
-
-#define MEMSEG_LIST_FMT "memseg-%" PRIu64 "k-%i-%i"
-static int
-alloc_memseg_list(struct rte_memseg_list *msl, uint64_t page_sz,
-               int n_segs, int socket_id, int type_msl_idx)
-{
-       char name[RTE_FBARRAY_NAME_LEN];
-
-       snprintf(name, sizeof(name), MEMSEG_LIST_FMT, page_sz >> 10, socket_id,
-                type_msl_idx);
-       if (rte_fbarray_init(&msl->memseg_arr, name, n_segs,
-                       sizeof(struct rte_memseg))) {
-               RTE_LOG(ERR, EAL, "Cannot allocate memseg list: %s\n",
-                       rte_strerror(rte_errno));
-               return -1;
-       }
-
-       msl->page_sz = page_sz;
-       msl->socket_id = socket_id;
-       msl->base_va = NULL;
-
-       RTE_LOG(DEBUG, EAL, "Memseg list allocated: 0x%zxkB at socket %i\n",
-                       (size_t)page_sz >> 10, socket_id);
-
-       return 0;
-}
-
-static int
-alloc_va_space(struct rte_memseg_list *msl)
-{
-       uint64_t page_sz;
-       size_t mem_sz;
-       void *addr;
-       int flags = 0;
-
-#ifdef RTE_ARCH_PPC_64
-       flags |= MAP_HUGETLB;
-#endif
-
-       page_sz = msl->page_sz;
-       mem_sz = page_sz * msl->memseg_arr.len;
-
-       addr = eal_get_virtual_area(msl->base_va, &mem_sz, page_sz, 0, flags);
-       if (addr == NULL) {
-               if (rte_errno == EADDRNOTAVAIL)
-                       RTE_LOG(ERR, EAL, "Could not mmap %llu bytes at [%p] - please use '--base-virtaddr' option\n",
-                               (unsigned long long)mem_sz, msl->base_va);
-               else
-                       RTE_LOG(ERR, EAL, "Cannot reserve memory\n");
-               return -1;
-       }
-       msl->base_va = addr;
-       msl->len = mem_sz;
-
-       return 0;
-}
-
-
-static int
-memseg_primary_init(void)
-{
-       struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
-       int hpi_idx, msl_idx = 0;
-       struct rte_memseg_list *msl;
-       uint64_t max_mem, total_mem;
-
-       /* no-huge does not need this at all */
-       if (internal_config.no_hugetlbfs)
-               return 0;
-
-       /* FreeBSD has an issue where core dump will dump the entire memory
-        * contents, including anonymous zero-page memory. Therefore, while we
-        * will be limiting total amount of memory to RTE_MAX_MEM_MB, we will
-        * also be further limiting total memory amount to whatever memory is
-        * available to us through contigmem driver (plus spacing blocks).
-        *
-        * so, at each stage, we will be checking how much memory we are
-        * preallocating, and adjust all the values accordingly.
-        */
-
-       max_mem = (uint64_t)RTE_MAX_MEM_MB << 20;
-       total_mem = 0;
-
-       /* create memseg lists */
-       for (hpi_idx = 0; hpi_idx < (int) internal_config.num_hugepage_sizes;
-                       hpi_idx++) {
-               uint64_t max_type_mem, total_type_mem = 0;
-               uint64_t avail_mem;
-               int type_msl_idx, max_segs, avail_segs, total_segs = 0;
-               struct hugepage_info *hpi;
-               uint64_t hugepage_sz;
-
-               hpi = &internal_config.hugepage_info[hpi_idx];
-               hugepage_sz = hpi->hugepage_sz;
-
-               /* no NUMA support on FreeBSD */
-
-               /* check if we've already exceeded total memory amount */
-               if (total_mem >= max_mem)
-                       break;
-
-               /* first, calculate theoretical limits according to config */
-               max_type_mem = RTE_MIN(max_mem - total_mem,
-                       (uint64_t)RTE_MAX_MEM_MB_PER_TYPE << 20);
-               max_segs = RTE_MAX_MEMSEG_PER_TYPE;
-
-               /* now, limit all of that to whatever will actually be
-                * available to us, because without dynamic allocation support,
-                * all of that extra memory will be sitting there being useless
-                * and slowing down core dumps in case of a crash.
-                *
-                * we need (N*2)-1 segments because we cannot guarantee that
-                * each segment will be IOVA-contiguous with the previous one,
-                * so we will allocate more and put spaces inbetween segments
-                * that are non-contiguous.
-                */
-               avail_segs = (hpi->num_pages[0] * 2) - 1;
-               avail_mem = avail_segs * hugepage_sz;
-
-               max_type_mem = RTE_MIN(avail_mem, max_type_mem);
-               max_segs = RTE_MIN(avail_segs, max_segs);
-
-               type_msl_idx = 0;
-               while (total_type_mem < max_type_mem &&
-                               total_segs < max_segs) {
-                       uint64_t cur_max_mem, cur_mem;
-                       unsigned int n_segs;
-
-                       if (msl_idx >= RTE_MAX_MEMSEG_LISTS) {
-                               RTE_LOG(ERR, EAL,
-                                       "No more space in memseg lists, please increase %s\n",
-                                       RTE_STR(CONFIG_RTE_MAX_MEMSEG_LISTS));
-                               return -1;
-                       }
-
-                       msl = &mcfg->memsegs[msl_idx++];
-
-                       cur_max_mem = max_type_mem - total_type_mem;
-
-                       cur_mem = get_mem_amount(hugepage_sz,
-                                       cur_max_mem);
-                       n_segs = cur_mem / hugepage_sz;
-
-                       if (alloc_memseg_list(msl, hugepage_sz, n_segs,
-                                       0, type_msl_idx))
-                               return -1;
-
-                       total_segs += msl->memseg_arr.len;
-                       total_type_mem = total_segs * hugepage_sz;
-                       type_msl_idx++;
-
-                       if (alloc_va_space(msl)) {
-                               RTE_LOG(ERR, EAL, "Cannot allocate VA space for memseg list\n");
-                               return -1;
-                       }
-               }
-               total_mem += total_type_mem;
-       }
-       return 0;
-}
-
-static int
-memseg_secondary_init(void)
-{
-       struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
-       int msl_idx = 0;
-       struct rte_memseg_list *msl;
-
-       for (msl_idx = 0; msl_idx < RTE_MAX_MEMSEG_LISTS; msl_idx++) {
-
-               msl = &mcfg->memsegs[msl_idx];
-
-               /* skip empty memseg lists */
-               if (msl->memseg_arr.len == 0)
-                       continue;
-
-               if (rte_fbarray_attach(&msl->memseg_arr)) {
-                       RTE_LOG(ERR, EAL, "Cannot attach to primary process memseg lists\n");
-                       return -1;
-               }
-
-               /* preallocate VA space */
-               if (alloc_va_space(msl)) {
-                       RTE_LOG(ERR, EAL, "Cannot preallocate VA space for hugepage memory\n");
-                       return -1;
-               }
-       }
-
-       return 0;
-}
-
-int
-rte_eal_memseg_init(void)
-{
-       return rte_eal_process_type() == RTE_PROC_PRIMARY ?
-                       memseg_primary_init() :
-                       memseg_secondary_init();
-}
diff --git a/lib/librte_eal/bsdapp/eal/eal_thread.c b/lib/librte_eal/bsdapp/eal/eal_thread.c
deleted file mode 100644 (file)
index 309b587..0000000
+++ /dev/null
@@ -1,177 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <sched.h>
-#include <pthread_np.h>
-#include <sys/queue.h>
-#include <sys/thr.h>
-
-#include <rte_debug.h>
-#include <rte_atomic.h>
-#include <rte_launch.h>
-#include <rte_log.h>
-#include <rte_memory.h>
-#include <rte_per_lcore.h>
-#include <rte_eal.h>
-#include <rte_lcore.h>
-
-#include "eal_private.h"
-#include "eal_thread.h"
-
-RTE_DEFINE_PER_LCORE(unsigned, _lcore_id) = LCORE_ID_ANY;
-RTE_DEFINE_PER_LCORE(unsigned, _socket_id) = (unsigned)SOCKET_ID_ANY;
-RTE_DEFINE_PER_LCORE(rte_cpuset_t, _cpuset);
-
-/*
- * Send a message to a slave lcore identified by slave_id to call a
- * function f with argument arg. Once the execution is done, the
- * remote lcore switch in FINISHED state.
- */
-int
-rte_eal_remote_launch(int (*f)(void *), void *arg, unsigned slave_id)
-{
-       int n;
-       char c = 0;
-       int m2s = lcore_config[slave_id].pipe_master2slave[1];
-       int s2m = lcore_config[slave_id].pipe_slave2master[0];
-
-       if (lcore_config[slave_id].state != WAIT)
-               return -EBUSY;
-
-       lcore_config[slave_id].f = f;
-       lcore_config[slave_id].arg = arg;
-
-       /* send message */
-       n = 0;
-       while (n == 0 || (n < 0 && errno == EINTR))
-               n = write(m2s, &c, 1);
-       if (n < 0)
-               rte_panic("cannot write on configuration pipe\n");
-
-       /* wait ack */
-       do {
-               n = read(s2m, &c, 1);
-       } while (n < 0 && errno == EINTR);
-
-       if (n <= 0)
-               rte_panic("cannot read on configuration pipe\n");
-
-       return 0;
-}
-
-/* set affinity for current thread */
-static int
-eal_thread_set_affinity(void)
-{
-       unsigned lcore_id = rte_lcore_id();
-
-       /* acquire system unique id  */
-       rte_gettid();
-
-       /* update EAL thread core affinity */
-       return rte_thread_set_affinity(&lcore_config[lcore_id].cpuset);
-}
-
-void eal_thread_init_master(unsigned lcore_id)
-{
-       /* set the lcore ID in per-lcore memory area */
-       RTE_PER_LCORE(_lcore_id) = lcore_id;
-
-       /* set CPU affinity */
-       if (eal_thread_set_affinity() < 0)
-               rte_panic("cannot set affinity\n");
-}
-
-/* main loop of threads */
-__attribute__((noreturn)) void *
-eal_thread_loop(__attribute__((unused)) void *arg)
-{
-       char c;
-       int n, ret;
-       unsigned lcore_id;
-       pthread_t thread_id;
-       int m2s, s2m;
-       char cpuset[RTE_CPU_AFFINITY_STR_LEN];
-
-       thread_id = pthread_self();
-
-       /* retrieve our lcore_id from the configuration structure */
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
-               if (thread_id == lcore_config[lcore_id].thread_id)
-                       break;
-       }
-       if (lcore_id == RTE_MAX_LCORE)
-               rte_panic("cannot retrieve lcore id\n");
-
-       m2s = lcore_config[lcore_id].pipe_master2slave[0];
-       s2m = lcore_config[lcore_id].pipe_slave2master[1];
-
-       /* set the lcore ID in per-lcore memory area */
-       RTE_PER_LCORE(_lcore_id) = lcore_id;
-
-       /* set CPU affinity */
-       if (eal_thread_set_affinity() < 0)
-               rte_panic("cannot set affinity\n");
-
-       ret = eal_thread_dump_affinity(cpuset, sizeof(cpuset));
-
-       RTE_LOG(DEBUG, EAL, "lcore %u is ready (tid=%p;cpuset=[%s%s])\n",
-               lcore_id, thread_id, cpuset, ret == 0 ? "" : "...");
-
-       /* read on our pipe to get commands */
-       while (1) {
-               void *fct_arg;
-
-               /* wait command */
-               do {
-                       n = read(m2s, &c, 1);
-               } while (n < 0 && errno == EINTR);
-
-               if (n <= 0)
-                       rte_panic("cannot read on configuration pipe\n");
-
-               lcore_config[lcore_id].state = RUNNING;
-
-               /* send ack */
-               n = 0;
-               while (n == 0 || (n < 0 && errno == EINTR))
-                       n = write(s2m, &c, 1);
-               if (n < 0)
-                       rte_panic("cannot write on configuration pipe\n");
-
-               if (lcore_config[lcore_id].f == NULL)
-                       rte_panic("NULL function pointer\n");
-
-               /* call the function and store the return value */
-               fct_arg = lcore_config[lcore_id].arg;
-               ret = lcore_config[lcore_id].f(fct_arg);
-               lcore_config[lcore_id].ret = ret;
-               rte_wmb();
-               lcore_config[lcore_id].state = FINISHED;
-       }
-
-       /* never reached */
-       /* pthread_exit(NULL); */
-       /* return NULL; */
-}
-
-/* require calling thread tid by gettid() */
-int rte_sys_gettid(void)
-{
-       long lwpid;
-       thr_self(&lwpid);
-       return (int)lwpid;
-}
-
-int rte_thread_setname(pthread_t id, const char *name)
-{
-       /* this BSD function returns no error */
-       pthread_set_name_np(id, name);
-       return 0;
-}
diff --git a/lib/librte_eal/bsdapp/eal/eal_timer.c b/lib/librte_eal/bsdapp/eal/eal_timer.c
deleted file mode 100644 (file)
index beff755..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
- */
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <inttypes.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <errno.h>
-
-#include <rte_common.h>
-#include <rte_log.h>
-#include <rte_cycles.h>
-#include <rte_memory.h>
-#include <rte_eal.h>
-#include <rte_debug.h>
-
-#include "eal_private.h"
-#include "eal_internal_cfg.h"
-
-#ifdef RTE_LIBEAL_USE_HPET
-#warning HPET is not supported in FreeBSD
-#endif
-
-enum timer_source eal_timer_source = EAL_TIMER_TSC;
-
-uint64_t
-get_tsc_freq(void)
-{
-       size_t sz;
-       int tmp;
-       uint64_t tsc_hz;
-
-       sz = sizeof(tmp);
-       tmp = 0;
-
-       if (sysctlbyname("kern.timecounter.smp_tsc", &tmp, &sz, NULL, 0))
-               RTE_LOG(WARNING, EAL, "%s\n", strerror(errno));
-       else if (tmp != 1)
-               RTE_LOG(WARNING, EAL, "TSC is not safe to use in SMP mode\n");
-
-       tmp = 0;
-
-       if (sysctlbyname("kern.timecounter.invariant_tsc", &tmp, &sz, NULL, 0))
-               RTE_LOG(WARNING, EAL, "%s\n", strerror(errno));
-       else if (tmp != 1)
-               RTE_LOG(WARNING, EAL, "TSC is not invariant\n");
-
-       sz = sizeof(tsc_hz);
-       if (sysctlbyname("machdep.tsc_freq", &tsc_hz, &sz, NULL, 0)) {
-               RTE_LOG(WARNING, EAL, "%s\n", strerror(errno));
-               return 0;
-       }
-
-       return tsc_hz;
-}
-
-int
-rte_eal_timer_init(void)
-{
-       set_tsc_freq();
-       return 0;
-}
diff --git a/lib/librte_eal/bsdapp/eal/meson.build b/lib/librte_eal/bsdapp/eal/meson.build
deleted file mode 100644 (file)
index 3945b52..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-env_objs = []
-env_headers = []
-env_sources = files('eal_alarm.c',
-               'eal_cpuflags.c',
-               'eal_debug.c',
-               'eal_hugepage_info.c',
-               'eal_interrupts.c',
-               'eal_lcore.c',
-               'eal_memalloc.c',
-               'eal_thread.c',
-               'eal_timer.c',
-               'eal.c',
-               'eal_memory.c',
-               'eal_dev.c'
-)
-
-deps += ['kvargs']
diff --git a/lib/librte_eal/freebsd/BSDmakefile.meson b/lib/librte_eal/freebsd/BSDmakefile.meson
new file mode 100644 (file)
index 0000000..42f5b2b
--- /dev/null
@@ -0,0 +1,43 @@
+#   BSD LICENSE
+#
+#   Copyright(c) 2017 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.
+#
+
+# makefile for building kernel modules using meson
+# takes parameters from the environment
+
+# source file is passed via KMOD_SRC as full path, we only use final
+# component of it, as VPATH is used to find actual file, so as to
+# have the .o files placed in the build, not source directory
+VPATH = ${KMOD_SRC:H}
+SRCS = ${KMOD_SRC:T} device_if.h bus_if.h pci_if.h
+CFLAGS += $(KMOD_CFLAGS)
+
+.include <bsd.kmod.mk>
diff --git a/lib/librte_eal/freebsd/Makefile b/lib/librte_eal/freebsd/Makefile
new file mode 100644 (file)
index 0000000..5b06b21
--- /dev/null
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2014 Intel Corporation
+
+include $(RTE_SDK)/mk/rte.vars.mk
+
+DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal
+
+include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/lib/librte_eal/freebsd/eal/Makefile b/lib/librte_eal/freebsd/eal/Makefile
new file mode 100644 (file)
index 0000000..bfeddaa
--- /dev/null
@@ -0,0 +1,94 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2015 Intel Corporation
+
+include $(RTE_SDK)/mk/rte.vars.mk
+
+LIB = librte_eal.a
+
+ARCH_DIR ?= $(RTE_ARCH)
+VPATH += $(RTE_SDK)/lib/librte_eal/common
+VPATH += $(RTE_SDK)/lib/librte_eal/common/arch/$(ARCH_DIR)
+
+CFLAGS += -DALLOW_EXPERIMENTAL_API
+CFLAGS += -I$(SRCDIR)/include
+CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common
+CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include
+CFLAGS += $(WERROR_FLAGS) -O3
+
+LDLIBS += -lexecinfo
+LDLIBS += -lpthread
+LDLIBS += -lgcc_s
+LDLIBS += -lrte_kvargs
+
+EXPORT_MAP := ../../rte_eal_version.map
+
+LIBABIVER := 9
+
+# specific to bsdapp exec-env
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) := eal.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_cpuflags.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_memory.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_hugepage_info.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_thread.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_debug.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_memalloc.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_lcore.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_timer.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_interrupts.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_alarm.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_dev.c
+
+# from common dir
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_lcore.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_timer.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_memzone.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_log.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_launch.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_memalloc.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_memory.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_tailqs.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_errno.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_cpuflags.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_hypervisor.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_string_fns.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_hexdump.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_devargs.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_class.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_bus.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_dev.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_options.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_thread.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_proc.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_fbarray.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal_common_uuid.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_malloc.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += hotplug_mp.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += malloc_elem.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += malloc_heap.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += malloc_mp.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_keepalive.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_option.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_service.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_reciprocal.c
+
+# from arch dir
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_cpuflags.c
+SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_hypervisor.c
+SRCS-$(CONFIG_RTE_ARCH_X86) += rte_spinlock.c
+SRCS-y += rte_cycles.c
+
+CFLAGS_eal_common_cpuflags.o := $(CPUFLAGS_LIST)
+
+# 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
+CFLAGS_eal_hpet.o += -Wno-return-type
+endif
+
+INC :=  # no bsdapp specific headers
+
+SYMLINK-$(CONFIG_RTE_EXEC_ENV_BSDAPP)-include/exec-env := \
+       $(addprefix include/exec-env/,$(INC))
+
+include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c
new file mode 100644 (file)
index 0000000..4e86b10
--- /dev/null
@@ -0,0 +1,1004 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2018 Intel Corporation.
+ * Copyright(c) 2014 6WIND S.A.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <syslog.h>
+#include <getopt.h>
+#include <sys/file.h>
+#include <stddef.h>
+#include <errno.h>
+#include <limits.h>
+#include <sys/mman.h>
+#include <sys/queue.h>
+#include <sys/stat.h>
+
+#include <rte_compat.h>
+#include <rte_common.h>
+#include <rte_debug.h>
+#include <rte_memory.h>
+#include <rte_launch.h>
+#include <rte_eal.h>
+#include <rte_eal_memconfig.h>
+#include <rte_errno.h>
+#include <rte_per_lcore.h>
+#include <rte_lcore.h>
+#include <rte_service_component.h>
+#include <rte_log.h>
+#include <rte_random.h>
+#include <rte_cycles.h>
+#include <rte_string_fns.h>
+#include <rte_cpuflags.h>
+#include <rte_interrupts.h>
+#include <rte_bus.h>
+#include <rte_dev.h>
+#include <rte_devargs.h>
+#include <rte_version.h>
+#include <rte_vfio.h>
+#include <rte_option.h>
+#include <rte_atomic.h>
+#include <malloc_heap.h>
+
+#include "eal_private.h"
+#include "eal_thread.h"
+#include "eal_internal_cfg.h"
+#include "eal_filesystem.h"
+#include "eal_hugepages.h"
+#include "eal_options.h"
+
+#define MEMSIZE_IF_NO_HUGE_PAGE (64ULL * 1024ULL * 1024ULL)
+
+/* Allow the application to print its usage message too if set */
+static rte_usage_hook_t        rte_application_usage_hook = NULL;
+/* early configuration structure, when memory config is not mmapped */
+static struct rte_mem_config early_mem_config;
+
+/* define fd variable here, because file needs to be kept open for the
+ * duration of the program, as we hold a write lock on it in the primary proc */
+static int mem_cfg_fd = -1;
+
+static struct flock wr_lock = {
+               .l_type = F_WRLCK,
+               .l_whence = SEEK_SET,
+               .l_start = offsetof(struct rte_mem_config, memsegs),
+               .l_len = sizeof(early_mem_config.memsegs),
+};
+
+/* Address of global and public configuration */
+static struct rte_config rte_config = {
+               .mem_config = &early_mem_config,
+};
+
+/* internal configuration (per-core) */
+struct lcore_config lcore_config[RTE_MAX_LCORE];
+
+/* internal configuration */
+struct internal_config internal_config;
+
+/* used by rte_rdtsc() */
+int rte_cycles_vmware_tsc_map;
+
+/* platform-specific runtime dir */
+static char runtime_dir[PATH_MAX];
+
+static const char *default_runtime_dir = "/var/run";
+
+int
+eal_create_runtime_dir(void)
+{
+       const char *directory = default_runtime_dir;
+       const char *xdg_runtime_dir = getenv("XDG_RUNTIME_DIR");
+       const char *fallback = "/tmp";
+       char tmp[PATH_MAX];
+       int ret;
+
+       if (getuid() != 0) {
+               /* try XDG path first, fall back to /tmp */
+               if (xdg_runtime_dir != NULL)
+                       directory = xdg_runtime_dir;
+               else
+                       directory = fallback;
+       }
+       /* create DPDK subdirectory under runtime dir */
+       ret = snprintf(tmp, sizeof(tmp), "%s/dpdk", directory);
+       if (ret < 0 || ret == sizeof(tmp)) {
+               RTE_LOG(ERR, EAL, "Error creating DPDK runtime path name\n");
+               return -1;
+       }
+
+       /* create prefix-specific subdirectory under DPDK runtime dir */
+       ret = snprintf(runtime_dir, sizeof(runtime_dir), "%s/%s",
+                       tmp, eal_get_hugefile_prefix());
+       if (ret < 0 || ret == sizeof(runtime_dir)) {
+               RTE_LOG(ERR, EAL, "Error creating prefix-specific runtime path name\n");
+               return -1;
+       }
+
+       /* create the path if it doesn't exist. no "mkdir -p" here, so do it
+        * step by step.
+        */
+       ret = mkdir(tmp, 0700);
+       if (ret < 0 && errno != EEXIST) {
+               RTE_LOG(ERR, EAL, "Error creating '%s': %s\n",
+                       tmp, strerror(errno));
+               return -1;
+       }
+
+       ret = mkdir(runtime_dir, 0700);
+       if (ret < 0 && errno != EEXIST) {
+               RTE_LOG(ERR, EAL, "Error creating '%s': %s\n",
+                       runtime_dir, strerror(errno));
+               return -1;
+       }
+
+       return 0;
+}
+
+int
+eal_clean_runtime_dir(void)
+{
+       /* FreeBSD doesn't need this implemented for now, because, unlike Linux,
+        * FreeBSD doesn't create per-process files, so no need to clean up.
+        */
+       return 0;
+}
+
+
+const char *
+rte_eal_get_runtime_dir(void)
+{
+       return runtime_dir;
+}
+
+/* Return user provided mbuf pool ops name */
+const char *
+rte_eal_mbuf_user_pool_ops(void)
+{
+       return internal_config.user_mbuf_pool_ops_name;
+}
+
+/* Return a pointer to the configuration structure */
+struct rte_config *
+rte_eal_get_configuration(void)
+{
+       return &rte_config;
+}
+
+enum rte_iova_mode
+rte_eal_iova_mode(void)
+{
+       return rte_eal_get_configuration()->iova_mode;
+}
+
+/* parse a sysfs (or other) file containing one integer value */
+int
+eal_parse_sysfs_value(const char *filename, unsigned long *val)
+{
+       FILE *f;
+       char buf[BUFSIZ];
+       char *end = NULL;
+
+       if ((f = fopen(filename, "r")) == NULL) {
+               RTE_LOG(ERR, EAL, "%s(): cannot open sysfs value %s\n",
+                       __func__, filename);
+               return -1;
+       }
+
+       if (fgets(buf, sizeof(buf), f) == NULL) {
+               RTE_LOG(ERR, EAL, "%s(): cannot read sysfs value %s\n",
+                       __func__, filename);
+               fclose(f);
+               return -1;
+       }
+       *val = strtoul(buf, &end, 0);
+       if ((buf[0] == '\0') || (end == NULL) || (*end != '\n')) {
+               RTE_LOG(ERR, EAL, "%s(): cannot parse sysfs value %s\n",
+                               __func__, filename);
+               fclose(f);
+               return -1;
+       }
+       fclose(f);
+       return 0;
+}
+
+
+/* create memory configuration in shared/mmap memory. Take out
+ * a write lock on the memsegs, so we can auto-detect primary/secondary.
+ * This means we never close the file while running (auto-close on exit).
+ * We also don't lock the whole file, so that in future we can use read-locks
+ * on other parts, e.g. memzones, to detect if there are running secondary
+ * processes. */
+static void
+rte_eal_config_create(void)
+{
+       void *rte_mem_cfg_addr;
+       int retval;
+
+       const char *pathname = eal_runtime_config_path();
+
+       if (internal_config.no_shconf)
+               return;
+
+       if (mem_cfg_fd < 0){
+               mem_cfg_fd = open(pathname, O_RDWR | O_CREAT, 0660);
+               if (mem_cfg_fd < 0)
+                       rte_panic("Cannot open '%s' for rte_mem_config\n", pathname);
+       }
+
+       retval = ftruncate(mem_cfg_fd, sizeof(*rte_config.mem_config));
+       if (retval < 0){
+               close(mem_cfg_fd);
+               rte_panic("Cannot resize '%s' for rte_mem_config\n", pathname);
+       }
+
+       retval = fcntl(mem_cfg_fd, F_SETLK, &wr_lock);
+       if (retval < 0){
+               close(mem_cfg_fd);
+               rte_exit(EXIT_FAILURE, "Cannot create lock on '%s'. Is another primary "
+                               "process running?\n", pathname);
+       }
+
+       rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config),
+                               PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0);
+
+       if (rte_mem_cfg_addr == MAP_FAILED){
+               rte_panic("Cannot mmap memory for rte_config\n");
+       }
+       memcpy(rte_mem_cfg_addr, &early_mem_config, sizeof(early_mem_config));
+       rte_config.mem_config = rte_mem_cfg_addr;
+}
+
+/* attach to an existing shared memory config */
+static void
+rte_eal_config_attach(void)
+{
+       void *rte_mem_cfg_addr;
+       const char *pathname = eal_runtime_config_path();
+
+       if (internal_config.no_shconf)
+               return;
+
+       if (mem_cfg_fd < 0){
+               mem_cfg_fd = open(pathname, O_RDWR);
+               if (mem_cfg_fd < 0)
+                       rte_panic("Cannot open '%s' for rte_mem_config\n", pathname);
+       }
+
+       rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config),
+                               PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0);
+       close(mem_cfg_fd);
+       if (rte_mem_cfg_addr == MAP_FAILED)
+               rte_panic("Cannot mmap memory for rte_config\n");
+
+       rte_config.mem_config = rte_mem_cfg_addr;
+}
+
+/* Detect if we are a primary or a secondary process */
+enum rte_proc_type_t
+eal_proc_type_detect(void)
+{
+       enum rte_proc_type_t ptype = RTE_PROC_PRIMARY;
+       const char *pathname = eal_runtime_config_path();
+
+       /* if there no shared config, there can be no secondary processes */
+       if (!internal_config.no_shconf) {
+               /* if we can open the file but not get a write-lock we are a
+                * secondary process. NOTE: if we get a file handle back, we
+                * keep that open and don't close it to prevent a race condition
+                * between multiple opens.
+                */
+               if (((mem_cfg_fd = open(pathname, O_RDWR)) >= 0) &&
+                               (fcntl(mem_cfg_fd, F_SETLK, &wr_lock) < 0))
+                       ptype = RTE_PROC_SECONDARY;
+       }
+
+       RTE_LOG(INFO, EAL, "Auto-detected process type: %s\n",
+                       ptype == RTE_PROC_PRIMARY ? "PRIMARY" : "SECONDARY");
+
+       return ptype;
+}
+
+/* Sets up rte_config structure with the pointer to shared memory config.*/
+static void
+rte_config_init(void)
+{
+       rte_config.process_type = internal_config.process_type;
+
+       switch (rte_config.process_type){
+       case RTE_PROC_PRIMARY:
+               rte_eal_config_create();
+               break;
+       case RTE_PROC_SECONDARY:
+               rte_eal_config_attach();
+               rte_eal_mcfg_wait_complete(rte_config.mem_config);
+               break;
+       case RTE_PROC_AUTO:
+       case RTE_PROC_INVALID:
+               rte_panic("Invalid process type\n");
+       }
+}
+
+/* display usage */
+static void
+eal_usage(const char *prgname)
+{
+       printf("\nUsage: %s ", prgname);
+       eal_common_usage();
+       /* Allow the application to print its usage message too if hook is set */
+       if ( rte_application_usage_hook ) {
+               printf("===== Application Usage =====\n\n");
+               rte_application_usage_hook(prgname);
+       }
+}
+
+/* Set a per-application usage message */
+rte_usage_hook_t
+rte_set_application_usage_hook( rte_usage_hook_t usage_func )
+{
+       rte_usage_hook_t        old_func;
+
+       /* Will be NULL on the first call to denote the last usage routine. */
+       old_func                                        = rte_application_usage_hook;
+       rte_application_usage_hook      = usage_func;
+
+       return old_func;
+}
+
+static inline size_t
+eal_get_hugepage_mem_size(void)
+{
+       uint64_t size = 0;
+       unsigned i, j;
+
+       for (i = 0; i < internal_config.num_hugepage_sizes; i++) {
+               struct hugepage_info *hpi = &internal_config.hugepage_info[i];
+               if (strnlen(hpi->hugedir, sizeof(hpi->hugedir)) != 0) {
+                       for (j = 0; j < RTE_MAX_NUMA_NODES; j++) {
+                               size += hpi->hugepage_sz * hpi->num_pages[j];
+                       }
+               }
+       }
+
+       return (size < SIZE_MAX) ? (size_t)(size) : SIZE_MAX;
+}
+
+/* Parse the arguments for --log-level only */
+static void
+eal_log_level_parse(int argc, char **argv)
+{
+       int opt;
+       char **argvopt;
+       int option_index;
+       const int old_optind = optind;
+       const int old_optopt = optopt;
+       const int old_optreset = optreset;
+       char * const old_optarg = optarg;
+
+       argvopt = argv;
+       optind = 1;
+       optreset = 1;
+
+       while ((opt = getopt_long(argc, argvopt, eal_short_options,
+                                 eal_long_options, &option_index)) != EOF) {
+
+               int ret;
+
+               /* getopt is not happy, stop right now */
+               if (opt == '?')
+                       break;
+
+               ret = (opt == OPT_LOG_LEVEL_NUM) ?
+                       eal_parse_common_option(opt, optarg, &internal_config) : 0;
+
+               /* common parser is not happy */
+               if (ret < 0)
+                       break;
+       }
+
+       /* restore getopt lib */
+       optind = old_optind;
+       optopt = old_optopt;
+       optreset = old_optreset;
+       optarg = old_optarg;
+}
+
+/* Parse the argument given in the command line of the application */
+static int
+eal_parse_args(int argc, char **argv)
+{
+       int opt, ret;
+       char **argvopt;
+       int option_index;
+       char *prgname = argv[0];
+       const int old_optind = optind;
+       const int old_optopt = optopt;
+       const int old_optreset = optreset;
+       char * const old_optarg = optarg;
+
+       argvopt = argv;
+       optind = 1;
+       optreset = 1;
+       opterr = 0;
+
+       while ((opt = getopt_long(argc, argvopt, eal_short_options,
+                                 eal_long_options, &option_index)) != EOF) {
+
+               /*
+                * getopt didn't recognise the option, lets parse the
+                * registered options to see if the flag is valid
+                */
+               if (opt == '?') {
+                       ret = rte_option_parse(argv[optind-1]);
+                       if (ret == 0)
+                               continue;
+
+                       eal_usage(prgname);
+                       ret = -1;
+                       goto out;
+               }
+
+               ret = eal_parse_common_option(opt, optarg, &internal_config);
+               /* common parser is not happy */
+               if (ret < 0) {
+                       eal_usage(prgname);
+                       ret = -1;
+                       goto out;
+               }
+               /* common parser handled this option */
+               if (ret == 0)
+                       continue;
+
+               switch (opt) {
+               case OPT_MBUF_POOL_OPS_NAME_NUM:
+               {
+                       char *ops_name = strdup(optarg);
+                       if (ops_name == NULL)
+                               RTE_LOG(ERR, EAL, "Could not store mbuf pool ops name\n");
+                       else {
+                               /* free old ops name */
+                               if (internal_config.user_mbuf_pool_ops_name !=
+                                               NULL)
+                                       free(internal_config.user_mbuf_pool_ops_name);
+
+                               internal_config.user_mbuf_pool_ops_name =
+                                               ops_name;
+                       }
+                       break;
+               }
+               case 'h':
+                       eal_usage(prgname);
+                       exit(EXIT_SUCCESS);
+               default:
+                       if (opt < OPT_LONG_MIN_NUM && isprint(opt)) {
+                               RTE_LOG(ERR, EAL, "Option %c is not supported "
+                                       "on FreeBSD\n", opt);
+                       } else if (opt >= OPT_LONG_MIN_NUM &&
+                                  opt < OPT_LONG_MAX_NUM) {
+                               RTE_LOG(ERR, EAL, "Option %s is not supported "
+                                       "on FreeBSD\n",
+                                       eal_long_options[option_index].name);
+                       } else {
+                               RTE_LOG(ERR, EAL, "Option %d is not supported "
+                                       "on FreeBSD\n", opt);
+                       }
+                       eal_usage(prgname);
+                       ret = -1;
+                       goto out;
+               }
+       }
+
+       /* create runtime data directory */
+       if (internal_config.no_shconf == 0 &&
+                       eal_create_runtime_dir() < 0) {
+               RTE_LOG(ERR, EAL, "Cannot create runtime directory\n");
+               ret = -1;
+               goto out;
+       }
+
+       if (eal_adjust_config(&internal_config) != 0) {
+               ret = -1;
+               goto out;
+       }
+
+       /* sanity checks */
+       if (eal_check_common_options(&internal_config) != 0) {
+               eal_usage(prgname);
+               ret = -1;
+               goto out;
+       }
+
+       if (optind >= 0)
+               argv[optind-1] = prgname;
+       ret = optind-1;
+
+out:
+       /* restore getopt lib */
+       optind = old_optind;
+       optopt = old_optopt;
+       optreset = old_optreset;
+       optarg = old_optarg;
+
+       return ret;
+}
+
+static int
+check_socket(const struct rte_memseg_list *msl, void *arg)
+{
+       int *socket_id = arg;
+
+       if (msl->external)
+               return 0;
+
+       if (msl->socket_id == *socket_id && msl->memseg_arr.count != 0)
+               return 1;
+
+       return 0;
+}
+
+static void
+eal_check_mem_on_local_socket(void)
+{
+       int socket_id;
+
+       socket_id = rte_lcore_to_socket_id(rte_config.master_lcore);
+
+       if (rte_memseg_list_walk(check_socket, &socket_id) == 0)
+               RTE_LOG(WARNING, EAL, "WARNING: Master core has no memory on local socket!\n");
+}
+
+
+static int
+sync_func(__attribute__((unused)) void *arg)
+{
+       return 0;
+}
+
+inline static void
+rte_eal_mcfg_complete(void)
+{
+       /* ALL shared mem_config related INIT DONE */
+       if (rte_config.process_type == RTE_PROC_PRIMARY)
+               rte_config.mem_config->magic = RTE_MAGIC;
+}
+
+/* return non-zero if hugepages are enabled. */
+int rte_eal_has_hugepages(void)
+{
+       return !internal_config.no_hugetlbfs;
+}
+
+/* Abstraction for port I/0 privilege */
+int
+rte_eal_iopl_init(void)
+{
+       static int fd = -1;
+
+       if (fd < 0)
+               fd = open("/dev/io", O_RDWR);
+
+       if (fd < 0)
+               return -1;
+       /* keep fd open for iopl */
+       return 0;
+}
+
+static void rte_eal_init_alert(const char *msg)
+{
+       fprintf(stderr, "EAL: FATAL: %s\n", msg);
+       RTE_LOG(ERR, EAL, "%s\n", msg);
+}
+
+/* Launch threads, called at application init(). */
+int
+rte_eal_init(int argc, char **argv)
+{
+       int i, fctret, ret;
+       pthread_t thread_id;
+       static rte_atomic32_t run_once = RTE_ATOMIC32_INIT(0);
+       char cpuset[RTE_CPU_AFFINITY_STR_LEN];
+       char thread_name[RTE_MAX_THREAD_NAME_LEN];
+
+       /* checks if the machine is adequate */
+       if (!rte_cpu_is_supported()) {
+               rte_eal_init_alert("unsupported cpu type.");
+               rte_errno = ENOTSUP;
+               return -1;
+       }
+
+       if (!rte_atomic32_test_and_set(&run_once)) {
+               rte_eal_init_alert("already called initialization.");
+               rte_errno = EALREADY;
+               return -1;
+       }
+
+       thread_id = pthread_self();
+
+       eal_reset_internal_config(&internal_config);
+
+       /* set log level as early as possible */
+       eal_log_level_parse(argc, argv);
+
+       if (rte_eal_cpu_init() < 0) {
+               rte_eal_init_alert("Cannot detect lcores.");
+               rte_errno = ENOTSUP;
+               return -1;
+       }
+
+       fctret = eal_parse_args(argc, argv);
+       if (fctret < 0) {
+               rte_eal_init_alert("Invalid 'command line' arguments.");
+               rte_errno = EINVAL;
+               rte_atomic32_clear(&run_once);
+               return -1;
+       }
+
+       /* FreeBSD always uses legacy memory model */
+       internal_config.legacy_mem = true;
+
+       if (eal_plugins_init() < 0) {
+               rte_eal_init_alert("Cannot init plugins");
+               rte_errno = EINVAL;
+               rte_atomic32_clear(&run_once);
+               return -1;
+       }
+
+       if (eal_option_device_parse()) {
+               rte_errno = ENODEV;
+               rte_atomic32_clear(&run_once);
+               return -1;
+       }
+
+       rte_config_init();
+
+       if (rte_eal_intr_init() < 0) {
+               rte_eal_init_alert("Cannot init interrupt-handling thread");
+               return -1;
+       }
+
+       /* Put mp channel init before bus scan so that we can init the vdev
+        * bus through mp channel in the secondary process before the bus scan.
+        */
+       if (rte_mp_channel_init() < 0) {
+               rte_eal_init_alert("failed to init mp channel");
+               if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+                       rte_errno = EFAULT;
+                       return -1;
+               }
+       }
+
+       if (rte_bus_scan()) {
+               rte_eal_init_alert("Cannot scan the buses for devices");
+               rte_errno = ENODEV;
+               rte_atomic32_clear(&run_once);
+               return -1;
+       }
+
+       /* if no EAL option "--iova-mode=<pa|va>", use bus IOVA scheme */
+       if (internal_config.iova_mode == RTE_IOVA_DC) {
+               /* autodetect the IOVA mapping mode (default is RTE_IOVA_PA) */
+               rte_eal_get_configuration()->iova_mode =
+                       rte_bus_get_iommu_class();
+       } else {
+               rte_eal_get_configuration()->iova_mode =
+                       internal_config.iova_mode;
+       }
+
+       if (internal_config.no_hugetlbfs == 0) {
+               /* rte_config isn't initialized yet */
+               ret = internal_config.process_type == RTE_PROC_PRIMARY ?
+                       eal_hugepage_info_init() :
+                       eal_hugepage_info_read();
+               if (ret < 0) {
+                       rte_eal_init_alert("Cannot get hugepage information.");
+                       rte_errno = EACCES;
+                       rte_atomic32_clear(&run_once);
+                       return -1;
+               }
+       }
+
+       if (internal_config.memory == 0 && internal_config.force_sockets == 0) {
+               if (internal_config.no_hugetlbfs)
+                       internal_config.memory = MEMSIZE_IF_NO_HUGE_PAGE;
+               else
+                       internal_config.memory = eal_get_hugepage_mem_size();
+       }
+
+       if (internal_config.vmware_tsc_map == 1) {
+#ifdef RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT
+               rte_cycles_vmware_tsc_map = 1;
+               RTE_LOG (DEBUG, EAL, "Using VMWARE TSC MAP, "
+                               "you must have monitor_control.pseudo_perfctr = TRUE\n");
+#else
+               RTE_LOG (WARNING, EAL, "Ignoring --vmware-tsc-map because "
+                               "RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT is not set\n");
+#endif
+       }
+
+       rte_srand(rte_rdtsc());
+
+       /* in secondary processes, memory init may allocate additional fbarrays
+        * not present in primary processes, so to avoid any potential issues,
+        * initialize memzones first.
+        */
+       if (rte_eal_memzone_init() < 0) {
+               rte_eal_init_alert("Cannot init memzone");
+               rte_errno = ENODEV;
+               return -1;
+       }
+
+       if (rte_eal_memory_init() < 0) {
+               rte_eal_init_alert("Cannot init memory");
+               rte_errno = ENOMEM;
+               return -1;
+       }
+
+       if (rte_eal_malloc_heap_init() < 0) {
+               rte_eal_init_alert("Cannot init malloc heap");
+               rte_errno = ENODEV;
+               return -1;
+       }
+
+       if (rte_eal_tailqs_init() < 0) {
+               rte_eal_init_alert("Cannot init tail queues for objects");
+               rte_errno = EFAULT;
+               return -1;
+       }
+
+       if (rte_eal_alarm_init() < 0) {
+               rte_eal_init_alert("Cannot init interrupt-handling thread");
+               /* rte_eal_alarm_init sets rte_errno on failure. */
+               return -1;
+       }
+
+       if (rte_eal_timer_init() < 0) {
+               rte_eal_init_alert("Cannot init HPET or TSC timers");
+               rte_errno = ENOTSUP;
+               return -1;
+       }
+
+       eal_check_mem_on_local_socket();
+
+       eal_thread_init_master(rte_config.master_lcore);
+
+       ret = eal_thread_dump_affinity(cpuset, sizeof(cpuset));
+
+       RTE_LOG(DEBUG, EAL, "Master lcore %u is ready (tid=%p;cpuset=[%s%s])\n",
+               rte_config.master_lcore, thread_id, cpuset,
+               ret == 0 ? "" : "...");
+
+       RTE_LCORE_FOREACH_SLAVE(i) {
+
+               /*
+                * create communication pipes between master thread
+                * and children
+                */
+               if (pipe(lcore_config[i].pipe_master2slave) < 0)
+                       rte_panic("Cannot create pipe\n");
+               if (pipe(lcore_config[i].pipe_slave2master) < 0)
+                       rte_panic("Cannot create pipe\n");
+
+               lcore_config[i].state = WAIT;
+
+               /* create a thread for each lcore */
+               ret = pthread_create(&lcore_config[i].thread_id, NULL,
+                                    eal_thread_loop, NULL);
+               if (ret != 0)
+                       rte_panic("Cannot create thread\n");
+
+               /* Set thread_name for aid in debugging. */
+               snprintf(thread_name, sizeof(thread_name),
+                               "lcore-slave-%d", i);
+               rte_thread_setname(lcore_config[i].thread_id, thread_name);
+       }
+
+       /*
+        * Launch a dummy function on all slave lcores, so that master lcore
+        * knows they are all ready when this function returns.
+        */
+       rte_eal_mp_remote_launch(sync_func, NULL, SKIP_MASTER);
+       rte_eal_mp_wait_lcore();
+
+       /* initialize services so vdevs register service during bus_probe. */
+       ret = rte_service_init();
+       if (ret) {
+               rte_eal_init_alert("rte_service_init() failed");
+               rte_errno = ENOEXEC;
+               return -1;
+       }
+
+       /* Probe all the buses and devices/drivers on them */
+       if (rte_bus_probe()) {
+               rte_eal_init_alert("Cannot probe devices");
+               rte_errno = ENOTSUP;
+               return -1;
+       }
+
+       /* initialize default service/lcore mappings and start running. Ignore
+        * -ENOTSUP, as it indicates no service coremask passed to EAL.
+        */
+       ret = rte_service_start_with_defaults();
+       if (ret < 0 && ret != -ENOTSUP) {
+               rte_errno = ENOEXEC;
+               return -1;
+       }
+
+       /*
+        * Clean up unused files in runtime directory. We do this at the end of
+        * init and not at the beginning because we want to clean stuff up
+        * whether we are primary or secondary process, but we cannot remove
+        * primary process' files because secondary should be able to run even
+        * if primary process is dead.
+        *
+        * In no_shconf mode, no runtime directory is created in the first
+        * place, so no cleanup needed.
+        */
+       if (!internal_config.no_shconf && eal_clean_runtime_dir() < 0) {
+               rte_eal_init_alert("Cannot clear runtime directory\n");
+               return -1;
+       }
+
+       rte_eal_mcfg_complete();
+
+       /* Call each registered callback, if enabled */
+       rte_option_init();
+
+       return fctret;
+}
+
+int __rte_experimental
+rte_eal_cleanup(void)
+{
+       rte_service_finalize();
+       rte_mp_channel_cleanup();
+       eal_cleanup_config(&internal_config);
+       return 0;
+}
+
+/* get core role */
+enum rte_lcore_role_t
+rte_eal_lcore_role(unsigned lcore_id)
+{
+       return rte_config.lcore_role[lcore_id];
+}
+
+enum rte_proc_type_t
+rte_eal_process_type(void)
+{
+       return rte_config.process_type;
+}
+
+int rte_eal_has_pci(void)
+{
+       return !internal_config.no_pci;
+}
+
+int rte_eal_create_uio_dev(void)
+{
+       return internal_config.create_uio_dev;
+}
+
+enum rte_intr_mode
+rte_eal_vfio_intr_mode(void)
+{
+       return RTE_INTR_MODE_NONE;
+}
+
+int rte_vfio_setup_device(__rte_unused const char *sysfs_base,
+                     __rte_unused const char *dev_addr,
+                     __rte_unused int *vfio_dev_fd,
+                     __rte_unused struct vfio_device_info *device_info)
+{
+       return -1;
+}
+
+int rte_vfio_release_device(__rte_unused const char *sysfs_base,
+                       __rte_unused const char *dev_addr,
+                       __rte_unused int fd)
+{
+       return -1;
+}
+
+int rte_vfio_enable(__rte_unused const char *modname)
+{
+       return -1;
+}
+
+int rte_vfio_is_enabled(__rte_unused const char *modname)
+{
+       return 0;
+}
+
+int rte_vfio_noiommu_is_enabled(void)
+{
+       return 0;
+}
+
+int rte_vfio_clear_group(__rte_unused int vfio_group_fd)
+{
+       return 0;
+}
+
+int
+rte_vfio_dma_map(uint64_t __rte_unused vaddr, __rte_unused uint64_t iova,
+                 __rte_unused uint64_t len)
+{
+       return -1;
+}
+
+int
+rte_vfio_dma_unmap(uint64_t __rte_unused vaddr, uint64_t __rte_unused iova,
+                   __rte_unused uint64_t len)
+{
+       return -1;
+}
+
+int
+rte_vfio_get_group_num(__rte_unused const char *sysfs_base,
+                      __rte_unused const char *dev_addr,
+                      __rte_unused int *iommu_group_num)
+{
+       return -1;
+}
+
+int
+rte_vfio_get_container_fd(void)
+{
+       return -1;
+}
+
+int
+rte_vfio_get_group_fd(__rte_unused int iommu_group_num)
+{
+       return -1;
+}
+
+int
+rte_vfio_container_create(void)
+{
+       return -1;
+}
+
+int
+rte_vfio_container_destroy(__rte_unused int container_fd)
+{
+       return -1;
+}
+
+int
+rte_vfio_container_group_bind(__rte_unused int container_fd,
+               __rte_unused int iommu_group_num)
+{
+       return -1;
+}
+
+int
+rte_vfio_container_group_unbind(__rte_unused int container_fd,
+               __rte_unused int iommu_group_num)
+{
+       return -1;
+}
+
+int
+rte_vfio_container_dma_map(__rte_unused int container_fd,
+                       __rte_unused uint64_t vaddr,
+                       __rte_unused uint64_t iova,
+                       __rte_unused uint64_t len)
+{
+       return -1;
+}
+
+int
+rte_vfio_container_dma_unmap(__rte_unused int container_fd,
+                       __rte_unused uint64_t vaddr,
+                       __rte_unused uint64_t iova,
+                       __rte_unused uint64_t len)
+{
+       return -1;
+}
diff --git a/lib/librte_eal/freebsd/eal/eal_alarm.c b/lib/librte_eal/freebsd/eal/eal_alarm.c
new file mode 100644 (file)
index 0000000..51ea4b8
--- /dev/null
@@ -0,0 +1,314 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2018 Intel Corporation
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+
+#include <rte_alarm.h>
+#include <rte_cycles.h>
+#include <rte_common.h>
+#include <rte_errno.h>
+#include <rte_interrupts.h>
+#include <rte_spinlock.h>
+
+#include "eal_private.h"
+#include "eal_alarm_private.h"
+
+#define NS_PER_US 1000
+
+#ifdef CLOCK_MONOTONIC_RAW /* Defined in glibc bits/time.h */
+#define CLOCK_TYPE_ID CLOCK_MONOTONIC_RAW
+#else
+#define CLOCK_TYPE_ID CLOCK_MONOTONIC
+#endif
+
+struct alarm_entry {
+       LIST_ENTRY(alarm_entry) next;
+       struct rte_intr_handle handle;
+       struct timespec time;
+       rte_eal_alarm_callback cb_fn;
+       void *cb_arg;
+       volatile uint8_t executing;
+       volatile pthread_t executing_id;
+};
+
+static LIST_HEAD(alarm_list, alarm_entry) alarm_list = LIST_HEAD_INITIALIZER();
+static rte_spinlock_t alarm_list_lk = RTE_SPINLOCK_INITIALIZER;
+
+static struct rte_intr_handle intr_handle = {.fd = -1 };
+static void eal_alarm_callback(void *arg);
+
+int
+rte_eal_alarm_init(void)
+{
+       intr_handle.type = RTE_INTR_HANDLE_ALARM;
+
+       /* on FreeBSD, timers don't use fd's, and their identifiers are stored
+        * in separate namespace from fd's, so using any value is OK. however,
+        * EAL interrupts handler expects fd's to be unique, so use an actual fd
+        * to guarantee unique timer identifier.
+        */
+       intr_handle.fd = open("/dev/zero", O_RDONLY);
+
+       return 0;
+}
+
+static inline int
+timespec_cmp(const struct timespec *now, const struct timespec *at)
+{
+       if (now->tv_sec < at->tv_sec)
+               return -1;
+       if (now->tv_sec > at->tv_sec)
+               return 1;
+       if (now->tv_nsec < at->tv_nsec)
+               return -1;
+       if (now->tv_nsec > at->tv_nsec)
+               return 1;
+       return 0;
+}
+
+static inline uint64_t
+diff_ns(struct timespec *now, struct timespec *at)
+{
+       uint64_t now_ns, at_ns;
+
+       if (timespec_cmp(now, at) >= 0)
+               return 0;
+
+       now_ns = now->tv_sec * NS_PER_S + now->tv_nsec;
+       at_ns = at->tv_sec * NS_PER_S + at->tv_nsec;
+
+       return at_ns - now_ns;
+}
+
+int
+eal_alarm_get_timeout_ns(uint64_t *val)
+{
+       struct alarm_entry *ap;
+       struct timespec now;
+
+       if (clock_gettime(CLOCK_TYPE_ID, &now) < 0)
+               return -1;
+
+       if (LIST_EMPTY(&alarm_list))
+               return -1;
+
+       ap = LIST_FIRST(&alarm_list);
+
+       *val = diff_ns(&now, &ap->time);
+
+       return 0;
+}
+
+static int
+unregister_current_callback(void)
+{
+       struct alarm_entry *ap;
+       int ret = 0;
+
+       if (!LIST_EMPTY(&alarm_list)) {
+               ap = LIST_FIRST(&alarm_list);
+
+               do {
+                       ret = rte_intr_callback_unregister(&intr_handle,
+                               eal_alarm_callback, &ap->time);
+               } while (ret == -EAGAIN);
+       }
+
+       return ret;
+}
+
+static int
+register_first_callback(void)
+{
+       struct alarm_entry *ap;
+       int ret = 0;
+
+       if (!LIST_EMPTY(&alarm_list)) {
+               ap = LIST_FIRST(&alarm_list);
+
+               /* register a new callback */
+               ret = rte_intr_callback_register(&intr_handle,
+                               eal_alarm_callback, &ap->time);
+       }
+       return ret;
+}
+
+static void
+eal_alarm_callback(void *arg __rte_unused)
+{
+       struct timespec now;
+       struct alarm_entry *ap;
+
+       rte_spinlock_lock(&alarm_list_lk);
+       ap = LIST_FIRST(&alarm_list);
+
+       if (clock_gettime(CLOCK_TYPE_ID, &now) < 0)
+               return;
+
+       while (ap != NULL && timespec_cmp(&now, &ap->time) >= 0) {
+               ap->executing = 1;
+               ap->executing_id = pthread_self();
+               rte_spinlock_unlock(&alarm_list_lk);
+
+               ap->cb_fn(ap->cb_arg);
+
+               rte_spinlock_lock(&alarm_list_lk);
+
+               LIST_REMOVE(ap, next);
+               free(ap);
+
+               ap = LIST_FIRST(&alarm_list);
+       }
+
+       /* timer has been deleted from the kqueue, so recreate it if needed */
+       register_first_callback();
+
+       rte_spinlock_unlock(&alarm_list_lk);
+}
+
+
+int
+rte_eal_alarm_set(uint64_t us, rte_eal_alarm_callback cb_fn, void *cb_arg)
+{
+       struct alarm_entry *ap, *new_alarm;
+       struct timespec now;
+       uint64_t ns;
+       int ret = 0;
+
+       /* check parameters, also ensure us won't cause a uint64_t overflow */
+       if (us < 1 || us > (UINT64_MAX - US_PER_S) || cb_fn == NULL)
+               return -EINVAL;
+
+       new_alarm = calloc(1, sizeof(*new_alarm));
+       if (new_alarm == NULL)
+               return -ENOMEM;
+
+       /* use current time to calculate absolute time of alarm */
+       clock_gettime(CLOCK_TYPE_ID, &now);
+
+       ns = us * NS_PER_US;
+
+       new_alarm->cb_fn = cb_fn;
+       new_alarm->cb_arg = cb_arg;
+       new_alarm->time.tv_nsec = (now.tv_nsec + ns) % NS_PER_S;
+       new_alarm->time.tv_sec = now.tv_sec + ((now.tv_nsec + ns) / NS_PER_S);
+
+       rte_spinlock_lock(&alarm_list_lk);
+
+       if (LIST_EMPTY(&alarm_list))
+               LIST_INSERT_HEAD(&alarm_list, new_alarm, next);
+       else {
+               LIST_FOREACH(ap, &alarm_list, next) {
+                       if (timespec_cmp(&new_alarm->time, &ap->time) < 0) {
+                               LIST_INSERT_BEFORE(ap, new_alarm, next);
+                               break;
+                       }
+                       if (LIST_NEXT(ap, next) == NULL) {
+                               LIST_INSERT_AFTER(ap, new_alarm, next);
+                               break;
+                       }
+               }
+       }
+
+       /* re-register first callback just in case */
+       register_first_callback();
+
+       rte_spinlock_unlock(&alarm_list_lk);
+
+       return ret;
+}
+
+int
+rte_eal_alarm_cancel(rte_eal_alarm_callback cb_fn, void *cb_arg)
+{
+       struct alarm_entry *ap, *ap_prev;
+       int count = 0;
+       int err = 0;
+       int executing;
+
+       if (!cb_fn) {
+               rte_errno = EINVAL;
+               return -1;
+       }
+
+       do {
+               executing = 0;
+               rte_spinlock_lock(&alarm_list_lk);
+               /* remove any matches at the start of the list */
+               while (1) {
+                       ap = LIST_FIRST(&alarm_list);
+                       if (ap == NULL)
+                               break;
+                       if (cb_fn != ap->cb_fn)
+                               break;
+                       if (cb_arg != ap->cb_arg && cb_arg != (void *) -1)
+                               break;
+                       if (ap->executing == 0) {
+                               LIST_REMOVE(ap, next);
+                               free(ap);
+                               count++;
+                       } else {
+                               /* If calling from other context, mark that
+                                * alarm is executing so loop can spin till it
+                                * finish. Otherwise we are trying to cancel
+                                * ourselves - mark it by EINPROGRESS.
+                                */
+                               if (pthread_equal(ap->executing_id,
+                                               pthread_self()) == 0)
+                                       executing++;
+                               else
+                                       err = EINPROGRESS;
+
+                               break;
+                       }
+               }
+               ap_prev = ap;
+
+               /* now go through list, removing entries not at start */
+               LIST_FOREACH(ap, &alarm_list, next) {
+                       /* this won't be true first time through */
+                       if (cb_fn == ap->cb_fn &&
+                                       (cb_arg == (void *)-1 ||
+                                        cb_arg == ap->cb_arg)) {
+                               if (ap->executing == 0) {
+                                       LIST_REMOVE(ap, next);
+                                       free(ap);
+                                       count++;
+                                       ap = ap_prev;
+                               } else if (pthread_equal(ap->executing_id,
+                                                        pthread_self()) == 0) {
+                                       executing++;
+                               } else {
+                                       err = EINPROGRESS;
+                               }
+                       }
+                       ap_prev = ap;
+               }
+               rte_spinlock_unlock(&alarm_list_lk);
+       } while (executing != 0);
+
+       if (count == 0 && err == 0)
+               rte_errno = ENOENT;
+       else if (err)
+               rte_errno = err;
+
+       rte_spinlock_lock(&alarm_list_lk);
+
+       /* unregister if no alarms left, otherwise re-register first */
+       if (LIST_EMPTY(&alarm_list))
+               unregister_current_callback();
+       else
+               register_first_callback();
+
+       rte_spinlock_unlock(&alarm_list_lk);
+
+       return count;
+}
diff --git a/lib/librte_eal/freebsd/eal/eal_alarm_private.h b/lib/librte_eal/freebsd/eal/eal_alarm_private.h
new file mode 100644 (file)
index 0000000..65c7115
--- /dev/null
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#ifndef EAL_ALARM_PRIVATE_H
+#define EAL_ALARM_PRIVATE_H
+
+#include <inttypes.h>
+
+/*
+ * FreeBSD needs a back-channel communication mechanism between interrupt and
+ * alarm thread, because on FreeBSD, timer period is set up inside the interrupt
+ * API and not inside alarm API like on Linux.
+ */
+
+int
+eal_alarm_get_timeout_ns(uint64_t *val);
+
+#endif // EAL_ALARM_PRIVATE_H
diff --git a/lib/librte_eal/freebsd/eal/eal_cpuflags.c b/lib/librte_eal/freebsd/eal/eal_cpuflags.c
new file mode 100644 (file)
index 0000000..69b161e
--- /dev/null
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2018 Mellanox Technologies, Ltd
+ */
+
+#include <rte_common.h>
+#include <rte_cpuflags.h>
+
+unsigned long
+rte_cpu_getauxval(unsigned long type __rte_unused)
+{
+       /* not implemented */
+       return 0;
+}
+
+int
+rte_cpu_strcmp_auxval(unsigned long type __rte_unused,
+               const char *str __rte_unused)
+{
+       /* not implemented */
+       return -1;
+}
diff --git a/lib/librte_eal/freebsd/eal/eal_debug.c b/lib/librte_eal/freebsd/eal/eal_debug.c
new file mode 100644 (file)
index 0000000..5d92500
--- /dev/null
@@ -0,0 +1,92 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#ifdef RTE_BACKTRACE
+#include <execinfo.h>
+#endif
+#include <stdarg.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+
+#include <rte_log.h>
+#include <rte_debug.h>
+#include <rte_common.h>
+#include <rte_eal.h>
+
+#define BACKTRACE_SIZE 256
+
+/* dump the stack of the calling core */
+void rte_dump_stack(void)
+{
+#ifdef RTE_BACKTRACE
+       void *func[BACKTRACE_SIZE];
+       char **symb = NULL;
+       int size;
+
+       size = backtrace(func, BACKTRACE_SIZE);
+       symb = backtrace_symbols(func, size);
+
+       if (symb == NULL)
+               return;
+
+       while (size > 0) {
+               rte_log(RTE_LOG_ERR, RTE_LOGTYPE_EAL,
+                       "%d: [%s]\n", size, symb[size - 1]);
+               size --;
+       }
+
+       free(symb);
+#endif /* RTE_BACKTRACE */
+}
+
+/* not implemented in this environment */
+void rte_dump_registers(void)
+{
+       return;
+}
+
+/* call abort(), it will generate a coredump if enabled */
+void __rte_panic(const char *funcname, const char *format, ...)
+{
+       va_list ap;
+
+       rte_log(RTE_LOG_CRIT, RTE_LOGTYPE_EAL, "PANIC in %s():\n", funcname);
+       va_start(ap, format);
+       rte_vlog(RTE_LOG_CRIT, RTE_LOGTYPE_EAL, format, ap);
+       va_end(ap);
+       rte_dump_stack();
+       rte_dump_registers();
+       abort();
+}
+
+/*
+ * Like rte_panic this terminates the application. However, no traceback is
+ * provided and no core-dump is generated.
+ */
+void
+rte_exit(int exit_code, const char *format, ...)
+{
+       va_list ap;
+
+       if (exit_code != 0)
+               RTE_LOG(CRIT, EAL, "Error - exiting with code: %d\n"
+                               "  Cause: ", exit_code);
+
+       va_start(ap, format);
+       rte_vlog(RTE_LOG_CRIT, RTE_LOGTYPE_EAL, format, ap);
+       va_end(ap);
+
+#ifndef RTE_EAL_ALWAYS_PANIC_ON_ERROR
+       if (rte_eal_cleanup() != 0)
+               RTE_LOG(CRIT, EAL,
+                       "EAL could not release all resources\n");
+       exit(exit_code);
+#else
+       rte_dump_stack();
+       rte_dump_registers();
+       abort();
+#endif
+}
diff --git a/lib/librte_eal/freebsd/eal/eal_dev.c b/lib/librte_eal/freebsd/eal/eal_dev.c
new file mode 100644 (file)
index 0000000..255d611
--- /dev/null
@@ -0,0 +1,35 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2018 Intel Corporation
+ */
+
+#include <rte_log.h>
+#include <rte_compat.h>
+#include <rte_dev.h>
+
+int __rte_experimental
+rte_dev_event_monitor_start(void)
+{
+       RTE_LOG(ERR, EAL, "Device event is not supported for FreeBSD\n");
+       return -1;
+}
+
+int __rte_experimental
+rte_dev_event_monitor_stop(void)
+{
+       RTE_LOG(ERR, EAL, "Device event is not supported for FreeBSD\n");
+       return -1;
+}
+
+int __rte_experimental
+rte_dev_hotplug_handle_enable(void)
+{
+       RTE_LOG(ERR, EAL, "Device event is not supported for FreeBSD\n");
+       return -1;
+}
+
+int __rte_experimental
+rte_dev_hotplug_handle_disable(void)
+{
+       RTE_LOG(ERR, EAL, "Device event is not supported for FreeBSD\n");
+       return -1;
+}
diff --git a/lib/librte_eal/freebsd/eal/eal_hugepage_info.c b/lib/librte_eal/freebsd/eal/eal_hugepage_info.c
new file mode 100644 (file)
index 0000000..1e8f5df
--- /dev/null
@@ -0,0 +1,156 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <sys/mman.h>
+#include <string.h>
+
+#include <rte_log.h>
+#include <fcntl.h>
+#include "eal_hugepages.h"
+#include "eal_internal_cfg.h"
+#include "eal_filesystem.h"
+
+#define CONTIGMEM_DEV "/dev/contigmem"
+
+/*
+ * Uses mmap to create a shared memory area for storage of data
+ * Used in this file to store the hugepage file map on disk
+ */
+static void *
+map_shared_memory(const char *filename, const size_t mem_size, int flags)
+{
+       void *retval;
+       int fd = open(filename, flags, 0666);
+       if (fd < 0)
+               return NULL;
+       if (ftruncate(fd, mem_size) < 0) {
+               close(fd);
+               return NULL;
+       }
+       retval = mmap(NULL, mem_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+       close(fd);
+       return retval;
+}
+
+static void *
+open_shared_memory(const char *filename, const size_t mem_size)
+{
+       return map_shared_memory(filename, mem_size, O_RDWR);
+}
+
+static void *
+create_shared_memory(const char *filename, const size_t mem_size)
+{
+       return map_shared_memory(filename, mem_size, O_RDWR | O_CREAT);
+}
+
+/*
+ * No hugepage support on freebsd, but we dummy it, using contigmem driver
+ */
+int
+eal_hugepage_info_init(void)
+{
+       size_t sysctl_size;
+       int num_buffers, fd, error;
+       int64_t buffer_size;
+       /* re-use the linux "internal config" structure for our memory data */
+       struct hugepage_info *hpi = &internal_config.hugepage_info[0];
+       struct hugepage_info *tmp_hpi;
+       unsigned int i;
+
+       internal_config.num_hugepage_sizes = 1;
+
+       sysctl_size = sizeof(num_buffers);
+       error = sysctlbyname("hw.contigmem.num_buffers", &num_buffers,
+                       &sysctl_size, NULL, 0);
+
+       if (error != 0) {
+               RTE_LOG(ERR, EAL, "could not read sysctl hw.contigmem.num_buffers\n");
+               return -1;
+       }
+
+       sysctl_size = sizeof(buffer_size);
+       error = sysctlbyname("hw.contigmem.buffer_size", &buffer_size,
+                       &sysctl_size, NULL, 0);
+
+       if (error != 0) {
+               RTE_LOG(ERR, EAL, "could not read sysctl hw.contigmem.buffer_size\n");
+               return -1;
+       }
+
+       fd = open(CONTIGMEM_DEV, O_RDWR);
+       if (fd < 0) {
+               RTE_LOG(ERR, EAL, "could not open "CONTIGMEM_DEV"\n");
+               return -1;
+       }
+
+       if (buffer_size >= 1<<30)
+               RTE_LOG(INFO, EAL, "Contigmem driver has %d buffers, each of size %dGB\n",
+                               num_buffers, (int)(buffer_size>>30));
+       else if (buffer_size >= 1<<20)
+               RTE_LOG(INFO, EAL, "Contigmem driver has %d buffers, each of size %dMB\n",
+                               num_buffers, (int)(buffer_size>>20));
+       else
+               RTE_LOG(INFO, EAL, "Contigmem driver has %d buffers, each of size %dKB\n",
+                               num_buffers, (int)(buffer_size>>10));
+
+       strlcpy(hpi->hugedir, CONTIGMEM_DEV, sizeof(hpi->hugedir));
+       hpi->hugepage_sz = buffer_size;
+       hpi->num_pages[0] = num_buffers;
+       hpi->lock_descriptor = fd;
+
+       /* for no shared files mode, do not create shared memory config */
+       if (internal_config.no_shconf)
+               return 0;
+
+       tmp_hpi = create_shared_memory(eal_hugepage_info_path(),
+                       sizeof(internal_config.hugepage_info));
+       if (tmp_hpi == NULL ) {
+               RTE_LOG(ERR, EAL, "Failed to create shared memory!\n");
+               return -1;
+       }
+
+       memcpy(tmp_hpi, hpi, sizeof(internal_config.hugepage_info));
+
+       /* we've copied file descriptors along with everything else, but they
+        * will be invalid in secondary process, so overwrite them
+        */
+       for (i = 0; i < RTE_DIM(internal_config.hugepage_info); i++) {
+               struct hugepage_info *tmp = &tmp_hpi[i];
+               tmp->lock_descriptor = -1;
+       }
+
+       if (munmap(tmp_hpi, sizeof(internal_config.hugepage_info)) < 0) {
+               RTE_LOG(ERR, EAL, "Failed to unmap shared memory!\n");
+               return -1;
+       }
+
+       return 0;
+}
+
+/* copy stuff from shared info into internal config */
+int
+eal_hugepage_info_read(void)
+{
+       struct hugepage_info *hpi = &internal_config.hugepage_info[0];
+       struct hugepage_info *tmp_hpi;
+
+       internal_config.num_hugepage_sizes = 1;
+
+       tmp_hpi = open_shared_memory(eal_hugepage_info_path(),
+                                 sizeof(internal_config.hugepage_info));
+       if (tmp_hpi == NULL) {
+               RTE_LOG(ERR, EAL, "Failed to open shared memory!\n");
+               return -1;
+       }
+
+       memcpy(hpi, tmp_hpi, sizeof(internal_config.hugepage_info));
+
+       if (munmap(tmp_hpi, sizeof(internal_config.hugepage_info)) < 0) {
+               RTE_LOG(ERR, EAL, "Failed to unmap shared memory!\n");
+               return -1;
+       }
+       return 0;
+}
diff --git a/lib/librte_eal/freebsd/eal/eal_interrupts.c b/lib/librte_eal/freebsd/eal/eal_interrupts.c
new file mode 100644 (file)
index 0000000..2feee2d
--- /dev/null
@@ -0,0 +1,561 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2018 Intel Corporation
+ */
+
+#include <string.h>
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/queue.h>
+#include <unistd.h>
+
+#include <rte_errno.h>
+#include <rte_lcore.h>
+#include <rte_spinlock.h>
+#include <rte_common.h>
+#include <rte_interrupts.h>
+
+#include "eal_private.h"
+#include "eal_alarm_private.h"
+
+#define MAX_INTR_EVENTS 16
+
+/**
+ * union buffer for reading on different devices
+ */
+union rte_intr_read_buffer {
+       char charbuf[16];                /* for others */
+};
+
+TAILQ_HEAD(rte_intr_cb_list, rte_intr_callback);
+TAILQ_HEAD(rte_intr_source_list, rte_intr_source);
+
+struct rte_intr_callback {
+       TAILQ_ENTRY(rte_intr_callback) next;
+       rte_intr_callback_fn cb_fn;  /**< callback address */
+       void *cb_arg;                /**< parameter for callback */
+};
+
+struct rte_intr_source {
+       TAILQ_ENTRY(rte_intr_source) next;
+       struct rte_intr_handle intr_handle; /**< interrupt handle */
+       struct rte_intr_cb_list callbacks;  /**< user callbacks */
+       uint32_t active;
+};
+
+/* global spinlock for interrupt data operation */
+static rte_spinlock_t intr_lock = RTE_SPINLOCK_INITIALIZER;
+
+/* interrupt sources list */
+static struct rte_intr_source_list intr_sources;
+
+/* interrupt handling thread */
+static pthread_t intr_thread;
+
+static volatile int kq = -1;
+
+static int
+intr_source_to_kevent(const struct rte_intr_handle *ih, struct kevent *ke)
+{
+       /* alarm callbacks are special case */
+       if (ih->type == RTE_INTR_HANDLE_ALARM) {
+               uint64_t timeout_ns;
+
+               /* get soonest alarm timeout */
+               if (eal_alarm_get_timeout_ns(&timeout_ns) < 0)
+                       return -1;
+
+               ke->filter = EVFILT_TIMER;
+               /* timers are one shot */
+               ke->flags |= EV_ONESHOT;
+               ke->fflags = NOTE_NSECONDS;
+               ke->data = timeout_ns;
+       } else {
+               ke->filter = EVFILT_READ;
+       }
+       ke->ident = ih->fd;
+
+       return 0;
+}
+
+int
+rte_intr_callback_register(const struct rte_intr_handle *intr_handle,
+               rte_intr_callback_fn cb, void *cb_arg)
+{
+       struct rte_intr_callback *callback = NULL;
+       struct rte_intr_source *src = NULL;
+       int ret, add_event;
+
+       /* first do parameter checking */
+       if (intr_handle == NULL || intr_handle->fd < 0 || cb == NULL) {
+               RTE_LOG(ERR, EAL,
+                       "Registering with invalid input parameter\n");
+               return -EINVAL;
+       }
+       if (kq < 0) {
+               RTE_LOG(ERR, EAL, "Kqueue is not active: %d\n", kq);
+               return -ENODEV;
+       }
+
+       /* allocate a new interrupt callback entity */
+       callback = calloc(1, sizeof(*callback));
+       if (callback == NULL) {
+               RTE_LOG(ERR, EAL, "Can not allocate memory\n");
+               return -ENOMEM;
+       }
+       callback->cb_fn = cb;
+       callback->cb_arg = cb_arg;
+
+       rte_spinlock_lock(&intr_lock);
+
+       /* check if there is at least one callback registered for the fd */
+       TAILQ_FOREACH(src, &intr_sources, next) {
+               if (src->intr_handle.fd == intr_handle->fd) {
+                       /* we had no interrupts for this */
+                       if (TAILQ_EMPTY(&src->callbacks))
+                               add_event = 1;
+
+                       TAILQ_INSERT_TAIL(&(src->callbacks), callback, next);
+                       ret = 0;
+                       break;
+               }
+       }
+
+       /* no existing callbacks for this - add new source */
+       if (src == NULL) {
+               src = calloc(1, sizeof(*src));
+               if (src == NULL) {
+                       RTE_LOG(ERR, EAL, "Can not allocate memory\n");
+                       ret = -ENOMEM;
+                       goto fail;
+               } else {
+                       src->intr_handle = *intr_handle;
+                       TAILQ_INIT(&src->callbacks);
+                       TAILQ_INSERT_TAIL(&(src->callbacks), callback, next);
+                       TAILQ_INSERT_TAIL(&intr_sources, src, next);
+                       add_event = 1;
+                       ret = 0;
+               }
+       }
+
+       /* add events to the queue. timer events are special as we need to
+        * re-set the timer.
+        */
+       if (add_event || src->intr_handle.type == RTE_INTR_HANDLE_ALARM) {
+               struct kevent ke;
+
+               memset(&ke, 0, sizeof(ke));
+               ke.flags = EV_ADD; /* mark for addition to the queue */
+
+               if (intr_source_to_kevent(intr_handle, &ke) < 0) {
+                       RTE_LOG(ERR, EAL, "Cannot convert interrupt handle to kevent\n");
+                       ret = -ENODEV;
+                       goto fail;
+               }
+
+               /**
+                * add the intr file descriptor into wait list.
+                */
+               if (kevent(kq, &ke, 1, NULL, 0, NULL) < 0) {
+                       /* currently, nic_uio does not support interrupts, so
+                        * this error will always be triggered and output to the
+                        * user. so, don't output it unless debug log level set.
+                        */
+                       if (errno == ENODEV)
+                               RTE_LOG(DEBUG, EAL, "Interrupt handle %d not supported\n",
+                                       src->intr_handle.fd);
+                       else
+                               RTE_LOG(ERR, EAL, "Error adding fd %d "
+                                               "kevent, %s\n",
+                                               src->intr_handle.fd,
+                                               strerror(errno));
+                       ret = -errno;
+                       goto fail;
+               }
+       }
+       rte_spinlock_unlock(&intr_lock);
+
+       return ret;
+fail:
+       /* clean up */
+       if (src != NULL) {
+               TAILQ_REMOVE(&(src->callbacks), callback, next);
+               if (TAILQ_EMPTY(&(src->callbacks))) {
+                       TAILQ_REMOVE(&intr_sources, src, next);
+                       free(src);
+               }
+       }
+       free(callback);
+       rte_spinlock_unlock(&intr_lock);
+       return ret;
+}
+
+int
+rte_intr_callback_unregister(const struct rte_intr_handle *intr_handle,
+               rte_intr_callback_fn cb_fn, void *cb_arg)
+{
+       int ret;
+       struct rte_intr_source *src;
+       struct rte_intr_callback *cb, *next;
+
+       /* do parameter checking first */
+       if (intr_handle == NULL || intr_handle->fd < 0) {
+               RTE_LOG(ERR, EAL,
+               "Unregistering with invalid input parameter\n");
+               return -EINVAL;
+       }
+       if (kq < 0) {
+               RTE_LOG(ERR, EAL, "Kqueue is not active\n");
+               return -ENODEV;
+       }
+
+       rte_spinlock_lock(&intr_lock);
+
+       /* check if the insterrupt source for the fd is existent */
+       TAILQ_FOREACH(src, &intr_sources, next)
+               if (src->intr_handle.fd == intr_handle->fd)
+                       break;
+
+       /* No interrupt source registered for the fd */
+       if (src == NULL) {
+               ret = -ENOENT;
+
+       /* interrupt source has some active callbacks right now. */
+       } else if (src->active != 0) {
+               ret = -EAGAIN;
+
+       /* ok to remove. */
+       } else {
+               struct kevent ke;
+
+               ret = 0;
+
+               /* remove it from the kqueue */
+               memset(&ke, 0, sizeof(ke));
+               ke.flags = EV_DELETE; /* mark for deletion from the queue */
+
+               if (intr_source_to_kevent(intr_handle, &ke) < 0) {
+                       RTE_LOG(ERR, EAL, "Cannot convert to kevent\n");
+                       ret = -ENODEV;
+                       goto out;
+               }
+
+               /**
+                * remove intr file descriptor from wait list.
+                */
+               if (kevent(kq, &ke, 1, NULL, 0, NULL) < 0) {
+                       RTE_LOG(ERR, EAL, "Error removing fd %d kevent, %s\n",
+                               src->intr_handle.fd, strerror(errno));
+                       /* removing non-existent even is an expected condition
+                        * in some circumstances (e.g. oneshot events).
+                        */
+               }
+
+               /*walk through the callbacks and remove all that match. */
+               for (cb = TAILQ_FIRST(&src->callbacks); cb != NULL; cb = next) {
+                       next = TAILQ_NEXT(cb, next);
+                       if (cb->cb_fn == cb_fn && (cb_arg == (void *)-1 ||
+                                       cb->cb_arg == cb_arg)) {
+                               TAILQ_REMOVE(&src->callbacks, cb, next);
+                               free(cb);
+                               ret++;
+                       }
+               }
+
+               /* all callbacks for that source are removed. */
+               if (TAILQ_EMPTY(&src->callbacks)) {
+                       TAILQ_REMOVE(&intr_sources, src, next);
+                       free(src);
+               }
+       }
+out:
+       rte_spinlock_unlock(&intr_lock);
+
+       return ret;
+}
+
+int
+rte_intr_enable(const struct rte_intr_handle *intr_handle)
+{
+       if (intr_handle && intr_handle->type == RTE_INTR_HANDLE_VDEV)
+               return 0;
+
+       if (!intr_handle || intr_handle->fd < 0 || intr_handle->uio_cfg_fd < 0)
+               return -1;
+
+       switch (intr_handle->type) {
+       /* not used at this moment */
+       case RTE_INTR_HANDLE_ALARM:
+               return -1;
+       /* not used at this moment */
+       case RTE_INTR_HANDLE_DEV_EVENT:
+               return -1;
+       /* unknown handle type */
+       default:
+               RTE_LOG(ERR, EAL,
+                       "Unknown handle type of fd %d\n",
+                                       intr_handle->fd);
+               return -1;
+       }
+
+       return 0;
+}
+
+int
+rte_intr_disable(const struct rte_intr_handle *intr_handle)
+{
+       if (intr_handle && intr_handle->type == RTE_INTR_HANDLE_VDEV)
+               return 0;
+
+       if (!intr_handle || intr_handle->fd < 0 || intr_handle->uio_cfg_fd < 0)
+               return -1;
+
+       switch (intr_handle->type) {
+       /* not used at this moment */
+       case RTE_INTR_HANDLE_ALARM:
+               return -1;
+       /* not used at this moment */
+       case RTE_INTR_HANDLE_DEV_EVENT:
+               return -1;
+       /* unknown handle type */
+       default:
+               RTE_LOG(ERR, EAL,
+                       "Unknown handle type of fd %d\n",
+                                       intr_handle->fd);
+               return -1;
+       }
+
+       return 0;
+}
+
+static void
+eal_intr_process_interrupts(struct kevent *events, int nfds)
+{
+       struct rte_intr_callback active_cb;
+       union rte_intr_read_buffer buf;
+       struct rte_intr_callback *cb;
+       struct rte_intr_source *src;
+       bool call = false;
+       int n, bytes_read;
+
+       for (n = 0; n < nfds; n++) {
+               int event_fd = events[n].ident;
+
+               rte_spinlock_lock(&intr_lock);
+               TAILQ_FOREACH(src, &intr_sources, next)
+                       if (src->intr_handle.fd == event_fd)
+                               break;
+               if (src == NULL) {
+                       rte_spinlock_unlock(&intr_lock);
+                       continue;
+               }
+
+               /* mark this interrupt source as active and release the lock. */
+               src->active = 1;
+               rte_spinlock_unlock(&intr_lock);
+
+               /* set the length to be read dor different handle type */
+               switch (src->intr_handle.type) {
+               case RTE_INTR_HANDLE_ALARM:
+                       bytes_read = 0;
+                       call = true;
+                       break;
+               case RTE_INTR_HANDLE_VDEV:
+               case RTE_INTR_HANDLE_EXT:
+                       bytes_read = 0;
+                       call = true;
+                       break;
+               case RTE_INTR_HANDLE_DEV_EVENT:
+                       bytes_read = 0;
+                       call = true;
+                       break;
+               default:
+                       bytes_read = 1;
+                       break;
+               }
+
+               if (bytes_read > 0) {
+                       /**
+                        * read out to clear the ready-to-be-read flag
+                        * for epoll_wait.
+                        */
+                       bytes_read = read(event_fd, &buf, bytes_read);
+                       if (bytes_read < 0) {
+                               if (errno == EINTR || errno == EWOULDBLOCK)
+                                       continue;
+
+                               RTE_LOG(ERR, EAL, "Error reading from file "
+                                       "descriptor %d: %s\n",
+                                       event_fd,
+                                       strerror(errno));
+                       } else if (bytes_read == 0)
+                               RTE_LOG(ERR, EAL, "Read nothing from file "
+                                       "descriptor %d\n", event_fd);
+                       else
+                               call = true;
+               }
+
+               /* grab a lock, again to call callbacks and update status. */
+               rte_spinlock_lock(&intr_lock);
+
+               if (call) {
+                       /* Finally, call all callbacks. */
+                       TAILQ_FOREACH(cb, &src->callbacks, next) {
+
+                               /* make a copy and unlock. */
+                               active_cb = *cb;
+                               rte_spinlock_unlock(&intr_lock);
+
+                               /* call the actual callback */
+                               active_cb.cb_fn(active_cb.cb_arg);
+
+                               /*get the lock back. */
+                               rte_spinlock_lock(&intr_lock);
+                       }
+               }
+
+               /* we done with that interrupt source, release it. */
+               src->active = 0;
+               rte_spinlock_unlock(&intr_lock);
+       }
+}
+
+static void *
+eal_intr_thread_main(void *arg __rte_unused)
+{
+       struct kevent events[MAX_INTR_EVENTS];
+       int nfds;
+
+       /* host thread, never break out */
+       for (;;) {
+               /* do not change anything, just wait */
+               nfds = kevent(kq, NULL, 0, events, MAX_INTR_EVENTS, NULL);
+
+               /* kevent fail */
+               if (nfds < 0) {
+                       if (errno == EINTR)
+                               continue;
+                       RTE_LOG(ERR, EAL,
+                               "kevent returns with fail\n");
+                       break;
+               }
+               /* kevent timeout, will never happen here */
+               else if (nfds == 0)
+                       continue;
+
+               /* kevent has at least one fd ready to read */
+               eal_intr_process_interrupts(events, nfds);
+       }
+       close(kq);
+       kq = -1;
+       return NULL;
+}
+
+int
+rte_eal_intr_init(void)
+{
+       int ret = 0;
+
+       /* init the global interrupt source head */
+       TAILQ_INIT(&intr_sources);
+
+       kq = kqueue();
+       if (kq < 0) {
+               RTE_LOG(ERR, EAL, "Cannot create kqueue instance\n");
+               return -1;
+       }
+
+       /* create the host thread to wait/handle the interrupt */
+       ret = rte_ctrl_thread_create(&intr_thread, "eal-intr-thread", NULL,
+                       eal_intr_thread_main, NULL);
+       if (ret != 0) {
+               rte_errno = -ret;
+               RTE_LOG(ERR, EAL,
+                       "Failed to create thread for interrupt handling\n");
+       }
+
+       return ret;
+}
+
+int
+rte_intr_rx_ctl(struct rte_intr_handle *intr_handle,
+               int epfd, int op, unsigned int vec, void *data)
+{
+       RTE_SET_USED(intr_handle);
+       RTE_SET_USED(epfd);
+       RTE_SET_USED(op);
+       RTE_SET_USED(vec);
+       RTE_SET_USED(data);
+
+       return -ENOTSUP;
+}
+
+int
+rte_intr_efd_enable(struct rte_intr_handle *intr_handle, uint32_t nb_efd)
+{
+       RTE_SET_USED(intr_handle);
+       RTE_SET_USED(nb_efd);
+
+       return 0;
+}
+
+void
+rte_intr_efd_disable(struct rte_intr_handle *intr_handle)
+{
+       RTE_SET_USED(intr_handle);
+}
+
+int
+rte_intr_dp_is_en(struct rte_intr_handle *intr_handle)
+{
+       RTE_SET_USED(intr_handle);
+       return 0;
+}
+
+int
+rte_intr_allow_others(struct rte_intr_handle *intr_handle)
+{
+       RTE_SET_USED(intr_handle);
+       return 1;
+}
+
+int
+rte_intr_cap_multiple(struct rte_intr_handle *intr_handle)
+{
+       RTE_SET_USED(intr_handle);
+       return 0;
+}
+
+int
+rte_epoll_wait(int epfd, struct rte_epoll_event *events,
+               int maxevents, int timeout)
+{
+       RTE_SET_USED(epfd);
+       RTE_SET_USED(events);
+       RTE_SET_USED(maxevents);
+       RTE_SET_USED(timeout);
+
+       return -ENOTSUP;
+}
+
+int
+rte_epoll_ctl(int epfd, int op, int fd, struct rte_epoll_event *event)
+{
+       RTE_SET_USED(epfd);
+       RTE_SET_USED(op);
+       RTE_SET_USED(fd);
+       RTE_SET_USED(event);
+
+       return -ENOTSUP;
+}
+
+int
+rte_intr_tls_epfd(void)
+{
+       return -ENOTSUP;
+}
+
+void
+rte_intr_free_epoll_fd(struct rte_intr_handle *intr_handle)
+{
+       RTE_SET_USED(intr_handle);
+}
diff --git a/lib/librte_eal/freebsd/eal/eal_lcore.c b/lib/librte_eal/freebsd/eal/eal_lcore.c
new file mode 100644 (file)
index 0000000..d9ef4bc
--- /dev/null
@@ -0,0 +1,52 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#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 "eal_private.h"
+#include "eal_thread.h"
+
+/* No topology information available on FreeBSD including NUMA info */
+unsigned
+eal_cpu_core_id(__rte_unused unsigned lcore_id)
+{
+       return 0;
+}
+
+static int
+eal_get_ncpus(void)
+{
+       static int ncpu = -1;
+       int mib[2] = {CTL_HW, HW_NCPU};
+       size_t len = sizeof(ncpu);
+
+       if (ncpu < 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(__rte_unused unsigned cpu_id)
+{
+       return 0;
+}
+
+/* Check if a cpu is present by the presence of the
+ * cpu information for it.
+ */
+int
+eal_cpu_detected(unsigned lcore_id)
+{
+       const unsigned ncpus = eal_get_ncpus();
+       return lcore_id < ncpus;
+}
diff --git a/lib/librte_eal/freebsd/eal/eal_memalloc.c b/lib/librte_eal/freebsd/eal/eal_memalloc.c
new file mode 100644 (file)
index 0000000..6893448
--- /dev/null
@@ -0,0 +1,81 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017-2018 Intel Corporation
+ */
+
+#include <inttypes.h>
+
+#include <rte_errno.h>
+#include <rte_log.h>
+#include <rte_memory.h>
+
+#include "eal_memalloc.h"
+
+int
+eal_memalloc_alloc_seg_bulk(struct rte_memseg **ms __rte_unused,
+               int __rte_unused n_segs, size_t __rte_unused page_sz,
+               int __rte_unused socket, bool __rte_unused exact)
+{
+       RTE_LOG(ERR, EAL, "Memory hotplug not supported on FreeBSD\n");
+       return -1;
+}
+
+struct rte_memseg *
+eal_memalloc_alloc_seg(size_t __rte_unused page_sz, int __rte_unused socket)
+{
+       RTE_LOG(ERR, EAL, "Memory hotplug not supported on FreeBSD\n");
+       return NULL;
+}
+
+int
+eal_memalloc_free_seg(struct rte_memseg *ms __rte_unused)
+{
+       RTE_LOG(ERR, EAL, "Memory hotplug not supported on FreeBSD\n");
+       return -1;
+}
+
+int
+eal_memalloc_free_seg_bulk(struct rte_memseg **ms __rte_unused,
+               int n_segs __rte_unused)
+{
+       RTE_LOG(ERR, EAL, "Memory hotplug not supported on FreeBSD\n");
+       return -1;
+}
+
+int
+eal_memalloc_sync_with_primary(void)
+{
+       RTE_LOG(ERR, EAL, "Memory hotplug not supported on FreeBSD\n");
+       return -1;
+}
+
+int
+eal_memalloc_get_seg_fd(int list_idx __rte_unused, int seg_idx __rte_unused)
+{
+       return -ENOTSUP;
+}
+
+int
+eal_memalloc_set_seg_fd(int list_idx __rte_unused, int seg_idx __rte_unused,
+               int fd __rte_unused)
+{
+       return -ENOTSUP;
+}
+
+int
+eal_memalloc_set_seg_list_fd(int list_idx __rte_unused, int fd __rte_unused)
+{
+       return -ENOTSUP;
+}
+
+int
+eal_memalloc_get_seg_fd_offset(int list_idx __rte_unused,
+               int seg_idx __rte_unused, size_t *offset __rte_unused)
+{
+       return -ENOTSUP;
+}
+
+int
+eal_memalloc_init(void)
+{
+       return 0;
+}
diff --git a/lib/librte_eal/freebsd/eal/eal_memory.c b/lib/librte_eal/freebsd/eal/eal_memory.c
new file mode 100644 (file)
index 0000000..4b092e1
--- /dev/null
@@ -0,0 +1,522 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+#include <sys/mman.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <inttypes.h>
+#include <errno.h>
+#include <string.h>
+#include <fcntl.h>
+
+#include <rte_eal.h>
+#include <rte_eal_memconfig.h>
+#include <rte_errno.h>
+#include <rte_log.h>
+#include <rte_string_fns.h>
+#include "eal_private.h"
+#include "eal_internal_cfg.h"
+#include "eal_filesystem.h"
+
+#define EAL_PAGE_SIZE (sysconf(_SC_PAGESIZE))
+
+/*
+ * 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_virt2iova() when hugepages are disabled. */
+       (void)virtaddr;
+       return RTE_BAD_IOVA;
+}
+rte_iova_t
+rte_mem_virt2iova(const void *virtaddr)
+{
+       return rte_mem_virt2phy(virtaddr);
+}
+
+int
+rte_eal_hugepage_init(void)
+{
+       struct rte_mem_config *mcfg;
+       uint64_t total_mem = 0;
+       void *addr;
+       unsigned int 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) {
+               struct rte_memseg_list *msl;
+               struct rte_fbarray *arr;
+               struct rte_memseg *ms;
+               uint64_t page_sz;
+               int n_segs, cur_seg;
+
+               /* create a memseg list */
+               msl = &mcfg->memsegs[0];
+
+               page_sz = RTE_PGSIZE_4K;
+               n_segs = internal_config.memory / page_sz;
+
+               if (rte_fbarray_init(&msl->memseg_arr, "nohugemem", n_segs,
+                               sizeof(struct rte_memseg))) {
+                       RTE_LOG(ERR, EAL, "Cannot allocate memseg list\n");
+                       return -1;
+               }
+
+               addr = mmap(NULL, internal_config.memory,
+                               PROT_READ | PROT_WRITE,
+                               MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+               if (addr == MAP_FAILED) {
+                       RTE_LOG(ERR, EAL, "%s: mmap() failed: %s\n", __func__,
+                                       strerror(errno));
+                       return -1;
+               }
+               msl->base_va = addr;
+               msl->page_sz = page_sz;
+               msl->len = internal_config.memory;
+               msl->socket_id = 0;
+
+               /* populate memsegs. each memseg is 1 page long */
+               for (cur_seg = 0; cur_seg < n_segs; cur_seg++) {
+                       arr = &msl->memseg_arr;
+
+                       ms = rte_fbarray_get(arr, cur_seg);
+                       if (rte_eal_iova_mode() == RTE_IOVA_VA)
+                               ms->iova = (uintptr_t)addr;
+                       else
+                               ms->iova = RTE_BAD_IOVA;
+                       ms->addr = addr;
+                       ms->hugepage_sz = page_sz;
+                       ms->len = page_sz;
+                       ms->socket_id = 0;
+
+                       rte_fbarray_set_used(arr, cur_seg);
+
+                       addr = RTE_PTR_ADD(addr, page_sz);
+               }
+               return 0;
+       }
+
+       /* map all hugepages and sort them */
+       for (i = 0; i < internal_config.num_hugepage_sizes; i ++){
+               struct hugepage_info *hpi;
+               rte_iova_t prev_end = 0;
+               int prev_ms_idx = -1;
+               uint64_t page_sz, mem_needed;
+               unsigned int n_pages, max_pages;
+
+               hpi = &internal_config.hugepage_info[i];
+               page_sz = hpi->hugepage_sz;
+               max_pages = hpi->num_pages[0];
+               mem_needed = RTE_ALIGN_CEIL(internal_config.memory - total_mem,
+                               page_sz);
+
+               n_pages = RTE_MIN(mem_needed / page_sz, max_pages);
+
+               for (j = 0; j < n_pages; j++) {
+                       struct rte_memseg_list *msl;
+                       struct rte_fbarray *arr;
+                       struct rte_memseg *seg;
+                       int msl_idx, ms_idx;
+                       rte_iova_t physaddr;
+                       int error;
+                       size_t sysctl_size = sizeof(physaddr);
+                       char physaddr_str[64];
+                       bool is_adjacent;
+
+                       /* first, check if this segment is IOVA-adjacent to
+                        * the previous one.
+                        */
+                       snprintf(physaddr_str, sizeof(physaddr_str),
+                                       "hw.contigmem.physaddr.%d", j);
+                       error = sysctlbyname(physaddr_str, &physaddr,
+                                       &sysctl_size, NULL, 0);
+                       if (error < 0) {
+                               RTE_LOG(ERR, EAL, "Failed to get physical addr for buffer %u "
+                                               "from %s\n", j, hpi->hugedir);
+                               return -1;
+                       }
+
+                       is_adjacent = prev_end != 0 && physaddr == prev_end;
+                       prev_end = physaddr + hpi->hugepage_sz;
+
+                       for (msl_idx = 0; msl_idx < RTE_MAX_MEMSEG_LISTS;
+                                       msl_idx++) {
+                               bool empty, need_hole;
+                               msl = &mcfg->memsegs[msl_idx];
+                               arr = &msl->memseg_arr;
+
+                               if (msl->page_sz != page_sz)
+                                       continue;
+
+                               empty = arr->count == 0;
+
+                               /* we need a hole if this isn't an empty memseg
+                                * list, and if previous segment was not
+                                * adjacent to current one.
+                                */
+                               need_hole = !empty && !is_adjacent;
+
+                               /* we need 1, plus hole if not adjacent */
+                               ms_idx = rte_fbarray_find_next_n_free(arr,
+                                               0, 1 + (need_hole ? 1 : 0));
+
+                               /* memseg list is full? */
+                               if (ms_idx < 0)
+                                       continue;
+
+                               if (need_hole && prev_ms_idx == ms_idx - 1)
+                                       ms_idx++;
+                               prev_ms_idx = ms_idx;
+
+                               break;
+                       }
+                       if (msl_idx == RTE_MAX_MEMSEG_LISTS) {
+                               RTE_LOG(ERR, EAL, "Could not find space for memseg. Please increase %s and/or %s in configuration.\n",
+                                       RTE_STR(CONFIG_RTE_MAX_MEMSEG_PER_TYPE),
+                                       RTE_STR(CONFIG_RTE_MAX_MEM_PER_TYPE));
+                               return -1;
+                       }
+                       arr = &msl->memseg_arr;
+                       seg = rte_fbarray_get(arr, ms_idx);
+
+                       addr = RTE_PTR_ADD(msl->base_va,
+                                       (size_t)msl->page_sz * ms_idx);
+
+                       /* address is already mapped in memseg list, so using
+                        * MAP_FIXED here is safe.
+                        */
+                       addr = mmap(addr, page_sz, PROT_READ|PROT_WRITE,
+                                       MAP_SHARED | MAP_FIXED,
+                                       hpi->lock_descriptor,
+                                       j * EAL_PAGE_SIZE);
+                       if (addr == MAP_FAILED) {
+                               RTE_LOG(ERR, EAL, "Failed to mmap buffer %u from %s\n",
+                                               j, hpi->hugedir);
+                               return -1;
+                       }
+
+                       seg->addr = addr;
+                       seg->iova = physaddr;
+                       seg->hugepage_sz = page_sz;
+                       seg->len = page_sz;
+                       seg->nchannel = mcfg->nchannel;
+                       seg->nrank = mcfg->nrank;
+                       seg->socket_id = 0;
+
+                       rte_fbarray_set_used(arr, ms_idx);
+
+                       RTE_LOG(INFO, EAL, "Mapped memory segment %u @ %p: physaddr:0x%"
+                                       PRIx64", len %zu\n",
+                                       seg_idx++, addr, physaddr, page_sz);
+
+                       total_mem += seg->len;
+               }
+               if (total_mem >= internal_config.memory)
+                       break;
+       }
+       if (total_mem < internal_config.memory) {
+               RTE_LOG(ERR, EAL, "Couldn't reserve requested memory, "
+                               "requested: %" PRIu64 "M "
+                               "available: %" PRIu64 "M\n",
+                               internal_config.memory >> 20, total_mem >> 20);
+               return -1;
+       }
+       return 0;
+}
+
+struct attach_walk_args {
+       int fd_hugepage;
+       int seg_idx;
+};
+static int
+attach_segment(const struct rte_memseg_list *msl, const struct rte_memseg *ms,
+               void *arg)
+{
+       struct attach_walk_args *wa = arg;
+       void *addr;
+
+       if (msl->external)
+               return 0;
+
+       addr = mmap(ms->addr, ms->len, PROT_READ | PROT_WRITE,
+                       MAP_SHARED | MAP_FIXED, wa->fd_hugepage,
+                       wa->seg_idx * EAL_PAGE_SIZE);
+       if (addr == MAP_FAILED || addr != ms->addr)
+               return -1;
+       wa->seg_idx++;
+
+       return 0;
+}
+
+int
+rte_eal_hugepage_attach(void)
+{
+       const struct hugepage_info *hpi;
+       int fd_hugepage = -1;
+       unsigned int i;
+
+       hpi = &internal_config.hugepage_info[0];
+
+       for (i = 0; i < internal_config.num_hugepage_sizes; i++) {
+               const struct hugepage_info *cur_hpi = &hpi[i];
+               struct attach_walk_args wa;
+
+               memset(&wa, 0, sizeof(wa));
+
+               /* Obtain a file descriptor for contiguous memory */
+               fd_hugepage = open(cur_hpi->hugedir, O_RDWR);
+               if (fd_hugepage < 0) {
+                       RTE_LOG(ERR, EAL, "Could not open %s\n",
+                                       cur_hpi->hugedir);
+                       goto error;
+               }
+               wa.fd_hugepage = fd_hugepage;
+               wa.seg_idx = 0;
+
+               /* Map the contiguous memory into each memory segment */
+               if (rte_memseg_walk(attach_segment, &wa) < 0) {
+                       RTE_LOG(ERR, EAL, "Failed to mmap buffer %u from %s\n",
+                               wa.seg_idx, cur_hpi->hugedir);
+                       goto error;
+               }
+
+               close(fd_hugepage);
+               fd_hugepage = -1;
+       }
+
+       /* hugepage_info is no longer required */
+       return 0;
+
+error:
+       if (fd_hugepage >= 0)
+               close(fd_hugepage);
+       return -1;
+}
+
+int
+rte_eal_using_phys_addrs(void)
+{
+       return 0;
+}
+
+static uint64_t
+get_mem_amount(uint64_t page_sz, uint64_t max_mem)
+{
+       uint64_t area_sz, max_pages;
+
+       /* limit to RTE_MAX_MEMSEG_PER_LIST pages or RTE_MAX_MEM_MB_PER_LIST */
+       max_pages = RTE_MAX_MEMSEG_PER_LIST;
+       max_mem = RTE_MIN((uint64_t)RTE_MAX_MEM_MB_PER_LIST << 20, max_mem);
+
+       area_sz = RTE_MIN(page_sz * max_pages, max_mem);
+
+       /* make sure the list isn't smaller than the page size */
+       area_sz = RTE_MAX(area_sz, page_sz);
+
+       return RTE_ALIGN(area_sz, page_sz);
+}
+
+#define MEMSEG_LIST_FMT "memseg-%" PRIu64 "k-%i-%i"
+static int
+alloc_memseg_list(struct rte_memseg_list *msl, uint64_t page_sz,
+               int n_segs, int socket_id, int type_msl_idx)
+{
+       char name[RTE_FBARRAY_NAME_LEN];
+
+       snprintf(name, sizeof(name), MEMSEG_LIST_FMT, page_sz >> 10, socket_id,
+                type_msl_idx);
+       if (rte_fbarray_init(&msl->memseg_arr, name, n_segs,
+                       sizeof(struct rte_memseg))) {
+               RTE_LOG(ERR, EAL, "Cannot allocate memseg list: %s\n",
+                       rte_strerror(rte_errno));
+               return -1;
+       }
+
+       msl->page_sz = page_sz;
+       msl->socket_id = socket_id;
+       msl->base_va = NULL;
+
+       RTE_LOG(DEBUG, EAL, "Memseg list allocated: 0x%zxkB at socket %i\n",
+                       (size_t)page_sz >> 10, socket_id);
+
+       return 0;
+}
+
+static int
+alloc_va_space(struct rte_memseg_list *msl)
+{
+       uint64_t page_sz;
+       size_t mem_sz;
+       void *addr;
+       int flags = 0;
+
+#ifdef RTE_ARCH_PPC_64
+       flags |= MAP_HUGETLB;
+#endif
+
+       page_sz = msl->page_sz;
+       mem_sz = page_sz * msl->memseg_arr.len;
+
+       addr = eal_get_virtual_area(msl->base_va, &mem_sz, page_sz, 0, flags);
+       if (addr == NULL) {
+               if (rte_errno == EADDRNOTAVAIL)
+                       RTE_LOG(ERR, EAL, "Could not mmap %llu bytes at [%p] - please use '--base-virtaddr' option\n",
+                               (unsigned long long)mem_sz, msl->base_va);
+               else
+                       RTE_LOG(ERR, EAL, "Cannot reserve memory\n");
+               return -1;
+       }
+       msl->base_va = addr;
+       msl->len = mem_sz;
+
+       return 0;
+}
+
+
+static int
+memseg_primary_init(void)
+{
+       struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
+       int hpi_idx, msl_idx = 0;
+       struct rte_memseg_list *msl;
+       uint64_t max_mem, total_mem;
+
+       /* no-huge does not need this at all */
+       if (internal_config.no_hugetlbfs)
+               return 0;
+
+       /* FreeBSD has an issue where core dump will dump the entire memory
+        * contents, including anonymous zero-page memory. Therefore, while we
+        * will be limiting total amount of memory to RTE_MAX_MEM_MB, we will
+        * also be further limiting total memory amount to whatever memory is
+        * available to us through contigmem driver (plus spacing blocks).
+        *
+        * so, at each stage, we will be checking how much memory we are
+        * preallocating, and adjust all the values accordingly.
+        */
+
+       max_mem = (uint64_t)RTE_MAX_MEM_MB << 20;
+       total_mem = 0;
+
+       /* create memseg lists */
+       for (hpi_idx = 0; hpi_idx < (int) internal_config.num_hugepage_sizes;
+                       hpi_idx++) {
+               uint64_t max_type_mem, total_type_mem = 0;
+               uint64_t avail_mem;
+               int type_msl_idx, max_segs, avail_segs, total_segs = 0;
+               struct hugepage_info *hpi;
+               uint64_t hugepage_sz;
+
+               hpi = &internal_config.hugepage_info[hpi_idx];
+               hugepage_sz = hpi->hugepage_sz;
+
+               /* no NUMA support on FreeBSD */
+
+               /* check if we've already exceeded total memory amount */
+               if (total_mem >= max_mem)
+                       break;
+
+               /* first, calculate theoretical limits according to config */
+               max_type_mem = RTE_MIN(max_mem - total_mem,
+                       (uint64_t)RTE_MAX_MEM_MB_PER_TYPE << 20);
+               max_segs = RTE_MAX_MEMSEG_PER_TYPE;
+
+               /* now, limit all of that to whatever will actually be
+                * available to us, because without dynamic allocation support,
+                * all of that extra memory will be sitting there being useless
+                * and slowing down core dumps in case of a crash.
+                *
+                * we need (N*2)-1 segments because we cannot guarantee that
+                * each segment will be IOVA-contiguous with the previous one,
+                * so we will allocate more and put spaces inbetween segments
+                * that are non-contiguous.
+                */
+               avail_segs = (hpi->num_pages[0] * 2) - 1;
+               avail_mem = avail_segs * hugepage_sz;
+
+               max_type_mem = RTE_MIN(avail_mem, max_type_mem);
+               max_segs = RTE_MIN(avail_segs, max_segs);
+
+               type_msl_idx = 0;
+               while (total_type_mem < max_type_mem &&
+                               total_segs < max_segs) {
+                       uint64_t cur_max_mem, cur_mem;
+                       unsigned int n_segs;
+
+                       if (msl_idx >= RTE_MAX_MEMSEG_LISTS) {
+                               RTE_LOG(ERR, EAL,
+                                       "No more space in memseg lists, please increase %s\n",
+                                       RTE_STR(CONFIG_RTE_MAX_MEMSEG_LISTS));
+                               return -1;
+                       }
+
+                       msl = &mcfg->memsegs[msl_idx++];
+
+                       cur_max_mem = max_type_mem - total_type_mem;
+
+                       cur_mem = get_mem_amount(hugepage_sz,
+                                       cur_max_mem);
+                       n_segs = cur_mem / hugepage_sz;
+
+                       if (alloc_memseg_list(msl, hugepage_sz, n_segs,
+                                       0, type_msl_idx))
+                               return -1;
+
+                       total_segs += msl->memseg_arr.len;
+                       total_type_mem = total_segs * hugepage_sz;
+                       type_msl_idx++;
+
+                       if (alloc_va_space(msl)) {
+                               RTE_LOG(ERR, EAL, "Cannot allocate VA space for memseg list\n");
+                               return -1;
+                       }
+               }
+               total_mem += total_type_mem;
+       }
+       return 0;
+}
+
+static int
+memseg_secondary_init(void)
+{
+       struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
+       int msl_idx = 0;
+       struct rte_memseg_list *msl;
+
+       for (msl_idx = 0; msl_idx < RTE_MAX_MEMSEG_LISTS; msl_idx++) {
+
+               msl = &mcfg->memsegs[msl_idx];
+
+               /* skip empty memseg lists */
+               if (msl->memseg_arr.len == 0)
+                       continue;
+
+               if (rte_fbarray_attach(&msl->memseg_arr)) {
+                       RTE_LOG(ERR, EAL, "Cannot attach to primary process memseg lists\n");
+                       return -1;
+               }
+
+               /* preallocate VA space */
+               if (alloc_va_space(msl)) {
+                       RTE_LOG(ERR, EAL, "Cannot preallocate VA space for hugepage memory\n");
+                       return -1;
+               }
+       }
+
+       return 0;
+}
+
+int
+rte_eal_memseg_init(void)
+{
+       return rte_eal_process_type() == RTE_PROC_PRIMARY ?
+                       memseg_primary_init() :
+                       memseg_secondary_init();
+}
diff --git a/lib/librte_eal/freebsd/eal/eal_thread.c b/lib/librte_eal/freebsd/eal/eal_thread.c
new file mode 100644 (file)
index 0000000..309b587
--- /dev/null
@@ -0,0 +1,177 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <sched.h>
+#include <pthread_np.h>
+#include <sys/queue.h>
+#include <sys/thr.h>
+
+#include <rte_debug.h>
+#include <rte_atomic.h>
+#include <rte_launch.h>
+#include <rte_log.h>
+#include <rte_memory.h>
+#include <rte_per_lcore.h>
+#include <rte_eal.h>
+#include <rte_lcore.h>
+
+#include "eal_private.h"
+#include "eal_thread.h"
+
+RTE_DEFINE_PER_LCORE(unsigned, _lcore_id) = LCORE_ID_ANY;
+RTE_DEFINE_PER_LCORE(unsigned, _socket_id) = (unsigned)SOCKET_ID_ANY;
+RTE_DEFINE_PER_LCORE(rte_cpuset_t, _cpuset);
+
+/*
+ * Send a message to a slave lcore identified by slave_id to call a
+ * function f with argument arg. Once the execution is done, the
+ * remote lcore switch in FINISHED state.
+ */
+int
+rte_eal_remote_launch(int (*f)(void *), void *arg, unsigned slave_id)
+{
+       int n;
+       char c = 0;
+       int m2s = lcore_config[slave_id].pipe_master2slave[1];
+       int s2m = lcore_config[slave_id].pipe_slave2master[0];
+
+       if (lcore_config[slave_id].state != WAIT)
+               return -EBUSY;
+
+       lcore_config[slave_id].f = f;
+       lcore_config[slave_id].arg = arg;
+
+       /* send message */
+       n = 0;
+       while (n == 0 || (n < 0 && errno == EINTR))
+               n = write(m2s, &c, 1);
+       if (n < 0)
+               rte_panic("cannot write on configuration pipe\n");
+
+       /* wait ack */
+       do {
+               n = read(s2m, &c, 1);
+       } while (n < 0 && errno == EINTR);
+
+       if (n <= 0)
+               rte_panic("cannot read on configuration pipe\n");
+
+       return 0;
+}
+
+/* set affinity for current thread */
+static int
+eal_thread_set_affinity(void)
+{
+       unsigned lcore_id = rte_lcore_id();
+
+       /* acquire system unique id  */
+       rte_gettid();
+
+       /* update EAL thread core affinity */
+       return rte_thread_set_affinity(&lcore_config[lcore_id].cpuset);
+}
+
+void eal_thread_init_master(unsigned lcore_id)
+{
+       /* set the lcore ID in per-lcore memory area */
+       RTE_PER_LCORE(_lcore_id) = lcore_id;
+
+       /* set CPU affinity */
+       if (eal_thread_set_affinity() < 0)
+               rte_panic("cannot set affinity\n");
+}
+
+/* main loop of threads */
+__attribute__((noreturn)) void *
+eal_thread_loop(__attribute__((unused)) void *arg)
+{
+       char c;
+       int n, ret;
+       unsigned lcore_id;
+       pthread_t thread_id;
+       int m2s, s2m;
+       char cpuset[RTE_CPU_AFFINITY_STR_LEN];
+
+       thread_id = pthread_self();
+
+       /* retrieve our lcore_id from the configuration structure */
+       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+               if (thread_id == lcore_config[lcore_id].thread_id)
+                       break;
+       }
+       if (lcore_id == RTE_MAX_LCORE)
+               rte_panic("cannot retrieve lcore id\n");
+
+       m2s = lcore_config[lcore_id].pipe_master2slave[0];
+       s2m = lcore_config[lcore_id].pipe_slave2master[1];
+
+       /* set the lcore ID in per-lcore memory area */
+       RTE_PER_LCORE(_lcore_id) = lcore_id;
+
+       /* set CPU affinity */
+       if (eal_thread_set_affinity() < 0)
+               rte_panic("cannot set affinity\n");
+
+       ret = eal_thread_dump_affinity(cpuset, sizeof(cpuset));
+
+       RTE_LOG(DEBUG, EAL, "lcore %u is ready (tid=%p;cpuset=[%s%s])\n",
+               lcore_id, thread_id, cpuset, ret == 0 ? "" : "...");
+
+       /* read on our pipe to get commands */
+       while (1) {
+               void *fct_arg;
+
+               /* wait command */
+               do {
+                       n = read(m2s, &c, 1);
+               } while (n < 0 && errno == EINTR);
+
+               if (n <= 0)
+                       rte_panic("cannot read on configuration pipe\n");
+
+               lcore_config[lcore_id].state = RUNNING;
+
+               /* send ack */
+               n = 0;
+               while (n == 0 || (n < 0 && errno == EINTR))
+                       n = write(s2m, &c, 1);
+               if (n < 0)
+                       rte_panic("cannot write on configuration pipe\n");
+
+               if (lcore_config[lcore_id].f == NULL)
+                       rte_panic("NULL function pointer\n");
+
+               /* call the function and store the return value */
+               fct_arg = lcore_config[lcore_id].arg;
+               ret = lcore_config[lcore_id].f(fct_arg);
+               lcore_config[lcore_id].ret = ret;
+               rte_wmb();
+               lcore_config[lcore_id].state = FINISHED;
+       }
+
+       /* never reached */
+       /* pthread_exit(NULL); */
+       /* return NULL; */
+}
+
+/* require calling thread tid by gettid() */
+int rte_sys_gettid(void)
+{
+       long lwpid;
+       thr_self(&lwpid);
+       return (int)lwpid;
+}
+
+int rte_thread_setname(pthread_t id, const char *name)
+{
+       /* this BSD function returns no error */
+       pthread_set_name_np(id, name);
+       return 0;
+}
diff --git a/lib/librte_eal/freebsd/eal/eal_timer.c b/lib/librte_eal/freebsd/eal/eal_timer.c
new file mode 100644 (file)
index 0000000..beff755
--- /dev/null
@@ -0,0 +1,64 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <inttypes.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <errno.h>
+
+#include <rte_common.h>
+#include <rte_log.h>
+#include <rte_cycles.h>
+#include <rte_memory.h>
+#include <rte_eal.h>
+#include <rte_debug.h>
+
+#include "eal_private.h"
+#include "eal_internal_cfg.h"
+
+#ifdef RTE_LIBEAL_USE_HPET
+#warning HPET is not supported in FreeBSD
+#endif
+
+enum timer_source eal_timer_source = EAL_TIMER_TSC;
+
+uint64_t
+get_tsc_freq(void)
+{
+       size_t sz;
+       int tmp;
+       uint64_t tsc_hz;
+
+       sz = sizeof(tmp);
+       tmp = 0;
+
+       if (sysctlbyname("kern.timecounter.smp_tsc", &tmp, &sz, NULL, 0))
+               RTE_LOG(WARNING, EAL, "%s\n", strerror(errno));
+       else if (tmp != 1)
+               RTE_LOG(WARNING, EAL, "TSC is not safe to use in SMP mode\n");
+
+       tmp = 0;
+
+       if (sysctlbyname("kern.timecounter.invariant_tsc", &tmp, &sz, NULL, 0))
+               RTE_LOG(WARNING, EAL, "%s\n", strerror(errno));
+       else if (tmp != 1)
+               RTE_LOG(WARNING, EAL, "TSC is not invariant\n");
+
+       sz = sizeof(tsc_hz);
+       if (sysctlbyname("machdep.tsc_freq", &tsc_hz, &sz, NULL, 0)) {
+               RTE_LOG(WARNING, EAL, "%s\n", strerror(errno));
+               return 0;
+       }
+
+       return tsc_hz;
+}
+
+int
+rte_eal_timer_init(void)
+{
+       set_tsc_freq();
+       return 0;
+}
diff --git a/lib/librte_eal/freebsd/eal/meson.build b/lib/librte_eal/freebsd/eal/meson.build
new file mode 100644 (file)
index 0000000..3945b52
--- /dev/null
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Intel Corporation
+
+env_objs = []
+env_headers = []
+env_sources = files('eal_alarm.c',
+               'eal_cpuflags.c',
+               'eal_debug.c',
+               'eal_hugepage_info.c',
+               'eal_interrupts.c',
+               'eal_lcore.c',
+               'eal_memalloc.c',
+               'eal_thread.c',
+               'eal_timer.c',
+               'eal.c',
+               'eal_memory.c',
+               'eal_dev.c'
+)
+
+deps += ['kvargs']
index 98c1d1f..4ae0efc 100644 (file)
@@ -15,7 +15,7 @@ if host_machine.system() == 'linux'
 
 elif host_machine.system() == 'freebsd'
        dpdk_conf.set('RTE_EXEC_ENV_BSDAPP', 1)
-       subdir('bsdapp/eal')
+       subdir('freebsd/eal')
 
 else
        error('unsupported system type "@0@"'.format(host_machine.system()))