Commit Graph

941 Commits

Author SHA1 Message Date
Ismael Gomez 9a264b62c4
Protect access to shared grants (#1117)
* Protect access to shared grants

* Set correct number of carriers for DL

* Fix previous issues

* Address comments
2020-03-25 14:30:43 +01:00
Francisco Paisana 4baeee10c5 avoid dangerous [] map operator 2020-03-24 17:48:29 +00:00
Francisco Paisana 1839b9a6e5 cleaned up paging code to avoid extra processing steps in worker threads 2020-03-24 17:48:29 +00:00
Francisco Paisana 9c028ab723 removed user_mutex from srsenb::rrc. All that needed to happen was the prach_worker calling add_user from stack thread (done in an earlier PR), and the get_metrics run in the stack thread. I achieved the latter with an extra metrics queue 2020-03-24 17:48:29 +00:00
Pedro Alvarez 75f35d8ded Making the default eNB TAC match the default EPC TAC. 2020-03-24 17:02:47 +01:00
Ismael Gomez c157a37894 Address comments 2020-03-24 16:47:33 +01:00
Ismael Gomez 7a7385d0e5 Support multiple carriers for common buffers (RAR/BCCH/PCCH) 2020-03-24 16:47:33 +01:00
Xavier Arteaga 8e891b7038 Added AWGN channel to SRSUE and SRSENB 2020-03-24 12:16:28 +01:00
Francisco Paisana a2866f661b made the number of ue payload allocations proportional to number of active carriers. Made mac::ue_db use unique_ptrs 2020-03-23 14:49:17 +00:00
Francisco Paisana 8772d8f85c use byte buffer pool for the ue tx_payload_buffer allocation. This halves the mac::ue object creation time 2020-03-23 14:49:17 +00:00
Andre Puschmann dff00c77c0 srsenb: fix mobility test after adding UE cap enquiry 2020-03-22 18:28:25 +01:00
Andre Puschmann ce45aabfec srsenb: enable UE capability enquiry during attach
the UE capability information isn't used so far but can now
be analyzed in the PCAP
2020-03-22 18:28:25 +01:00
Xavier Arteaga 2c93f6d20a Fix PUCCH DMRS correlation 2020-03-22 08:49:12 +01:00
Ismael Gomez fd3d4a7874 Refactor thread_pool: use std::mutex and fix some hidden potential bugs 2020-03-22 08:48:40 +01:00
Francisco Paisana 82cb6baef0 now the whole ue and enb mac uses the logmap 2020-03-20 11:32:03 +00:00
Ismael Gomez 5846e64a4d
Deallocate all CQI resources when deallocating users (#1097) 2020-03-20 12:24:46 +01:00
Francisco Paisana fb967d17a2 now we can disable tprofs individually 2020-03-19 10:59:37 +00:00
Francisco Paisana deb76d5dbd improved design to avoid data structures, and allow guarded start/stop even in lambdas 2020-03-19 10:59:37 +00:00
Francisco Paisana 8a54aef89d created a better/more composable design for time measures 2020-03-19 10:59:37 +00:00
Francisco Paisana eb20f651b9 account for all exit points 2020-03-19 10:59:37 +00:00
Francisco Paisana 854211496b redesign of tprof for thread safety 2020-03-19 10:59:37 +00:00
Francisco Paisana 269c852767 created a class for time profiling. An object of such class, if disabled, has almost zero overhead. Added a compile-time flag to turn on/off time profiling 2020-03-19 10:59:37 +00:00
Andre Puschmann 76f1b87b69 fix uninit var in s1ap 2020-03-19 10:33:15 +01:00
Francisco Paisana 34bc48d31a fix cfi to cc assignment 2020-03-18 19:55:39 +00:00
Francisco Paisana 0770c13f08 fixed overwriting of parsed max CFI 2020-03-18 19:55:39 +00:00
Francisco Paisana 5ee96079a2 added nof ctrl symbols of CFI to enb.conf 2020-03-18 13:27:56 +00:00
Francisco Paisana 4fc243ae4b added minimum CFI to config 2020-03-17 22:06:37 +00:00
Francisco Paisana 807d177b47 fix hanging issue, and simplified the handling of minRBG for different CFIs 2020-03-17 22:06:37 +00:00
Francisco Paisana ede09cb9b2 added dynamic CFI capability to the eNB scheduler 2020-03-17 22:06:37 +00:00
Xavier Arteaga ada8772f57 Initial srenb TA compensation 2020-03-17 17:21:43 +01:00
Andre Puschmann ac17ec6452 add common signal_handler for srsUE/srsENB/srsEPC
the signal handler is the same for all three apps. The "running" flag
as well as the file_logger object are in the common header in order
to allow the signal handler to flush the file if the alarm goes off.
2020-03-17 09:58:01 +01:00
Ismael Gomez cf4f4508ce Normalize throughput in CSV/stdout metrics with respect to number of TTIs 2020-03-16 22:58:09 +01:00
Xavier Arteaga 0408d357a7 Minor fixes 2020-03-16 15:07:12 +01:00
Ismael Gomez 858165f177
Allocate a different PDU buffer for each carrier in MAC eNodeB (#1069) 2020-03-16 13:35:03 +01:00
Ismael Gomez 73447972d8
Fix issue with simultaneous CQI and ACK/NACK transmission in CA (#1067)
* Fix memory corruption when phy calling mac scheduler and not yet initiated

* Do not drop CQI if collision with ACK/NACK and PUSCH

* Allocate CQI resources for SCell properly

* Use UE_PCELL_CC_IDX macro

* Protect ul_sched from being called if not yet started
2020-03-16 13:10:21 +01:00
Xavier Arteaga e832769ae6 Updated copyright 2020-03-16 11:26:06 +01:00
Francisco Paisana afd7ea9e83 Fixed the check for msg3 delay to account for retxs 2020-03-13 19:57:48 +00:00
Francisco Paisana 5330249625 created tti_point type and unit test. Added also the tti_point to the scheduler harqs, and rrc procedure 2020-03-13 19:20:40 +00:00
Francisco Paisana e824cbd251 fixes in the mac log and cell parsing 2020-03-13 18:45:38 +01:00
Andre Puschmann 1099e75e7c fix SCell carrier list population for MAC config
the issue caused to assign 0 as enb_cc_idx for the first SCell always
2020-03-13 18:41:24 +01:00
Xavier Arteaga caf7b514a0 Avoid TTI initial magic number 2020-03-13 14:01:58 +01:00
Xavier Arteaga 5af89513eb use double precission for frequency in srsue and srsenb 2020-03-13 14:01:58 +01:00
Xavier Arteaga 834a081c09 Add EPRE measurement to PUSCH decoder 2020-03-13 14:01:58 +01:00
Francisco Paisana 567790c1a2 Renamed struct to store cell context in rrc. Moved sib buffers to this struct. Created helper methods for lookup 2020-03-13 11:46:12 +00:00
Francisco Paisana fe3195bb27 add default pcell to ue_cfg in RRC 2020-03-13 11:46:12 +00:00
Francisco Paisana ce03971ca0 fix rrc_mobility_test 2020-03-13 11:46:12 +00:00
Francisco Paisana 349aed5e0d use sib configuration to set SCellToAddModList 2020-03-13 11:46:12 +00:00
Andre Puschmann 764c912977 fix a few more displaying issue in the stdout metrics 2020-03-13 11:34:32 +01:00
Francisco Paisana 4217dba7e0 fix msg3 delayed allocation and update test 2020-03-13 08:30:42 +01:00
Ismael Gomez e8b8c9922e
Add RF per-channel frequency band constraints (#1026) 2020-03-12 23:06:09 +01:00
Andre Puschmann 2f8643fb97 add tx/rx pkt ok/nok to enb metrics, also add enb metrics test
This is what it'll look like if running the new test:

------DL--------------------------------UL-------------------------------------
rnti cqi  ri mcs brate   ok  nok  (%)  snr  phr mcs brate   ok  nok  (%)    bsr
  46  16 1.5  28 15.2G 1000 1000 100% 14.2 12.0  20 15.2M   50   10  20%  100.0
ffff 1.2 1.5 6.2 1.00M  100   54  54% 22.2 99.1  28 1.00k   50   10  20%  100.0
2020-03-12 21:43:36 +01:00
Andre Puschmann 074ffbbb1d remove braces and reformat code 2020-03-12 21:04:15 +01:00
Andre Puschmann a95605a8a2 trim log name for eNB 2020-03-12 21:04:15 +01:00
Andre Puschmann f14697cdaa schedule PMI for SCells right after PCell, disable SRS for SCells 2020-03-12 21:04:15 +01:00
Andre Puschmann fdb7b0fa41 fix simple typo 2020-03-12 20:55:47 +01:00
Andre Puschmann 111aa6fc46 add SIB3 definition and enable in SI scheduling
SIB3 contains common cell re-selection information for intra, inter and intra-RAT cell reselection
2020-03-12 20:55:47 +01:00
Andre Puschmann 90beda34a1 fix parsing of optional field in SIB3 2020-03-12 20:55:47 +01:00
Andre Puschmann c534ee2b55 fix SCell packing in RRC reconfig 2020-03-12 12:22:41 +01:00
Andre Puschmann 0e4f97d1a0 fix bug in MAC where new PHY RNTI was always registered for enb_cc_idx==0 2020-03-12 12:22:41 +01:00
Andre Puschmann ab210c5f3c tiny cosmetic changes to the error messages printing 0x and clear cc_idx use 2020-03-12 12:22:41 +01:00
Andre Puschmann b7aad27d86 move packing of SCell list into extra method and add fill PHY config on the spot
previously we've packed the RRCReconfig with SCellToAddMod list and have then
parsed the message again to pack the PHY config dedicated for the new SCell carrier. This
is now done in one step.
2020-03-12 12:22:41 +01:00
Francisco Paisana d18b476e37 use utility macro for printing function name 2020-03-12 11:11:20 +00:00
yagoda f09c8324eb adding success/error macros in scheduler.cc 2020-03-12 11:11:20 +00:00
yagoda bfa451559b adding error logs to some scheduler function calls to ue_db to add clarity 2020-03-12 11:11:20 +00:00
Francisco Paisana 9b4a0baa87 activate scells in the phy 2020-03-11 21:56:33 +01:00
Francisco Paisana 7548402632 change scell activation interface to use arrays. Added a method to the scheduler to get the current set of activated carriers 2020-03-11 21:56:33 +01:00
Xavier Arteaga c42cb92784 Fix srsENB PHY stop 2020-03-11 21:17:13 +01:00
Xavier Arteaga 76408b195e Rename TX_DELAY and FDD_HARQ_DELAY_MS 2020-03-11 21:16:36 +01:00
Xavier Arteaga 442926cf66 Fix enb_phy_test deadlock 2020-03-11 12:08:24 +01:00
Andre Puschmann a8acd235f6 extend eNB MAC to support multiple CC per UE
- add tx/rx softbuffers for each CC that a UE might have
- make sure to call assign correct buffers when iterating
  over the CC for UL/DL grant assignment
2020-03-11 10:16:23 +01:00
Pedro Alvarez 96c82b3fc6 Moved PDCP configs to pdcp_config.h. Added `as_security_cfg_t` structure to hold access stratum keys.
Refactored PDCP, RRC and USIM accordingly.
2020-03-11 09:00:38 +00:00
Francisco Paisana dc8dca2a08 fix namespace-related compilation error 2020-03-10 22:06:07 +00:00
Francisco Paisana a744729007 use range of rbgs 2020-03-10 22:06:07 +00:00
Francisco Paisana 46579da1ff use signed integer to express the error 2020-03-10 22:06:07 +00:00
Francisco Paisana 9ad80ee29f added initial_dl_cqi to the enb rr.cfg parser 2020-03-10 22:06:07 +00:00
Francisco Paisana bcbb08ebae use initial_dl_cqi for first DL tx. 2020-03-10 22:06:07 +00:00
Francisco Paisana ab69c6fe43 account for delays in RAR tx in scheduler CA tester 2020-03-10 22:06:07 +00:00
Francisco Paisana 3b937348a2 refactored some sched util methods 2020-03-10 22:06:07 +00:00
Francisco Paisana fad897cb35 DL scheduler metric now takes into account the min and max of RBGs possible. This is to forbid segmentation of SRB0 allocations 2020-03-10 22:06:07 +00:00
Francisco Paisana 6317750de2 fix computation of ranged of allowed sched dl bytes 2020-03-10 22:06:07 +00:00
Francisco Paisana 414259e83b fix allocation expected alloc bytes (min and max) 2020-03-10 22:06:07 +00:00
Francisco Paisana 698899d309 added scells to enb rrc reconf message 2020-03-10 21:32:16 +01:00
Xavier Arteaga d585cf14f3 SRSENB: phy_ue_db returns default configuration for non User C-RNTI 2020-03-10 20:51:24 +01:00
Xavier Arteaga 47b7c1b72b SRSENB: remove assert macros from phy_ue_db.cc 2020-03-10 20:51:24 +01:00
Andre Puschmann f2e1bfa699 refactor naming for s/p/cell structs and {enb,ue}_cc_idx 2020-03-10 15:01:00 +01:00
Francisco Paisana 639f473042 fixed unsigned signed comparison 2020-03-10 14:17:49 +01:00
Francisco Paisana 1e63fa41cf made ue_cc_idx int to set to -1 for rar and bc allocs 2020-03-10 14:17:49 +01:00
Francisco Paisana f3c3c52fcd added ue_cc_idx to dci allocation 2020-03-10 14:17:49 +01:00
Francisco Paisana e62972d38e fix fdd delays in scheduler 2020-03-10 14:17:49 +01:00
Xavier Arteaga 04b3416d87 Remove auto for u16 2020-03-10 09:19:54 +01:00
Xavier Arteaga 5311c37429 SRSENB PHY: check RNTI type before requesting configuration 2020-03-10 09:19:54 +01:00
Xavier Arteaga 002a68e183 SRSENB: hard-coded parametrized PUCCH DMRS correlation threshold 2020-03-10 09:19:54 +01:00
Xavier Arteaga 385cc8ecd8 tweaked I_offset_ack in enb_phy_test 2020-03-10 09:19:54 +01:00
Xavier Arteaga 64caa4321b Fix UL control decoding. Some minor aesthetic changes. 2020-03-10 09:19:54 +01:00
Pedro Alvarez 8c58d1054a Changed pcap.mac_enable back to pcap.enable in eNB. 2020-03-09 17:35:10 +00:00
Pedro Alvarez 08a4ce0970 Added the ability to save S1AP pcaps at the eNB. 2020-03-09 17:35:10 +00:00
Andre Puschmann 2edecea33e fix SIB transmission for CA
Avoid double buffering of SIBs in MAC as this would require one buffer for each CC.
Instead, use byte_buffer managed by RRC that contains packed SIBs to avoid
double memcpy for each SIB tx. Only use MAC provided buffer in error case.

Also avoid MAC calling RLC for each SIB and call RRC directly.
2020-03-09 14:18:09 +01:00
Pau Espin Pedrol 91a5d1a74e gtpu: Log bind failure cause 2020-03-09 11:08:12 +01:00
Andre Puschmann 73feeaeba9 make UL earfcn optional in cell list 2020-03-06 17:57:26 +01:00
Andre Puschmann 120ad76c63 refactor cell param handling and fix SIB transmissions
- move cell specific eNB params to cell list in rr.conf
- make sure DL EARFCN and DL freq can be used to manually overwrite a single cell config
- fix SIB packing and transmission for multi cell configs
- introduce cell list to MAC
- adapt default enb.conf.example and rr.conf.example
2020-03-06 16:20:44 +01:00
Ismael Gomez 4e12405fff
Remove radio_multi class and organize channels, ports and carrier buffers (#1019) 2020-03-06 15:26:48 +01:00
Xavier Arteaga ecb22600ff improved eNb PHY test scheduler 2020-03-06 13:58:49 +01:00
Xavier Arteaga 89a672a585 SRSENB: fix UE phy dB defect for SCell Index 2020-03-06 13:58:49 +01:00
Xavier Arteaga 84dd9911ca eNb PHY test uses only Aggregation level 0 2020-03-06 13:58:49 +01:00
Xavier Arteaga 0d6694d5e6 Improvement in eNb PHY test 2020-03-06 13:58:49 +01:00
Xavier Arteaga 5c689ed4c4 SRSENB: minor aesthetic change 2020-03-06 13:58:49 +01:00
Xavier Arteaga 8eb96747ab SRSENB: Minor RAR RNTI fix 2020-03-06 13:58:49 +01:00
Xavier Arteaga da701cd82b SRSENB: Added PUSCH TA and EVM measurement. Some more PHY cleanup. 2020-03-06 13:58:49 +01:00
Pedro Alvarez bb9ff82490 Remove enb singleton and make sure log is initialized. 2020-03-06 13:05:25 +01:00
Pedro Alvarez bd3598f774 Moved srsEPC to the new S1AP library. Deleted liblte_s1ap.cc and liblte_s1ap.h. 2020-03-06 11:57:07 +00:00
Xavier Arteaga a61ff0b0fc SRSENB cleanup phy common 2020-03-06 12:24:28 +01:00
Xavier Arteaga cac2ee33b6 SRSENB: PHY uses tti_semaphore class instead of normal semaphores 2020-03-06 12:24:28 +01:00
Francisco Paisana ec1f1cc677 remove const_casts from scheduler. Fix ODR issue 2020-03-05 20:23:07 +00:00
Francisco Paisana e9a599857a created a header for all common structs and helper functions 2020-03-05 20:23:07 +00:00
Francisco Paisana 02ccb8b32b fix wrong calculation of sched tx and rx delays 2020-03-05 20:23:07 +00:00
Andre Puschmann 73c8b02820 enb: loop over CC in MAC 2020-03-05 20:46:14 +01:00
Andre Puschmann 664170fec6 pcap: add CC index when writing PCAP 2020-03-05 20:46:14 +01:00
Andre Puschmann 33a410bda4 fix parsing of DL/UL earfcn in cell config
using a single earfcn or dl_freq value that gets set by default
in the [rf] section doesn't make sense in a enb config with more
than 1 cell, so we should actually remove the earfcn/freq setting in [rf]
and only configure the radio through the values in the cell list in rr.cfg
2020-03-05 20:46:14 +01:00
Andre Puschmann 87f1b2a939 catch exceptions from eNB config parser
since the eNB config gets more complex, especially with CA,
we need to catch potential parsing errors from libconfig,
print an error with the position of the error and gracefully
stop the enb
2020-03-05 20:46:14 +01:00
Francisco Paisana 43e67b8536 created a harq entity that handles all harq procs. This entity accepts as arg the number of harq procs. 2020-03-05 17:51:33 +00:00
Francisco Paisana 1c041b2c1d created harq entity class 2020-03-05 17:51:33 +00:00
Andre Puschmann dfb1cd1361 temporarily disabling enb_phy_test_1cell until it is fixed 2020-03-05 14:47:07 +01:00
Francisco Paisana 9f266161cf increase tbs until allocation is big enough to fit MAC subheader and RLC header 2020-03-05 12:47:43 +00:00
Ismael Gomez 1f3aee2fc0 Fix incorrect parameters 2020-03-05 13:26:16 +01:00
Francisco Paisana 7e840bde86 fix tb idx assignment in scheduler mac sdu alloc 2020-03-05 12:18:05 +00:00
Francisco Paisana d1356568e0 separated sf sched result from sf_sched class. The interface became way simpler. No need for finish_tti() method, sf_sched::new_tti() is called automatically when we access the sf_sched. 2020-03-05 00:04:21 +00:00
Francisco Paisana bb38fa7119 fixed tti resetting after tti end 2020-03-05 00:04:21 +00:00
Francisco Paisana 47b05118ad simplified msg3 allocation. Now we can allocate resources ahead of time (e.g. msg3 is 2 ttis ahead) using the sf_sched interface. It's guaranteed that the given allocations wont be erased when the respective tti starts 2020-03-05 00:04:21 +00:00
Francisco Paisana 8f7890c60a store mask results in separate variables for testing, and reset sf_sched state at the end of the tti 2020-03-05 00:04:21 +00:00
Pedro Alvarez afc209711c Fix jump depending on uninitialized variable in srsenb::sched_ue::set_bearer_cfg_unlocked 2020-03-04 22:03:17 +01:00
Francisco Paisana 5bdc603113 added error macros 2020-03-03 21:26:17 +00:00
Francisco Paisana b37d9b9930 fixed msg4 setting in sched tester 2020-03-03 21:26:17 +00:00
Francisco Paisana 3cc94c3694 simplified mutexing of the scheduler. One single mutex for everything, and removed rwlock 2020-03-03 21:26:17 +00:00
Francisco Paisana 7210c35c6c checked all methods of srsenb::pdcp to see if they are called by different threads. Since it is all single-threaded, I removed the locks 2020-03-03 21:03:37 +00:00
Francisco Paisana fed06138b9 moved rach_detected to stack thread. Created a more friendly interface to enqueue tasks in stack 2020-03-03 21:03:21 +00:00
Francisco Paisana d10e950650 fix ue streamid assignment in s1ap 2020-03-03 21:19:09 +01:00
Andre Puschmann c79e202fd9 fix typo 2020-03-03 17:20:44 +01:00
Andre Puschmann 37c342af39 give enb_phy_tests individual names 2020-03-03 17:20:17 +01:00
Andre Puschmann a8bbe551ac move thread class into srslte namespace to avoid ambiguity between std::thread 2020-03-03 16:22:04 +01:00
Andre Puschmann 8b46f631c1 add basic TTI stats in stack 2020-03-03 16:22:04 +01:00
Francisco Paisana ad9e126299 test for different enb_cc_idxs as pcell. Bug fixes 2020-03-02 16:33:31 +00:00
Francisco Paisana 0f3ef11f8b now the scheduler only activates a scell after receiving a valid CQI for the SCell 2020-03-02 16:33:31 +00:00
Francisco Paisana f571b7c16b cleaned up some of the log error messages in the sched tester 2020-03-02 16:33:31 +00:00
Francisco Paisana c595696ec2 no need for a separate class for the CA tester 2020-03-02 16:33:31 +00:00
Francisco Paisana b44754f0ae the CA and random sched testers now use same structs and common interface. 2020-03-02 16:33:31 +00:00
Francisco Paisana 385fa226e0 started to use a type-safe tti counter for comparisons. Uniformized the common_sched_tester api. Next, need to use the same struct to register events. 2020-03-02 16:33:31 +00:00
Francisco Paisana 518f813f13 now the CA testing generation and simulation happen simultaneously. This way we can do more tti/event specific checks 2020-03-02 16:33:31 +00:00
Francisco Paisana b319f8dfcd created first version of CA test. Now we need to create actual asserts 2020-03-02 16:33:31 +00:00
Francisco Paisana 507bc2d2a2 created a test for CA. Currently is quite empty 2020-03-02 16:33:31 +00:00
Xavier Arteaga 2c534c9059 Correction of TX_DELAY and FDD_HARQ_DELAY_MS uses in srsenb PHY 2020-03-02 12:19:09 +01:00