Commit Graph
100 Commits
Author SHA1 Message Date
Melissa Elkadi f8efb13b7d NR MIMO 2x2 Support
This commit provides CSI reporting support
which is required for MIMO.  It also updates
the configuration files, provides sample BLER
simualtion files for packet dropping in the
MIMO 2x2 case. It also includes the hooks
and functions (e.g., updating UCI2_3_4 PDU field)
for MIMO 2x2 support. This commit will not include
any channel abstraction code or modelling.
2022-10-18 15:24:48 +02:00
Melissa Elkadi 7b75305e3c pthread_create, RT scheduler, and address sanitizer are incompatible in Ubuntu 18.04
When we run with the RT scheduler and the address sanitizer in Ubuntu
18.04, pthread_create will hang and never create threads.  This adds
some explanatory text in CMakeLists.txt to explain about this issue.
2022-06-16 21:42:26 +02:00
Melissa Elkadi 630f8ac2b1 Putting all CM code in one file
This commit includes reorganization of
all of the SISO/MIMO channel modelling
support being moved into a single CM
file. Furthermore, it includes a bug
fix for the number of MCS simulation
tables (29 total, 0-28).
2022-06-14 12:52:01 -07:00
Melissa Elkadi cc2c3b9123 Adding required LOG_As for EpiSci CI testing. (Proxy)
In commit 05c07c401f,
four of the LOG_A logs were demoted. These are required
for the L2 simulator proxy CI testbed.
2022-06-03 16:40:46 -07:00
Melissa Elkadi 8e90e7415a Merge branch 'eurecom-develop' into episys-throughput-updates-and-downlink-siso-cm 2022-03-29 13:41:35 -07:00
Melissa Elkadi 3e6f957a63 Several nfapi bug fixes for RX ind and SR ind
The SR ind was not properly being packed and unpacked.
The RX inidcation was not properly being allocated
prior to unpacking.
The freq_shift field was declared as a uint16_t but
push/pulled as a uint8_t.
Added MSG_TRUNC in the nfapi VNF recvfrom.
2022-03-23 10:03:08 -07:00
Melissa Elkadi f5e143ec78 Removing multiple conf files when running multiple NRUEs 2022-03-22 14:49:23 -07:00
Melissa Elkadi 0df18854fc Merge branch 'eurecom-develop' into episys-throughput-updates-and-downlink-siso-cm 2022-03-22 11:52:34 -07:00
Melissa Elkadi a5e4cbb971 Merge branch 'episys-throughput-updates-and-downlink-siso-cm' of https://gitlab.eurecom.fr/oai/openairinterface5g into episys-throughput-updates-and-downlink-siso-cm 2022-03-17 12:48:14 -07:00
Melissa Elkadi 91d42fd5ec Fixing memory leaks and hoping to fix num_dci_option bug 2022-03-17 12:44:30 -07:00
Melissa Elkadi 22f4b083c2 Merge branch 'eurecom-develop' into episys-throughput-updates-and-downlink-siso-cm 2022-03-15 08:57:50 -07:00
Melissa Elkadi 2e0d8fd753 Removing TimeDomainAllocationList from conf file
Also updating pdcch_config for SIB1
2022-03-15 08:56:21 -07:00
Melissa Elkadi d1cd5b771b Clean up to nFAPI and error checking UL_TTI_REQ n_pdus
We seprarated out the large if block in the push/pull
of the UL_TTI_REQ fields to make it easier to read
and debug. Furthermore, we add in AsserFatals before
indexing in UL_TTI_REQ PDU list to ensure we are not
indexing past the end of the array.
2022-03-08 07:47:44 -08:00
Melissa Elkadi b66d187477 Including more UE conf files for multi-UE tests 2022-03-07 12:00:10 -08:00
Melissa Elkadi a6049bcddf Relying on mac->ra.ra_state instead of RRC state. 2022-03-07 11:59:23 -08:00
Melissa Elkadi 79cc21f6f5 Merge branch 'eurecom-develop' into episys-throughput-updates-and-downlink-siso-cm 2022-03-07 06:33:51 -08:00
Melissa Elkadi 7e0757fb48 Addressing MR review comments
- OPENAIR_DIR replaced with AWGN_RESULTS_DIR
- Copying UCI_2_3_4 PDU with rx'd PDU from proxy
- Reverting hacks/whitespace changes
2022-03-03 15:46:54 -08:00
Melissa Elkadi 241f00d170 Adding min_rxtxtime = 6; to NSA gNB conf file 2022-03-01 08:29:27 -08:00
Melissa Elkadi bf153a2306 Merge branch 'eurecom-develop' into episys-throughput-updates-and-downlink-siso-cm 2022-03-01 07:23:54 -08:00
Melissa Elkadi 7681feee07 Removing "included fixes" from root dir README 2022-03-01 07:23:14 -08:00
Melissa Elkadi 7aed0b6e76 These changes should not be checked in or merged to develop 2022-02-24 16:01:51 -08:00
Melissa Elkadi 2b1cc455b0 Merge branch 'episys-ul-info-cleanup' into episys/master-sa 2022-02-24 15:48:43 -08:00
Melissa da63c3f69a Merge branch 'episys/mel/debug-thorughput-new-sa-master' into 'episys/master-sa'
Properly sending DL ACK/nACKs

