From 8412b94b8c0843fd5fe872713edda2b7ed1054c1 Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Thu, 3 Apr 2025 11:07:49 +0200 Subject: [PATCH 1/4] CI: update VVDN configuration file - change frequency - use MAC address of new VVDN RU --- .../gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf index 4641cf8742..1ae1655fec 100644 --- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf +++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf @@ -30,12 +30,12 @@ gNBs = physCellId = 0; # downlinkConfigCommon #frequencyInfoDL - # center frequency = 3999.36 MHz - # selected SSB frequency = 3999.36 MHz - absoluteFrequencySSB = 666624; + # center frequency = 4049.76 MHz + # selected SSB frequency = 4049.76 MHz + absoluteFrequencySSB = 669984; dl_frequencyBand = 77; - # frequency point A = 3950.22 MHz - dl_absoluteFrequencyPointA = 663348; + # frequency point A = 4000.62 MHz + dl_absoluteFrequencyPointA = 666708; #scs-SpecificCarrierList dl_offstToCarrier = 0; # subcarrierSpacing @@ -253,7 +253,7 @@ fhi_72 = { system_core = 0; io_core = 1; worker_cores = (2); - ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb"); + ru_addr = ("98:ae:71:04:83:e3", "98:ae:71:04:83:e3"); mtu = 9600; fh_config = ({ T1a_cp_dl = (285, 470); From 683e982137d8156c7ece60653a295d936bcaef49 Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Thu, 3 Apr 2025 19:02:44 +0200 Subject: [PATCH 2/4] CI: more modifications for FHI72 VVDN test - use Ubuntu image, instead of RHEL image - gNB fails with "Illegal instruction" during RA, when running with RHEL image - init DPDK in VA mode - increase number of cores Tpool --- .../conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf | 1 + ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml | 7 +++---- .../yaml_files/sa_fhi_7.2_vvdn_gnb/docker-compose.yml | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf index 1ae1655fec..d81dd38694 100644 --- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf +++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf @@ -250,6 +250,7 @@ log_config : fhi_72 = { dpdk_devices = ("0000:c3:11.0", "0000:c3:11.1"); + dpdk_iova_mode = "VA"; system_core = 0; io_core = 1; worker_cores = (2); diff --git a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml index 927fe1a3e7..df48634240 100644 --- a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml +++ b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml @@ -53,11 +53,10 @@ - Pull_Cluster_Image - Pull Images from Cluster - oaicicd-ran + Pull_Local_Registry + Pull Images from Local Registry + 0 oai-gnb-fhi72 - cacofonix Create_Workspace diff --git a/ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/docker-compose.yml b/ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/docker-compose.yml index 7ea8b576d4..a74b583e2b 100644 --- a/ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/docker-compose.yml +++ b/ci-scripts/yaml_files/sa_fhi_7.2_vvdn_gnb/docker-compose.yml @@ -2,7 +2,6 @@ services: oai-gnb: image: ${REGISTRY:-oaisoftwarealliance}/oai-gnb-fhi72:${TAG:-develop} cap_add: - - SYS_ADMIN - IPC_LOCK - SYS_NICE cap_drop: @@ -10,14 +9,14 @@ services: container_name: oai-gnb environment: TZ: Europe/Paris - USE_ADDITIONAL_OPTIONS: --thread-pool 6,7,8,9 + USE_ADDITIONAL_OPTIONS: --thread-pool 7,8,9,10,11,12 devices: - /dev/vfio:/dev/vfio/ volumes: - ../../conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf:/opt/oai-gnb/etc/gnb.conf - /dev/hugepages:/dev/hugepages # Please change these values based on your system - cpuset: "0,1,2,3,4,5,6,7,8,9" + cpuset: "0,1,2,3,4,5,6,7,8,9,10,11,12" networks: oai-net: ipv4_address: 172.21.18.20 From 85b50925a44c4ef58cc465918e7e6673f33c3b8e Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Fri, 4 Apr 2025 09:44:33 +0200 Subject: [PATCH 3/4] doc: Update VVDN sample configuration files --- .../CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf | 12 ++++++------ .../CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn.conf | 12 ++++++------ .../CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf index a5b059bcfa..7622e508bc 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.106prb.fhi72.4x4-vvdn.conf @@ -33,12 +33,12 @@ gNBs = # n_TimingAdvanceOffset = 0; # downlinkConfigCommon #frequencyInfoDL - # center frequency = 3999.36 MHz - # selected SSB frequency = 3999.36 MHz - absoluteFrequencySSB = 666624; + # center frequency = 4049.76 MHz + # selected SSB frequency = 4049.76 MHz + absoluteFrequencySSB = 669984; dl_frequencyBand = 77; - # frequency point A = 3980.28 MHz - dl_absoluteFrequencyPointA = 665352; + # frequency point A = 4030.68 MHz + dl_absoluteFrequencyPointA = 668712; #scs-SpecificCarrierList dl_offstToCarrier = 0; # subcarrierSpacing @@ -259,7 +259,7 @@ fhi_72 = { system_core = 0; io_core = 1; worker_cores = (2); - ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb"); + ru_addr = ("98:ae:71:04:83:e3", "98:ae:71:04:83:e3"); mtu = 9600; fh_config = ({ T1a_cp_dl = (285, 470); diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn.conf index a1cc7a9685..ce2a75d529 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.2x2-vvdn.conf @@ -31,12 +31,12 @@ gNBs = # n_TimingAdvanceOffset = 0; # downlinkConfigCommon #frequencyInfoDL - # center frequency = 3999.36 MHz - # selected SSB frequency = 3999.36 MHz - absoluteFrequencySSB = 666624; + # center frequency = 4049.76 MHz + # selected SSB frequency = 4049.76 MHz + absoluteFrequencySSB = 669984; dl_frequencyBand = 77; - # frequency point A = 3950.22 MHz - dl_absoluteFrequencyPointA = 663348; + # frequency point A = 4000.62 MHz + dl_absoluteFrequencyPointA = 666708; #scs-SpecificCarrierList dl_offstToCarrier = 0; # subcarrierSpacing @@ -256,7 +256,7 @@ fhi_72 = { system_core = 0; io_core = 1; worker_cores = (2); - ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb"); + ru_addr = ("98:ae:71:04:83:e3", "98:ae:71:04:83:e3"); mtu = 9600; fh_config = ({ T1a_cp_dl = (285, 470); diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf index 50fedbb5c2..55a78fd901 100644 --- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf +++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf @@ -33,12 +33,12 @@ gNBs = # n_TimingAdvanceOffset = 0; # downlinkConfigCommon #frequencyInfoDL - # center frequency = 3999.36 MHz - # selected SSB frequency = 3999.36 MHz - absoluteFrequencySSB = 666624; + # center frequency = 4049.76 MHz + # selected SSB frequency = 4049.76 MHz + absoluteFrequencySSB = 669984; dl_frequencyBand = 77; - # frequency point A = 3950.22 MHz - dl_absoluteFrequencyPointA = 663348; + # frequency point A = 4000.62 MHz + dl_absoluteFrequencyPointA = 666708; #scs-SpecificCarrierList dl_offstToCarrier = 0; # subcarrierSpacing @@ -258,7 +258,7 @@ fhi_72 = { system_core = 0; io_core = 1; worker_cores = (2); - ru_addr = ("98:ae:71:01:c5:eb", "98:ae:71:01:c5:eb"); + ru_addr = ("98:ae:71:04:83:e3", "98:ae:71:04:83:e3"); mtu = 9600; fh_config = ({ T1a_cp_dl = (285, 470); From 9207c74cbaa172baf9bdbae6eb2a092fd4d39b0d Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Thu, 3 Apr 2025 23:28:05 +0200 Subject: [PATCH 4/4] CI: enable 4 DL layers in VVDN FHI72 test - increase tested throughput - modify gNB config file to enable 4 DL layers --- .../gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf | 13 ++++++------- .../xml_files/container_sa_fhi72_vvdn_up2.xml | 10 +++++----- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf index d81dd38694..4837e4f775 100644 --- a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf +++ b/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-vvdn.conf @@ -18,11 +18,12 @@ gNBs = ////////// Physical parameters: pdsch_AntennaPorts_XP = 2; - pdsch_AntennaPorts_N1 = 1; - maxMIMO_layers = 2; + pdsch_AntennaPorts_N1 = 2; + maxMIMO_layers = 4; pusch_AntennaPorts = 4; do_CSIRS = 1; do_SRS = 0; + force_UL256qam_off = 1; servingCellConfigCommon = ( { @@ -177,10 +178,8 @@ MACRLCs = ( num_cc = 1; tr_s_preference = "local_L1"; tr_n_preference = "local_RRC"; - pusch_TargetSNRx10 = 180; - pucch_TargetSNRx10 = 230; - ul_bler_target_upper = .35; - ul_bler_target_lower = .15; + pusch_TargetSNRx10 = 200; + pucch_TargetSNRx10 = 250; pusch_FailureThres = 100; } ); @@ -212,7 +211,7 @@ RUs = ( sf_extension = 0; eNB_instances = [0]; ru_thread_core = 5; - sl_ahead = 5; + sl_ahead = 10; tr_preference = "raw_if4p5"; # important: activate FHI7.2 do_precoding = 0; # needs to match O-RU configuration } diff --git a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml index df48634240..3f57f91934 100644 --- a/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml +++ b/ci-scripts/xml_files/container_sa_fhi72_vvdn_up2.xml @@ -89,8 +89,8 @@ Iperf - iperf (DL/300Mbps/UDP)(30 sec)(multi-ue profile) - -u -b 300M -t 30 -R + iperf (DL/600Mbps/UDP)(30 sec)(multi-ue profile) + -u -b 600M -t 30 -R up2-fhi72 20 80 @@ -109,8 +109,8 @@ Iperf - iperf (UL/70Mbps/UDP)(30 sec)(multi-ue profile) - -u -b 70M -t 30 + iperf (UL/80Mbps/UDP)(30 sec)(multi-ue profile) + -u -b 80M -t 30 up2-fhi72 20 80 @@ -123,7 +123,7 @@ iperf (UL/TCP)(30 sec)(multi-ue profile) -t 30 up2-fhi72 - 40 + 10 oc-cn5g-20897