From 8b0be9cf87708f9f5976ff239daa8d719d17dae4 Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Thu, 20 Jan 2022 15:45:43 +0100
Subject: [PATCH] nr rlc: speedup ack/nack reception

The code completely changed, expect problems.
---
 openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c  | 850 +++++++++++----------
 openair2/LAYER2/nr_rlc/nr_rlc_entity_am.h  |   3 -
 openair2/LAYER2/nr_rlc/nr_rlc_sdu.c        |  11 +-
 openair2/LAYER2/nr_rlc/nr_rlc_sdu.h        |   7 +-
 openair2/LAYER2/nr_rlc/tests/test14.txt.gz | Bin 792 -> 799 bytes
 openair2/LAYER2/nr_rlc/tests/test15.txt.gz | Bin 546 -> 554 bytes
 6 files changed, 441 insertions(+), 430 deletions(-)

diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c b/openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c
index af8cb5715a..e86e7c7d05 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c
@@ -103,36 +103,6 @@ static int segment_already_received(nr_rlc_entity_am_t *entity,
   return size <= 0;
 }
 
-static void consider_retransmission(nr_rlc_entity_am_t *entity,
-    nr_rlc_sdu_segment_t *cur, int update_retx)
-{
-  if (update_retx)
-    cur->sdu->retx_count++;
-
-  /* let's report max RETX reached for all retx_count >= max_retx_threshold
-   * (specs say to report if retx_count == max_retx_threshold).
-   * Upper layers should react (radio link failure), so no big deal actually.
-   */
-  if (update_retx && cur->sdu->retx_count >= entity->max_retx_threshold) {
-    entity->common.max_retx_reached(entity->common.max_retx_reached_data,
-                                    (nr_rlc_entity_t *)entity);
-  }
-
-  /* let's put in retransmit list even if we are over max_retx_threshold.
-   * upper layers should deal with this condition, internally it's better
-   * for the RLC code to keep going with this segment (we only remove
-   * a segment that was ACKed)
-   */ 
-  LOG_D(RLC, "RLC segment to be added at the ReTx list \n"); 
-  nr_rlc_sdu_segment_list_append(&entity->retransmit_list,
-                                 &entity->retransmit_end,
-                                 cur);
-
-  /* update buffer status */
-  entity->common.bstatus.retx_size += compute_pdu_header_size(entity, cur)
-                                      + cur->size;
-}
-
 /* checks that all the bytes of the SDU sn have been received (but SDU
  * has not been already processed)
  */
@@ -315,81 +285,6 @@ static void reception_actions(nr_rlc_entity_am_t *entity, nr_rlc_pdu_t *pdu)
   }
 }
 
