Commit Graph

1144 Commits

Author SHA1 Message Date
faluco 9058ee9a5b Move gNB metrics processing to the stack thread avoiding concurrency issues in MAC and RRC. 2021-10-06 11:31:54 +02:00
faluco a703279975 Fix a data race when passing the nr_workers to the txrx worker.
There was an unprotected access of the txrx reading this variable while being set from a different thread.
Fix it by starting the txrx thread after all variables are ready.
2021-10-06 11:31:54 +02:00
Andre Puschmann 06fbb58d70 gnb,mac: add dedicated arguments struct for MAC-NR
as the PCAP object is now only visible inside MAC-NR we can't
share the PCAP file between EUTRA/NR (like we do in the UE).

This patch removes the hard-coded filename for the NR PCAP file.
2021-10-06 10:44:56 +02:00
Xavier Arteaga b6ea78dfd3
Fix gNb PHY-Stack UL-DL time paradox (#3365)
* Fix gNb PHY-Stack UL-DL time paradox

* Fix clang compilation
2021-10-05 17:22:36 +02:00
Francisco Paisana b58915d7ed rrc,nr: make gnb cell CSI NZP configuration consistent with UE NSA configuration. 2021-10-05 10:28:36 +02:00
Ismael Gomez 410cec7557 NR: assume all zero LCG is SBSR with 0 is received 2021-10-05 10:26:30 +02:00
Francisco Paisana 23bf542ae7 stack,nr: isolate calls between LTE and NR stacks via the task multiqueue 2021-10-05 10:12:28 +02:00
Andre Puschmann 8bb06ff2c0 Added SSB in gNb PHY 2021-10-04 19:26:07 +02:00
Xavier Arteaga ca19b466bb Fix paging float to int conversion 2021-10-04 15:24:55 +02:00
Francisco Paisana 55ea2cbcee sched,nr: fix harq delay derivation 2021-10-04 14:44:35 +02:00
Francisco Paisana 8ceb573ea7 mac,nr: avoid concurrency in update of pdsch/pusch slot 2021-10-04 12:24:51 +02:00
Carlo Galiotto f177a03605 sched,nr: add const to function input parameter
Signed-off-by: Carlo Galiotto <carlo@srs.io>
2021-10-04 11:44:25 +02:00
Carlo Galiotto 9887c17c17 sched,nr: move ssb_sched test to different file...
and also:
- correct half-frame bit in MIB package
- rename slot_index variable in ssb_sched function

Signed-off-by: Carlo Galiotto <carlo@srs.io>
2021-10-04 11:44:25 +02:00
Carlo Galiotto d18af603aa sched,nr: address comments in PR (code formatting)
Signed-off-by: Carlo Galiotto <carlo@srs.io>
2021-10-04 11:44:25 +02:00
Carlo Galiotto 9d864bbe55 sched,nr: add function that schedule SSB
Notes:
- NOT YET TESTED
- Requires rebase on commit with PHY changes to work

Signed-off-by: Carlo Galiotto <carlo@srs.io>
2021-10-04 11:44:25 +02:00
Andre Puschmann f8d55a6fd3 Refactor rrc nr. 2021-10-03 14:20:42 +02:00
yagoda 82bda02b36 adding nr metrics 2021-10-03 13:06:59 +02:00
Andre Puschmann 782aefa553 enb,rrc: derive ENDC configuration from cell config
* move ENDC config struct to main RRC config (same for all UEs)
* remove hard-coded measurement config for NR carrier
* now both TDD and FDD cells are correctly handled
2021-10-02 17:39:19 +02:00
Fabian Eckermann 992d1bb02a Configure PHY from RRC. 2021-10-01 19:21:08 +02:00
Francisco Paisana 28e25b12b4 sched,nr: add error checking and logging for invalid PIDs 2021-10-01 17:35:54 +02:00
Francisco Paisana d927b779dc sched,nr: implement methods to fill nzp csi-rs in scheduler 2021-09-29 13:42:48 +02:00
faluco a8f58f503c - Fix arm compiler warning. GCC treats chars as unsigned in this arch.
- Fix race condition in json metrics.
2021-09-29 13:26:14 +02:00
Andre Puschmann 315057d11c enb: signal user activity to EUTRA RRC when doing NR DL traffic
to avoid releasing the UE when only NR DL traffic is done.
similar to the EUTRA solution.
2021-09-28 16:55:54 +02:00
Francisco Paisana cbb709d4e3 sched,nr: function to log UEs buffer status before scheduling decision, fix const_iterator of circular_map 2021-09-27 15:43:16 +02:00
Ismael Gomez 1c77998df5 Stop PDCP for data bearers before initiating HO 2021-09-27 13:54:51 +02:00
faluco fa351cd285 Rename functions that contain the unsafe word to nolock.
The term "unsafe" does not clearly state that the function is not locking the shared date and it sounds "dangerous", so use a more explicit term.
2021-09-27 13:26:21 +02:00
Francisco Paisana a952f0f62d sched,nr: expose sched nr UE bearer configuration in sched interface 2021-09-24 17:35:15 +02:00
Francisco Paisana bdf18856d1 sched,nr: fix handling of DL BSR in NR scheduler and computation of UCI 2021-09-24 17:35:15 +02:00
Francisco Paisana 70fe48a5ab sched,nr: change NR sched configuration api 2021-09-24 13:27:45 +02:00
Francisco Paisana a035ad144b mac,nr: create sched_nr object only at mac::init() 2021-09-24 13:27:45 +02:00
Andre Puschmann 5966760458 rrc_endc: start SgNB addition from start if B1 events are disabled 2021-09-24 11:43:53 +02:00
Andre Puschmann af73c57780 rrc_endc: prepare ENDC paramter
exposes some of the hard-coded params as struct.
filling/parsing from file still needs to be added.
2021-09-24 11:43:53 +02:00
Francisco Paisana 12d63468e3 sched,lte: separated adaptive mcs learning rate argument into two arguments, one for DL and the other for UL 2021-09-23 19:12:46 +02:00
Andre Puschmann 7f897d83e2 gnb,mac_nr: push DL buffer state to scheduler 2021-09-23 19:07:31 +02:00
Andre Puschmann 426e876047 enb,nr: fix GTPU handler to forward UL PDUs 2021-09-23 19:07:31 +02:00
yagoda bc4388a78c -adding temp crnti removal for NR carrier attach 2021-09-23 18:27:13 +02:00
Ismael Gomez af9822bede srsenb: add error handling on RRC message generation 2021-09-23 18:26:24 +02:00
Francisco Paisana 3351e97aa2 nr,mac: use SR to send an UL grant after Msg3 and complete ContextResolution of UE NSA NR 2021-09-23 16:08:48 +02:00
Francisco Paisana e1a4e63ec8 sched,nr: use MAC-NR as prefix for NR scheduler 2021-09-23 09:46:56 +02:00
Francisco Paisana 00cc8fb8d8 sched,nr: ensure PUCCH is generated for SR even if the UE doesn't have any pending ACK 2021-09-23 09:46:56 +02:00
Ismael Gomez 3bbf173149 Allocate PUCCH resources on ConnectionRequest and send ConnectionReject if not available 2021-09-22 17:48:20 +02:00
Andre Puschmann faf9d2dbd8 gnb,rrc: replace hard-coded PCI with actual value in rrc_cfg 2021-09-22 16:41:18 +02:00
Andre Puschmann 802b22ac91 enb,nsa: refactor NR RRC/cell config parsing
this allows to access all cell-related params from within RRC
2021-09-22 16:41:18 +02:00
faluco feec3c5905 Fix a data race during enb initialization.
The stack unique pointer in the enb class is written while the phy workers are calling enb::tti_clock() where it is read.
Avoid the read access until the whole class has been properly initialized.
2021-09-22 16:07:51 +02:00
David Rupprecht 611255aa5f Added GTPU bind address as output parameter 2021-09-22 15:15:47 +02:00
Bedran Karakoc 43915550cc NGAP GTP Bearer Establishment 2021-09-22 15:15:47 +02:00
David Rupprecht 3712983308 Added PDU Session est request 2021-09-22 15:15:47 +02:00
David Rupprecht 0385980347 Fixed minor NGAP issues 2021-09-22 15:15:47 +02:00
Andre Puschmann b134781d36 enb: remove redundant RLC/PDPC classes for NR
the RLC/PDCP entities for NR are included in the RLC/PDCP wrapper classes
and don't require their own
2021-09-22 10:56:56 +02:00
Fabian Eckermann 651a76000e Add function to pack secondary cell group config for FDD. 2021-09-21 18:12:34 +02:00
Xavier Arteaga 0324806d6c Packed NR TDD config in duplex configuration and created test case for FDD 2021-09-21 18:11:16 +02:00
Ismael Gomez 3eaf5c50cb Make PUCCH HARQ region a configurable parameter. Skip grants when ACK falls outside region 2021-09-21 11:49:04 +02:00
Andre Puschmann 3fd47d2af4 enb: refactor L2/L3 and (re)move all NR components to gNB stack
* decouple EUTRA and NR stack classes
* implement dummy X2 interface with control and data plane methods
* implement eNB time source interface that PHY calls
2021-09-17 14:57:33 +02:00
Andre Puschmann 1e9a4e3fba enb: remove stack type variable 2021-09-17 14:57:33 +02:00
Andre Puschmann 8d49e58078 enb: prepare split of EUTRA and NR stack classes
this allows for a slimmer base station if only EUTRA or NR cells are used.
also it seperates entities in a cleaner way
2021-09-17 14:57:33 +02:00
faluco 8a2231251a Fix data race in enb::mac::ue class. 2021-09-17 11:34:42 +02:00
faluco 457dcf4de4 Fix data race in enb::ta class. 2021-09-17 11:34:42 +02:00
Andre Puschmann ed92f2bd34 enb,mac_nr: remove EUTRA cell param for MAC-NR cell config calls
* the old srsran_cell_cfg_t is only carried for SIB params
* the SIB scheduling, etc needs to be ported and integrated into NR data structures
* disbable SIB test for the moment
2021-09-15 14:49:28 +02:00
Andre Puschmann e2b1bbe2dc enb,metrics: add helper method to print MAC metrics
preparation to be used to print MAC metrics for EUTRA and NR cells
2021-09-15 14:49:28 +02:00
Andre Puschmann 6a46931144 mac_nr,enb: move header into nr subfolder 2021-09-15 14:49:28 +02:00
Andre Puschmann 4a5d2a8659 mac_nr: add basic get_metrics() implementation 2021-09-15 14:49:28 +02:00
Andre Puschmann dbcf5c9503 sched_nr: add ue_exists() helper 2021-09-15 14:49:28 +02:00
Andre Puschmann 9a49d47968 sched_nr_interface: disable auto-refill of NR scheduler 2021-09-13 17:10:32 +02:00
Andre Puschmann dbbc621905 phy_common: fix PRB lookup for NR cells 2021-09-10 22:08:26 +02:00
Andre Puschmann c1892eb2ec enb,nsa: refactor of SgNB addition interface
* update of FSM
* better integration of parameter for X2 calls
2021-09-09 14:29:04 +02:00
Andre Puschmann f7e943b6b6 enb,mac_nr: add handling of SBSR MAC CE 2021-09-09 14:29:04 +02:00
faluco 5798f09252 Re-format the enb stdout metrics and port the code to use the fmt library. 2021-09-08 17:05:37 +02:00
faluco fdb4b91e98 Adapt the enb metrics to allow adding a PCI field for each CC.
Include the PCI field in the enb JSON metrics.
2021-09-07 16:36:56 +02:00
faluco d168536bc4 Add a new program option to control how ASN1 messages get printed into the enb JSON report file. 2021-09-07 16:36:56 +02:00
faluco df6ae7b0e0 - Implement new enb events:
* ho_command
* connection_resume
* rlf_detected
- Rename rlf_report event to "rlf_report".
2021-09-07 16:36:56 +02:00
Ismael Gomez 00653bdd46 Fix PUCCH2 RRC scheduling 2021-09-07 12:14:36 +02:00
Andre Puschmann 88bb92dc0d mac_nr,sched: handle C-RNTI CE 2021-09-06 10:35:59 +02:00
Francisco Paisana e146345df0 sched,nr: add ue removal method to nr sched 2021-09-04 11:34:56 +02:00
Francisco Paisana a7bf1ad26d sched,nr: use NR UL DCI to fill RAR grant contents 2021-09-03 12:50:36 +02:00
Andre Puschmann 548c45a8fc enb,mac_nr: add RAR packing 2021-09-03 12:09:41 +02:00
Francisco Paisana ebd12b0778 stack lte,refactor: pass bearer manager instead of stack pointer to srsenb::rrc 2021-09-03 12:06:17 +02:00
Francisco Paisana f4df55c245 stack lte: separate bearer manager into two classes, one for the ue and one for the enb 2021-09-03 12:06:17 +02:00
Francisco Paisana cb2c339456 sched,nr: fix max number of UEs in NR scheduler 2021-09-03 12:05:55 +02:00
Andre Puschmann 201f29b4e5 enb,rrc_nr: register DRB1 at RLC/PDCP when enabling NSA mode 2021-09-03 11:23:17 +02:00
Francisco Paisana 296949b5f9 stack lte: use adapter for pdcp->gtpu write_pdu interface that converts lcid to eps bearer id 2021-09-02 17:12:04 +02:00
Francisco Paisana 2ade4628ca stack lte: create an gtpu-pdcp adapter class that correctly converts lcids to eps bearers and vice-versa 2021-09-02 17:12:04 +02:00
Francisco Paisana 4b2f079581 gtpu: renamed lcid to eps_bearer_id as parte of the refactor of gtpu to use eps_bearer_ids 2021-09-02 17:12:04 +02:00
Andre Puschmann b27d1d913e enb_stack_lte: use bearer manager class
* user common bearer manager in eNB
* register/deregister bearers (LTE only so far
* provide dummy stack class for RRC tests
2021-09-02 17:12:04 +02:00
Andre Puschmann ebef8a4cc4 enb_stack_lte: implement the PDCP interface for GTPU on the stack
this prepares for a change in which GTPU no longer writes into PDCP
directly but instead uses the stack as a wrapper.

For this the interface will be changed to use the EPS bearer ID instead
of the LCID

The stack will know which PDCP entity (EUTRA or NR) is currently associated
with the EPS bearer ID and will forward the PDU accordingly.
2021-09-02 17:12:04 +02:00
Francisco Paisana 75cd71b794 sched,nr: fix older gcc compilation array initialization 2021-09-01 20:08:11 +02:00
Francisco Paisana 510a87e4b2 sched,nr: added logic to update UE DL and UL buffer status 2021-09-01 20:08:11 +02:00
Francisco Paisana 020bec025e sched: created class common to LTE and NR for ue buffer status management 2021-09-01 20:08:11 +02:00
Francisco Paisana de06dbc684 sched,nr: implemented basic UE buffer status manager 2021-09-01 20:08:11 +02:00
Francisco Paisana 2fb2598f8c sched,nr: avoid extra copy of DL result and other small fixes 2021-09-01 20:08:11 +02:00
Francisco Paisana 5f9cfb56f6 lte,gtpu: fix and refactor gtpu tunnel management during handover 2021-08-31 15:46:46 +02:00
Francisco Paisana b311806179 mac,nr: avoid repacking NR DL retxs 2021-08-31 15:46:05 +02:00
Francisco Paisana 01441d143d mac,nr: avoid use of uninitialized rnti value 2021-08-31 15:46:05 +02:00
Francisco Paisana fec60344dd sched,nr: fix rar softbuffer allocation 2021-08-27 15:50:23 +02:00
Francisco Paisana 04e5c81edf sched,nr: nr_phy_test now uses the whole mac class rather than just the scheduler 2021-08-27 15:50:23 +02:00
Francisco Paisana 05a5f4115f sched,nr: extended sched nr DL output to account for RAR content and assist with RAR encoding in the mac_nr class 2021-08-27 15:50:23 +02:00
Francisco Paisana b486d2a1b5 sched,nr: implement prb grant fmt formatting 2021-08-26 12:09:11 +02:00
Francisco Paisana da4b7e4f80 sched,nr: fix sched RAR NR test; update test assert macros 2021-08-26 12:09:11 +02:00
Francisco Paisana 8f00c9363c sched,nr: change ra nr sched and bwp allocator interfaces 2021-08-26 12:09:11 +02:00
Francisco Paisana 664bc626bf sched,nr: creation of basic logic for NR SI scheduling 2021-08-24 10:29:36 +02:00
Francisco Paisana f518861ebc fix location of support/ folder. Created macros for ASSERT_EQ and ASSERT_NEQ 2021-08-23 16:47:54 +02:00