See merge request aburger/openairinterface5g!113
2022-02-24 23:07:26 +00:00
Melissa Elkadi ce12e8270b Code clean up 2022-02-24 14:58:50 -08:00
Melissa Elkadi 13401a5f8c Comments from OAI:
This commit include dynamically setting the slots_per_frame
value based on configuration. It also includes some comments.
Lastly, simplified bug fix in MAC layer related to sched_frame
calculation.
2022-02-24 09:49:47 -08:00
Melissa Elkadi 5f7f56f056 Added a comment to justify pdu_len checks in gNB 2022-02-24 09:03:00 -08:00
Melissa Elkadi 0165ffd160 Merge branch 'episys/master-sa' into episys/mel/debug-thorughput-new-sa-master 2022-02-23 15:55:06 -08:00
Melissa 817fc792e8 Merge branch 'episys/david/updating_channel_info_with_msg_id' into 'episys/master-sa'
Using message_id to identify channel info.

See merge request aburger/openairinterface5g!114
2022-02-23 22:59:45 +00:00
Melissa Elkadi 4398630da7 Merge branch 'eurecom-develop' into episys-ul-info-cleanup 2022-02-23 08:55:10 -08:00
Melissa Elkadi abbcbe6aa5 Adding fixes for MR from review
These include:
- Simplifying VNF code.
- Adding comments to several areas of the code.
- Using free_and_zero macros
- Fixing spelling errors
2022-02-22 09:16:59 -08:00
Melissa Elkadi 7fb509511d Merge branch 'eurecom-develop' into episys-ul-info-cleanup 2022-02-21 06:19:54 -08:00
Melissa Elkadi ca336ea917 Fixing comments from MR review. 2022-02-18 10:27:34 -08:00
Melissa Elkadi 221e8402cc Fixing spacing in lines were already changing 2022-02-18 10:14:16 -08:00
Melissa Elkadi b2e2a6bc2e Changing UL_INFO naming convention to be normal 2022-02-18 10:08:44 -08:00
Melissa Elkadi 0db8f80f73 Removing invalid log 2022-02-18 09:58:26 -08:00
Melissa Elkadi b7c767147e Hacks with comments are added in this commit.
These allow the NRUE to reach roughtly 15-25 Mbps
with ~20%-34% packetloss without crashing.
2022-02-18 09:48:38 -08:00
Melissa Elkadi bf3d7959bd Comment for #define _GNU_SOURCE 2022-02-18 09:39:06 -08:00
Melissa Elkadi cc22ec9978 Calling scheduler before handling DCI to ensure nbits are set
Previously, we thought the memset in the nr_ue_dl_indication()
was causing issues / exposing a race. This is not the case. The
memset is not problematic, the issue is that in the emulate_l1
mode we were not always configuring the DCI nbits before handling
the DCI when we are pushing high (15 Mbps) throughput traffic.
2022-02-18 09:29:00 -08:00
Melissa Elkadi a21fb77dd1 Added comment to justify uci_size condition
Also, properly filling the CCE index and Agg level
in the stub function when we get the DCI from
nfapi
2022-02-17 10:25:28 -08:00
Melissa Elkadi 2208abfedd Modifying change to MAC layer
Instead of conditionally calling the pucch_scheduler
we now only call the functions we need from the stub
function directly. This is better because we are not
modifying the OAI MAC layer code and ensuring that we
are not calling the pucch_scheduler twice for the same
sfn/slot
2022-02-17 08:48:26 -08:00
Melissa Elkadi 5637b62ed8 Return in gNB if pdu_len is less than cast length
This is what we did in the NRUE for NSA mode
2022-02-16 16:26:41 -08:00
Melissa Elkadi c917352dd2 Resolving issues in MR:
Adding error checking before indexing in mac layer harq array
Adding error checking before writing ul_harq_sfn_slot
Added comments
Made a "static" free_uci_inds() actually static
2022-02-16 16:11:19 -08:00
Melissa Elkadi e5ddd558ad Fixing spacing in nfapi code 2022-02-16 15:13:26 -08:00
Melissa Elkadi 3c925942a9 Getting rid of pthread warning with GNU_SOURCE 2022-02-16 13:18:32 -08:00
Melissa Elkadi 10d0f13ceb Revert "Getting rid of pthread warning and fixing nfapi"
This reverts commit 9a78b58927.
2022-02-16 13:15:15 -08:00
Melissa Elkadi 9a78b58927 Getting rid of pthread warning and fixing nfapi
The nfapi code releases dl_ttis and tx_data_reqs
if the buffer has data in it. In the proxy code we
overwrite this instead of dropping the packet.
2022-02-16 13:12:12 -08:00
Melissa Elkadi 679816c3c1 Added comment around asn1cCalloc memory leak 2022-02-15 15:05:04 -08:00
Melissa Elkadi 39d9febc0c Hardcoding TI and UL_CQI in stub function.
Also, the allocation of the eNB measurement
report keeps getting commented out becasue
the compiler throws an error. I have un-commented
the allocation of memory (becasue it breaks NSA
mode) and added a memset to ensure we are using
the allocated memory. This gets rid of the
warning and ensures NSA mode still works.
2022-02-15 08:39:55 -08:00
Melissa Elkadi e461ab51a1 Merge branch 'eurecom-develop' into episys-ul-info-cleanup 2022-02-14 16:16:43 -08:00
Melissa Elkadi 6de93fbb59 Only assigning harq_pid in emulated L1 mode. 2022-02-14 16:15:39 -08:00
Melissa Elkadi abddc13a13 Adding \n to several logs and demoting two logs 2022-02-14 13:51:57 -08:00
Melissa Elkadi ea6e96aada Merge branch 'episys/master-sa' into episys/mel/debug-thorughput-new-sa-master 2022-02-14 12:25:36 -08:00
Melissa Elkadi d8d616a1fa Setting timing advance in stub function.
The timing advance field could be abstracted in
the proxy gNB. Currently we are not abstracting
this value.
2022-02-14 12:24:34 -08:00
Melissa Elkadi 5e7de1cdfc Fixing typo and adding .h files for linking 2022-02-14 11:41:22 -08:00
Melissa Elkadi af18fc7e70 Log demotion and white space clean up 2022-02-14 11:14:13 -08:00
Melissa Elkadi 26349dbe20 More clean up for merge request 2022-02-14 11:07:14 -08:00
Melissa Elkadi 987363b8a8 Clean up for MR 2022-02-14 10:34:23 -08:00
Melissa Elkadi df06a1e8e4 Merge branch 'episys/master-sa' into episys/mel/debug-thorughput-new-sa-master 2022-02-09 16:20:22 -08:00
Melissa Elkadi 4c950bb006 Resetting dl_config->number_pdus in NRUE scheduler 2022-02-09 14:06:55 -08:00
Melissa Elkadi e81b901355 nFAPI bug fix. Not properly packing/unpacking PUCCH PDU
Attempting to manually cherry-pick this commit:
30c14c2f5a
2022-02-09 14:05:05 -08:00
Melissa 65dadfb3e2 Merge branch 'episys/master-nsa-nfapi-errors' into 'episys/master-nsa'
nfapi.c: Add on_error()

