From 3857f3f735f44c156ba261db0fdf10e2f4011510 Mon Sep 17 00:00:00 2001 From: Peng Cao Date: Wed, 29 Apr 2020 22:08:22 +0800 Subject: [PATCH] 1. Update Dockerfile for CI build. But there is dependency on Intel System Studio license. User should get license before running the build. 2. Temporary solution: Change the core assignment in both source code and test case configuration files to explicitly bind any thread to the core specified from configuration file. 3. Provide a automation script to assign VF devices/core IDs/test case ID/others to sample-app configuration file and run test cases. Change-Id: I58c33e5aa5cc31979f396fd69ee680b496516e53 Signed-off-by: Peng Cao --- Dockerfile | 92 ++++++++++++--- fhi_lib/app/src/config.c | 18 +++ fhi_lib/app/src/config.h | 6 +- fhi_lib/app/src/sample-app.c | 28 +++-- .../cat_b/mu1_100mhz/1/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/1/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/101/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/101/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/102/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/102/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/103/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/103/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/104/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/104/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/105/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/105/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/106/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/106/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/107/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/107/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/108/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/108/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/109/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/109/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/201/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/201/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/202/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/202/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/203/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/203/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/204/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/204/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/205/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/205/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/206/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/206/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/211/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/211/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/212/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/212/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/213/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/213/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/214/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/214/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/215/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/215/config_file_o_ru.dat | 6 +- .../cat_b/mu1_100mhz/216/config_file_o_du.dat | 6 +- .../cat_b/mu1_100mhz/216/config_file_o_ru.dat | 6 +- .../usecase/cat_b/mu1_100mhz/config_file_o_du.dat | 6 +- .../usecase/cat_b/mu1_100mhz/config_file_o_ru.dat | 6 +- fhi_lib/app/usecase/mu0_10mhz/config_file_o_du.dat | 6 +- fhi_lib/app/usecase/mu0_10mhz/config_file_o_ru.dat | 6 +- .../app/usecase/mu0_20mhz/12/config_file_o_du.dat | 6 +- .../app/usecase/mu0_20mhz/12/config_file_o_ru.dat | 6 +- fhi_lib/app/usecase/mu0_20mhz/config_file_o_du.dat | 6 +- fhi_lib/app/usecase/mu0_20mhz/config_file_o_ru.dat | 6 +- fhi_lib/app/usecase/mu0_5mhz/config_file_o_du.dat | 6 +- fhi_lib/app/usecase/mu0_5mhz/config_file_o_ru.dat | 6 +- .../app/usecase/mu1_100mhz/config_file_o_du.dat | 8 +- .../app/usecase/mu1_100mhz/config_file_o_ru.dat | 10 +- .../app/usecase/mu3_100mhz/config_file_o_du.dat | 6 +- .../app/usecase/mu3_100mhz/config_file_o_ru.dat | 6 +- fhi_lib/lib/src/xran_main.c | 9 +- misc/build-xran-image.sh | 27 +++++ misc/update-config-run.sh | 125 +++++++++++++++++++++ 65 files changed, 570 insertions(+), 89 deletions(-) create mode 100755 misc/build-xran-image.sh create mode 100755 misc/update-config-run.sh diff --git a/Dockerfile b/Dockerfile index c6a87d2..784a3f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,30 +13,88 @@ # See the License for the specific language governing permissions and # # limitations under the License. # ################################################################################ -FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:2-u16.04-nng as ubuntu +FROM centos:centos7.7.1908 AS builder + +ENV https_proxy $https_proxy +ENV http_proxy $http_proxy +ENV no_proxy $no_proxy + +ARG icc_license_file WORKDIR /opt/o-du/phy -COPY . . +ENV BUILD_DIR /opt/o-du/phy +ENV XRAN_DIR $BUILD_DIR/fhi_lib -ENV XRAN_DIR /opt/o-du/phy/fhi_lib -ENV BUILD_GCC 1 +###Install required libs +RUN yum update -y && \ + yum install -y libhugetlbfs-utils libhugetlbfs-devel libhugetlbfs numactl-devel ethtool gcc make module-init-tools kmod patch xz iproute pciutils python vim cmake unzip nano mc iputils-ping libaio libaio-devel net-tools wget zip -RUN apt-get update &&\ - apt-get install -y wget libnuma-dev linux-headers-generic libgtest-dev -# because we run in VM which may be linuxkit kernel. Faking for "regular" kernel -RUN cp -r /lib/modules/$(ls -1 /lib/modules | head -1) /lib/modules/$(uname -r) +###Install some libs to compile DPDK +RUN yum groupinstall -y "Development Tools" +RUN yum install -y ncurses-devel hmaccalc zlib-devel binutils-devel elfutils-libelf-devel bc libstdc++-4.8.5-28.el7_5.1.x86_64 gcc-c++ libstdc++-devel-4.8.5-28.el7_5.1.x86_64 autoconf-2.69-11.el7.noarch +###googletest is required for XRAN unittests build and run RUN wget https://github.com/google/googletest/archive/v1.8.x.zip && \ - unzip v1.8.x.zip -ENV GTEST_ROOT /opt/o-du/phy/googletest-1.8.x + cd /opt && unzip $BUILD_DIR/v1.8.x.zip +ENV GTEST_ROOT /opt/googletest-1.8.x/googletest +ENV GTEST_DIR /opt/googletest-1.8.x/googletest +RUN cd $GTEST_DIR && \ + g++ -isystem ${GTEST_DIR}/include -I${GTEST_DIR} -pthread -c ${GTEST_DIR}/src/gtest-all.cc && \ + ar -rv libgtest.a gtest-all.o + + +###Before install ISS, please go to Intel site to get a free license: https://software.intel.com/en-us/system-studio/choose-download +COPY $icc_license_file $BUILD_DIR/license.lic + +####Download Intel System Studio from Intel website and install ICC +RUN wget https://registrationcenter-download.intel.com/akdlm/irc_nas/16242/system_studio_2020_ultimate_edition_offline.tar.gz && \ + cd /opt && mkdir intel && cp $BUILD_DIR/license.lic intel/license.lic && \ + tar -zxvf $BUILD_DIR/system_studio_2020_ultimate_edition_offline.tar.gz && \ + cd system_studio_2020_ultimate_edition_offline/ && \ + sed -i "s/ACCEPT_EULA.*/ACCEPT_EULA=accept/" silent.cfg && \ + sed -i "s/PSET_INSTALL_DIR.*/PSET_INSTALL_DIR=\/opt\/intel/" silent.cfg && \ + sed -i "s/.*ACTIVATION_LICENSE_FILE.*/ACTIVATION_LICENSE_FILE=\/opt\/intel\/license.lic/" silent.cfg && \ + sed -i "s/ACTIVATION_TYPE.*/ACTIVATION_TYPE=license_file/" silent.cfg && \ + ./install.sh -s silent.cfg + +###Set env for ICC +RUN source /opt/intel/system_studio_2020/bin/iccvars.sh intel64 +ENV PATH /opt/intel/system_studio_2020/bin/:$PATH -ENV RTE_TARGET x86_64-native-linuxapp-gcc +####Download and build DPDK +ENV RTE_TARGET x86_64-native-linuxapp-icc ENV RTE_SDK /opt/o-du/dpdk-18.08 -RUN wget http://fast.dpdk.org/rel/dpdk-18.08.1.tar.xz && \ - tar -xf dpdk-18.08.1.tar.xz && \ - mv dpdk-stable-18.08.1 $RTE_SDK && \ +RUN wget http://fast.dpdk.org/rel/dpdk-18.08.tar.xz && \ + tar -xf dpdk-18.08.tar.xz && \ + mv dpdk-18.08 $RTE_SDK && \ cd $RTE_SDK && \ - make install T="$RTE_TARGET" + make config T=$RTE_TARGET O=$RTE_TARGET && \ + cd $RTE_SDK/$RTE_TARGET && \ + sed -i "s/CONFIG_RTE_EAL_IGB_UIO=y/CONFIG_RTE_EAL_IGB_UIO=n/" .config && \ + sed -i "s/CONFIG_RTE_KNI_KMOD=y/CONFIG_RTE_KNI_KMOD=n/" .config && \ + make + +####Install octave. Issue when downloading octave. And the octave will take 500MB space. +RUN yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm -y && \ + yum install octave -y + +###Copy XRAN source code into docker image +COPY fhi_lib $BUILD_DIR/fhi_lib +COPY misc $BUILD_DIR/misc + +####Build XRAN lib, unittests, sample app +RUN cd $BUILD_DIR/fhi_lib/ && ./build.sh xclean && ./build.sh && cd app && octave gen_test.m + +####Unset network proxy +RUN unset http_proxy https_prox ftp_proxy no_proxy + +FROM centos:centos7.7.1908 +ENV TARGET_DIR /opt/o-du/phy +COPY --from=builder /opt/o-du/phy/fhi_lib $TARGET_DIR/fhi_lib +COPY --from=builder /opt/o-du/phy/misc $TARGET_DIR/misc +COPY --from=builder /usr/lib64/libnuma* /usr/lib64/ +ENV XRAN_DIR $TARGET_DIR/fhi_lib +WORKDIR $TARGET_DIR/fhi_lib + +LABEL description="ORAN Fronthaul Sample Application" -RUN cd fhi_lib/lib && \ - bash ./build_ci.sh diff --git a/fhi_lib/app/src/config.c b/fhi_lib/app/src/config.c index f000a46..88bd649 100644 --- a/fhi_lib/app/src/config.c +++ b/fhi_lib/app/src/config.c @@ -29,6 +29,7 @@ #include "debug.h" #include +#include #define MAX_LINE_SIZE 512 /* Configuration file maximum supported line length */ @@ -67,6 +68,11 @@ #define KEY_MTU_SIZE "MTUSize" #define KEY_IO_CORE "ioCore" +#define KEY_SYSTEM_CORE "systemCore" +#define KEY_PKT_PROC_CORE "pktProcCore" +#define KEY_PKT_AUX_CORE "pktAuxCore" +#define KEY_TIMING_CORE "timingCore" + #define KEY_INSTANCE_ID "instanceId" #define KEY_LLS_CU_MAC "llsCUMac" @@ -244,6 +250,18 @@ static int fillConfigStruct(RuntimeConfig *config, const char *key, const char * } else if (strcmp(key, KEY_IO_CORE) == 0) { config->io_core = atoi(value); printf("io_core %d\n", config->io_core); + } else if (strcmp(key, KEY_SYSTEM_CORE) == 0) { + config->system_core = atoi(value); + printf("system_core -c %" PRIx64 "\n", config->system_core); + } else if (strcmp(key, KEY_PKT_PROC_CORE) == 0) { + config->pkt_proc_core = atoi(value); + printf("pkt_proc_core -c %" PRIx64 "\n", config->pkt_proc_core); + } else if (strcmp(key, KEY_PKT_AUX_CORE) == 0) { + config->pkt_aux_core = atoi(value); + printf("pkt_aux_core -c %" PRIx64 "\n", config->pkt_aux_core); + } else if (strcmp(key, KEY_TIMING_CORE) == 0) { + config->timing_core = atoi(value); + printf("timing_core -c %" PRIx64 "\n", config->timing_core); }else if (strcmp(key, KEY_INSTANCE_ID) == 0) { config->instance_id = atoi(value); printf("instance_id %d\n", config->instance_id); diff --git a/fhi_lib/app/src/config.h b/fhi_lib/app/src/config.h index 5c0e3e3..d9cae09 100644 --- a/fhi_lib/app/src/config.h +++ b/fhi_lib/app/src/config.h @@ -52,7 +52,11 @@ typedef struct _RuntimeConfig uint32_t instance_id; /**< Instance ID of application */ uint32_t io_core; /**< Core used for IO */ - + uint64_t system_core; /* */ + uint64_t pkt_proc_core; + uint64_t pkt_aux_core; + uint64_t timing_core; + uint32_t mtu; /**< maximum transmission unit (MTU) is the size of the largest protocol data unit (PDU) that can be communicated in a single xRAN network layer transaction. supported 1500 bytes and 9600 bytes (Jumbo Frame) */ int numSlots; /**< number of slots in IQ vector */ diff --git a/fhi_lib/app/src/sample-app.c b/fhi_lib/app/src/sample-app.c index 4b28193..9b9e1d0 100644 --- a/fhi_lib/app/src/sample-app.c +++ b/fhi_lib/app/src/sample-app.c @@ -32,7 +32,6 @@ #include #include - #include "common.h" #include "config.h" #include "xran_mlog_lnx.h" @@ -1417,20 +1416,31 @@ int main(int argc, char *argv[]) printf("set O-DU\n"); xranInit.io_cfg.id = 0;/* O-DU */ xranInit.io_cfg.core = startupConfiguration.io_core; - xranInit.io_cfg.system_core = 0; - xranInit.io_cfg.pkt_proc_core = startupConfiguration.io_core+1; - xranInit.io_cfg.pkt_aux_core = 0; /* do not start*/ - xranInit.io_cfg.timing_core = startupConfiguration.io_core+2; + xranInit.io_cfg.system_core = startupConfiguration.system_core; + xranInit.io_cfg.pkt_proc_core = startupConfiguration.pkt_proc_core; + xranInit.io_cfg.pkt_aux_core = startupConfiguration.pkt_aux_core; /* do not start*/ + xranInit.io_cfg.timing_core = startupConfiguration.timing_core; } else { printf("set O-RU\n"); xranInit.io_cfg.id = 1; /* O-RU*/ xranInit.io_cfg.core = startupConfiguration.io_core; - xranInit.io_cfg.system_core = 0; - xranInit.io_cfg.pkt_proc_core = startupConfiguration.io_core+1; - xranInit.io_cfg.pkt_aux_core = 0; /* do not start */ - xranInit.io_cfg.timing_core = startupConfiguration.io_core+2; + xranInit.io_cfg.system_core = startupConfiguration.system_core; + xranInit.io_cfg.pkt_proc_core = startupConfiguration.pkt_proc_core; + xranInit.io_cfg.pkt_aux_core = startupConfiguration.pkt_aux_core; /* do not start*/ + xranInit.io_cfg.timing_core = startupConfiguration.timing_core; } + cpu_set_t cpuset; + pthread_t thread; + + thread = pthread_self(); + CPU_ZERO(&cpuset); + CPU_SET(xranInit.io_cfg.system_core,&cpuset); + pthread_setaffinity_np(thread, sizeof(cpu_set_t), &cpuset); +/* if (s != 0) + handle_error_en(s, "pthread_setaffinity_np"); +*/ + xranInit.io_cfg.bbdev_mode = XRAN_BBDEV_NOT_USED; if(startupConfiguration.xranCat == XRAN_CATEGORY_A){ diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/1/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/1/config_file_o_du.dat index e136eb4..45f55df 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/1/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/1/config_file_o_du.dat @@ -62,7 +62,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/1/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/1/config_file_o_ru.dat index f50dd8c..92e018a 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/1/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/1/config_file_o_ru.dat @@ -62,7 +62,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/101/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/101/config_file_o_du.dat index 5e6f978..01311b5 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/101/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/101/config_file_o_du.dat @@ -63,7 +63,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/101/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/101/config_file_o_ru.dat index b7dd74e..be7ec3c 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/101/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/101/config_file_o_ru.dat @@ -63,7 +63,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/102/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/102/config_file_o_du.dat index d7923e2..66e1a31 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/102/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/102/config_file_o_du.dat @@ -63,7 +63,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/102/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/102/config_file_o_ru.dat index 8384252..45a9413 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/102/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/102/config_file_o_ru.dat @@ -63,7 +63,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/103/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/103/config_file_o_du.dat index b98f95b..97ec342 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/103/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/103/config_file_o_du.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/103/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/103/config_file_o_ru.dat index 0b842f0..6087db2 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/103/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/103/config_file_o_ru.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/104/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/104/config_file_o_du.dat index 0b34785..5e43fdd 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/104/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/104/config_file_o_du.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/104/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/104/config_file_o_ru.dat index 0a45697..f036662 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/104/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/104/config_file_o_ru.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/105/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/105/config_file_o_du.dat index e6e4a3b..fb73d8f 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/105/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/105/config_file_o_du.dat @@ -65,7 +65,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/105/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/105/config_file_o_ru.dat index baf2b62..f621251 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/105/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/105/config_file_o_ru.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/106/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/106/config_file_o_du.dat index 3349adb..b7beadc 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/106/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/106/config_file_o_du.dat @@ -65,7 +65,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/106/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/106/config_file_o_ru.dat index 814809e..856982e 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/106/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/106/config_file_o_ru.dat @@ -65,7 +65,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/107/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/107/config_file_o_du.dat index 74af2d2..cd62844 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/107/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/107/config_file_o_du.dat @@ -63,7 +63,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/107/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/107/config_file_o_ru.dat index c082603..fe9913f 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/107/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/107/config_file_o_ru.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/108/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/108/config_file_o_du.dat index 5d56afd..4687297 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/108/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/108/config_file_o_du.dat @@ -63,7 +63,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/108/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/108/config_file_o_ru.dat index 1b6969d..61b1a22 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/108/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/108/config_file_o_ru.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/109/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/109/config_file_o_du.dat index b112b56..b427de9 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/109/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/109/config_file_o_du.dat @@ -63,7 +63,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/109/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/109/config_file_o_ru.dat index 43e55ce..2af5f46 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/109/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/109/config_file_o_ru.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/201/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/201/config_file_o_du.dat index cf510d6..8428b44 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/201/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/201/config_file_o_du.dat @@ -63,7 +63,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/201/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/201/config_file_o_ru.dat index 29ce808..2962cfc 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/201/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/201/config_file_o_ru.dat @@ -63,7 +63,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/202/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/202/config_file_o_du.dat index 90ca90d..64ebc7c 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/202/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/202/config_file_o_du.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/202/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/202/config_file_o_ru.dat index 29e0ddf..6a637ae 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/202/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/202/config_file_o_ru.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/203/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/203/config_file_o_du.dat index 5285d6a..43fb1db 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/203/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/203/config_file_o_du.dat @@ -65,7 +65,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/203/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/203/config_file_o_ru.dat index de704d8..37a7609 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/203/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/203/config_file_o_ru.dat @@ -65,7 +65,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/204/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/204/config_file_o_du.dat index 6e7ad4c..b0588f5 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/204/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/204/config_file_o_du.dat @@ -65,7 +65,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/204/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/204/config_file_o_ru.dat index cc11f1f..886266f 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/204/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/204/config_file_o_ru.dat @@ -65,7 +65,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/205/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/205/config_file_o_du.dat index b60c3e6..a159531 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/205/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/205/config_file_o_du.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/205/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/205/config_file_o_ru.dat index a741ff0..8cde62e 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/205/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/205/config_file_o_ru.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/206/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/206/config_file_o_du.dat index ca480ae..bb6e419 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/206/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/206/config_file_o_du.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/206/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/206/config_file_o_ru.dat index cf4ebee..38e81c5 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/206/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/206/config_file_o_ru.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/211/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/211/config_file_o_du.dat index 38df6fc..182c3a0 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/211/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/211/config_file_o_du.dat @@ -63,7 +63,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/211/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/211/config_file_o_ru.dat index af5d1e0..2210d73 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/211/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/211/config_file_o_ru.dat @@ -63,7 +63,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/212/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/212/config_file_o_du.dat index a49efb7..27a9148 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/212/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/212/config_file_o_du.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/212/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/212/config_file_o_ru.dat index 42f7403..506b131 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/212/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/212/config_file_o_ru.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/213/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/213/config_file_o_du.dat index bd1bfce..3ec819e 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/213/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/213/config_file_o_du.dat @@ -65,7 +65,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/213/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/213/config_file_o_ru.dat index aa64202..a31c4c4 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/213/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/213/config_file_o_ru.dat @@ -65,7 +65,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/214/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/214/config_file_o_du.dat index 2bb64b6..7433fbc 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/214/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/214/config_file_o_du.dat @@ -65,7 +65,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/214/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/214/config_file_o_ru.dat index cd2e4a0..74e41c0 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/214/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/214/config_file_o_ru.dat @@ -65,7 +65,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/215/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/215/config_file_o_du.dat index 886acec..65ecf3d 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/215/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/215/config_file_o_du.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/215/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/215/config_file_o_ru.dat index 22296a0..bdb89aa 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/215/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/215/config_file_o_ru.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/216/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/216/config_file_o_du.dat index 35d1a12..7777e45 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/216/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/216/config_file_o_du.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/216/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/216/config_file_o_ru.dat index 2adce67..dd9fe2a 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/216/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/216/config_file_o_ru.dat @@ -64,7 +64,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/config_file_o_du.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/config_file_o_du.dat index 406d247..52d8fe5 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/config_file_o_du.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/config_file_o_du.dat @@ -62,7 +62,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/cat_b/mu1_100mhz/config_file_o_ru.dat b/fhi_lib/app/usecase/cat_b/mu1_100mhz/config_file_o_ru.dat index ce3def4..4f0a789 100644 --- a/fhi_lib/app/usecase/cat_b/mu1_100mhz/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/cat_b/mu1_100mhz/config_file_o_ru.dat @@ -62,7 +62,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=25 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of O-DU VF ruMac=00:11:22:33:44:55 # O-RU VF for O-RU app diff --git a/fhi_lib/app/usecase/mu0_10mhz/config_file_o_du.dat b/fhi_lib/app/usecase/mu0_10mhz/config_file_o_du.dat index 8746394..d43dd02 100644 --- a/fhi_lib/app/usecase/mu0_10mhz/config_file_o_du.dat +++ b/fhi_lib/app/usecase/mu0_10mhz/config_file_o_du.dat @@ -42,7 +42,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of lls-CU VF ruMac=00:11:22:33:44:55 #RU VF for RU app diff --git a/fhi_lib/app/usecase/mu0_10mhz/config_file_o_ru.dat b/fhi_lib/app/usecase/mu0_10mhz/config_file_o_ru.dat index 23cfadc..58b80d1 100644 --- a/fhi_lib/app/usecase/mu0_10mhz/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/mu0_10mhz/config_file_o_ru.dat @@ -42,7 +42,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=10 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of lls-CU VF ruMac=00:11:22:33:44:55 #RU VF for RU app diff --git a/fhi_lib/app/usecase/mu0_20mhz/12/config_file_o_du.dat b/fhi_lib/app/usecase/mu0_20mhz/12/config_file_o_du.dat index f6dd20b..3ebad83 100644 --- a/fhi_lib/app/usecase/mu0_20mhz/12/config_file_o_du.dat +++ b/fhi_lib/app/usecase/mu0_20mhz/12/config_file_o_du.dat @@ -28,7 +28,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of lls-CU VF ruMac=00:11:22:33:44:55 #RU VF for RU app diff --git a/fhi_lib/app/usecase/mu0_20mhz/12/config_file_o_ru.dat b/fhi_lib/app/usecase/mu0_20mhz/12/config_file_o_ru.dat index f46761a..5e04c0a 100644 --- a/fhi_lib/app/usecase/mu0_20mhz/12/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/mu0_20mhz/12/config_file_o_ru.dat @@ -28,7 +28,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=1 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of lls-CU VF #llsCUMac=3c:fd:fe:a8:e0:70 #lls-CU PF for tcpdump diff --git a/fhi_lib/app/usecase/mu0_20mhz/config_file_o_du.dat b/fhi_lib/app/usecase/mu0_20mhz/config_file_o_du.dat index 44c0a2e..67e2257 100644 --- a/fhi_lib/app/usecase/mu0_20mhz/config_file_o_du.dat +++ b/fhi_lib/app/usecase/mu0_20mhz/config_file_o_du.dat @@ -42,7 +42,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of lls-CU VF ruMac=00:11:22:33:44:55 #RU VF for RU app numSlots=40 #number of slots per IQ files diff --git a/fhi_lib/app/usecase/mu0_20mhz/config_file_o_ru.dat b/fhi_lib/app/usecase/mu0_20mhz/config_file_o_ru.dat index 7f10891..c5d1004 100644 --- a/fhi_lib/app/usecase/mu0_20mhz/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/mu0_20mhz/config_file_o_ru.dat @@ -42,7 +42,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=10 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of lls-CU VF #llsCUMac=3c:fd:fe:a8:e0:70 ruMac=00:11:22:33:44:55 #RU VF for RU app diff --git a/fhi_lib/app/usecase/mu0_5mhz/config_file_o_du.dat b/fhi_lib/app/usecase/mu0_5mhz/config_file_o_du.dat index 7eefd0c..8edffee 100644 --- a/fhi_lib/app/usecase/mu0_5mhz/config_file_o_du.dat +++ b/fhi_lib/app/usecase/mu0_5mhz/config_file_o_du.dat @@ -42,7 +42,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of lls-CU VF ruMac=00:11:22:33:44:55 #RU VF for RU app diff --git a/fhi_lib/app/usecase/mu0_5mhz/config_file_o_ru.dat b/fhi_lib/app/usecase/mu0_5mhz/config_file_o_ru.dat index 8f45b72..b0fc8ad 100644 --- a/fhi_lib/app/usecase/mu0_5mhz/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/mu0_5mhz/config_file_o_ru.dat @@ -42,7 +42,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=10 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of lls-CU VF ruMac=00:11:22:33:44:55 #RU VF for RU app numSlots=40 #number of slots per IQ files diff --git a/fhi_lib/app/usecase/mu1_100mhz/config_file_o_du.dat b/fhi_lib/app/usecase/mu1_100mhz/config_file_o_du.dat index 4e78c97..7894a4b 100644 --- a/fhi_lib/app/usecase/mu1_100mhz/config_file_o_du.dat +++ b/fhi_lib/app/usecase/mu1_100mhz/config_file_o_du.dat @@ -54,7 +54,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of lls-CU VF ruMac=00:11:22:33:44:55 # RU VF for RU app #ruMac=3c:fd:fe:9e:93:68 #RU PF for tcpdump @@ -116,7 +120,7 @@ iqswap=0 #do swap of IQ before send buffer to eth nebyteorderswap=1 #do swap of byte order for each I and Q from CPU byte order to network byte order ##Debug -debugStop=0 #stop app on 1pps boundary (gps_second % 30) +debugStop=1 #stop app on 1pps boundary (gps_second % 30) debugStopCount=0 #if this value is >0 then stop app after x transmission packets, otherwise app will stop at 1pps boundary bbdevMode=-1 #bbdev mode, -1 = not use bbdev, 0: use software mode, 1: use hardware mode diff --git a/fhi_lib/app/usecase/mu1_100mhz/config_file_o_ru.dat b/fhi_lib/app/usecase/mu1_100mhz/config_file_o_ru.dat index 9c9740b..e06582b 100644 --- a/fhi_lib/app/usecase/mu1_100mhz/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/mu1_100mhz/config_file_o_ru.dat @@ -54,7 +54,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=10 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of lls-CU VF #llsCUMac=3c:fd:fe:a8:e0:70 ruMac=00:11:22:33:44:55 # RU VF for RU app @@ -133,11 +137,11 @@ iqswap=0 #do swap of IQ before send buffer to eth nebyteorderswap=1 #do swap of byte order for each I and Q from CPU byte order to network byte order ##Debug -debugStop=0 #stop app on 1pps boundary (gps_second % 30) +debugStop=1 #stop app on 1pps boundary (gps_second % 30) debugStopCount=0 #if this value is >0 then stop app after x transmission packets, otherwise app will stop at 1pps boundary bbdevMode=-1 #bbdev mode, -1 = not use bbdev, 0: use software mode, 1: use hardware mode -CPenable=1 #(1) C-Plane is enabled| (0) C-Plane is disabled +CPenable=0 #(1) C-Plane is enabled| (0) C-Plane is disabled ##O-RU Settings Tadv_cp_dl=25 # in us diff --git a/fhi_lib/app/usecase/mu3_100mhz/config_file_o_du.dat b/fhi_lib/app/usecase/mu3_100mhz/config_file_o_du.dat index 69212c9..2790631 100644 --- a/fhi_lib/app/usecase/mu3_100mhz/config_file_o_du.dat +++ b/fhi_lib/app/usecase/mu3_100mhz/config_file_o_du.dat @@ -53,7 +53,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=5 +ioCore=5 +systemCore=5 +pktProcCore=5 +pktAuxCore=5 +timingCore=6 llsCUMac=00:11:22:33:44:66 # asigned MAC of lls-CU VF ruMac=00:11:22:33:44:55 # RU VF for RU app #ruMac=3c:fd:fe:9e:93:68 #RU PF for tcpdump diff --git a/fhi_lib/app/usecase/mu3_100mhz/config_file_o_ru.dat b/fhi_lib/app/usecase/mu3_100mhz/config_file_o_ru.dat index 0145ef3..5ee3ea7 100644 --- a/fhi_lib/app/usecase/mu3_100mhz/config_file_o_ru.dat +++ b/fhi_lib/app/usecase/mu3_100mhz/config_file_o_ru.dat @@ -53,7 +53,11 @@ MTUSize=9600 #maximum transmission unit (MTU) is the size of the largest protoco Gps_Alpha=0 #alpha and beta value as in section 9.7.2 of ORAN spec Gps_Beta=0 -ioCore=10 +ioCore=10 +systemCore=10 +pktProcCore=10 +pktAuxCore=10 +timingCore=11 llsCUMac=00:11:22:33:44:66 # asigned MAC of lls-CU VF #llsCUMac=3c:fd:fe:a8:e0:70 ruMac=00:11:22:33:44:55 # RU VF for RU app diff --git a/fhi_lib/lib/src/xran_main.c b/fhi_lib/lib/src/xran_main.c index 7b77361..0f4bf8f 100644 --- a/fhi_lib/lib/src/xran_main.c +++ b/fhi_lib/lib/src/xran_main.c @@ -2325,7 +2325,14 @@ int32_t xran_init(int argc, char *argv[], struct xran_io_loop_cfg *p_io_cfg = (struct xran_io_loop_cfg *)&p_xran_fh_init->io_cfg; struct xran_device_ctx * p_xran_dev_ctx = xran_dev_get_ctx(); - int32_t lcore_id = 0; + cpu_set_t system_cpuset; + pthread_getaffinity_np(pthread_self(), sizeof(cpu_set_t), &system_cpuset); + for (j = 0; j < CPU_SETSIZE; j++) + if (CPU_ISSET(j, &system_cpuset)) + break; + + int32_t lcore_id = j; + char filename[64]; int64_t offset_sec, offset_nsec; diff --git a/misc/build-xran-image.sh b/misc/build-xran-image.sh new file mode 100755 index 0000000..1f04fad --- /dev/null +++ b/misc/build-xran-image.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +############################################################################### +# +# Copyright (c) 2019 Intel. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +################################################################################ + +sudo docker build \ + --build-arg http_proxy=$http_proxy \ + --build-arg https_proxy=$https_proxy \ + --build-arg no_proxy=$no_proxy \ + --build-arg icc_license_file=$icc_license_file \ + -t o-du-app:1.0 . + diff --git a/misc/update-config-run.sh b/misc/update-config-run.sh new file mode 100755 index 0000000..f6e38a6 --- /dev/null +++ b/misc/update-config-run.sh @@ -0,0 +1,125 @@ +#!/bin/bash + + +###Check environment K8S_SRIOV_DP (0 or 1, default 0), K8S_CPU_MANAGER (0 or 1, default 0), XRAN_DIR before running this script + +###Parameters: + +###$1 - used to specify sriov net devices to run XRAN sample app. +###The input will be different depending on k8s sriov device plugin enabled or not. +###If k8s sriov net device plugin is enabled, container will request integral sriov VF devices ($1) from k8s, +###which is specified in the pod configuration file like - intel.com/intel_sriov_dpdk: "2". +###Then the input of this parameter would be number like 2, or 4. +###Else this parameter $1 will be sriov net devices PCIe address list like "18:02.0 18:02.1" + +###$2 - Test case index. Like "mu3_100mhz" + +###$3 - "du" or "ru" + +###$4 - Instance/wls ID. Like "1", "2", or "3". + +###$5 - Used to assign core affinity to different threads of XRAN sample app. +###If this parameter input is "0", k8s CPU Manager is enabled, and this script will get core mapping from the container taskset affinity, +###which is assigned by the CPU Manager. +###Else this parameter input should be taskset core mask assigned by user (in Hex format, but removing 0x in the head), like "0000f0" + +cd $XRAN_DIR + +#########Assigned PCIe VF for container +vf_num=$1 +#########Test Case index +case_index=$2 +########du or ru? +mode_du_ru=$3 +########instance/wls ID +wls_id=$4 +########taskset core mask +taskset_str=$5 + +###########Get SRIOV VF PCI addresses if K8S_SRIOV_DP enabled or not +array_pci_list="" +if [ $K8S_SRIOV_DP ]; then + env_pci_list=$(env | grep -i PCIDEVICE | grep -i DPDK | awk -F= '{print $2}') + + let i=1 + while [ $i -le $vf_num ] + do + addr=$(echo $env_pci_list | awk -F, '{print $'$i'}') + array_pci_list="$array_pci_list $addr" + let i++ + done +else + array_pci_list=$vf_number +fi + +#####Specify which test case to run and the VF number +sed -i "s/\.\/build\/sample-app .*/\.\/build\/sample-app \.\/usecase\/$case_index\/config_file_o_${mode_du_ru}.dat $array_pci_list/" $XRAN_DIR/app/run_o_${mode_du_ru}.sh + +####Update some parameters for test case +sed -i "s/debugStop=.*/debugStop=0/" app/usecase/${case_index}/config_file_o_${mode_du_ru}.dat +sed -i "s/CPenable=.*/CPenable=1/" app/usecase/${case_index}/config_file_o_${mode_du_ru}.dat +sed -i "s/instanceId=.*/instanceId=${wls_id}/" app/usecase/${case_index}/config_file_o_${mode_du_ru}.dat + +####Get core ID from core mask +if [ $K8S_CPU_MANAGER ]; then + taskset_str=$(echo $(taskset -p 1) | sed 's/.*affinity mask: \(.*\)/\1/') +fi +let core_map="0x$taskset_str" +let core_mask=1 +let first_core_mask=$((core_map & core_mask)) +let first_core_num=0 + + +#####Get first core ID for system thread +let max_cpu=64 +while [ $first_core_mask -eq 0 ] +do + if [ $max_cpu -eq 0 ]; then + echo "ERROR: provided core mask is wrong in your system. Please check." + fi + core_mask=$(($core_mask+$core_mask)) + first_core_num=$(($first_core_num+1)) + echo core_mask $core_mask + echo first_core_num $first_core_num + first_core_mask=$((core_map & core_mask)) + echo first_core_mask=$first_core_mask + max_cpu=$(($max_cpu-1)) +done + +system_core_num=$first_core_num + +core_map=$(($core_map-$core_mask)) +if [ $core_map -eq 0 ] +then + echo "ERROR: require at least two cores for O-DU/RU sample app" + exit +fi + +#####Get the second core ID for timing thread +first_core_mask=0 +while [ $first_core_mask -eq 0 ] +do + if [ $max_cpu -eq 0 ]; then + echo "ERROR: provided core mask is wrong in your system. Please check." + fi + + core_mask=$(($core_mask+$core_mask)) + first_core_num=$(($first_core_num+1)) + echo core_mask $core_mask + echo first_core_num $first_core_num + first_core_mask=$((core_map & core_mask)) + echo first_core_mask=$first_core_mask + max_cpu=$(($max_cpu-1)) +done + +timing_core_num=$first_core_num +####Currently only use 2 cores to run O-DU/RU sample app +sed -i "s/ioCore.*/ioCore=${system_core_num}/" app/usecase/${case_index}/config_file_o_${mode_du_ru}.dat +sed -i "s/pktAuxCore.*/pktAuxCore=${system_core_num}/" app/usecase/${case_index}/config_file_o_${mode_du_ru}.dat +sed -i "s/pktProcCore.*/pktProcCore=${system_core_num}/" app/usecase/${case_index}/config_file_o_${mode_du_ru}.dat +sed -i "s/systemCore.*/systemCore=${system_core_num}/" app/usecase/${case_index}/config_file_o_${mode_du_ru}.dat +sed -i "s/timingCore.*/timingCore=${timing_core_num}/" app/usecase/${case_index}/config_file_o_${mode_du_ru}.dat + +cd app +sh run_o_${mode_du_ru}.sh + -- 2.16.6