Commit Graph

115 Commits

Author SHA1 Message Date
Andre Puschmann 5838ec4999 rlc_am: revert expect macro back to error log and inform higher layers
the incidence really must be handled by the higher layers, i.e. the bearer
needs to be reestablished.
2021-06-03 21:11:47 +02:00
Andre Puschmann f22f4b4fbd rlc_am: fix potential stalling in RLC transmitter
it turned out that a certain order of events can lead to
a RLC transmitter stalling because even though unacknowledged PDUs
are queued, none of them was actually considered for retx.

This can happen if a pollRetxTimer expires for a SN that, meanwhile,
has already been acknowledged. The positive lead to the deletion of
the SN from the Tx window.

The fix makes sure that when a retx for a unexisting SN is requested,
the sender will consider the next unacknowledged SN instead.
2021-06-03 21:11:47 +02:00
Andre Puschmann 50f7fc644b rlc_am_lte: log event when status prohibit timer expires 2021-05-31 12:40:17 +02:00
Andre Puschmann 3102861ee3 rlc_am_lte: make func param const& 2021-05-31 09:40:37 +02:00
Andre Puschmann bc3be73364 rlc_am_lte: replace simple sanitfy check with error log with expect
this should help debugging the situation when this happens by
aborting when STOP_ON_WARNING is enabled
2021-05-20 23:19:17 +02:00
Andre Puschmann 21b3635ae4 rlc_am_lte: refactor retransmit_pdu() to send different SNs
it seems that different SNs should be retransmitted depending
on the actual situation. In case of pollRetx timer expiration,
vt_s - 1 should actually be resent.

This patch prepares the function to accept different SNs but
leaves it to send vt_a by default. The RLC AM test would need
to changed as well to not fail.
2021-05-20 13:41:07 +02:00
Francisco ad1a0eb2ac rlc,fix - Add PDCP PDUs to undelivered_sdu_info_queue when the PDUs are popped from the tx_sdu_queue, rather than they are pushed to.
- This simplifies the sdu discard
- This also fixes an existing race condition
2021-04-29 15:41:00 +02:00
Francisco 7ced0e73eb rlc,bugfix - avoid accessing the PDCP info of RLC segments when the PDCP has already discarded the respective PDCP SN. 2021-04-28 21:15:00 +02:00
Andre Puschmann 597729ac53 rlc: always remove PDCP SNs from undelivered queue
if RLC PDUs with certain PDCP SNs were already in flight
when their discard timer at PDCP expires, they weren't
remove from the undelivered_sdu_info_queue causing
indesired log entries like:

08:08:52.455280 [RLC    ] [W] PDCP_SN=2103 already marked as undelivered

when the SN was sent again (after wrap around).

The patch makes sure to always try to delete the PDCP SN
from the queue. It should fix (at least partly) #2560
2021-04-28 21:15:00 +02:00
Francisco e3e4564a7e fix inconsistency in use of invalid_sn and status_report_sn throughout rlc am code 2021-04-16 13:54:10 +01:00
Francisco c3ec28002b refactor - integration of segment list in rlc_amd_tx_pdu and pdcp_pdu_info classes 2021-04-16 13:54:10 +01:00
Francisco 7f0083a985 implementation of intrusive list abstract classes to be used in RLC for lists of segments 2021-04-16 13:54:10 +01:00
Francisco b06f16891d use of a single array-based pool of RLC AM PDU segments to build data PDUs, while
avoiding any allocations.
Each segment stores its own PDCP SN and RLC SN and has two pointers,
one for the next segment of the same RLC PDU, and another for the next segment
of the same PDCP PDU.
2021-04-16 13:54:10 +01:00
Francisco dc763b5045 rlc am - fix bugs in buffered_pdcp_pdu_list
The count and container elements were not being correctly updated in the events
of SN overwrite, clear(), clear_pdcp_sdu(sn) of sn that doesnt exist
2021-04-08 20:11:15 +01:00
Andre Puschmann 0fdcea2924 rlc_am: count every segment retx as a full retx for this SN
previously we were only counting retx if we retx the start of a segment.
this could lead to unwanted behaviour, i.e., not counting retx
correctly and thus not triggering the maxretx attempt, if the receive
always sends NACKs with a SO_start.