See merge request aburger/openairinterface5g!96
2022-02-09 13:56:27 -08:00
Melissa Elkadi 9322701ce4 Need a break if we queue a ul_tti_req based on PDU state
If we dont have this break we are trying to queue
the UL_TTI_REQ we just queued
2022-02-09 13:32:09 -08:00
Melissa Elkadi 60a9d41bc6 UCI ACK/NACK most of the way working
We have gotten rid of filling the ACK/NACK with
the DLSCH and now only fill with the PUCCH. This
assumes that the MAC layer is properly decoding the
dl_tti_req and tx_data_req and allows us to
simply use the MAC layers scheduled SNF/Slot
to return the ACK NACK. There are some hacks added
in this commit which ensure that the PDCP packet
has the correct header (1st byte = 80) and now with
15Mbps we are seeing about 20% packet loss and
a gNB bug on the edge case (current frame is 1023
and the gNB schduler wants an ACK in frame 0 but the
scheduled UL_TTI_REQ has a frame of 1023).
2022-02-09 07:59:10 -08:00
Melissa Elkadi f336cbc645 Fixing pull/push array 32 and cleaning nFAPI code
Several of these changes were made previously and
lost in the merge.
2022-02-09 07:30:04 -08:00
Melissa Elkadi a1dee602fe Duplicated packing and unpacking fixed in this commit
This now matches the develop branch as well.
2022-02-08 17:11:59 -08:00
Melissa Elkadi a8a04c7293 Accidentally ommited SISO channel modeling change
We should be setting the queued UCI indication slot
based on the SCHEDULED slot, not the current slot.
2022-02-08 16:55:25 -08:00
Melissa fb3e3ea6e5 Merge branch 'episys/david/adding_NR_to_NUM_MCS' into 'episys/master-nsa'
Added NR to NUM_MCS for nr channel modeling.