-static void process_received_ack(nr_rlc_entity_am_t *entity, int ack_sn)
-{
-  nr_rlc_sdu_segment_t head;
-  nr_rlc_sdu_segment_t *cur;
-  nr_rlc_sdu_segment_t *prev;
-  unsigned char sn_set[32768];  /* used to dec retx_count only once per sdu */
-
-  memset(sn_set, 0, 32768);
-
-#define IS_SN_SET(b) (sn_set[(b)/8] & (1 << ((b) % 8)))
-#define SET_SN(b) do { sn_set[(b)/8] |= (1 << ((b) % 8)); } while (0)
-
-  /* put SDUs from wait and retransmit lists with SN < 'ack_sn' to ack_list */
-
-  /* process wait list */
-  head.next = entity->wait_list;
-  prev = &head;
-  cur = entity->wait_list;
-  while (cur != NULL) {
-    if (sn_compare_tx(entity, cur->sdu->sn, ack_sn) < 0) {
-      /* remove from wait list */
-      prev->next = cur->next;
-      /* put the PDU in the ack list */
-      entity->ack_list = nr_rlc_sdu_segment_list_add(sn_compare_tx, entity,
-                                                     entity->ack_list, cur);
-      entity->wait_end = prev;
-      cur = prev->next;
-    } else {
-      entity->wait_end = cur;
-      prev = cur;
-      cur = cur->next;
-    }
-  }
-  entity->wait_list = head.next;
-  if (entity->wait_list == NULL)
-    entity->wait_end = NULL;
-
-  /* process retransmit list */
-  head.next = entity->retransmit_list;
-  prev = &head;
-  cur = entity->retransmit_list;
-  while (cur != NULL) {
-    if (sn_compare_tx(entity, cur->sdu->sn, ack_sn) < 0) {
-      /* dec. retx_count in case we put this segment back in retransmit list
-       * in 'process_received_nack'
-       * do it only once per SDU
-       */
-      if (!IS_SN_SET(cur->sdu->sn)) {
-        cur->sdu->retx_count--;
-        SET_SN(cur->sdu->sn);
-      }
-      /* remove from retransmit list */
-      prev->next = cur->next;
-      /* update buffer status */
-      entity->common.bstatus.retx_size -= compute_pdu_header_size(entity, cur)
-                                          + cur->size;
-      /* put the PDU in the ack list */
-      entity->ack_list = nr_rlc_sdu_segment_list_add(sn_compare_tx, entity,
-                                                     entity->ack_list, cur);
-      entity->retransmit_end = prev;
-      cur = prev->next;
-    } else {
-      entity->retransmit_end = cur;
-      prev = cur;
-      cur = cur->next;
-    }
-  }
-  entity->retransmit_list = head.next;
-  if (entity->retransmit_list == NULL)
-    entity->retransmit_end = NULL;
-
-#undef IS_BIT_SET
-#undef SET_BIT
-}
-
 static int so_overlap(int s1, int e1, int s2, int e2)
 {
   if (s1 < s2) {
@@ -402,136 +297,375 @@ static int so_overlap(int s1, int e1, int s2, int e2)
   return 0;
 }
 
-static void process_nack_sn(nr_rlc_entity_am_t *entity, int nack_sn,
-                            int so_start, int so_end, unsigned char *sn_set)
-{
-  /* put all SDU segments with SN == 'sn' and with an overlapping so start/end
-   * to the retransmit list
-   * source lists are ack list and wait list.
-   * Not sure if we should consider wait list, isn't the other end supposed
-   * to only NACK SNs lower than the ACK SN sent in the status PDU, in which
-   * case all potential SDU segments should all be in ack list when calling
-   * the current function? in doubt let's accept anything and thus process
-   * also wait list.
-   */
-  nr_rlc_sdu_segment_t head;
-  nr_rlc_sdu_segment_t *cur;
-  nr_rlc_sdu_segment_t *prev;
-
-#define IS_SN_SET(b) (sn_set[(b)/8] & (1 << ((b) % 8)))
-#define SET_SN(b) do { sn_set[(b)/8] |= (1 << ((b) % 8)); } while (0)
-
-  /* check that tx_next_ack <= sn < tx_next */
-  if (!(sn_compare_tx(entity, entity->tx_next_ack, nack_sn) <= 0 &&
-        sn_compare_tx(entity, nack_sn, entity->tx_next) < 0))
-    return;
-
-  /* process wait list */
-  head.next = entity->wait_list;
-  prev = &head;
-  cur = entity->wait_list;
-  while (cur != NULL) {
-    if (cur->sdu->sn == nack_sn &&
-        so_overlap(so_start, so_end, cur->so, cur->so + cur->size - 1)) {
-      /* remove from wait list */
-      prev->next = cur->next;
-      cur->next = NULL;
-      /* consider the SDU segment for retransmission */
-      consider_retransmission(entity, cur, !IS_SN_SET(cur->sdu->sn));
-      SET_SN(cur->sdu->sn);
-      entity->wait_end = prev;
-      cur = prev->next;
-    } else {
-      entity->wait_end = cur;
-      prev = cur;
-      cur = cur->next;
-    }
-  }
-  entity->wait_list = head.next;
-  if (entity->wait_list == NULL)
-    entity->wait_end = NULL;
-
-  /* process ack list */
-  head.next = entity->ack_list;
-  prev = &head;
-  cur = entity->ack_list;
-  while (cur != NULL) {
-    if (cur->sdu->sn == nack_sn &&
-        so_overlap(so_start, so_end, cur->so, cur->so + cur->size - 1)) {
-      /* remove from ack list */
-      prev->next = cur->next;
-      cur->next = NULL;
-      /* consider the SDU segment for retransmission */
-      consider_retransmission(entity, cur, !IS_SN_SET(cur->sdu->sn));
-      SET_SN(cur->sdu->sn);
-      cur = prev->next;
-    } else {
-      prev = cur;
-      cur = cur->next;
-    }
-  }
-  entity->ack_list = head.next;
-
-#undef IS_BIT_SET
-#undef SET_BIT
-}
-
-static void process_received_nack(nr_rlc_entity_am_t *entity, int nack_sn,
-                                  int so_start, int so_end, int range,
-                                  unsigned char *sn_set)
+static void process_control_pdu(nr_rlc_entity_am_t *entity,
+                                char *buffer, int size)
 {
+#define R(d) do { if (nr_rlc_pdu_decoder_in_error(&d)) goto err; } while (0)
+  nr_rlc_pdu_decoder_t decoder;
   int i;
+  int cpt;
+  int ack_sn;
+  int nack_sn;
+  int e1;
+  int e2;
+  int e3;
+  int so_start;
+  int so_end;
+  int range;
+  int prev_nack_sn = -1;
+  int prev_so_start;
+  int prev_so_end;
+  int tx_next_ack;
+  nr_rlc_sdu_segment_t *cur_wait_list;
+  nr_rlc_sdu_segment_t *prev_wait_list;
+  nr_rlc_sdu_segment_t *end_wait_list = NULL;
+  nr_rlc_sdu_segment_t head_wait_list;
+  nr_rlc_sdu_segment_t *cur_retransmit_list;
+  nr_rlc_sdu_segment_t *new_retransmit_list;
+  nr_rlc_sdu_segment_t head_retransmit_list;
 
-  for (i = 0; i < range; i++)
-    process_nack_sn(entity, (nack_sn + i) % entity->sn_modulus,
-                    i == 0 ?         so_start : 0,
-                    i == range - 1 ? so_end : -1,
-                    sn_set);
-}
+  head_wait_list.next = entity->wait_list;
+  cur_wait_list       = entity->wait_list;
+  prev_wait_list      = &head_wait_list;
 
-static int sdu_segment_in_ack_list_full(nr_rlc_sdu_segment_t *sdu)
-{
-  int target_count = sdu->sdu->ref_count;
-  int actual_count = 0;
-  int sn = sdu->sdu->sn;
+  head_retransmit_list.next = NULL;
+  cur_retransmit_list = entity->retransmit_list;
+  new_retransmit_list = &head_retransmit_list;
 
-  while (sdu != NULL && sdu->sdu->sn == sn) {
-    actual_count++;
-    sdu = sdu->next;
+  nr_rlc_pdu_decoder_init(&decoder, buffer, size);
+  nr_rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder); /* dc */
+
+  cpt = nr_rlc_pdu_decoder_get_bits(&decoder, 3); R(decoder);
+  if (cpt != 0) {
+    LOG_E(RLC, "%s:%d:%s: warning: discard PDU, CPT not 0 (%d)\n",
+          __FILE__, __LINE__, __FUNCTION__, cpt);
+    goto err;
+  }
+  ack_sn = nr_rlc_pdu_decoder_get_bits(&decoder, entity->sn_field_length); R(decoder);
+  e1 = nr_rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
+  /* r bits */
+  if (entity->sn_field_length == 18) {
+    nr_rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
+  } else {
+    nr_rlc_pdu_decoder_get_bits(&decoder, 7); R(decoder);
   }
 
-  return actual_count == target_count;
-}
-
-static void finalize_ack_nack_processing(nr_rlc_entity_am_t *entity)
-{
-  nr_rlc_sdu_segment_t *cur = entity->ack_list;
-  int sn;
-
-  /* - send indication of successful delivery for all consecutive acked SDUs
-   *   starting from tx_next_ack. Also free them.
-   * - update tx_next_ack to the next SN not acked yet
+  /* 38.322 5.3.3.3 says to stop t_poll_retransmit if a ACK or NACK is
+   * received for the SN 'poll_sn' - check ACK case (NACK done below)
    */
-  /* todo: send indication of successful delivery as soon as possible as
-   *       the specs say (38.322 5.2.3.1.1). As the code is, if we receive
-   *       ack for SN+2 we won't indicate successful delivery before
-   *       SN+1 has been indicated.
+  if (sn_compare_tx(entity, entity->poll_sn, ack_sn) < 0)
+    entity->t_poll_retransmit_start = 0;
+
+  while (e1) {
+    nack_sn = nr_rlc_pdu_decoder_get_bits(&decoder, entity->sn_field_length); R(decoder);
+    e1 = nr_rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
+    e2 = nr_rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
+    e3 = nr_rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
+    /* r bits */
+    if (entity->sn_field_length == 18) {
+      nr_rlc_pdu_decoder_get_bits(&decoder, 3); R(decoder);
+    } else {
+      nr_rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
+    }
+    if (e2) {
+      so_start = nr_rlc_pdu_decoder_get_bits(&decoder, 16); R(decoder);
+      so_end = nr_rlc_pdu_decoder_get_bits(&decoder, 16); R(decoder);
+    } else {
+      so_start = 0;
+      so_end = 0xffff;
+    }
+    if (e3) {
+      range = nr_rlc_pdu_decoder_get_bits(&decoder, 8); R(decoder);
+    } else {
+      range = 1;
+    }
+    /* special value 0xffff indicates 'all bytes to the end' */
+    if (so_end == 0xffff)
+      so_end = -1;
+
+    /* process nacks */
+    for (i = 0; i < range; i++) {
+      int cur_nack_sn  = (nack_sn + i) % entity->sn_modulus;
+      int cur_so_start = i == 0 ?         so_start : 0;
+      int cur_so_end   = i == range - 1 ? so_end : -1;
+
+      /* check that current nack is > previous nack and <= ack
+       * if not then skip it and all following nacks, and
+       * do not touch t_poll_retransmit
+       */
+      if (prev_nack_sn != -1) {
+        int cmp = sn_compare_tx(entity, cur_nack_sn, prev_nack_sn);
+        if (cmp < 0
+            || (cmp == 0
+                && (prev_so_end == -1
+                    || cur_so_start <= prev_so_end))) {
+          LOG_E(RLC, "%s:%d:%s: bad NACK (nack sn %d so start/end %d/%d, previous nack sn %d so start/end %d/%d), skip it and all following NACKs\n",
+                __FILE__, __LINE__, __FUNCTION__,
+                cur_nack_sn, cur_so_start, cur_so_end,
+                prev_nack_sn, prev_so_start, prev_so_end);
+          goto nacks_done;
+        }
+      }
+      if (sn_compare_tx(entity, cur_nack_sn, ack_sn) > 0) {
+        LOG_E(RLC, "%s:%d:%s: bad NACK (nack %d ack %d), skip it and all following NACKs\n",
+              __FILE__, __LINE__, __FUNCTION__,
+              cur_nack_sn, ack_sn);
+        goto nacks_done;
+      }
+
+process_next_pdu:
+      /* process smallest SN either from wait_list or retransmit list */
+      if (cur_wait_list == NULL && cur_retransmit_list == NULL)
+        goto lists_over;
+      if (cur_wait_list == NULL)
+        goto process_retransmit_list_head;
+      if (cur_retransmit_list == NULL)
+        goto process_wait_list_head;
+      if (cur_wait_list->sdu->sn < cur_retransmit_list->sdu->sn
+          || (cur_wait_list->sdu->sn == cur_retransmit_list->sdu->sn &&
+              cur_wait_list->so < cur_retransmit_list->so))
+        goto process_wait_list_head;
+      goto process_retransmit_list_head;
+
+process_wait_list_head:
+      /* if nack overlaps with current segment, put it in retransmit list */
+      if (cur_wait_list->sdu->sn == cur_nack_sn
+          && so_overlap(cur_so_start, cur_so_end,
+                        cur_wait_list->so,
+                        cur_wait_list->so + cur_wait_list->size - 1)) {
+        prev_wait_list->next = cur_wait_list->next;
+        if (cur_wait_list == entity->wait_end)
+          end_wait_list = prev_wait_list;
+        cur_wait_list->next = NULL;
+        new_retransmit_list->next = cur_wait_list;
+        new_retransmit_list = cur_wait_list;
+        /* increase retx count. Don't care about segmentation, so maybe we
+         * increase too much.
+         */
+        cur_wait_list->sdu->retx_count++;
+        /* report max RETX reached for all retx_count >= max_retx_threshold
+         * (specs say to report if retx_count == max_retx_threshold).
+         * Upper layers should react (radio link failure), so no big deal.
+         * We deal with segmentation by requiring
+         * retx_count >= max_retx_threshold * number of segments.
+         * We may report max RETX reached too late/early. To be refined if
+         * this is a problem.
+         */
+        if (cur_wait_list->sdu->retx_count
+              >= entity->max_retx_threshold * cur_wait_list->sdu->ref_count)
+          entity->common.max_retx_reached(entity->common.max_retx_reached_data,
+                                          (nr_rlc_entity_t *)entity);
+        /* update buffer status */
+        entity->common.bstatus.retx_size += compute_pdu_header_size(entity, cur_wait_list)
+                                            + cur_wait_list->size;
+        /* and go process the next pdu, still for the current nack */
+        cur_wait_list = prev_wait_list->next;
+        goto process_next_pdu;
+      }
+
+      /* if current segment SN > current NACK, we can't classify it yet */
+      if (sn_compare_tx(entity, cur_wait_list->sdu->sn, cur_nack_sn) > 0
+          || (cur_wait_list->sdu->sn == cur_nack_sn
+              && cur_wait_list->so > cur_so_start))
+        goto done_nack;
+
+      /* if current segment is acked, free it, indicate successful delivery
+       * if fully acked
+       */
+      if (sn_compare_tx(entity, cur_wait_list->sdu->sn, ack_sn) < 0) {
+        nr_rlc_sdu_segment_t *cur = cur_wait_list;
+        int upper_layer_id = cur->sdu->upper_layer_id;
+        int sdu_size = cur->sdu->size;
+        cur_wait_list = cur_wait_list->next;
+        prev_wait_list->next = cur_wait_list;
+        if (cur_wait_list == entity->wait_end)
+          end_wait_list = prev_wait_list;
+        if (nr_rlc_free_sdu_segment(cur)) {
+          entity->tx_size -= sdu_size;
+          entity->common.sdu_successful_delivery(
+              entity->common.sdu_successful_delivery_data,
+              (nr_rlc_entity_t *)entity, upper_layer_id);
+        }
+        goto process_next_pdu;
+      }
+
+      /* if current segment SN > ack_sn, we're done with this list */
+      if (sn_compare_tx(entity, cur_wait_list->sdu->sn, ack_sn) > 0) {
+        cur_wait_list = NULL;
+        goto process_next_pdu;
+      }
+
+      /* current segment SN == ack_sn, skip this segment and move to the next.
+       * Not sure if correct, can we get a nack_sn == ack_sn? 38.322 5.3.4 says
+       * "set the ACK_SN to the SN of the next not received RLC SDU which is
+       * not indicated as missing in the resulting STATUS PDU." Is it okay to
+       * receive some NACK for a given SN and an ACK == this SN? I can see a
+       * case where it's possible (only parts of an SN were received and the
+       * TB is too small to report the several NACKs for this SN, then we
+       * can't set ACK = SN+1 but in this case, shouldn't we skip sending
+       * NACKs for this SN and only send ACK = SN? our current implementation
+       * does send both NACKs and ACK, see function generate_status()).
+       */
+      prev_wait_list = cur_wait_list;
+      cur_wait_list = cur_wait_list->next;
+      goto process_next_pdu;
+
+process_retransmit_list_head:
+      /* if nack overlaps with current segment, leave it in retransmit list */
+      if (cur_retransmit_list->sdu->sn == cur_nack_sn
+          && so_overlap(cur_so_start, cur_so_end,
+                        cur_retransmit_list->so,
+                        cur_retransmit_list->so + cur_retransmit_list->size - 1)) {
+        new_retransmit_list->next = cur_retransmit_list;
+        cur_retransmit_list = cur_retransmit_list->next;
+        new_retransmit_list = new_retransmit_list->next;
+        new_retransmit_list->next = NULL;
+        /* go process the next pdu, still for the current nack */
+        goto process_next_pdu;
+      }
+
+      /* if current segment SN > current NACK, we can't classify it yet */
+      if (sn_compare_tx(entity, cur_retransmit_list->sdu->sn, cur_nack_sn) > 0
+          || (cur_retransmit_list->sdu->sn == cur_nack_sn
+              && cur_retransmit_list->so > cur_so_start))
+        goto done_nack;
+
+      /* if current segment is acked, free it, indicate successful delivery
+       * if fully acked
+       */
+      if (sn_compare_tx(entity, cur_retransmit_list->sdu->sn, ack_sn) < 0) {
+        nr_rlc_sdu_segment_t *cur = cur_retransmit_list;
+        int upper_layer_id = cur->sdu->upper_layer_id;
+        int sdu_size = cur->sdu->size;
+        cur_retransmit_list = cur_retransmit_list->next;
+        /* update buffer status */
+        entity->common.bstatus.retx_size -= compute_pdu_header_size(entity, cur)
+                                            + cur->size;
+        if (nr_rlc_free_sdu_segment(cur)) {
+          entity->tx_size -= sdu_size;
+          entity->common.sdu_successful_delivery(
+              entity->common.sdu_successful_delivery_data,
+              (nr_rlc_entity_t *)entity, upper_layer_id);
+        }
+        goto process_next_pdu;
+      }
+
+      /* current segment SN >= ack_sn
+       * if the wait list is empty, then put the remaining retransmit list at
+       * the end of the new retransmit list (just a speedup)
+       * if not, put only this segment
+       */
+      if (cur_wait_list == NULL) {
+        new_retransmit_list->next = cur_retransmit_list;
+        cur_retransmit_list = NULL;
+        goto lists_over;
+      }
+      new_retransmit_list->next = cur_retransmit_list;
+      cur_retransmit_list = cur_retransmit_list->next;
+      new_retransmit_list = new_retransmit_list->next;
+      new_retransmit_list->next = NULL;
+      goto process_next_pdu;
+
+done_nack:
+      prev_nack_sn  = cur_nack_sn;
+      prev_so_start = cur_so_start;
+      prev_so_end   = cur_so_end;
+    } /* for (i = 0; i < range; i++) */
+
+lists_over:
+    /* 38.322 5.3.3.3 says to stop t_poll_retransmit if a ACK or NACK is
+     * received for the SN 'poll_sn' - check NACK case (ACK done above)
+     */
+    if (sn_compare_tx(entity, nack_sn, entity->poll_sn) <= 0 &&
+        sn_compare_tx(entity, entity->poll_sn, (nack_sn + range) % entity->sn_modulus) < 0)
+      entity->t_poll_retransmit_start = 0;
+  } /* while (e1) */
+
+nacks_done:
+  /* nacks done, finish with ack */
+  /* we may report successful delivery out of order, if it's a problem
+   * then we can have a single loop and deal with the smallest sn of
+   * the current head of wait list and the current head of retransmit list.
+   * (It's simpler to process those two lists the one after the other.)
    */
-  while (cur != NULL && cur->sdu->sn == entity->tx_next_ack &&
-         sdu_segment_in_ack_list_full(cur)) {
-    entity->tx_size -= cur->sdu->size;
-    sn = cur->sdu->sn;
-    entity->common.sdu_successful_delivery(
-        entity->common.sdu_successful_delivery_data,
-        (nr_rlc_entity_t *)entity, cur->sdu->upper_layer_id);
-    while (cur != NULL && cur->sdu->sn == sn) {
-      nr_rlc_sdu_segment_t *s = cur;
-      cur = cur->next;
-      nr_rlc_free_sdu_segment(s);
+  /* deal with wait list */
+  while (cur_wait_list != NULL
+         && sn_compare_tx(entity, cur_wait_list->sdu->sn, ack_sn) < 0) {
+    /* current segment is acked, free it, indicate successful delivery
+     * if fully acked
+     */
+    nr_rlc_sdu_segment_t *cur = cur_wait_list;
+    int upper_layer_id = cur->sdu->upper_layer_id;
+    int sdu_size = cur->sdu->size;
+    prev_wait_list->next = cur_wait_list->next;
+    if (cur_wait_list == entity->wait_end)
+      end_wait_list = prev_wait_list;
+    cur_wait_list = cur_wait_list->next;
+    if (nr_rlc_free_sdu_segment(cur)) {
+      entity->tx_size -= sdu_size;
+      entity->common.sdu_successful_delivery(
+          entity->common.sdu_successful_delivery_data,
+          (nr_rlc_entity_t *)entity, upper_layer_id);
     }
-    entity->ack_list = cur;
-    entity->tx_next_ack = (entity->tx_next_ack + 1) % entity->sn_modulus;
   }
+  /* deal with retransmit list */
+  while (cur_retransmit_list != NULL
+         && sn_compare_tx(entity, cur_retransmit_list->sdu->sn, ack_sn) < 0) {
+    /* current segment is acked, free it, indicate successful delivery
+     * if fully acked
+     */
+    nr_rlc_sdu_segment_t *cur = cur_retransmit_list;
+    int upper_layer_id = cur->sdu->upper_layer_id;
+    int sdu_size = cur->sdu->size;
+    cur_retransmit_list = cur_retransmit_list->next;
+    /* update buffer status */
+    entity->common.bstatus.retx_size -= compute_pdu_header_size(entity, cur)
+                                        + cur->size;
+    if (nr_rlc_free_sdu_segment(cur)) {
+      entity->tx_size -= sdu_size;
+      entity->common.sdu_successful_delivery(
+          entity->common.sdu_successful_delivery_data,
+          (nr_rlc_entity_t *)entity, upper_layer_id);
+    }
+  }
+
+  new_retransmit_list->next = cur_retransmit_list;
+
+  entity->wait_list       = head_wait_list.next;
+  entity->retransmit_list = head_retransmit_list.next;
+
+  if (end_wait_list != NULL) {
+    if (end_wait_list == &head_wait_list)
+      entity->wait_end = NULL;
+    else
+      entity->wait_end = end_wait_list;
+  }
+
+  /* update tx_next_ack */
+  /* 38.322 5.2.3.1.1 says "set TX_Next_Ack equal to the SN of the RLC SDU
+   * with the smallest SN, whose SN falls within the range
+   * TX_Next_Ack <= SN <= TX_Next and for which a positive acknowledgment
+   * has not been received yet.
+   */
+  /* let's start from highest possible value and go down as needed */
+  tx_next_ack = entity->tx_next;
+  if (entity->wait_list != NULL
+      && sn_compare_tx(entity, entity->wait_list->sdu->sn, tx_next_ack) < 0)
+    tx_next_ack = entity->wait_list->sdu->sn;
+  if (entity->retransmit_list != NULL
+      && sn_compare_tx(entity, entity->retransmit_list->sdu->sn, tx_next_ack) < 0)
+    tx_next_ack = entity->retransmit_list->sdu->sn;
+  if (sn_compare_tx(entity, ack_sn, tx_next_ack) < 0)
+    tx_next_ack = ack_sn;
+  entity->tx_next_ack = tx_next_ack;
+
+  return;
+
+err:
+  LOG_E(RLC, "%s:%d:%s: error decoding PDU, NR RLC entity in inconsistent state\n",
+        __FILE__, __LINE__, __FUNCTION__);
+
+#undef R
 }
 
 void nr_rlc_entity_am_recv_pdu(nr_rlc_entity_t *_entity,
@@ -540,7 +674,6 @@ void nr_rlc_entity_am_recv_pdu(nr_rlc_entity_t *_entity,
 #define R(d) do { if (nr_rlc_pdu_decoder_in_error(&d)) goto err; } while (0)
   nr_rlc_entity_am_t *entity = (nr_rlc_entity_am_t *)_entity;
   nr_rlc_pdu_decoder_t decoder;
-  nr_rlc_pdu_decoder_t control_decoder;
   nr_rlc_pdu_t *pdu;
   int dc;
   int p = 0;
@@ -551,23 +684,11 @@ void nr_rlc_entity_am_recv_pdu(nr_rlc_entity_t *_entity,
   int is_first;
   int is_last;
 
-  int cpt;
-  int e1;
-  int e2;
-  int e3;
-  int ack_sn;
-  int nack_sn;
-  int so_start;
-  int so_end;
-  int range;
-  int control_e1;
-  int control_e2;
-  int control_e3;
-  unsigned char sn_set[32768];  /* used to dec retx_count only once per sdu */
-
   nr_rlc_pdu_decoder_init(&decoder, buffer, size);
   dc = nr_rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
-  if (dc == 0) goto control;
+
+  if (dc == 0)
+    return process_control_pdu(entity, buffer, size);
 
   /* data PDU */
   p  = nr_rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
@@ -596,20 +717,20 @@ void nr_rlc_entity_am_recv_pdu(nr_rlc_entity_t *_entity,
 
   /* dicard PDU if no data */
   if (data_size <= 0) {
-    LOG_W(RLC, "%s:%d:%s: warning: discard PDU, no data\n",
+    LOG_D(RLC, "%s:%d:%s: warning: discard PDU, no data\n",
           __FILE__, __LINE__, __FUNCTION__);
     goto discard;
   }
 
   /* dicard PDU if rx buffer is full */
   if (entity->rx_size + data_size > entity->rx_maxsize) {
-    LOG_W(RLC, "%s:%d:%s: warning: discard PDU, RX buffer full\n",
+    LOG_D(RLC, "%s:%d:%s: warning: discard PDU, RX buffer full\n",
           __FILE__, __LINE__, __FUNCTION__);
     goto discard;
   }
 
   if (!sn_in_recv_window(entity, sn)) {
-    LOG_W(RLC, "%s:%d:%s: warning: discard PDU, sn out of window (sn %d rx_next %d)\n",
+    LOG_D(RLC, "%s:%d:%s: warning: discard PDU, sn out of window (sn %d rx_next %d)\n",
           __FILE__, __LINE__, __FUNCTION__,
            sn, entity->rx_next);
     goto discard;
@@ -617,7 +738,7 @@ void nr_rlc_entity_am_recv_pdu(nr_rlc_entity_t *_entity,
 
   /* discard segment if all the bytes of the segment are already there */
   if (segment_already_received(entity, sn, so, data_size)) {
-    LOG_W(RLC, "%s:%d:%s: warning: discard PDU, already received\n",
+    LOG_D(RLC, "%s:%d:%s: warning: discard PDU, already received\n",
           __FILE__, __LINE__, __FUNCTION__);
     goto discard;
   }
@@ -650,118 +771,6 @@ void nr_rlc_entity_am_recv_pdu(nr_rlc_entity_t *_entity,
 
   return;
 
-control:
-  cpt = nr_rlc_pdu_decoder_get_bits(&decoder, 3); R(decoder);
-  if (cpt != 0) {
-    LOG_W(RLC, "%s:%d:%s: warning: discard PDU, CPT not 0 (%d)\n",
-          __FILE__, __LINE__, __FUNCTION__, cpt);
-    goto discard;
-  }
-  ack_sn = nr_rlc_pdu_decoder_get_bits(&decoder, entity->sn_field_length); R(decoder);
-  e1 = nr_rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
-  /* r bits */
-  if (entity->sn_field_length == 18) {
-    nr_rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
-  } else {
-    nr_rlc_pdu_decoder_get_bits(&decoder, 7); R(decoder);
-  }
-
-  /* let's try to parse the control PDU once to check consistency */
-  control_decoder = decoder;
-  control_e1 = e1;
-  while (control_e1) {
-    nack_sn = nr_rlc_pdu_decoder_get_bits(&control_decoder, entity->sn_field_length); R(control_decoder);
-    control_e1 = nr_rlc_pdu_decoder_get_bits(&control_decoder, 1); R(control_decoder);
-    control_e2 = nr_rlc_pdu_decoder_get_bits(&control_decoder, 1); R(control_decoder);
-    control_e3 = nr_rlc_pdu_decoder_get_bits(&control_decoder, 1); R(control_decoder);
-    /* r bits */
-    if (entity->sn_field_length == 18) {
-      nr_rlc_pdu_decoder_get_bits(&control_decoder, 3); R(control_decoder);
-    } else {
-      nr_rlc_pdu_decoder_get_bits(&control_decoder, 1); R(control_decoder);
-    }
-    /* check range and so_start/so_end consistency */
-    if (control_e2) {
-      so_start = nr_rlc_pdu_decoder_get_bits(&control_decoder, 16); R(control_decoder);
-      so_end = nr_rlc_pdu_decoder_get_bits(&control_decoder, 16); R(control_decoder);
-    } else {
-      so_start = 0;
-      so_end = 0xffff;
-    }
-    if (control_e3) {
-      range = nr_rlc_pdu_decoder_get_bits(&control_decoder, 8); R(control_decoder);
-    } else {
-      range = 1;
-    }
-    if (range < 1) {
-      LOG_E(RLC, "%s:%d:%s: error, bad 'range' in RLC NACK (sn %d)\n",
-            __FILE__, __LINE__, __FUNCTION__, nack_sn);
-      goto err;
-    }
-    /* so_start can be > so_end if more than one range; they don't refer
-     * to the same PDU then
-     */
-    if (range == 1 && so_end < so_start) {
-      LOG_E(RLC, "%s:%d:%s: error, bad so start/end (sn %d)\n",
-            __FILE__, __LINE__, __FUNCTION__, nack_sn);
-      goto err;
-    }
-  }
-
-  /* 38.322 5.3.3.3 says to stop t_poll_retransmit if a ACK or NACK is
-   * received for the SN 'poll_sn' - check ACK case (NACK done below)
-   */
-  if (sn_compare_tx(entity, entity->poll_sn, ack_sn) < 0)
-    entity->t_poll_retransmit_start = 0;
-
-  /* at this point, accept the PDU even if the actual values
-   * may be incorrect (eg. if so_start > so_end)
-   */
-  process_received_ack(entity, ack_sn);
-
-  if (e1)
-    memset(sn_set, 0, 32768);
-
-  while (e1) {
-    nack_sn = nr_rlc_pdu_decoder_get_bits(&decoder, entity->sn_field_length); R(decoder);
-    e1 = nr_rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
-    e2 = nr_rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
-    e3 = nr_rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
-    /* r bits */
-    if (entity->sn_field_length == 18) {
-      nr_rlc_pdu_decoder_get_bits(&decoder, 3); R(decoder);
-    } else {
-      nr_rlc_pdu_decoder_get_bits(&decoder, 1); R(decoder);
-    }
-    if (e2) {
-      so_start = nr_rlc_pdu_decoder_get_bits(&decoder, 16); R(decoder);
-      so_end = nr_rlc_pdu_decoder_get_bits(&decoder, 16); R(decoder);
-    } else {
-      so_start = 0;
-      so_end = 0xffff;
-    }
-    if (e3) {
-      range = nr_rlc_pdu_decoder_get_bits(&decoder, 8); R(decoder);
-    } else {
-      range = 1;
-    }
-    /* special value 0xffff indicates 'all bytes to the end' */
-    if (so_end == 0xffff)
-      so_end = -1;
-    process_received_nack(entity, nack_sn, so_start, so_end, range, sn_set);
-
-    /* 38.322 5.3.3.3 says to stop t_poll_retransmit if a ACK or NACK is
-     * received for the SN 'poll_sn' - check NACK case (ACK done above)
-     */
-    if (sn_compare_tx(entity, nack_sn, entity->poll_sn) <= 0 &&
-        sn_compare_tx(entity, entity->poll_sn, (nack_sn + range) % entity->sn_modulus) < 0)
-      entity->t_poll_retransmit_start = 0;
-  }
-
-  finalize_ack_nack_processing(entity);
-
-  return;
-
 err:
   LOG_W(RLC, "%s:%d:%s: error decoding PDU, discarding\n", __FILE__, __LINE__, __FUNCTION__);
   goto discard;
@@ -1225,7 +1234,7 @@ static int generate_missing(nr_rlc_entity_am_t *entity,
 static int generate_status(nr_rlc_entity_am_t *entity, char *buffer, int size)
 {
   int                  ack_sn = entity->rx_next;
-  missing_data_t  m;
+  missing_data_t       m;
   nr_rlc_pdu_t         *cur;
   int                  nack_count = 0;
   nr_rlc_pdu_encoder_t encoder;
@@ -1427,8 +1436,6 @@ static int generate_retx_pdu(nr_rlc_entity_am_t *entity, char *buffer,
     return 0;
 
   entity->retransmit_list = entity->retransmit_list->next;
-  if (entity->retransmit_list == NULL)
-    entity->retransmit_end = NULL;
 
   sdu->next = NULL;
 
@@ -1444,15 +1451,24 @@ static int generate_retx_pdu(nr_rlc_entity_am_t *entity, char *buffer,
     /* put the second SDU back at the head of the retransmit list */
     next_sdu->next = entity->retransmit_list;
     entity->retransmit_list = next_sdu;
-    if (entity->retransmit_end == NULL)
-      entity->retransmit_end = entity->retransmit_list;
     /* update buffer status */
     entity->common.bstatus.retx_size += compute_pdu_header_size(entity, next_sdu)
                                         + next_sdu->size;
   }
 
   /* put SDU/SDU segment in the wait list */
-  nr_rlc_sdu_segment_list_append(&entity->wait_list, &entity->wait_end, sdu);
+  /* speedup: check end of wait list, maybe the new sdu comes after */
+  if (entity->wait_end == NULL
+      || sn_compare_tx(entity, sdu->sdu->sn, entity->wait_end->sdu->sn) > 0
+      || (sn_compare_tx(entity, sdu->sdu->sn, entity->wait_end->sdu->sn) == 0
+          && sdu->so > entity->wait_end->so))
+    nr_rlc_sdu_segment_list_append(&entity->wait_list, &entity->wait_end, sdu);
+  else {
+    entity->wait_list = nr_rlc_sdu_segment_list_add(sn_compare_tx, entity,
+                            entity->wait_list, sdu);
+    if (entity->wait_list->next == NULL)
+      entity->wait_end = entity->wait_list;
+  }
 
   p = check_poll_after_pdu_assembly(entity);
 
@@ -1519,7 +1535,18 @@ static int generate_tx_pdu(nr_rlc_entity_am_t *entity, char *buffer, int size)
     entity->tx_next = (entity->tx_next + 1) % entity->sn_modulus;
 
   /* put SDU/SDU segment in the wait list */
-  nr_rlc_sdu_segment_list_append(&entity->wait_list, &entity->wait_end, sdu);
+  /* speedup: check end of wait list, probably the new sdu comes after */
+  if (entity->wait_end == NULL
+      || sn_compare_tx(entity, sdu->sdu->sn, entity->wait_end->sdu->sn) > 0
+      || (sn_compare_tx(entity, sdu->sdu->sn, entity->wait_end->sdu->sn) == 0
+          && sdu->so > entity->wait_end->so))
+    nr_rlc_sdu_segment_list_append(&entity->wait_list, &entity->wait_end, sdu);
+  else {
+    entity->wait_list = nr_rlc_sdu_segment_list_add(sn_compare_tx, entity,
+                            entity->wait_list, sdu);
+    if (entity->wait_list->next == NULL)
+      entity->wait_end = entity->wait_list;
+  }
 
   /* polling actions for a new PDU */
   entity->pdu_without_poll++;
@@ -1629,11 +1656,7 @@ void nr_rlc_entity_am_recv_sdu(nr_rlc_entity_t *_entity,
 
 static void check_t_poll_retransmit(nr_rlc_entity_am_t *entity)
 {
-  nr_rlc_sdu_segment_t head;
   nr_rlc_sdu_segment_t *cur;
-  nr_rlc_sdu_segment_t *prev;
-  int sn;
-  int old_retx_count;
 
   /* 38.322 5.3.3.4 */
   /* did t_poll_retransmit expire? */
@@ -1659,74 +1682,58 @@ static void check_t_poll_retransmit(nr_rlc_entity_am_t *entity)
    */
   entity->force_poll = 1;
 
-  LOG_W(RLC, "%s:%d:%s: warning: t_poll_retransmit expired\n",
+  LOG_D(RLC, "%s:%d:%s: warning: t_poll_retransmit expired\n",
         __FILE__, __LINE__, __FUNCTION__);
 
   /* do we meet conditions of 38.322 5.3.3.4? */
   if (!check_poll_after_pdu_assembly(entity))
     return;
 
-  /* search wait list for SDU with highest SN */
-  /* this code may be incorrect: in LTE we had to look for PDU
-   * with SN = VT(S) - 1, but for NR the specs say "highest SN among the
-   * ones submitted to lower layers" not 'tx_next - 1'. So we should look
-   * for the highest SN in the wait list. But that's no big deal. If the
-   * program runs this code, then the connection is in a bad state and we
-   * can retransmit whatever we want. At some point we will receive a status
-   * report and retransmit what we really have to. Actually we could just
-   * retransmit the head of wait list (the specs have this 'or').
-   * (Actually, maybe this interpretation is not correct and what the code
-   * does is correct. The specs are confusing.)
+  /* retransmit the head of wait list, this is the case
+   * "consider any RLC SDU which has not been positively acknowledged for
+   * retransmission" of 36.322 5.3.3.4.
+   * We don't search for the highest SN, it's simpler to just take the head
+   * of wait list. This can be changed if needed.
    */
-  sn = (entity->tx_next - 1 + entity->sn_modulus) % entity->sn_modulus;
-
-  head.next = entity->wait_list;
   cur = entity->wait_list;
-  prev = &head;
-
-  while (cur != NULL) {
-    if (cur->sdu->sn == sn)
-      break;
-    prev = cur;
-    cur = cur->next;
-  }
-
-  /* SDU with highest SN not found? take the head of wait list */
-  if (cur == NULL) {
-    cur = entity->wait_list;
-    prev = &head;
-    sn = cur->sdu->sn;
-  }
 
   /* todo: do we need to for check cur == NULL?
    * It seems that no, the wait list should not be empty here, but not sure.
    */
 
-  old_retx_count = cur->sdu->retx_count;
+  entity->wait_list = cur->next;
+  if (entity->wait_list == NULL)
+     entity->wait_end = NULL;
 
-  /* 38.322 says "SDU", not "SDU segment", so let's retransmit all
-   * SDU segments with this SN
+  /* 38.322 says "SDU", not "SDU segment", but let's retransmit only
+   * the 'cur' SDU segment. To be changed if needed. (Maybe we have
+   * to retransmit all SDU segments with the same SN that are in the
+   * wait list.)
    */
-  /* todo: maybe we could simply retransmit the current SDU segment,
-   * so that we don't have to run through the full wait list.
+
+  /* increase retx count. Don't care about segmentation, so maybe we
+   * increase too much.
    */
-  while (cur != NULL) {
-    if (cur->sdu->sn == sn) {
-      prev->next = cur->next;
-      cur->next = NULL;
-      /* put in retransmit list */
-      consider_retransmission(entity, cur,
-                              old_retx_count == cur->sdu->retx_count);
-    } else {
-      prev = cur;
-    }
-    cur = prev->next;
-  }
-  entity->wait_list = head.next;
-  /* reset wait_end (todo: optimize?) */
-  entity->wait_end = entity->wait_list;
-  while (entity->wait_end != NULL && entity->wait_end->next != NULL)
-    entity->wait_end = entity->wait_end->next;
+  cur->sdu->retx_count++;
+  /* report max RETX reached for all retx_count >= max_retx_threshold
+   * (specs say to report if retx_count == max_retx_threshold).
+   * Upper layers should react (radio link failure), so no big deal.
+   * We deal with segmentation by requiring
+   * retx_count >= max_retx_threshold * number of segments.
+   * We may report max RETX reached too late/early. To be refined if
+   * this is a problem.
+   */
+  if (cur->sdu->retx_count
+        >= entity->max_retx_threshold * cur->sdu->ref_count)
+    entity->common.max_retx_reached(entity->common.max_retx_reached_data,
+                                    (nr_rlc_entity_t *)entity);
+  /* update buffer status */
+  entity->common.bstatus.retx_size += compute_pdu_header_size(entity, cur)
+                                      + cur->size;
+
+  /* put in retransmit list */
+  entity->retransmit_list = nr_rlc_sdu_segment_list_add(sn_compare_tx, entity,
+                                entity->retransmit_list, cur);
 }
 
 static void check_t_reassembly(nr_rlc_entity_am_t *entity)
@@ -1815,6 +1822,7 @@ void nr_rlc_entity_am_discard_sdu(nr_rlc_entity_t *_entity, int sdu_id)
   entity->common.bstatus.tx_size -= compute_pdu_header_size(entity, cur)
                                     + cur->size;
 
+  entity->tx_size -= cur->sdu->size;
   nr_rlc_free_sdu_segment(cur);
 }
 
@@ -1857,7 +1865,6 @@ static void clear_entity(nr_rlc_entity_am_t *entity)
   nr_rlc_free_sdu_segment_list(entity->tx_list);
   nr_rlc_free_sdu_segment_list(entity->wait_list);
   nr_rlc_free_sdu_segment_list(entity->retransmit_list);
-  nr_rlc_free_sdu_segment_list(entity->ack_list);
 
   entity->tx_list         = NULL;
   entity->tx_end          = NULL;
@@ -1867,9 +1874,6 @@ static void clear_entity(nr_rlc_entity_am_t *entity)
   entity->wait_end        = NULL;
 
   entity->retransmit_list = NULL;
-  entity->retransmit_end  = NULL;
-
-  entity->ack_list        = NULL;
 
   entity->common.bstatus.tx_size   = 0;
   entity->common.bstatus.retx_size = 0;
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_entity_am.h b/openair2/LAYER2/nr_rlc/nr_rlc_entity_am.h
index 453fe87026..57ae1a3485 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_entity_am.h
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_entity_am.h
@@ -84,9 +84,6 @@ typedef struct {
   nr_rlc_sdu_segment_t *wait_end;
 
   nr_rlc_sdu_segment_t *retransmit_list;
-  nr_rlc_sdu_segment_t *retransmit_end;
-
-  nr_rlc_sdu_segment_t *ack_list;
 } nr_rlc_entity_am_t;
 
 void nr_rlc_entity_am_recv_sdu(nr_rlc_entity_t *entity,
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_sdu.c b/openair2/LAYER2/nr_rlc/nr_rlc_sdu.c
index ef0d52558a..ef64389ac5 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_sdu.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_sdu.c
@@ -58,14 +58,19 @@ oom:
   exit(1);
 }
 
-void nr_rlc_free_sdu_segment(nr_rlc_sdu_segment_t *sdu)
+int nr_rlc_free_sdu_segment(nr_rlc_sdu_segment_t *sdu)
 {
-  sdu->sdu->ref_count--;
-  if (sdu->sdu->ref_count == 0) {
+  int ret = 0;
+
+  sdu->sdu->free_count++;
+  if (sdu->sdu->free_count == sdu->sdu->ref_count) {
     free(sdu->sdu->data);
     free(sdu->sdu);
+    ret = 1;
   }
   free(sdu);
+
+  return ret;
 }
 
 void nr_rlc_sdu_segment_list_append(nr_rlc_sdu_segment_t **list,
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_sdu.h b/openair2/LAYER2/nr_rlc/nr_rlc_sdu.h
index f4585fb7d6..20cc90f185 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_sdu.h
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_sdu.h
@@ -30,6 +30,10 @@ typedef struct nr_rlc_sdu_t {
   int retx_count;
 
   int ref_count;      /* incremented each time the SDU is segmented */
+  int free_count;     /* incremented each time a segment is freed
+                       * when it equals ref_count we can free the SDU
+                       * completely
+                       */
 } nr_rlc_sdu_t;
 
 typedef struct nr_rlc_sdu_segment_t {
@@ -44,7 +48,8 @@ typedef struct nr_rlc_sdu_segment_t {
 nr_rlc_sdu_segment_t *nr_rlc_new_sdu(
     char *buffer, int size,
     int upper_layer_id);
-void nr_rlc_free_sdu_segment(nr_rlc_sdu_segment_t *sdu);
+/* return 1 if the SDU has been freed too, 0 if not (more segments to free) */
+int nr_rlc_free_sdu_segment(nr_rlc_sdu_segment_t *sdu);
 void nr_rlc_sdu_segment_list_append(nr_rlc_sdu_segment_t **list,
                                     nr_rlc_sdu_segment_t **end,
                                     nr_rlc_sdu_segment_t *sdu);
diff --git a/openair2/LAYER2/nr_rlc/tests/test14.txt.gz b/openair2/LAYER2/nr_rlc/tests/test14.txt.gz
index 53616dae3d10b71375cea41ca9061d4304f64dcf..45e54651eb317c3b7695cfcab7428fe43172227b 100644
GIT binary patch
delta 727
zcmV;|0x12M2A>9hABzYGOnK#D0t0kqb96B@E_8Tw0Ns{LYhy<ch4=Xt-!j<@-Cfl$
zFGGgxvKh}R1k=x8Fd^tM$;_{xD;Xz9Xe>M4NCCm^MOEKZ=bSpax9>mP-mu=3)#kg~
z{rThj8|)3M(LUX+`<CzTJLZR_=KjmTn;U+`7>va@j9?Uh<1qmfF$t3~1yeB%vosFO
z#2T!{I;>z7>#+eFu?d^81zWKV+pz;XaRz5`4ktLpd0fCnT*75s!Bt$tb=<&B#31&!
zL;SywKgOzT#@(NN`vhKg;G5awH<v$!J5s?Osvr&#L=le!Bq9mPNI@#nkd6#wq6W37
zLj_gTqXCUVXhJhu(26#+qXV7G{dkLa3uAc2dwjr0e8OjZ!B>34cl-io5)8o-96^ro
zpHsnJ_7p$=^5cGtJ|6BrjTIk$`uLMT0at$vP`7iA)!mX%o9%j^RLk>jKZUUQ`|)I!
zIsZ8yU2wvJ@)Tmb-w|Qw9P6%ww$qNiXy`iu^vJPt=-3>{k(|hxT*#H&$eldMlVT{A
z;wVB<il+ohq$EnF6iTHuN~a9Uq#CNFI;v2W>ZySmsfn7Yg<7eN+Npy&cMfQl=4gLH
zQ<|p*T0Ed$-|AR>on!U9W92$%JMGxZhwk61xPQ6g`}*+g3(d1H+*#%={g3gIP9hHf
zB3?d{PR8rfxRclNS6Q>(wl>!5xqW!}{G|Tq?@rXaSJulb>i-AdiJFg6Qx8+KC0eEx
zTBS8wrw!Vq8@i=Cy3m#G>46^UiJpJyg<k26-WT@hlVKQ^;TXbDhGzsuWF$sr6h>t<
zMrRDhWE!SrI;Jp{>6w8UnTeT?2RNsLUiKJ|DVDz#W0#M8XO(ASA-o{R%-L87Cu3pP
zxT8y7xVC4Yo=z|?M>kyg;_oR>{y$RwjmE1a;Pl2_0rqh2kKgKnX5n#7%(Dw?@)b>e
JEYZ;s0009vZy5jp

delta 720
zcmV;>0x$ia2ABqaABzYG$u*{70t0kqb96B@E_8Tw0Ns{5ZyZMugmeFjFSHY5X1eFa
zP>|rviKxghh<OSG2*J3AZ0Xl~?+Dts!-*%F$(?}(c7mRn>Z<D6y?yuo_J;MQtTsQ~
z?$;mQ-C%E6jrRF&-M9RB-!VTeHTPc!-rVpT#$YVQVFaUp7>@~<h)I}?DVU0Bm}TR@
zOsv6LtiuXcu^t<+5u30XTd)<|upK+F6K8N1=Wv2koW})R#3fwD6<ozNT*nREL=0ko
zKg9oWd>X5=8Fzp5?Gt#}fp2Dy-&}qd?nniDsDd~|5Jfx^kccECBL%5QLpm~$i5k?R
z4i!{Uj|MbCq6y7tK`YwOjt+D#=i@EjEsWt6@9_a2@d=;t1z+(E-|-8WNiYOUa0EHR
ze@+E^*<Jkd>zjQWeLUQM9xL9z{qU1O0at%CP`7iA)!mX%o9%j^RLlEr--WRG>v3h4
zKL1%C9dN>e@)Tmb=ZLU#j&;{T+iAyMH1wSSdgNF+bZidfNKWKTF62sX<W3&sNih^l
zaTK8_#Zv+$QW7Oo3Z+sSrBeoFQVrEo9aX4G_0&L()I`nHLao$B?bJb?I|npNb2NXU
zDb3RYEgn#>uXU`x%&~gjv2q=>op$WyL-(&$+<(8~`}*+gh344{cb0k0{>OMpClQB#
z5idVUC*w8!FaFCkAElHYrc_I`Oe?fXYqU-qv`IH~OLugkE8WurJ<=0B(+j=Q8@(^H
zK%Wf5unfl#hB7=OFd`!{GNUjmqcMLvV=yMuFfG$Dg{e%>49v((%zWIyIUV$}+jvZk
z{H@ryeC#``JTr#jJ95LE9m8;P49{GBIsv>Kop9xYyr(ev|489CHeMwGrzhwNu!nOW
zPOAr+E%mz|4S$w3>uqaey`I~Lhc8bQjQ;b9di%n9_riL4VZA<E|2JY2HBbc65dZ*8
C(N`k?

diff --git a/openair2/LAYER2/nr_rlc/tests/test15.txt.gz b/openair2/LAYER2/nr_rlc/tests/test15.txt.gz
index 2619436c2d4740017eb6b620d8fd0c7b919d3d84..ddb895d56f0fe88f0ceffb9a100359413292f2b7 100644
GIT binary patch
literal 554
zcmV+_0@eK=iwFo<dF5dO19W9`bTKt9ba-?C&6Q7Y6EP6Q?|h2i5iZCx9{<Y`QE}ta
z_JmNiyY`|=6+%f<1fQPWG(iot2}Pn*vMe7wqxastXP=#%o-J5icgyP+XPfi8_iq-+
zf@K?SE>?BT%gc&;HC?*=-Ux2N2b{wRPH`S*xPXhegv+>s>u^18z)gh>HzE!ZL=le|
z5|D@_BqIgskRBP3iZo<I9V)1z9yK(e5lv`D3)-PQI-nJ8=!kcC`FMzc>=W>c_jtnx
ze8eYw#ut2t@9_h^;v0U%9444z9y2Up5ldLc3f5sgHeeNN*f{kk2tf&+V1z)3gha@M
zLg)xRVIWk(1ZE^Uq7aqn4-(LQ0?~+p7>S9PiG|n^d*VQ>#6}!RjwB={d6JO=DUuQ?
zlM1OL^`wDRNsTm;9a+dq_GBXmawI2mCKqx??#TnWk{fxXIEqk|;weT6zY_S=KDT9e
z-7db=^%lKt&`*`_=XyFL?cvjV@kyTXb$9U1=6k&V{Bid3#4g;!XUEygmi=FtHymfL
zPi)~meDMJLw!?SJ{&CJfKiM>|?dtNTEjfLAz6<Sh&+HcYJ+k=Si$AZs*XMcOC!^dc
zXxqaS&|5v{eG0nnyK(9?Yo&bcR;<>;&{nH)eRcJ1CuOUz_X^}+rFTP29vb2E|M*M~
sWUv0;muI7`KBVol{*!mmkK|+cZ5A^}_s6#07RbSZA0L&&0<;ML09iH+!vFvP

literal 546
zcmV+-0^R)|iwFqSHKt(#19W9`bTKt9ba-?C&6P`QlR*@Q_x_4!sT-MdnOl}(ap$J(
zN~C<3`J_-plBS}+-Xu+=(U?%dS{Q~|%o(2d%=^w<oSk3HSlo8=+ZPv`^}F|PX2^_r
z8}6<a<C2%xBjMF*)Ajd83^P6u0zn8$FoF{zArUg65GtV~^n`)1Dr|%a35Xzy7~)7o
z5|WXERHQ?CWI#rwArl%<K@~OB(TFBAqXn&KhxX`zj%Y(CEMW5Sm;l)qV2T;$Si};R
zv4T~s!+LDMMyz2I9&o`GH{9`vCp_Z?uXu;|_<)ai!>85xL?J5Ch)#^eM9joOti+Dk
z69?i*T)|AFKoXLY?5F_U7m%D3Nr{w6g;Yr$sV5Djk<>^NIgo{{WFtE{k`p<T3%Qaz
za!($}Be{_$N}vcuDMoQhq$EnF6iTIZl%6tBMoObh)Ib%gQjO}=_^W_V?Q@%Vx9#f7
zxZKkFhJIBUevYRz(jK24<dd@I>mKl}&G&f!*=hCi#4g<9^V8~OtNt&{8&9j(C${h&
zUpk_`?fCB1KhF7=XPd*vc5{8#=A6I1+=ceJXLd_|pe?q0@z>+w_Vs-pYNI?TXxqgq
zp!fY;&#R#8z8mFVg>l0vf4Y(9|BtyIiPHFgACgUP^-sNh)?e%n{e<0z-|k|qG4Qop
kuviX5TP&vK&CR!63)=YlP=P$QK#vyu0JKzLn6wE10El1~J^%m!