February 2023 - gerrit-log - lists.osmocom.org

[L] Change in libosmocore[master]: Add libosmocore.map

by fixeria

Attention is currently required from: laforge, daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31173 ) Change subject: Add libosmocore.map ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I13169c00a59fb59513dfc598de5a71d094492422 Gerrit-Change-Number: 31173 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Feb 2023 19:07:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: TC_ho_in_fail_mgw_mdcx_timeout: fixup

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31439 ) Change subject: bsc: TC_ho_in_fail_mgw_mdcx_timeout: fixup ...................................................................... Patch Set 1: Code-Review+1 (2 comments) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31439/comment/1e460eac_72fd… PS1, Line 6352: DLXC s/DLXC/DLCX/ https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31439/comment/930e75e4_c49a… PS1, Line 6355: MGCP.receive(tr_MDCX); Just to confirm: are you sure these MGCP messages always being sent in this particular order? If not sure, then maybe use the interleave statement here. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31439 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: If47fa3e0204ce841c79a67dd78a1c53d04e4a586 Gerrit-Change-Number: 31439 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Feb 2023 19:04:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[L] Change in libosmo-gprs[master]: rlcmac: Use finished UL TBF to request a new one after Final UL ACK/NACK

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31446 to look at the new patch set (#2). Change subject: rlcmac: Use finished UL TBF to request a new one after Final UL ACK/NACK ...................................................................... rlcmac: Use finished UL TBF to request a new one after Final UL ACK/NACK Change-Id: I4eb873250f5ee7eafb5b6126382ce088091d0447 --- M include/osmocom/gprs/rlcmac/tbf_ul.h M include/osmocom/gprs/rlcmac/tbf_ul_ass_fsm.h M include/osmocom/gprs/rlcmac/tbf_ul_fsm.h M src/rlcmac/sched.c M src/rlcmac/tbf_ul.c M src/rlcmac/tbf_ul_ass_fsm.c M src/rlcmac/tbf_ul_fsm.c M tests/rlcmac/rlcmac_prim_test.c M tests/rlcmac/rlcmac_prim_test.err M tests/rlcmac/rlcmac_prim_test.ok 10 files changed, 289 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/46/31446/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I4eb873250f5ee7eafb5b6126382ce088091d0447 Gerrit-Change-Number: 31446 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

[S] Change in libosmo-gprs[master]: rlcmac: ul_tbf: Fix ul_state wrong check

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31448 ) Change subject: rlcmac: ul_tbf: Fix ul_state wrong check ...................................................................... rlcmac: ul_tbf: Fix ul_state wrong check This error was introduced when importing and rerwitting code from osmo-pcu.git. Fixes: 8c2734fa436c0e1a85be7a1b5a0c5131df99b190 Change-Id: Id4d7ad5fb393580a2e760513bb513ba968d2c1ef --- M src/rlcmac/tbf_ul.c M tests/rlcmac/rlcmac_prim_test.err 2 files changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/48/31448/1 diff --git a/src/rlcmac/tbf_ul.c b/src/rlcmac/tbf_ul.c index 0b62610..d5e4439 100644 --- a/src/rlcmac/tbf_ul.c +++ b/src/rlcmac/tbf_ul.c @@ -265,7 +265,7 @@ if (ack_desc->FINAL_ACK_INDICATION) { LOGPTBFUL(ul_tbf, LOGL_DEBUG, "Final ACK received.\n"); rc = gprs_rlcmac_ul_tbf_handle_final_ack(ul_tbf, dl_block); - } else if (gprs_rlcmac_tbf_ul_state(ul_tbf) && + } else if (gprs_rlcmac_tbf_ul_state(ul_tbf) == GPRS_RLCMAC_TBF_UL_ST_FINISHED && gprs_rlcmac_rlc_ul_window_window_empty(ul_tbf->ulw)) { LOGPTBFUL(ul_tbf, LOGL_NOTICE, "Received acknowledge of all blocks, but without final ack indication (don't worry)\n"); diff --git a/tests/rlcmac/rlcmac_prim_test.err b/tests/rlcmac/rlcmac_prim_test.err index e84461f..5e78c2b 100644 --- a/tests/rlcmac/rlcmac_prim_test.err +++ b/tests/rlcmac/rlcmac_prim_test.err @@ -420,7 +420,6 @@ DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) V(B): (V(A)=1)""(V(S)-1=0) A=Acked N=Nacked U=Unacked X=Resend-Unacked I=Invalid DLGLOBAL INFO UL_TBF{FLOW}: Received Event CONTENTION_RESOLUTION_SUCCESS DLGLOBAL INFO UL_TBF{FLOW}: Contention resolution succeeded, stop T3166 -DLGLOBAL NOTICE TBF(UL:NR-0:TLLI-00002342) Received acknowledge of all blocks, but without final ack indication (don't worry) DLGLOBAL INFO Rx from lower layers: L1CTL-PDCH_RTS.indication DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Sending new block at BSN 1, CS=CS-2 DLGLOBAL DEBUG -- Chunk with length 7 is less than remaining space (30): add length header to delimit LLC frame -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Id4d7ad5fb393580a2e760513bb513ba968d2c1ef Gerrit-Change-Number: 31448 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: ul_tbf_fsm: rework Rx UL ACK/NACK fsm events

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31449 ) Change subject: rlcmac: ul_tbf_fsm: rework Rx UL ACK/NACK fsm events ...................................................................... rlcmac: ul_tbf_fsm: rework Rx UL ACK/NACK fsm events We'll need to get one event for each Pkt UL ACK/NACK the UL TBF receives in order to implement T3182 properly in a follow-up patch, hence rework the events sent to the FSM (merge events about Final ACK and Contention Resolution in one generic UL ACK/NACK event with some data parameters). Change-Id: I4420abd69a318bd93fde73a67239456466071497 --- M include/osmocom/gprs/rlcmac/tbf_ul_fsm.h M src/rlcmac/tbf_ul.c M src/rlcmac/tbf_ul_fsm.c M tests/rlcmac/rlcmac_prim_test.err 4 files changed, 60 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/49/31449/1 diff --git a/include/osmocom/gprs/rlcmac/tbf_ul_fsm.h b/include/osmocom/gprs/rlcmac/tbf_ul_fsm.h index cfdb677..b1f82e3 100644 --- a/include/osmocom/gprs/rlcmac/tbf_ul_fsm.h +++ b/include/osmocom/gprs/rlcmac/tbf_ul_fsm.h @@ -36,9 +36,13 @@ GPRS_RLCMAC_TBF_UL_EV_UL_ASS_COMPL, GPRS_RLCMAC_TBF_UL_EV_FIRST_UL_DATA_SENT, GPRS_RLCMAC_TBF_UL_EV_N3104_MAX, - GPRS_RLCMAC_TBF_UL_EV_CONTENTION_RESOLUTION_SUCCESS, + GPRS_RLCMAC_TBF_UL_EV_RX_UL_ACK_NACK, /* data: struct tbf_ul_ass_ev_rx_ul_ack_nack* */ GPRS_RLCMAC_TBF_UL_EV_LAST_UL_DATA_SENT, - GPRS_RLCMAC_TBF_UL_EV_FINAL_ACK_RECVD, /* data: bool TBF_EST */ +}; + +struct tbf_ul_ass_ev_rx_ul_ack_nack { + bool final_ack; + bool tbf_est; }; int gprs_rlcmac_tbf_ul_fsm_init(void); diff --git a/src/rlcmac/tbf_ul.c b/src/rlcmac/tbf_ul.c index d5e4439..fbef343 100644 --- a/src/rlcmac/tbf_ul.c +++ b/src/rlcmac/tbf_ul.c @@ -212,25 +212,6 @@ return 0; } -int gprs_rlcmac_ul_tbf_handle_final_ack(struct gprs_rlcmac_ul_tbf *ul_tbf, const RlcMacDownlink_t *dl_block) -{ - int rc = 0; - bool tbf_est = false; - const PU_AckNack_GPRS_t *ack_gprs = &dl_block->u.Packet_Uplink_Ack_Nack.u.PU_AckNack_GPRS_Struct; - - if (ack_gprs->Exist_AdditionsR99) - tbf_est = ack_gprs->AdditionsR99.TBF_EST; - - osmo_fsm_inst_dispatch(ul_tbf->state_fsm.fi, GPRS_RLCMAC_TBF_UL_EV_FINAL_ACK_RECVD, &tbf_est); - - /* range V(A)..V(S)-1 */ - //received = gprs_rlcmac_rlc_ul_window_count_unacked(ul_tbf->ulw); - /* report all outstanding packets as received */ - //gprs_rlcmac_received_lost(this, received, 0); - gprs_rlcmac_rlc_ul_window_reset(ul_tbf->ulw); - return rc; -} - int gprs_rlcmac_ul_tbf_handle_pkt_ul_ack_nack(struct gprs_rlcmac_ul_tbf *ul_tbf, const RlcMacDownlink_t *dl_block) { @@ -247,6 +228,10 @@ .cur_bit = 0, }; int rc; + struct tbf_ul_ass_ev_rx_ul_ack_nack ev_ack = { + .final_ack = ack_desc->FINAL_ACK_INDICATION, + .tbf_est = (gprs->Exist_AdditionsR99 && gprs->AdditionsR99.TBF_EST), + }; num_blocks = gprs_rlcmac_decode_gprs_acknack_bits( ack_desc, &bits, &bsn_begin, &bsn_end, ul_tbf->ulw); @@ -259,12 +244,10 @@ rc = gprs_rlcmac_ul_tbf_update_window(ul_tbf, bsn_begin, &bits); - if (gprs_rlcmac_ul_tbf_in_contention_resolution(ul_tbf)) - osmo_fsm_inst_dispatch(ul_tbf->state_fsm.fi, GPRS_RLCMAC_TBF_UL_EV_CONTENTION_RESOLUTION_SUCCESS, NULL); + osmo_fsm_inst_dispatch(ul_tbf->state_fsm.fi, GPRS_RLCMAC_TBF_UL_EV_RX_UL_ACK_NACK, &ev_ack); if (ack_desc->FINAL_ACK_INDICATION) { - LOGPTBFUL(ul_tbf, LOGL_DEBUG, "Final ACK received.\n"); - rc = gprs_rlcmac_ul_tbf_handle_final_ack(ul_tbf, dl_block); + gprs_rlcmac_rlc_ul_window_reset(ul_tbf->ulw); } else if (gprs_rlcmac_tbf_ul_state(ul_tbf) == GPRS_RLCMAC_TBF_UL_ST_FINISHED && gprs_rlcmac_rlc_ul_window_window_empty(ul_tbf->ulw)) { LOGPTBFUL(ul_tbf, LOGL_NOTICE, diff --git a/src/rlcmac/tbf_ul_fsm.c b/src/rlcmac/tbf_ul_fsm.c index cb7df60..617ed2e 100644 --- a/src/rlcmac/tbf_ul_fsm.c +++ b/src/rlcmac/tbf_ul_fsm.c @@ -35,9 +35,8 @@ { GPRS_RLCMAC_TBF_UL_EV_UL_ASS_COMPL, "UL_ASS_COMPL" }, { GPRS_RLCMAC_TBF_UL_EV_FIRST_UL_DATA_SENT, "FIRST_UL_DATA_SENT" }, { GPRS_RLCMAC_TBF_UL_EV_N3104_MAX, "N3104_MAX" }, - { GPRS_RLCMAC_TBF_UL_EV_CONTENTION_RESOLUTION_SUCCESS, "CONTENTION_RESOLUTION_SUCCESS" }, + { GPRS_RLCMAC_TBF_UL_EV_RX_UL_ACK_NACK, "RX_UL_ACK_NACK" }, { GPRS_RLCMAC_TBF_UL_EV_LAST_UL_DATA_SENT, "LAST_UL_DATA_SENT" }, - { GPRS_RLCMAC_TBF_UL_EV_FINAL_ACK_RECVD, "FINAL_ACK_RECVD" }, { 0, NULL } }; @@ -153,12 +152,16 @@ case GPRS_RLCMAC_TBF_UL_EV_N3104_MAX: reinit_pkt_acces_procedure(ctx); break; - case GPRS_RLCMAC_TBF_UL_EV_CONTENTION_RESOLUTION_SUCCESS: - LOGPFSML(ctx->fi, LOGL_INFO, "Contention resolution succeeded, stop T3166\n"); - OSMO_ASSERT(ctx->ul_tbf->ul_ass_fsm.ass_type == GPRS_RLCMAC_TBF_UL_ASS_TYPE_1PHASE); - OSMO_ASSERT(fi->T == 3166); - osmo_timer_del(&fi->timer); - fi->T = 0; + case GPRS_RLCMAC_TBF_UL_EV_RX_UL_ACK_NACK: + if (gprs_rlcmac_ul_tbf_in_contention_resolution(ctx->ul_tbf)) { + LOGPFSML(ctx->fi, LOGL_INFO, "Contention resolution succeeded, stop T3166\n"); + OSMO_ASSERT(ctx->ul_tbf->ul_ass_fsm.ass_type == GPRS_RLCMAC_TBF_UL_ASS_TYPE_1PHASE); + OSMO_ASSERT(fi->T == 3166); + osmo_timer_del(&fi->timer); + fi->T = 0; + } + /* It's impossible we receive a correct final_ack here, since we didn't + * sent last data (FSM would be in FINISHED state then) */ break; case GPRS_RLCMAC_TBF_UL_EV_LAST_UL_DATA_SENT: tbf_ul_fsm_state_chg(fi, GPRS_RLCMAC_TBF_UL_ST_FINISHED); @@ -171,16 +174,25 @@ static void st_finished(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gprs_rlcmac_tbf_ul_fsm_ctx *ctx = (struct gprs_rlcmac_tbf_ul_fsm_ctx *)fi->priv; + struct tbf_ul_ass_ev_rx_ul_ack_nack *ctx_ul_ack_nack; switch (event) { case GPRS_RLCMAC_TBF_UL_EV_N3104_MAX: reinit_pkt_acces_procedure(ctx); break; - case GPRS_RLCMAC_TBF_UL_EV_CONTENTION_RESOLUTION_SUCCESS: - LOGPFSML(ctx->fi, LOGL_INFO, "Contention resolution succeeded, stop T3166\n"); - OSMO_ASSERT(ctx->ul_tbf->ul_ass_fsm.ass_type == GPRS_RLCMAC_TBF_UL_ASS_TYPE_1PHASE); - OSMO_ASSERT(fi->T == 3166); - osmo_timer_del(&fi->timer); - fi->T = 0; + case GPRS_RLCMAC_TBF_UL_EV_RX_UL_ACK_NACK: + ctx_ul_ack_nack = (struct tbf_ul_ass_ev_rx_ul_ack_nack *)data; + if (gprs_rlcmac_ul_tbf_in_contention_resolution(ctx->ul_tbf)) { + LOGPFSML(ctx->fi, LOGL_INFO, "Contention resolution succeeded, stop T3166\n"); + OSMO_ASSERT(ctx->ul_tbf->ul_ass_fsm.ass_type == GPRS_RLCMAC_TBF_UL_ASS_TYPE_1PHASE); + OSMO_ASSERT(fi->T == 3166); + osmo_timer_del(&fi->timer); + fi->T = 0; + } + if (ctx_ul_ack_nack->final_ack) { + LOGPFSML(ctx->fi, LOGL_DEBUG, "Final ACK received\n"); + ctx->rx_final_pkt_ul_ack_nack_has_tbf_est = ctx_ul_ack_nack->tbf_est; + tbf_ul_fsm_state_chg(fi, GPRS_RLCMAC_TBF_UL_ST_RELEASING); + } break; case GPRS_RLCMAC_TBF_UL_EV_LAST_UL_DATA_SENT: /* If LAST_UL_DATA_SENT is received in this state, it means the @@ -195,10 +207,6 @@ gprs_rlcmac_ul_tbf_free(ctx->ul_tbf); } break; - case GPRS_RLCMAC_TBF_UL_EV_FINAL_ACK_RECVD: - ctx->rx_final_pkt_ul_ack_nack_has_tbf_est = *((bool *)data); - tbf_ul_fsm_state_chg(fi, GPRS_RLCMAC_TBF_UL_ST_RELEASING); - break; default: OSMO_ASSERT(0); } @@ -236,7 +244,7 @@ .in_event_mask = X(GPRS_RLCMAC_TBF_UL_EV_FIRST_UL_DATA_SENT) | X(GPRS_RLCMAC_TBF_UL_EV_N3104_MAX) | - X(GPRS_RLCMAC_TBF_UL_EV_CONTENTION_RESOLUTION_SUCCESS) | + X(GPRS_RLCMAC_TBF_UL_EV_RX_UL_ACK_NACK) | X(GPRS_RLCMAC_TBF_UL_EV_LAST_UL_DATA_SENT), .out_state_mask = X(GPRS_RLCMAC_TBF_UL_ST_NEW) | @@ -247,9 +255,8 @@ [GPRS_RLCMAC_TBF_UL_ST_FINISHED] = { .in_event_mask = X(GPRS_RLCMAC_TBF_UL_EV_N3104_MAX) | - X(GPRS_RLCMAC_TBF_UL_EV_CONTENTION_RESOLUTION_SUCCESS) | - X(GPRS_RLCMAC_TBF_UL_EV_LAST_UL_DATA_SENT) | - X(GPRS_RLCMAC_TBF_UL_EV_FINAL_ACK_RECVD), + X(GPRS_RLCMAC_TBF_UL_EV_RX_UL_ACK_NACK) | + X(GPRS_RLCMAC_TBF_UL_EV_LAST_UL_DATA_SENT), .out_state_mask = X(GPRS_RLCMAC_TBF_UL_ST_NEW) | X(GPRS_RLCMAC_TBF_UL_ST_RELEASING), diff --git a/tests/rlcmac/rlcmac_prim_test.err b/tests/rlcmac/rlcmac_prim_test.err index 5e78c2b..885e29b 100644 --- a/tests/rlcmac/rlcmac_prim_test.err +++ b/tests/rlcmac/rlcmac_prim_test.err @@ -49,10 +49,9 @@ DLGLOBAL DEBUG - got ack for BSN=0 DLGLOBAL DEBUG - got ack for BSN=1 DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) V(B): (V(A)=2)""(V(S)-1=1) A=Acked N=Nacked U=Unacked X=Resend-Unacked I=Invalid -DLGLOBAL INFO UL_TBF{FINISHED}: Received Event CONTENTION_RESOLUTION_SUCCESS +DLGLOBAL INFO UL_TBF{FINISHED}: Received Event RX_UL_ACK_NACK DLGLOBAL INFO UL_TBF{FINISHED}: Contention resolution succeeded, stop T3166 -DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Final ACK received. -DLGLOBAL INFO UL_TBF{FINISHED}: Received Event FINAL_ACK_RECVD +DLGLOBAL DEBUG UL_TBF{FINISHED}: Final ACK received DLGLOBAL INFO UL_TBF{FINISHED}: state_chg to RELEASING DLGLOBAL DEBUG Register POLL (TS=7 FN=21, reason=UL_ACK) DLGLOBAL INFO Rx from lower layers: L1CTL-PDCH_RTS.indication @@ -418,7 +417,7 @@ DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) ack: (BSN=0)"R"(BSN=0) R=ACK I=NACK DLGLOBAL DEBUG - got ack for BSN=0 DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) V(B): (V(A)=1)""(V(S)-1=0) A=Acked N=Nacked U=Unacked X=Resend-Unacked I=Invalid -DLGLOBAL INFO UL_TBF{FLOW}: Received Event CONTENTION_RESOLUTION_SUCCESS +DLGLOBAL INFO UL_TBF{FLOW}: Received Event RX_UL_ACK_NACK DLGLOBAL INFO UL_TBF{FLOW}: Contention resolution succeeded, stop T3166 DLGLOBAL INFO Rx from lower layers: L1CTL-PDCH_RTS.indication DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Sending new block at BSN 1, CS=CS-2 @@ -512,10 +511,9 @@ DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) ack: (BSN=0)"R"(BSN=0) R=ACK I=NACK DLGLOBAL DEBUG - got ack for BSN=0 DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) V(B): (V(A)=1)""(V(S)-1=0) A=Acked N=Nacked U=Unacked X=Resend-Unacked I=Invalid -DLGLOBAL INFO UL_TBF{FINISHED}: Received Event CONTENTION_RESOLUTION_SUCCESS +DLGLOBAL INFO UL_TBF{FINISHED}: Received Event RX_UL_ACK_NACK DLGLOBAL INFO UL_TBF{FINISHED}: Contention resolution succeeded, stop T3166 -DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Final ACK received. -DLGLOBAL INFO UL_TBF{FINISHED}: Received Event FINAL_ACK_RECVD +DLGLOBAL DEBUG UL_TBF{FINISHED}: Final ACK received DLGLOBAL INFO UL_TBF{FINISHED}: state_chg to RELEASING DLGLOBAL DEBUG Register POLL (TS=7 FN=17, reason=UL_ACK) DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I4420abd69a318bd93fde73a67239456466071497 Gerrit-Change-Number: 31449 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: Implement T3182

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31450 ) Change subject: rlcmac: Implement T3182 ...................................................................... rlcmac: Implement T3182 Related: OS#550 Change-Id: I4fe9523af1b53c826ccfdd8700bab2a9e1413662 --- M src/rlcmac/rlcmac.c M src/rlcmac/tbf_ul_fsm.c M tests/rlcmac/rlcmac_prim_test.c M tests/rlcmac/rlcmac_prim_test.err M tests/rlcmac/rlcmac_prim_test.ok 5 files changed, 171 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/50/31450/1 diff --git a/src/rlcmac/rlcmac.c b/src/rlcmac/rlcmac.c index 46addeb..4023586 100644 --- a/src/rlcmac/rlcmac.c +++ b/src/rlcmac/rlcmac.c @@ -48,6 +48,7 @@ { .T=3166, .default_val=5, .unit = OSMO_TDEF_S, .desc="Wait for Packet Uplink ACK/NACK after sending of first data block (s)" }, /* T3168: dynamically updated with what's received in BCCH SI13 */ { .T=3168, .default_val=5000, .unit = OSMO_TDEF_MS, .desc="Wait for PACKET UPLINK ASSIGNMENT (updated by BCCH SI13) (ms)" }, + { .T=3182, .default_val=5, .unit = OSMO_TDEF_S, .desc="Wait for Acknowledgement (s)" }, { 0 } /* empty item at the end */ }; diff --git a/src/rlcmac/tbf_ul_fsm.c b/src/rlcmac/tbf_ul_fsm.c index 617ed2e..e49e6dc 100644 --- a/src/rlcmac/tbf_ul_fsm.c +++ b/src/rlcmac/tbf_ul_fsm.c @@ -91,6 +91,27 @@ gprs_rlcmac_ul_tbf_free(ctx->ul_tbf); } +/* 9.3.3.3.2: Upon each retransmission of the last block with CV=0, the mobile station shall restart timer T3182 for the TBF. +* Slight impl deviation from spec: If tbf is still in contention resolution, keep using T3166, otherwise start T3182 +*/ +static void arm_T3182_if_needed(struct gprs_rlcmac_tbf_ul_fsm_ctx *ctx) +{ + struct osmo_fsm_inst *fi = ctx->fi; + unsigned long val_sec; + + if (gprs_rlcmac_ul_tbf_in_contention_resolution(ctx->ul_tbf)) { + OSMO_ASSERT(fi->T == 3166); + OSMO_ASSERT(osmo_timer_pending(&fi->timer)); + } else { + OSMO_ASSERT(!osmo_timer_pending(&fi->timer) || + (osmo_timer_pending(&fi->timer) && fi->T == 3182)); + LOGPFSML(ctx->fi, LOGL_INFO, "Last UL block sent (CV=0), start T3182\n"); + fi->T = 3182; + val_sec = osmo_tdef_get(g_ctx->T_defs, fi->T, OSMO_TDEF_S, -1); + osmo_timer_schedule(&fi->timer, val_sec, 0); + } +} + /* This one is triggered when packet access procedure fails, which can happen * either in WAIT_IMM_ASS (ImmAss timeout), FLOW (T3164) or FINISHED (T3164, T3166) */ static void st_new_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) @@ -164,6 +185,7 @@ * sent last data (FSM would be in FINISHED state then) */ break; case GPRS_RLCMAC_TBF_UL_EV_LAST_UL_DATA_SENT: + arm_T3182_if_needed(ctx); tbf_ul_fsm_state_chg(fi, GPRS_RLCMAC_TBF_UL_ST_FINISHED); break; default: @@ -187,6 +209,14 @@ OSMO_ASSERT(fi->T == 3166); osmo_timer_del(&fi->timer); fi->T = 0; + } else if (fi->T == 3182 && osmo_timer_pending(&fi->timer)) { + /* 9.3.3.3.2 "Upon reception of a PACKET UPLINK ACK/NACK message for this TBF + * the mobile station shall stop timer T3182 for the TBF". + * In our case we only use T3128 once we are out of contention resolution (T3166) + */ + LOGPFSML(ctx->fi, LOGL_DEBUG, "Rx Pkt UL ACK/NACK, stop T3182\n"); + osmo_timer_del(&fi->timer); + fi->T = 0; } if (ctx_ul_ack_nack->final_ack) { LOGPFSML(ctx->fi, LOGL_DEBUG, "Final ACK received\n"); @@ -201,6 +231,7 @@ */ ctx->last_data_block_retrans_attempts++; LOGPFSML(ctx->fi, LOGL_INFO, "Data block with CV=0 retransmit attempts=%u\n", ctx->last_data_block_retrans_attempts); + arm_T3182_if_needed(ctx); if (ctx->last_data_block_retrans_attempts == 4) { LOGPFSML(ctx->fi, LOGL_NOTICE, "TBF establishment failure (Data block with CV=0 retransmit attempts=%u)\n", ctx->last_data_block_retrans_attempts); @@ -306,6 +337,9 @@ } reinit_pkt_acces_procedure(ctx); break; + case 3182: + gprs_rlcmac_ul_tbf_free(ctx->ul_tbf); + break; default: OSMO_ASSERT(0); } diff --git a/tests/rlcmac/rlcmac_prim_test.c b/tests/rlcmac/rlcmac_prim_test.c index 96cc6d9..02ee04c 100644 --- a/tests/rlcmac/rlcmac_prim_test.c +++ b/tests/rlcmac/rlcmac_prim_test.c @@ -709,6 +709,61 @@ cleanup_test(); } +static void test_ul_tbf_t3182_timeout(void) +{ + struct osmo_gprs_rlcmac_prim *rlcmac_prim; + int rc; + + printf("=== %s start ===\n", __func__); + prepare_test(); + uint32_t tlli = 0x2342; + uint8_t ul_tfi = 0; + uint8_t ts_nr = 7; + uint8_t usf = 0; + uint32_t rts_fn = 4; + RlcMacDownlink_t dl_block; + Ack_Nack_Description_t *ack_desc = &dl_block.u.Packet_Uplink_Ack_Nack.u.PU_AckNack_GPRS_Struct.Ack_Nack_Description; + + /* Submit 14 bytes to fit in 1 RLCMAC block to shorten test and end up in FINISHED state quickly: */ + rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_grr_unitdata_req(tlli, pdu_llc_gmm_att_req, + sizeof(pdu_llc_gmm_att_req)); + rlcmac_prim->grr.unitdata_req.sapi = OSMO_GPRS_RLCMAC_LLC_SAPI_GMM; + rc = osmo_gprs_rlcmac_prim_upper_down(rlcmac_prim); + + ccch_imm_ass_pkt_ul_tbf_normal[7] = last_rach_req_ra; /* Update RA to match */ + rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_ccch_data_ind(0, ccch_imm_ass_pkt_ul_tbf_normal); + rc = osmo_gprs_rlcmac_prim_lower_up(rlcmac_prim); + OSMO_ASSERT(rc == 0); + + /* Trigger transmission of LLC data (GMM Attach) (first part) */ + rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_rts_ind(ts_nr, rts_fn, usf); + rc = osmo_gprs_rlcmac_prim_lower_up(rlcmac_prim); + OSMO_ASSERT(rc == 0); + + /* PCU acks it: */ + ul_ack_nack_init(&dl_block, ul_tfi, GPRS_RLCMAC_CS_2); + ack_desc->STARTING_SEQUENCE_NUMBER = 1; + ack_desc->FINAL_ACK_INDICATION = 0; + ul_ack_nack_mark(ack_desc, 0, true); + rlcmac_prim = create_dl_ctrl_block(&dl_block, ts_nr, rts_fn); + rc = osmo_gprs_rlcmac_prim_lower_up(rlcmac_prim); + OSMO_ASSERT(rc == 0); + + /* Trigger transmission of LLC data (GMM Attach) (second part, CV=0) */ + rts_fn = fn_next_block(rts_fn); + rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_rts_ind(ts_nr, rts_fn, usf); + rc = osmo_gprs_rlcmac_prim_lower_up(rlcmac_prim); + OSMO_ASSERT(rc == 0); + + /* increase time 5 seconds, timeout should trigger */ + clock_override_add(5, 0); + clock_debug("Expect T3182 timeout"); + osmo_select_main(0); + + printf("=== %s end ===\n", __func__); + cleanup_test(); +} + /* 9.3.3.3.2: The block with CV=0 shall not be retransmitted more than four times. */ static void test_ul_tbf_last_data_cv0_retrans_max(void) { @@ -840,6 +895,7 @@ test_ul_tbf_t3164_timeout(); test_ul_tbf_t3166_timeout(); test_ul_tbf_n3104_timeout(); + test_ul_tbf_t3182_timeout(); test_ul_tbf_last_data_cv0_retrans_max(); test_ul_tbf_request_another_ul_tbf(); test_dl_tbf_ccch_assign(); diff --git a/tests/rlcmac/rlcmac_prim_test.err b/tests/rlcmac/rlcmac_prim_test.err index 885e29b..5946e0a 100644 --- a/tests/rlcmac/rlcmac_prim_test.err +++ b/tests/rlcmac/rlcmac_prim_test.err @@ -430,6 +430,62 @@ DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Copying data unit 0 (BSN 1) DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) msg block (BSN 1, CS-2): 00 00 02 1d 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 DLGLOBAL INFO UL_TBF{FLOW}: Received Event LAST_UL_DATA_SENT +DLGLOBAL INFO UL_TBF{FLOW}: Last UL block sent (CV=0), start T3182 +DLGLOBAL INFO UL_TBF{FLOW}: state_chg to FINISHED +DLGLOBAL INFO UL_TBF{FINISHED}: Timeout of T3182 +DLGLOBAL INFO UL_TBF_ASS{IDLE}: Deallocated +DLGLOBAL INFO UL_TBF{FINISHED}: Deallocated +DLGLOBAL INFO Rx from upper layers: GRR-UNITDATA.request +DLGLOBAL INFO TLLI=0x00002342 not found, creating entity on the fly +DLGLOBAL INFO UL_TBF{NEW}: Allocated +DLGLOBAL INFO UL_TBF_ASS{IDLE}: Allocated +DLGLOBAL INFO UL_TBF_ASS{IDLE}: Received Event START +DLGLOBAL INFO UL_TBF{NEW}: Received Event UL_ASS_START +DLGLOBAL INFO UL_TBF{NEW}: state_chg to ASSIGN +DLGLOBAL INFO UL_TBF_ASS{IDLE}: Send RACH.req ra=0x7b +DLGLOBAL INFO UL_TBF_ASS{IDLE}: state_chg to WAIT_CCCH_IMM_ASS +DLGLOBAL INFO Rx from lower layers: L1CTL-CCCH_DATA.indication +DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: Received Event RX_CCCH_IMM_ASS +DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: ImmAss initial CS=CS-2 +DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: ImmAss DynamicAlloc (1phase access) ts_nr=7 usf=0 +DLGLOBAL INFO UL_TBF_ASS{WAIT_CCCH_IMM_ASS}: state_chg to COMPLETED +DLGLOBAL INFO UL_TBF{ASSIGN}: Received Event UL_ASS_COMPL +DLGLOBAL INFO UL_TBF{ASSIGN}: Send L1CTL-CF_UL_TBF.req ul_slotmask=0x80 +DLGLOBAL INFO UL_TBF{ASSIGN}: state_chg to FLOW +DLGLOBAL INFO UL_TBF_ASS{COMPLETED}: state_chg to IDLE +DLGLOBAL INFO Rx from lower layers: L1CTL-PDCH_RTS.indication +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Sending new block at BSN 0, CS=CS-2 +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Dequeue next LLC (len=33) +DLGLOBAL DEBUG -- Chunk with length 33 larger than space (26) left in block: copy only remaining space, and we are done +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) data block (BSN 0, CS-2): 00 00 23 42 01 c0 00 08 01 01 d5 71 00 00 08 29 26 24 00 00 00 00 71 62 f2 24 6c 84 44 04 +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) need_padding 0 spb_status 0 spb 0 (BSN1 0 BSN2 -1) +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Copying 1 RLC blocks, 1 BSNs +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Copying data unit 0 (BSN 0) +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) msg block (BSN 0, CS-2): 3c 00 01 00 00 23 42 01 c0 00 08 01 01 d5 71 00 00 08 29 26 24 00 00 00 00 71 62 f2 24 6c 84 44 04 00 +DLGLOBAL INFO UL_TBF{FLOW}: Received Event FIRST_UL_DATA_SENT +DLGLOBAL INFO UL_TBF{FLOW}: First UL block sent, stop T3164 +DLGLOBAL INFO UL_TBF{FLOW}: First UL block sent (1 phase access), start T3166 +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) N3104 inc (1) +DLGLOBAL INFO Rx from lower layers: L1CTL-PDCH_DATA.indication +DLGLOBAL INFO TS=7 FN=4 Rx Pkt UL ACK/NACK +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Got GPRS UL ACK bitmap: SSN: 1, BSN 0 to 1 - 1 (1 blocks), "R" +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) ack: (BSN=0)"R"(BSN=0) R=ACK I=NACK +DLGLOBAL DEBUG - got ack for BSN=0 +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) V(B): (V(A)=1)""(V(S)-1=0) A=Acked N=Nacked U=Unacked X=Resend-Unacked I=Invalid +DLGLOBAL INFO UL_TBF{FLOW}: Received Event RX_UL_ACK_NACK +DLGLOBAL INFO UL_TBF{FLOW}: Contention resolution succeeded, stop T3166 +DLGLOBAL INFO Rx from lower layers: L1CTL-PDCH_RTS.indication +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Sending new block at BSN 1, CS=CS-2 +DLGLOBAL DEBUG -- Chunk with length 7 is less than remaining space (30): add length header to delimit LLC frame +DLGLOBAL DEBUG -- Final block, so we done. +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Complete UL frame, len=0 +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) data block (BSN 1, CS-2): 1d 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) need_padding 0 spb_status 0 spb 0 (BSN1 1 BSN2 -1) +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Copying 1 RLC blocks, 1 BSNs +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Copying data unit 0 (BSN 1) +DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) msg block (BSN 1, CS-2): 00 00 02 1d 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 +DLGLOBAL INFO UL_TBF{FLOW}: Received Event LAST_UL_DATA_SENT +DLGLOBAL INFO UL_TBF{FLOW}: Last UL block sent (CV=0), start T3182 DLGLOBAL INFO UL_TBF{FLOW}: state_chg to FINISHED DLGLOBAL INFO Rx from lower layers: L1CTL-PDCH_RTS.indication DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Restarting at BSN 1, because all blocks have been transmitted. @@ -440,6 +496,7 @@ DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) msg block (BSN 1, CS-2): 00 00 02 1d 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 DLGLOBAL INFO UL_TBF{FINISHED}: Received Event LAST_UL_DATA_SENT DLGLOBAL INFO UL_TBF{FINISHED}: Data block with CV=0 retransmit attempts=1 +DLGLOBAL INFO UL_TBF{FINISHED}: Last UL block sent (CV=0), start T3182 DLGLOBAL INFO Rx from lower layers: L1CTL-PDCH_RTS.indication DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Restarting at BSN 1, because all blocks have been transmitted. DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Resending BSN 1 @@ -449,6 +506,7 @@ DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) msg block (BSN 1, CS-2): 00 00 02 1d 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 DLGLOBAL INFO UL_TBF{FINISHED}: Received Event LAST_UL_DATA_SENT DLGLOBAL INFO UL_TBF{FINISHED}: Data block with CV=0 retransmit attempts=2 +DLGLOBAL INFO UL_TBF{FINISHED}: Last UL block sent (CV=0), start T3182 DLGLOBAL INFO Rx from lower layers: L1CTL-PDCH_RTS.indication DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Restarting at BSN 1, because all blocks have been transmitted. DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Resending BSN 1 @@ -458,6 +516,7 @@ DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) msg block (BSN 1, CS-2): 00 00 02 1d 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 DLGLOBAL INFO UL_TBF{FINISHED}: Received Event LAST_UL_DATA_SENT DLGLOBAL INFO UL_TBF{FINISHED}: Data block with CV=0 retransmit attempts=3 +DLGLOBAL INFO UL_TBF{FINISHED}: Last UL block sent (CV=0), start T3182 DLGLOBAL INFO Rx from lower layers: L1CTL-PDCH_RTS.indication DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Restarting at BSN 1, because all blocks have been transmitted. DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) Resending BSN 1 @@ -467,6 +526,7 @@ DLGLOBAL DEBUG TBF(UL:NR-0:TLLI-00002342) msg block (BSN 1, CS-2): 00 00 02 1d 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 DLGLOBAL INFO UL_TBF{FINISHED}: Received Event LAST_UL_DATA_SENT DLGLOBAL INFO UL_TBF{FINISHED}: Data block with CV=0 retransmit attempts=4 +DLGLOBAL INFO UL_TBF{FINISHED}: Last UL block sent (CV=0), start T3182 DLGLOBAL NOTICE UL_TBF{FINISHED}: TBF establishment failure (Data block with CV=0 retransmit attempts=4) DLGLOBAL INFO UL_TBF_ASS{IDLE}: Deallocated DLGLOBAL INFO UL_TBF{FINISHED}: Deallocated diff --git a/tests/rlcmac/rlcmac_prim_test.ok b/tests/rlcmac/rlcmac_prim_test.ok index fdd570f..9e913ed 100644 --- a/tests/rlcmac/rlcmac_prim_test.ok +++ b/tests/rlcmac/rlcmac_prim_test.ok @@ -80,12 +80,21 @@ test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=43 ts=7 data_len=34 data=[3c 00 01 00 00 23 42 01 c0 00 08 01 01 d5 71 00 00 08 29 26 24 00 00 00 00 71 62 f2 24 6c 84 44 04 00 ] test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x80 === test_ul_tbf_n3104_timeout end === -=== test_ul_tbf_last_data_cv0_retrans_max start === +=== test_ul_tbf_t3182_timeout start === sys={0.000000}, mono={0.000000}: clock_override_set test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7a test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x80 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=4 ts=7 data_len=34 data=[3c 00 01 00 00 23 42 01 c0 00 08 01 01 d5 71 00 00 08 29 26 24 00 00 00 00 71 62 f2 24 6c 84 44 04 00 ] test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=8 ts=7 data_len=34 data=[00 00 02 1d 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 ] +sys={5.000000}, mono={5.000000}: clock_override_add +sys={5.000000}, mono={5.000000}: Expect T3182 timeout +=== test_ul_tbf_t3182_timeout end === +=== test_ul_tbf_last_data_cv0_retrans_max start === +sys={0.000000}, mono={0.000000}: clock_override_set +test_rlcmac_prim_down_cb(): Rx L1CTL-RACH.request ra=0x7b +test_rlcmac_prim_down_cb(): Rx L1CTL-CFG_UL_TBF.request ul_tbf_nr=0 ul_slotmask=0x80 +test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=4 ts=7 data_len=34 data=[3c 00 01 00 00 23 42 01 c0 00 08 01 01 d5 71 00 00 08 29 26 24 00 00 00 00 71 62 f2 24 6c 84 44 04 00 ] +test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=8 ts=7 data_len=34 data=[00 00 02 1d 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 ] RTS 0: FN=13 test_rlcmac_prim_down_cb(): Rx L1CTL-PDCH_DATA.request fn=13 ts=7 data_len=34 data=[00 00 02 1d 11 e5 10 00 e2 18 f2 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 00 ] RTS 1: FN=17 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I4fe9523af1b53c826ccfdd8700bab2a9e1413662 Gerrit-Change-Number: 31450 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

[S] Change in libosmocore[master]: Add osmo_sockaddr_size() to return the size of the variant used

by pespin

Attention is currently required from: daniel, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31172 ) Change subject: Add osmo_sockaddr_size() to return the size of the variant used ...................................................................... Patch Set 2: (1 comment) File include/osmocom/core/socket.h: https://gerrit.osmocom.org/c/libosmocore/+/31172/comment/ab732591_cc270f9b PS1, Line 42: { > man sendto […] Ok, maybe add a comment in the code about this when handling this case, because it's really not intuitive. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I952b6bb752441fe019fc18f89bce4bbfbe58994a Gerrit-Change-Number: 31172 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Feb 2023 18:41:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: deps/Makefile: replace git://git.osmocom.org urls

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31447 ) Change subject: deps/Makefile: replace git://git.osmocom.org urls ...................................................................... deps/Makefile: replace git://git.osmocom.org urls Change-Id: I49d4ee141eb97ac58c0aff493531f120b21bb22d --- M deps/Makefile 1 file changed, 21 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/31447/1 diff --git a/deps/Makefile b/deps/Makefile index 83ce761..d7e3dd4 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -15,7 +15,8 @@ ECLIPSEGITLAB:=https://gitlab.eclipse.org/eclipse/titan OSMOGITHUB:=https://github.com/osmocom -OSMOGIT:=git://git.osmocom.org +OSMOGERRIT:=https://gerrit.osmocom.org +OSMOGITEA:=https://gitea.osmocom.org/ttcn3 ECLIPSEGITLAB_REPOS= titan.Libraries.TCCUsefulFunctions \ titan.ProtocolEmulations.M3UA \ @@ -66,12 +67,13 @@ titan.ProtocolEmulations.SCCP \ titan.ProtocolModules.BSSGP_v13.0.0 -OSMOGIT_REPOS= titan.ProtocolModules.MAP \ - titan.ProtocolModules.BSSMAP \ - titan.TestPorts.USB \ - titan.TestPorts.AF_PACKET \ +OSMOGERRIT_REPOS= titan.ProtocolModules.BSSMAP \ osmo-uecups +OSMOGITEA_REPOS= titan.ProtocolModules.MAP \ + titan.TestPorts.USB \ + titan.TestPorts.AF_PACKET + ALL_REPOS=$(ECLIPSEGITLAB_REPOS) $(OSMOGITHUB_REPOS) $(OSMOGIT_REPOS) $(FORKEDGITLAB_REPOS) # Tag names from 'git-describe --tags'; if not available, a commit hash may be used instead. @@ -187,8 +189,11 @@ $(foreach dir,$(OSMOGITHUB_REPOS), \ $(eval $(call GIT_template,$(dir),$(OSMOGITHUB)))) -$(foreach dir,$(OSMOGIT_REPOS), \ - $(eval $(call GIT_template,$(dir),$(OSMOGIT)))) +$(foreach dir,$(OSMOGERRIT_REPOS), \ + $(eval $(call GIT_template,$(dir),$(OSMOGERRIT)))) + +$(foreach dir,$(OSMOGITEA_REPOS), \ + $(eval $(call GIT_template,$(dir),$(OSMOGITEA)))) $(foreach dir,$(FORKEDGITLAB_REPOS), \ $(eval $(call GIT_template,$(dir),$(FORKEDGITLAB)))) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31447 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: I49d4ee141eb97ac58c0aff493531f120b21bb22d Gerrit-Change-Number: 31447 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

[S] Change in libosmocore[master]: Add osmo_sockaddr_size() to return the size of the variant used

by daniel

Attention is currently required from: pespin, msuraev. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31172 ) Change subject: Add osmo_sockaddr_size() to return the size of the variant used ...................................................................... Patch Set 2: (1 comment) File include/osmocom/core/socket.h: https://gerrit.osmocom.org/c/libosmocore/+/31172/comment/5e47653c_19e393cc PS1, Line 42: { > "I was about to disagree with Max, but since sendto() can be used with NULL and 0 for addr/addr_len […] man sendto ``` send(sockfd, buf, len, flags); is equivalent to sendto(sockfd, buf, len, flags, NULL, 0); ``` -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I952b6bb752441fe019fc18f89bce4bbfbe58994a Gerrit-Change-Number: 31172 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 21 Feb 2023 17:27:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3-testsuites: replace 2022q2 with 2023q1

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31261 ) Change subject: jobs/ttcn3-testsuites: replace 2022q2 with 2023q1 ...................................................................... jobs/ttcn3-testsuites: replace 2022q2 with 2023q1 Related: SYS#6283 Change-Id: I1e1e47c3a040bc5b4aa79a5584517ff5b42cb317 --- M jobs/ttcn3-testsuites.yml 1 file changed, 18 insertions(+), 8 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 2dae3b8..cac271f 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -257,20 +257,20 @@ - TTCN3-centos-cbc-test-latest: timer: 40 10 * * * - # centos8 2022q2 (SYS#6007) - - TTCN3-centos-pcu-test-2022q2: + # centos8 2023q1 (SYS#6283) + - TTCN3-centos-pcu-test-2023q1: timer: 00 17 * * * - - TTCN3-centos-pcu-test-sns-2022q2: + - TTCN3-centos-pcu-test-sns-2023q1: timer: 15 17 * * * - - TTCN3-centos-bsc-test-2022q2: + - TTCN3-centos-bsc-test-2023q1: timer: 30 17 * * * - - TTCN3-centos-mgw-test-2022q2: + - TTCN3-centos-mgw-test-2023q1: timer: 45 17 * * * - - TTCN3-centos-bts-test-2022q2: + - TTCN3-centos-bts-test-2023q1: timer: 00 18 * * * - - TTCN3-centos-smlc-test-2022q2: + - TTCN3-centos-smlc-test-2023q1: timer: 15 18 * * * - - TTCN3-centos-gbproxy-test-2022q2: + - TTCN3-centos-gbproxy-test-2023q1: timer: 30 18 * * * - job-template: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31261 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1e1e47c3a040bc5b4aa79a5584517ff5b42cb317 Gerrit-Change-Number: 31261 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023