Commit Graph

1408 Commits

Author SHA1 Message Date
Francisco 2fcb507de7 Fix gcc compilation errors with false_position_method in sched_ue.cc 2020-12-12 15:59:25 +01:00
Francisco 8d181ef41c Optimization of cc_sched_ue::cqi_to_tbs(...) method via the use of root-finding algorithm 2020-12-12 15:59:25 +01:00
Francisco 94efeab672 Optimization of sched_ue methods to derive required number of prbs to allocate to a rnti
This optimization has been achieved by:
- implementation of "false position method" root-finding algorithm
- application of the false position method in cc_sched_ue::get_required_prb_dl/ul(...)

The number of iterations in the worst case scenario, reduced from 100 to 5 with
the proposed algorithm.
2020-12-12 15:59:25 +01:00
Francisco f07e52129c increase mcs ul upper bound to 24 when ue is cat4 and enb supports 64qam. Simplified max_mcs computation 2020-12-12 15:59:25 +01:00
Francisco 3d80ff4831 fix activation of PDCCH for adaptive retxs. 2020-12-12 15:59:25 +01:00
Francisco fc81a5c6ba harq ack state can now only be NACK or ACK. The ul_harq pending phich flag is now reset after phich scheduling. Thus, the existence of a crc_info(...) signal from the PHY is not required. 2020-12-12 15:59:25 +01:00
Andre Puschmann 1ecfb88e46 txrx: fix double white space 2020-12-12 15:59:25 +01:00
Andre Puschmann 43220e42d6 enb: print cell bandwidth when initializing them carrier
this allows to quickly check the cell bandwidth
2020-12-12 15:59:25 +01:00
Francisco 7a74bf28d1 forward declare s1ap types in enb interfaces 2020-12-12 15:59:25 +01:00
Francisco 95cc6238a5 compilation time reduction - avoid including enb_stack_lte.h in main.cc and include enb_stack_base instead 2020-12-12 15:59:25 +01:00
Francisco 66712023bb remove unneeded includes of full rrc asn1 lib 2020-12-12 15:59:25 +01:00
Francisco 3067e81e67 fix check of pending UL bytes 2020-12-12 15:59:25 +01:00
Francisco bb96625129 renaming lch_manager -> lch_ue_manager 2020-12-12 15:59:25 +01:00
Francisco a348508072 simplified sched_ue pending DL bytes calculation API 2020-12-12 15:59:25 +01:00
Francisco 0ffea62411 Wrote logging functions for SCHED MAC CE/LCID allocations 2020-12-12 15:59:25 +01:00
Francisco c1fb161004 Move sched lch_manager to separate file 2020-12-12 15:59:25 +01:00
Francisco eae0dc93ad rename scheduler files. scheduler -> sched 2020-12-12 15:59:25 +01:00
Francisco 4350e8ff70 fix calculation of number of users during the phy metrics acquisition 2020-12-12 15:59:25 +01:00
Francisco 68eda336bd remove ENB_METRICS_MAX_USERS compile time macro and use run-time variable to set maximum number of UEs the srseNB can have connected at a given instant. 2020-12-12 15:59:25 +01:00
Ismael Gomez ce20cc4c54 Add missing current_tx_nb which was causing all in uplink to fail 2020-12-12 15:58:34 +01:00
Pedro Alvarez d05bc064b5 Reduced SCTP connect() timeout.
Added configuration for RTO_MAX. Cleanup debug prints.
2020-12-12 15:58:34 +01:00
Francisco 324cb80cac rename cell_info_common->enb_cell_common and cell_ctxt_dedicated->ue_cell_ded 2020-12-12 15:58:34 +01:00
yagoda bdc1964335 consolidating RRC eMBMS configuration into single function, setting some parameters to const 2020-12-12 15:58:34 +01:00
yagoda b90574975b refactoring asn1 eMBMS code, removing asn1 from PHY and MAC in eNodeB 2020-12-12 15:58:34 +01:00
Andre Puschmann fb83b5c307 enb: fix reestablishment with AS security enabled
this fixes RRC reestablishment with security turned on

the bearers, primarily SRB1, were reestablished before the "old"
security context was restored from the previous RNTI of the
reestablishing user.

this let SRB1 without proper security config. therefore the UE
couldn't decrypt the first response of the UE on SRB1 that was
already encrypted.
2020-12-12 15:58:34 +01:00
Francisco 92c1c2a182 more efficient measObjToAddModList reconfiguration by ensuring consistency in EARFCN ordering 2020-12-12 15:58:34 +01:00
Francisco 68d463b08f remove var_meas_cfg_t class 2020-12-12 15:58:34 +01:00
Francisco e88ba6dfc8 move rrc measconfig handling functions to separate file. Update measconfig tests 2020-12-12 15:58:34 +01:00
Francisco 25bfb6d84d move rrc measconfig handling functions to separate file. Update measconfig tests 2020-12-12 15:58:34 +01:00
Francisco 1cb65f07f1 enable meas gaps in RRC and enb parser 2020-12-12 15:58:34 +01:00
Francisco Paisana 9ff0a9b254 fix random array index picker 2020-12-12 15:58:34 +01:00
Francisco Paisana 49a48c0130 add measgap awareness to scheduler metric and sf_sched. Add measGap test to random sched test suite. 2020-12-12 15:58:34 +01:00
Francisco Paisana 2b05d5a67c add meas gap addition logic to srsenb rrc mac controller 2020-12-12 15:58:34 +01:00
Francisco Paisana 9579931f16 added meas gap checks to scheduler ue 2020-12-12 15:58:34 +01:00
Xavier Arteaga 036026be04 SRSENB: CSI reports on active SCells only 2020-12-12 15:58:33 +01:00
Andre Puschmann 35373d1385 enb,ue: add cmdline arg to enable usage of default LTE sample rate
some RF boards might have issues with the sharp filters that are needed
for the reduced sample rate operation that we use by default.

This switch allows to use the default LTE sampling rates and
configure this at run-time, not compile time.
2020-12-12 15:58:33 +01:00
Francisco Paisana fdec451a9d disable mcs>20 if eNB supports UL 64QAM but UE doesn't 2020-12-12 15:58:33 +01:00
Francisco Paisana bc00abeeb8 fix phy configuration of UL 64QAM 2020-12-12 15:58:33 +01:00
Francisco Paisana b369d6d5d5 consider enb sib config when activating UL 64QAM 2020-12-12 15:58:33 +01:00
Francisco Paisana bf7c587e4f add UL 64QAM support to eNB RRC and scheduler 2020-12-12 15:58:33 +01:00
Pedro Alvarez 604e79214d Changed NAS is_attached interface to is_registered. 2020-12-12 15:58:33 +01:00
Pedro Alvarez 14844a168a Created new class to hold all NAS states for the NAS state machine. Added EMM-DEREGISTERED substates and EMM-REGISTERED substates.
Decoupled PLMN selection, attach request and service request. Removed RRC connect procedure from NAS.
2020-12-12 15:58:33 +01:00
Francisco Paisana ff7811c822 remove unused member variable from sched tester 2020-12-12 15:58:33 +01:00
Francisco Paisana 3407ac6741 fix ca sched test 2020-12-12 15:58:33 +01:00
Francisco Paisana e8ac98d06f added extra tbs and dci aggregation level checks to sched test suite 2020-12-12 15:58:33 +01:00
Francisco Paisana 5467ee9f83 moved more tests to ue-dedicated test suite 2020-12-12 15:58:33 +01:00
Francisco Paisana 992ea7fd29 moved UE-dedicated RA sched test to separate test suite file. 2020-12-12 15:58:33 +01:00
Francisco Paisana d5f6ccc0c4 integrated UL UE-dedicated sched tests in random test 2020-12-12 15:58:33 +01:00
Francisco Paisana eb327183d3 moved harq tests from scheduler_test_common.cc to separate test suite file. Created a class ue_sim, whose role is to emulate a UE behavior 2020-12-12 15:58:33 +01:00
Francisco Paisana 64fca23eb3 extended dci content checks of DL and UL grants in the scheduler random tester. 2020-12-12 15:58:33 +01:00
Francisco Paisana 88105c1577 change the namespace of tti point helper functions for the eNB 2020-12-12 15:58:33 +01:00
Francisco Paisana 114932b4c6 extended common sched test suite api to multi carrier 2020-12-12 15:58:33 +01:00
Francisco Paisana f24e5aadaf clean common sched output tests 2020-12-12 15:58:33 +01:00
Ismael Gomez 524453a6af Fixes N_pucch_cs allocation to avoid collision with SR 2020-12-12 15:58:33 +01:00
Ismael Gomez 13f1d65b24 Add missing current_tx_nb which was causing all in uplink to fail 2020-12-12 15:58:33 +01:00
Ismael Gomez 8ed6345ff2 Do not reset softbuffer on each iteration 2020-12-12 15:58:32 +01:00
Francisco Paisana 3ea47b645a changed the way the number of UL pending bytes is calculated in the scheduler 2020-12-12 15:58:32 +01:00
Ismael Gomez dfb389d68f srsenb: Use MCS from new grant when doing adaptive retx 2020-12-12 15:58:32 +01:00
Francisco Paisana 77d64f3ea5 add PDCCH alloc to UL retxs that resume the HARQ 2020-12-12 15:58:32 +01:00
Francisco Paisana d8203acd56 implement harq resuming functionality 2020-12-12 15:58:32 +01:00
Francisco Paisana 510959b50f update nr asn1 files, and asn1 tests 2020-12-12 15:58:32 +01:00
Francisco Paisana f927ccaf55 fix pusch grant allocation for cqi reporting in CA. 2020-11-05 19:35:03 +00:00
Francisco Paisana a351b2534e allow PUSCH grants for CQI in PCell 2020-11-03 09:25:17 +00:00
Francisco Paisana 2ade364434 defer scell activation to rrc reconf complete reception 2020-11-03 09:25:01 +00:00
Andre Puschmann 74dcdec54f enb: fix antenna port count for SCell config in RRC reconfig
set antenna port count for SCells in RRC reconfig message according
to configured ports in the enb config
2020-11-02 21:38:49 +01:00
Francisco Paisana a865858db3 disable srbs UL during handover to avoid UL grants and scheduling requests before the handover is complete 2020-10-30 21:51:58 +00:00
Francisco Paisana 484c7586b4 fix heap buffer overflow 2020-10-30 20:35:41 +01:00
Francisco Paisana 42cdc5e340 Allocate all the leftover bytes of the TBS to last allocated MAC SDU.
Fix the way the RLC header is accounted for depending on the bearer id.
For instance, the SRB0 does not require any RLC header.
2020-10-30 13:35:15 +00:00
Francisco Paisana 55d62a2baa fix rlc buffer updating inside the scheduler to account for RLC headers 2020-10-30 13:35:15 +00:00
Francisco Paisana 980278fdec add comments regarding radio resource asn1 setting in the eNB 2020-10-29 21:19:40 +00:00
Francisco Paisana 84cfc29ca1 apply the scell configuration sooner during intra-enb handover 2020-10-29 21:19:40 +00:00
Francisco Paisana b40a5a958e use common function to fill rrc reconf message in handover 2020-10-29 21:19:40 +00:00
Francisco Paisana e9b693942f diff-based cell selection activation 2020-10-29 21:19:40 +00:00
Francisco Paisana 836e7d7ede refactor scell addition in the srsenb::rrc to follow the same style of other rrc recfg fields 2020-10-29 21:19:40 +00:00
Francisco Paisana a8e11d7991 removal of the special case for rrc reconf update 2020-10-29 21:19:40 +00:00
Francisco Paisana f26b5ccde7 fix drb reestablishment during handover 2020-10-29 21:19:40 +00:00
Francisco Paisana 7bf196a6e0 removal of srb handling from srsenb::rrc::bearer_cfg_handler 2020-10-29 21:19:40 +00:00
Francisco Paisana 2ef1e286b2 fix set of rrc reconf message radio resource cfg fields 2020-10-29 21:19:40 +00:00
Francisco Paisana 890113fd32 now the rrc enb is using a common function for rr_cfg reconf for the first reconf message 2020-10-29 21:19:40 +00:00
Francisco Paisana ce78fa82ce now the rrc enb is using a common function for rr_cfg setup/reest 2020-10-29 21:19:40 +00:00
Francisco Paisana 97f2e4336e refactor of functions for filling the asn1 radio resource config structs. This functions are used during rrc setup/reest/reconf 2020-10-29 21:19:40 +00:00
Xavier Arteaga fa837925d0 Fix inter-frequency/intra-enb HO 2020-10-29 09:17:34 +01:00
Andre Puschmann ff21d9c077 enb: fix error log when parsing cell config 2020-10-28 12:05:53 +01:00
Xavier Arteaga 58be68f856 Changed cell gain command from cell index to cell id 2020-10-26 10:13:02 +01:00
Francisco Paisana 9b40d1da99 fix 256qam for handover 2020-10-22 19:55:46 +02:00
Francisco Paisana c24d754dbb add 256qam to scell as well 2020-10-22 19:55:46 +02:00
Francisco Paisana 514deaf25b fix resetting of phy and mac during reestablishment 2020-10-22 19:55:46 +02:00
Francisco Paisana 83d13cf20f uncomment 256qam features 2020-10-22 19:55:46 +02:00
Francisco Paisana 4cb6ed27eb updated scheduler ue mcs computation to account for new 256QAM tables 2020-10-22 19:55:46 +02:00
Francisco Paisana 461f34785d activation of 256qam in reconf message if the UE supports it. 2020-10-22 19:55:46 +02:00
Francisco Paisana 44a9ad76f1 avoid sched_ue dangling pointer
With the sched feature that allows scheduling in TTIs
ahead of time, there is no guarantee that when
the tti arrives to generate a sched result, the stored
raw sched_ue pointers are still valid. For this reason,
I now store the rnti and check if the rnti still exists.
2020-10-22 12:42:34 +01:00
Francisco Paisana 0d38e28ce7 address PR comments. Change warning message if sched ue cells cqi configs will lead to time collisions. 2020-10-22 09:59:45 +02:00
Francisco Paisana 852c31c0bc log warnings when the sched ue cfg is not valid 2020-10-22 09:59:45 +02:00
Xavier Arteaga fac6d40a45 SRSENB: fix PUSCH max number of iterations 2020-10-22 09:24:40 +02:00
yagoda e09b6aaacb updating sib13 config for mbms, fixing small bug with metrics 2020-10-21 22:43:44 +01:00
Francisco Paisana e84aa34139 comment out 256qam features 2020-10-20 16:32:44 +01:00
Francisco Paisana 1ce928ab2e use of current / future ue sched config structs in the srsenb::rrc::ue::mac_controller as an approach to deal with the multi-step mac reconfiguration of the UE 2020-10-20 16:30:01 +01:00
Francisco Paisana 1e6d902873 cleanup of srsenb::rrc::ue::mac_controller api 2020-10-20 16:30:01 +01:00
Pedro Alvarez f5ca40e3bf Make sure that security is enabled after sending RRC reestablish, so that reestablish complete is integrity checked and unciphered. 2020-10-19 14:47:05 +02:00
Francisco Paisana 78e580a89f fix rrc_mobility_test failure due to access to uninit variable 2020-10-19 11:23:44 +01:00
Andre Puschmann 9be7dc9572 enb: fix AWGN config example and help message
we've moved to SNR rather than channel noise so this fixes the example and help text
2020-10-19 10:02:24 +02:00
Francisco Paisana 4230a60859 added a warning to the enb parsing that checks for invalid cell pci configurations 2020-10-19 10:00:10 +02:00
Francisco Paisana f1bdf33d10 addition of cells provided in cell_meas_list of rr.conf to cellsToAddModList in the rrc reconfiguration message 2020-10-16 15:55:22 +01:00
yagoda 7e60d8aae5 fixing issue with explicit uplink frequency setting 2020-10-16 12:02:39 +01:00
Andre Puschmann a0ff8d3226 enb.conf.example: add comment about device args for 75 PRB cells 2020-10-16 11:57:00 +02:00
Francisco Paisana c5c7700cb7 implemented DL logical channel prioritization test for finite PBRs 2020-10-14 22:55:12 +01:00
Francisco Paisana 2d3681699a added test for DL sched logical channel prioritization. At the moment only PBR=infinity is tested 2020-10-14 22:55:12 +01:00
Francisco Paisana 9b10acff06 implemented logical channel prioritization in DL scheduler 2020-10-14 22:55:12 +01:00
Francisco Paisana b7ed8b1858 - added react method to to_state<...> transitions
- s1 handover composite state simplified
- the eNB now starts a HO cancellation when it receives an invalid
Handover Command
- the FSM log now prints the current state when it receives an unhandled
event
2020-10-12 18:24:14 +01:00
Francisco Paisana 53f1a62c64 cleaned up state machine of sched_ue for activation/deactivation of carriers 2020-10-12 14:45:13 +01:00
Francisco Paisana a761762ec8 extended cc_sched_ue fsm to account for more harmonious transition of an scell to deactivated state 2020-10-12 14:45:13 +01:00
Francisco Paisana 74c18ecf6c implementation of SCell Deactivation 2020-10-12 14:45:13 +01:00
Francisco Paisana eafc003671 Altered the way the generation of the scheduling decision for a given
TTI is made. Instead of generating one CC in each dl_sched()/ul_sched()
call, all CC decisions are generated at once. This avoids race
conditions with calls from the RRC to the MAC to configure UEs.
2020-10-12 14:04:34 +01:00
Francisco Paisana bc429eae94 add comment explaining why BSR has to be accounting in the computation of the number of bytes to allocate in UL 2020-10-12 13:43:13 +01:00
Francisco Paisana 12c147d75a The scheduler now accounts for the possible presence of BSRs in the size of UL grants 2020-10-12 13:43:13 +01:00
Jan df46a3284c Add missing device names to enb.conf.example
The enb.conf.example config was missing the options "soapy" and "zmq" for device_name.
2020-10-07 15:38:57 +02:00
Francisco Paisana c46402c836 fix phy configuration during handover on srsenb. The function srsenb::rrc::ue::fill_scell_to_addmod_list assumes that the phy_cfg of the PCell is up-to-date, which was not the case. With this PR, the srsenb rrc updates the phy_cfg before the ho cmd is sent, but, in the case of intra-enb ho, the updates are not submitted to the phy before the reception of the crnti mac ce 2020-10-07 09:10:47 +01:00
Andre Puschmann 9105b36cee srsenb: backport of a Xico's patch to explicitly link against libconfig
this caused issues for some systems in parallel builds
2020-10-07 09:29:48 +02:00
Francisco Paisana 5325a15d42 fix libconfig std::string cast linking issue 2020-10-07 09:29:48 +02:00
Francisco Paisana 0f51d70aac fix measObj addition in srsenb. Now the enb considers both scells and meas_cells in the rr.conf 2020-10-06 21:16:18 +01:00
Francisco Paisana ae32ab9b13 addressed xavie's comments regarding list of scells to add to rrc reconf message not being in order when we iterate it 2020-10-06 17:08:08 +02:00
Francisco Paisana d42cdca729 fix scell activation in the phy during intra-enb handover. 2020-10-06 17:08:08 +02:00
Andre Puschmann 9866dcc10b enb: disable qam256 configuration
disable qam256 altogether until underlying PHY/MAC support
is implemented
2020-10-06 16:26:50 +02:00
faluco d53f69bf0a - Initialize the log backend, otherwise no log entries are generated. 2020-10-06 09:23:38 +02:00
Francisco Paisana 49186e2b1f Fix NCC set in HO command message for intra-enb handover 2020-10-05 20:43:05 +01:00
Francisco Paisana 2e10c8e13d bug fix - eNB was not allocating UL grants for an UE that has performed intra-enb handover. The problem resulted from the fact that the ue configuration in the scheduler not accounting for removed cells. 2020-10-03 09:12:40 +01:00
Francisco Paisana 8a5a571045 bug fix - in case of intra-enb Handover, the eNB was not adding SCells in the HO command 2020-10-02 20:10:28 +01:00
Francisco Paisana 4383796393 add scells in case of intra-enb handover 2020-10-02 20:10:28 +01:00
Francisco Paisana 688dda30a4 favour carriers with best channel conditions for UL grants due to SRs 2020-10-01 19:58:00 +01:00
Pedro Alvarez 2f0125ef4e Fix issue recovering key state, when the first HO fails (specifically, is_first_ncc was not recovered). Minor improvements in key logging. 2020-10-01 18:48:07 +01:00
Francisco Paisana 137e554eb3 reestablish pdcp bearers is required in case of AM bearers 2020-10-01 16:57:08 +01:00
Francisco Paisana 4c88404801 fix measurement report handling in case of intra enb handover 2020-09-30 18:03:03 +01:00
Francisco Paisana 4b1626bf24 fix eutra packing recovering during reestablishment in the srsenb 2020-09-30 10:20:55 +01:00
faluco dfeed52514 - Rename out_stream function to console. 2020-09-29 17:38:13 +02:00
faluco 62faef7c71 - Replaced all uses of the log::console method. 2020-09-29 17:38:13 +02:00
Francisco Paisana 942c28881d converted member method of list of cells in the enb to a free function 2020-09-25 15:03:58 +01:00
Francisco Paisana 3a924a1d80 avoid sending cellsToAddModList if cell offsets are zero 2020-09-25 15:03:58 +01:00
Francisco Paisana da70c0fdaf fix cellsToAddModList handling. Now the eNB always adds PCell+SCells as measObjects in the RRC Reconfiguration messages. It may also further include cellsToAddModList if they are provided in the rr.conf file 2020-09-25 15:03:58 +01:00
Francisco Paisana 89eeb5a355 use utility methods to find meas objs based on earfcn 2020-09-24 09:52:09 +01:00
Francisco Paisana 141960fbda remove unnecessary shared_ptrs and use value semantics instead for the var_meas_cfg of the different enb cells 2020-09-24 09:52:09 +01:00
Francisco Paisana 098172c911 fix cellIndex assignment in srsENB to not necessarily copy cell ID 2020-09-23 18:00:09 +01:00
Andre Puschmann b2576b34b9 enb.conf.example: comment PUSCH MCS limit in example 2020-09-23 14:54:35 +02:00
faluco f0d651ae8e - Fixed a leak in the MME class not releasing the static byte buffer pool.
- Now the pool gets destroyed on program exit using a unique_ptr.
- Removed manual cleanup() calls in all the code base to free the pool instance.
2020-09-22 18:00:50 +02:00
Francisco Paisana dcf5a727f2 do not send RRC release in case the eNB receives a S1AP UEContextRelease command and the UE is doing handover. Handle GTPU end marker 2020-09-22 16:51:45 +01:00
Francisco Paisana 13a5bfb525 - fix reestablishment reject transmission in the srsenb. For SRB0 SDUs, no RLC header is required, so we do not need to check in such case if there is enough space in the TB for the header.
- fix srsenb reestablishment check for UE context. The pci has to be accounted for the srsenb to understand that the UE trying to do reestablishment corresponds to one of its own
2020-09-18 22:18:05 +01:00
Xavier Arteaga 3e6c337b44 SRSENB: protect MAC softbuffers access
SRSENB: fix retransmissions
2020-09-16 20:07:20 +02:00
Xavier Arteaga b633c1abcd SRSENB: report MAC CSI measurements of all configured cells 2020-09-16 20:07:20 +02:00
Xavier Arteaga d0969a7ad9 SRSENB: review PHY UE DB assertions 2020-09-16 20:07:20 +02:00
Andre Puschmann 49655cd33c enb,s1ap: only log info in the s1ap connection procedure
the event is logged as error by the calling function already
2020-09-16 13:41:32 +02:00
Francisco Paisana 7e6487b6fa perform PUCCH+PRACH PRB reservation right at the start of a new TTI in the scheduler 2020-09-15 16:10:50 +01:00