The RLC spec is not clear on how this should be handled correctly but
IMHO using an integer number of retx is reasonable, even for segments
that might be retransmitted more often.

The alternative of using a fractional retx counter that may be increamented
proportional to the segment size that is retx is another alternative
but considered too complex to implement (and test correctly).
2021-04-07 22:18:22 +02:00
Andre Puschmann c74661ae95 rlc_am: add log message when received NACK SN is already on retx queue 2021-04-07 22:18:22 +02:00
Pedro Alvarez 5bc55ec48c Changed discard_if to appyly_if in circular_buffer.h.
This was done so it would work when circular buffer holds other things
that are not unique_pointers. Queue and pop_func had to be made public
to be able to call the pop_func when an SDU is discarded.
2021-03-24 00:57:58 +00:00
Andre Puschmann 1b1cfa40c9 rlc_am_lte: add some more sanity checks around retx of PDUs
this patch doesn't change any functionality but adds a bit
of further error checking around the handling of status PDUs
and the retx of PDUs
2021-03-23 23:36:53 +01:00
Francisco dd336c53ea changed srsran_warning to srsran_expect. Applied new macro to rlc am 2021-03-23 10:49:28 +00:00
Pedro Alvarez d91119baf6
RLC discard (#2515)
* Added ability to discard to dyn_block_queue

* Change way of keeping track of SDUs

* Check nullptr in poping callback. Starting to check for nullptr in RLC read_pdu.

* Adding RLC discard tests

* Clearing PDCP info when RLC discard happens

* Read SDUs until they are no longer nullptr

* Changed discard_if to use template argument
2021-03-22 16:51:32 +00:00
Codebot 4523ee6087 rename srsLTE to srsRAN 2021-03-21 21:47:01 +01:00
Andre Puschmann 2cfc657fbb rlc_am_lte: refactor logging when PDCP SDUs are enqueued
the patch refactor the logging when a new PDCP SDU is enqueued for
transmission at RLC.

If the SN is already present, only a warning is logged. From the RLC
perspective operation continues and the SDU will be transmitted.

The patch also changes the order of logs. When the SN cannot be inserted
inside the queue of undelivered SDUs, only one message is logged.
2021-03-18 15:27:49 +01:00
faluco c7542daf43 Remove rlc traces and add new ones into tti run functions both in the enb and ue. 2021-03-10 11:59:09 +01:00
faluco 82db6544fb Add instrumentation points to rlc_am_lte::rlc_am_lte_tx::handle_control_pdu using srslog. 2021-03-10 11:59:09 +01:00
Andre Puschmann 16de8668e0 rlc_am_lte: convert mutexes to std::mutex
replace all pthread_mutex with std::mutex and use lock_guard and unique_lock (where needed)
2021-03-09 21:56:33 +01:00
Andre Puschmann 20cbc48f90 rlc_am_lte: refactor PDCP/RLC interface to use fix sized data structure
this patch replaces the std::vector type used in the interface between
PDCP and RLC to signal delivery status between both layers. The new
data type is a configurable but fixed-size vector.
The RLC AM doesn't need to dynamically allocate the vector for every SN but
uses the tx_window for storage.
2021-03-09 21:56:33 +01:00
Francisco ee77343f26 fix compilation issue for centos7 2021-03-09 16:23:08 +00:00
Francisco f72cd4151c rlc am,bugfix - fixed formatting of RLC AM header and status pdu 2021-03-09 16:23:08 +00:00
Francisco 1ffc4cef86 rlc am,optimization - change helper log methods to avoid mallocs 2021-03-09 16:23:08 +00:00
Andre Puschmann ace8764568 rlc_am_lte: add missing unlock when building status PDU fails 2021-03-08 15:19:07 +01:00
Andre Puschmann ceacf8508d rlc_am_lte: fix handling of maxretx
this patch fixes the actions/handling after RLC detected
maxRetx reached for a given SN.

According to the TS, RLC should only inform upper layers and
not try to recover from the event itself.

As a consequence, we won't manipulate the Tx or Rx window.
As a result of this, we might retransmit a SN more than
the specified amount of times.

It's the task of RRC to reestablish the bearer to recover
from that.
2021-03-06 20:55:08 +01:00
Andre Puschmann 6a4bf65fd8 rlc_am_lte: extend check for valid status PDU
check for all NACKed SNs are smaller than ACK_SN
2021-03-05 19:46:00 +01:00
Andre Puschmann 62b2327178 rlc_am_lte: fix header reconstruction
* optimize processing of status PDU (SN is removed from window immediately)
* fix maxRetx signaling for segments
* make tx_window_t a template class, rename and use for rx_window as well
2021-03-05 15:47:30 +01:00
Francisco b329e25bbb move ue phy interfaces to separate interfaces header file 2021-02-26 16:44:57 +01:00
Francisco a988351f46 move ue pdcp interfaces to separate interfaces header file 2021-02-26 16:44:57 +01:00
Andre Puschmann 822abc763e rlc_am_lte: when max retx is reached, remove SN from tx window
this fixes an issue when the RLC bearer isn't reset from RRC.
In this case, the RLC would retransmit the same PDU over and over
again despite the max retx counter being reached.
2021-02-24 21:57:56 +01:00
Francisco 0b6b62324f convert rlc am retx_queue to circular buffer 2021-02-24 21:19:15 +01:00
Francisco 138685399e remove allocations from rlc_am_tx::handle_control_pdu 2021-02-24 12:06:34 +01:00
Francisco 9a6512f4e8 fix RLC AM undelivered PDCN SNs reset bug 2021-02-22 22:56:19 +01:00
Francisco 1ede82bb30 use circular array for buffered PDCP SNs in RLC AM to limit memory allocations 2021-02-22 22:56:19 +01:00
Francisco 2a65bf9636 fix undelivered PDCP SNs buffers in RLC AM to handle SN=-1 case 2021-02-22 22:56:19 +01:00
Francisco bad2302e31 avoid the use of two arrays for managing buffered pdcp sns in RLC AM 2021-02-22 22:56:19 +01:00
Francisco 299634b319 use of vector to store undelivered PDCP SNs in RLC AM 2021-02-22 22:56:19 +01:00
Pedro Alvarez d8f3878ce1
RLC failure to deliver notifications and discard timer limits to 1500ms (#2368)
* Added interfaces for the RLC to notify the PDCP of failure to transmit
SDU

* Limit discard timer to 1500ms, to avoid issues of lingering SDUs in the undeliverd_sdus_queue.

* Fix bug in early exit of notify_delivery and notify_failure

* fix compilation issue in rlc-pdcp notification

Co-authored-by: Francisco <francisco.paisana@softwareradiosystems.com>
2021-02-22 10:36:14 +00:00
Francisco 2f75abcc7a fix failing rlc am test 2021-02-21 21:24:24 +01:00
Francisco abe4f4c7eb use tx_window to store the map of rlc sn to pdcp sns 2021-02-21 21:24:24 +01:00
Francisco f86eb84876 conversion of RLC AM tx window from std::map to array 2021-02-21 21:24:24 +01:00
Andre Puschmann 40d7934267 rlc: call PDCP notify without holding Tx lock
move notify_info_vec as stack variable and unlock mutex
before calling PDCP notify
2021-02-21 11:03:44 +01:00
Francisco Paisana cd8ee37f74
Use a reverse lookup to avoid iteration over a std::map (#2363)
* reuse vector capacity for pdcp sn notification
* use an extra lookup data structure to find PDCP SNs that an RLC SN contains
* fix rlc sn->pdcp sn lookup datastructure in rlc
* fix rlc failing test
2021-02-20 15:08:00 +01:00
Pedro Alvarez ba5367bc56 Change order which reestablish is called in eNB
Make sure that RLC info queue is reset when reestablish happens
2021-02-18 14:51:29 +00:00