See merge request aburger/openairinterface5g!109
2022-02-08 15:56:44 -08:00
Melissa 2ec11592c3 Merge branch 'episys/david/fixing_Bler_tables' into 'episys/master-nsa'
Removed strange characters in the first line.

See merge request aburger/openairinterface5g!108
2022-02-08 14:55:13 -08:00
Melissa cfc2311a96 Merge branch 'episys/david/adding_logs_for_timing_analysis' into 'episys/master-nsa'
Added logs for timing analysis.

See merge request aburger/openairinterface5g!106
2022-02-08 14:54:20 -08:00
Melissa 8c2a067a22 Merge branch 'episys/david/checking_downlink_siso_model' into 'episys/master-nsa'
Downlink SISO modeling

See merge request aburger/openairinterface5g!104
2022-02-08 14:51:55 -08:00
Melissa Elkadi 9da3cbc9ec Cherry picking UCI multiplexing for CSI reports 2022-02-08 13:03:13 -08:00
Melissa Elkadi 62b525c579 TODO: Revert this change after discussion with OAI 2022-02-08 11:59:54 -08:00
Melissa Elkadi b897287d1f Changes made to gNB cause emulated-L1 mode not to work for multiple UEs.
It seems that the RA procedure in the gNB was modified so
the RAR is sent in a single tx_data_req. The emualted mode
was not previously handling this. We now only process the
PDU in the rx_ind that has a matching preamble. If any
other PDUs exist, we ignore them and only build Msg3 based
on this single matching RAR PDU.

Also, two bug fixes applied here in the emulate-l1 mode.
2022-02-08 11:59:04 -08:00
Melissa Elkadi f518b9d61f Merge branch 'eurecom-develop' into episys-ul-info-cleanup 2022-02-08 09:39:13 -08:00
Melissa Elkadi 8b4ae5ef2b Remove the new UL_INFO local variable in the VNF.
This struct is used to store the uplink 5G nFAPI
messages between the proxy and the gNB MAC layer.
The original OAI implementation utilizes a similarly
named variable (UL_info) to store the uplink 5G nFAPI
messages between the PHY and MAC layer. This commit
will utilize the original UL_info variable prior to
calling the handle functions. These changes allow us
to make minimal changes to the nFAPI handle functions
and modifies the NR_UL_Indication parent function instead.
2022-02-07 15:14:22 -08:00
Melissa Elkadi 5e182c4e50 Adding a few more LOG_A's for critical milestones 2022-02-01 05:41:24 -08:00
Melissa af6d95a348 Update rtusage.md 2022-02-01 13:37:06 +00:00
Melissa cfa636ce5f Update rtusage.md 2022-02-01 13:36:30 +00:00
Melissa 761d154fe7 Update addconsoletrace.md 2022-02-01 13:33:17 +00:00
Melissa Elkadi a2b0f455cd Updating config file for min_rxtxtime 2022-01-31 07:18:46 -08:00
Melissa Elkadi 4c4d317822 Removing commented code that causes SEG_FAULT in NSA mode 2022-01-25 16:57:58 +01:00
Melissa Elkadi fd54f2cf76 This commit includes several nfapi bug fixes
-cell_config.phy_cell_id is a uint16 and was being push/pulled
as a uint8_t
-several members of the p5 message we not push/pulled
-the second member of the ssb_mask_list is causing invalid tag length
-the error code of the push response was push8 when it should have
been a push32
-packing vendor extension causes invalid tag id(0x000)
2022-01-25 16:57:44 +01:00
Melissa Elkadi 918862475c Removing log_minimal and adding new run-time logging opts 2022-01-25 05:53:41 -08:00
Melissa Elkadi 0ea0965a35 Modifying new changes from develop to exclude emulated L1 mode 2021-12-21 06:08:24 -08:00
Melissa Elkadi e7ef264226 Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-12-21 06:02:40 -08:00
Melissa Elkadi 30c14c2f5a nFAPI bug fix. Not properly packing/unpacking PUCCH PDU 2021-12-21 05:51:25 -08:00
Melissa Elkadi f32244136a Demoting more logs to log_D 2021-12-14 12:19:10 -08:00
Melissa Elkadi acb5db8ecd Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-12-14 12:03:04 -08:00
Melissa Elkadi d61bcb2113 Demoting several PHY logs 2021-12-14 10:27:23 -08:00
Melissa Elkadi 60e39af311 Updating min_txtxtime_pdsch and dl_harq_pid fix 2021-12-14 09:56:02 -08:00
Melissa Elkadi f028f8e209 Added new conf file for NR UE 2021-12-09 10:45:58 -08:00
Melissa Elkadi 932f8b385f Reverting changes to ue_test_sfr (SIM) conf file for NSA mode 2021-12-08 05:38:29 -08:00
Melissa Elkadi 118bd8b36f Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-12-06 13:23:21 -08:00
Melissa Elkadi fd2f61debc Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-12-03 05:44:34 -08:00
Melissa Elkadi 3fac8bd2e1 Merge branch 'episys/master-nsa' into eurecom-episys-merge-nsa 2021-11-29 14:40:21 -08:00
Melissa Elkadi 4f9c2bd869 Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-11-29 14:33:23 -08:00
Melissa Elkadi 67df305219 Merge branch 'eurecom-develop' into episys/master-nsa 2021-11-29 10:59:20 -08:00
Melissa 85047dd70c Merge branch 'episys/master-nsa-LOG_A' into 'episys/master-nsa'
Change some LOG_I's to LOG_A's

See merge request aburger/openairinterface5g!88
2021-11-29 17:12:55 +00:00
Melissa Elkadi df72429b04 Merge branch 'eurecom-episys-merge-nsa' into episys/master-nsa 2021-11-24 08:54:14 -08:00
Melissa Elkadi 92ef60d07f This commit does the following:
1. Reverts GTPU_need_ITTI back to develop
2. Removed gdb helper and co files
3. Reverts changes to logging mechanism
4. Reverts changes to assert that were unnecessary
5. Reverts changes to VNF that occured from a bad merge
6. Removes unnecessary else() in gNB softmodem
2021-11-23 15:49:47 -08:00