Attention is currently required from: osmith.
Hello osmith, Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-pcu/+/29905
to look at the new patch set (#3).
Change subject: Delay ImmAss(PCH, PktDlAss) if waiting for PKT_CTRL_ACK answering UL_ACK_NACK (FinACK=1)
......................................................................
Delay ImmAss(PCH, PktDlAss) if waiting for PKT_CTRL_ACK answering UL_ACK_NACK (FinACK=1)
In that state (ul_tbf=TBF_ST_FINISHED), we are unable to reach the MS to
assign a new DL TBF.
* MS Is not available in CCCH because it's attached the PDCH.
* MS won't be able to PKT_CTRL_ACK a PktDlAss on PACCH, because next
thing it will do is to PKT_CTRL_ACK the UL_ACK_NACK(FINACK=1) we
already polled it for, and immediatelly after that it will release the
UL TBF on its side and go back to packet idle mode.
Hence, we must wait for MS to send the PKT_CTRL_ACK to us in order to be
able to assign the DL TBF in PCH (CCCH).
Related: OS#5700
Change-Id: I7a30db9cc7dae70e04054f1a4dba004bd1780d4a
---
M src/gprs_ms.c
M src/gprs_ms.h
M src/pdch.cpp
M src/tbf.cpp
M src/tbf.h
M src/tbf_dl.cpp
M src/tbf_fsm.c
M tests/tbf/TbfTest.cpp
M tests/tbf/TbfTest.err
9 files changed, 230 insertions(+), 70 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/05/29905/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29905
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I7a30db9cc7dae70e04054f1a4dba004bd1780d4a
Gerrit-Change-Number: 29905
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29905 )
Change subject: Delay ImmAss(PCH, PktDlAss) if waiting for PKT_CTRL_ACK answering UL_ACK_NACK (FinACK=1)
......................................................................
Patch Set 2:
(2 comments)
File src/pdch.cpp:
https://gerrit.osmocom.org/c/osmo-pcu/+/29905/comment/a6db0106_8188edd5
PS2, Line 388: something is wrong
> should it log an error message in both if code paths then?
The logging in he correct path is done through usual FSM event logging.
The previous log also was moved inside the FSM.
This way the log shows first the event being sent and later the consequence of the event (the UPLINK TBF ending).
File src/tbf_fsm.c:
https://gerrit.osmocom.org/c/osmo-pcu/+/29905/comment/7da40346_33febd03
PS2, Line 265: thr
> the
Ack
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29905
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I7a30db9cc7dae70e04054f1a4dba004bd1780d4a
Gerrit-Change-Number: 29905
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 28 Oct 2022 13:14:08 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29909 )
Change subject: cosmetic: pcu: Fix typo in several comments
......................................................................
cosmetic: pcu: Fix typo in several comments
Change-Id: I7a2419514582cb9efd8df126bf449711f78586fe
---
M pcu/PCU_Tests.ttcn
1 file changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/29909/1
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 8b3d1ea..6d17d96 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -430,7 +430,7 @@
f_ms_establish_ul_tbf(ms);
/* Send one UL block (with TLLI since we are in One-Phase Access
- contention resoultion) and make sure it is ACKED fine */
+ contention resolution) and make sure it is ACKED fine */
f_ms_tx_ul_data_block_multi(ms, 1, with_tlli := true, fn := ms.ul_tbf.start_time_fn);
f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn);
/* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */
@@ -538,7 +538,7 @@
/* Simulate a delay > 0 */
ms.ta := 2;
- /* We're in One-Phase Access contention resoultion, include TLLI */
+ /* We're in One-Phase Access contention resolution, include TLLI */
f_ms_tx_ul_data_block_multi(ms, 1, with_tlli := true, fn := ms.ul_tbf.start_time_fn);
f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn);
@@ -832,7 +832,7 @@
ms.lqual_cb := 0;
/* Send one UL block (with TLLI since we are in One-Phase Access
- contention resoultion) and make sure it is ACKED fine. */
+ contention resolution) and make sure it is ACKED fine. */
/* 16 bytes fills the llc block (because TLLI takes 4 bytes) */
/* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */
f_ms_tx_ul_data_block(ms, f_rnd_octstring(16), cv := 15, with_tlli := true, fn := ms.ul_tbf.start_time_fn)
@@ -916,7 +916,7 @@
f_ms_establish_ul_tbf(ms);
/* Send one UL block (with TLLI since we are in One-Phase Access
- contention resoultion) and make sure it is ACKED fine. */
+ contention resolution) and make sure it is ACKED fine. */
/* 16 bytes fills the llc block (because TLLI takes 4 bytes) */
/* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */
f_ms_tx_ul_data_block(ms, f_rnd_octstring(16), cv := 15, with_tlli := true, fn := ms.ul_tbf.start_time_fn)
@@ -988,7 +988,7 @@
f_ms_establish_ul_tbf(ms);
/* Send one UL block (with TLLI since we are in One-Phase Access
- contention resoultion) and make sure it is ACKED fine. */
+ contention resolution) and make sure it is ACKED fine. */
/* 16 bytes fills the llc block (because TLLI takes 4 bytes) */
/* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */
f_ms_tx_ul_data_block(ms, f_rnd_octstring(16), cv := 15, with_tlli := true, fn := ms.ul_tbf.start_time_fn)
@@ -2152,7 +2152,7 @@
f_ms_establish_ul_tbf(ms);
/* Send one UL block (with TLLI since we are in One-Phase Access
- contention resoultion) and make sure it is ACKED fine. */
+ contention resolution) and make sure it is ACKED fine. */
total_payload := f_rnd_octstring(f_ultbf_payload_fill_length(ms.ul_tbf, true));
/* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */
f_ms_tx_ul_data_block(ms, total_payload, cv := 15, with_tlli := true, fn := ms.ul_tbf.start_time_fn)
@@ -2203,7 +2203,7 @@
f_ms_establish_ul_tbf(ms);
/* Send one UL block (with TLLI since we are in One-Phase Access
- contention resoultion) and make sure it is ACKED fine. */
+ contention resolution) and make sure it is ACKED fine. */
payload := f_rnd_octstring(16); /* 16 bytes fills the llc block (because TLLI takes 4 bytes) */
blk_hdr := t_RLCMAC_LLCBLOCK_HDR(length_ind := lengthof(payload),
more := false, e := true);
@@ -2285,7 +2285,7 @@
block_len := f_rlcmac_cs_mcs2block_len(cs);
/* We need to send with TLLI since we are in One-Phase Access Contenion
- * resoultion), so that's -4 bytes of data, -3 for headers, -1 for LI
+ * resolution), so that's -4 bytes of data, -3 for headers, -1 for LI
* indicator, -1 for spare bits octet at the end */
max_valid_data_len := block_len - 4 - 3 - 1 - 1;
payload := f_rnd_octstring(max_valid_data_len + 1); /* +1 to write LLC data on last padding octet */
@@ -2371,7 +2371,7 @@
f_ms_establish_ul_tbf(ms);
/* Send one UL block (with TLLI since we are in One-Phase Access
- contention resoultion) and make sure it is ACKED fine */
+ contention resolution) and make sure it is ACKED fine */
f_ms_tx_ul_data_block_multi(ms, 1, with_tlli := true, fn := ms.ul_tbf.start_time_fn);
f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn);
/* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */
@@ -2581,7 +2581,7 @@
f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_UL_PACKET_ASS);
/* Send one UL block (with TLLI since we are in One-Phase Access
- contention resoultion) and make sure it is ACKED fine */
+ contention resolution) and make sure it is ACKED fine */
f_ms_tx_ul_data_block_multi(ms, 1, with_tlli := true);
f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn);
/* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */
@@ -2639,7 +2639,7 @@
tfi := ms.ul_tbf.tfi;
/* Send one UL block (with TLLI since we are in One-Phase Access
- contention resoultion) and make sure it is ACKED fine. */
+ contention resolution) and make sure it is ACKED fine. */
payload := f_rnd_octstring(f_ultbf_payload_fill_length(ms.ul_tbf, true)); /* 16 bytes fills the llc block (because TLLI takes 4 bytes) */
f_ms_tx_ul_data_block(ms, payload, cv := 15, with_tlli := true, fn := ms.ul_tbf.start_time_fn);
@@ -3154,7 +3154,7 @@
f_ms_establish_ul_tbf(ms);
/* Send one UL block (with TLLI since we are in One-Phase Access
- contention resoultion) and make sure it is ACKED fine */
+ contention resolution) and make sure it is ACKED fine */
f_ms_tx_ul_data_block(ms, data, with_tlli := true, fn := ms.ul_tbf.start_time_fn,
nr := f_ms_tx_TsTrxBtsNum(ms));
/* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */
@@ -3299,7 +3299,7 @@
f_ms_establish_ul_tbf(ms);
/* Send one UL block (with TLLI since we are in One-Phase Access
- contention resoultion) and make sure it is ACKED fine */
+ contention resolution) and make sure it is ACKED fine */
f_ms_tx_ul_data_block_multi(ms, 1, with_tlli := true, fn := ms.ul_tbf.start_time_fn);
/* UL block should be received in SGSN */
@@ -3386,7 +3386,7 @@
f_ms_establish_ul_tbf(ms);
/* Send one UL block (with TLLI since we are in One-Phase Access
- contention resoultion) and make sure it is ACKED fine */
+ contention resolution) and make sure it is ACKED fine */
f_ms_tx_ul_data_block_multi(ms, 1, with_tlli := true, fn := ms.ul_tbf.start_time_fn);
/* UL block should be received in SGSN */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29909
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I7a2419514582cb9efd8df126bf449711f78586fe
Gerrit-Change-Number: 29909
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
Hello osmith, Jenkins Builder, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29906
to look at the new patch set (#3).
Change subject: pcu: Introduce test TC_ul_tbf_finished_pkt_dl_ass_pch
......................................................................
pcu: Introduce test TC_ul_tbf_finished_pkt_dl_ass_pch
Related: OS#5700
Change-Id: Id99b048e7c305fe616bb54437313a1e45449ff57
---
M pcu/GPRS_Components.ttcn
M pcu/PCU_Tests.ttcn
M pcu/expected-results.xml
3 files changed, 63 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/29906/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29906
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Id99b048e7c305fe616bb54437313a1e45449ff57
Gerrit-Change-Number: 29906
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29905 )
Change subject: Delay ImmAss(PCH, PktDlAss) if waiting for PKT_CTRL_ACK answering UL_ACK_NACK (FinACK=1)
......................................................................
Patch Set 2: Code-Review+1
(2 comments)
File src/pdch.cpp:
https://gerrit.osmocom.org/c/osmo-pcu/+/29905/comment/ff284e0f_b7fe58c1
PS2, Line 388: something is wrong
should it log an error message in both if code paths then?
File src/tbf_fsm.c:
https://gerrit.osmocom.org/c/osmo-pcu/+/29905/comment/b6479671_c27a38d7
PS2, Line 265: thr
the
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29905
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I7a30db9cc7dae70e04054f1a4dba004bd1780d4a
Gerrit-Change-Number: 29905
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 28 Oct 2022 12:53:09 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29902 )
Change subject: pdch: Use helper function tbf_as_ul_tbf()
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29902
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ie2a0af7928578823e944b85781ce284722547661
Gerrit-Change-Number: 29902
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 28 Oct 2022 12:40:14 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29900 )
Change subject: use new {dl,ul}_tbf_as_tbf(_const) helper functions
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29900
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I223d9d5823c90ff31089420d35a7bf0fe1ebf870
Gerrit-Change-Number: 29900
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 28 Oct 2022 12:39:53 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment