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

[S] Change in libosmo-gprs[master]: rlcmac: ul_tbf: Implement TBF_Starting time (phase1)

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34046 ) Change subject: rlcmac: ul_tbf: Implement TBF_Starting time (phase1) ...................................................................... rlcmac: ul_tbf: Implement TBF_Starting time (phase1) This is unfortunately not yet working since lower layers are always sending hardcoded fn=0 and hence ctx->tbf_starting_time calculated in handle_imm_ass()->TBF_StartingTime_to_fn() is wrong. Related: OS#6130 Change-Id: If6b7766ee1ba6667db4e54e897f376f5b27ad73d --- M src/rlcmac/tbf_ul_ass_fsm.c 1 file changed, 39 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/46/34046/1 diff --git a/src/rlcmac/tbf_ul_ass_fsm.c b/src/rlcmac/tbf_ul_ass_fsm.c index 35b6ca7..3d82113 100644 --- a/src/rlcmac/tbf_ul_ass_fsm.c +++ b/src/rlcmac/tbf_ul_ass_fsm.c @@ -153,7 +153,7 @@ ctx->phase1_alloc.ts[d->ts_nr].allocated = true; ctx->phase1_alloc.num_ts = 1; LOGPFSML(ctx->fi, LOGL_INFO, "ImmAss SingleBlock (2phase access) ts_nr=%u start_fn=%u\n", d->ts_nr, ctx->tbf_starting_time); - return -ENOTSUP; + return 0; case 1: /* d->iaro->u.hh.u.UplinkDownlinkAssignment.ul_dl.Packet_Uplink_ImmAssignment.Access.DynamicOrFixedAllocation.* (GPRS_DynamicOrFixedAllocation_t) */ ctx->phase1_alloc.ul_tfi = d->iaro->u.hh.u.UplinkDownlinkAssignment.ul_dl.Packet_Uplink_ImmAssignment.Access.DynamicOrFixedAllocation.TFI_ASSIGNMENT; ctx->ul_tbf->tx_cs = d->iaro->u.hh.u.UplinkDownlinkAssignment.ul_dl.Packet_Uplink_ImmAssignment.Access.DynamicOrFixedAllocation.CHANNEL_CODING_COMMAND + 1; @@ -316,6 +316,16 @@ } } +static void st_wait_tbf_starting_time1_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ + struct gprs_rlcmac_tbf_ul_ass_fsm_ctx *ctx = (struct gprs_rlcmac_tbf_ul_ass_fsm_ctx *)fi->priv; + + /* Configure lower layers to submit an RTS tick starting at tbf_starting_time + * and scheduler will send event GPRS_RLCMAC_TBF_UL_ASS_EV_TBF_STARTING_TIME to us. */ + gprs_rlcmac_ul_tbf_submit_configure_req(ctx->ul_tbf, &ctx->phase1_alloc, + ctx->tbf_starting_time_exists, ctx->tbf_starting_time); +} + static void st_wait_tbf_starting_time1(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gprs_rlcmac_tbf_ul_ass_fsm_ctx *ctx = (struct gprs_rlcmac_tbf_ul_ass_fsm_ctx *)fi->priv; @@ -481,6 +491,7 @@ X(GPRS_RLCMAC_TBF_UL_ASS_ST_SCHED_PKT_RES_REQ) | X(GPRS_RLCMAC_TBF_UL_ASS_ST_COMPL), .name = "WAIT_TBF_STARTING_TIME1", + .onenter = st_wait_tbf_starting_time1_on_enter, .action = st_wait_tbf_starting_time1, }, [GPRS_RLCMAC_TBF_UL_ASS_ST_SCHED_PKT_RES_REQ] = { @@ -651,13 +662,23 @@ /* The scheduled ticks the new FN, which may trigger changes internally if TBF Starting Time is reached */ void gprs_rlcmac_tbf_ul_ass_fn_tick(const struct gprs_rlcmac_ul_tbf *ul_tbf, uint32_t fn, uint8_t ts_nr) { + int res; + OSMO_ASSERT(gprs_rlcmac_tbf_ul_ass_waiting_tbf_starting_time(ul_tbf)); OSMO_ASSERT(ul_tbf->ul_ass_fsm.tbf_starting_time_exists); OSMO_ASSERT(ul_tbf->ul_ass_fsm.phase1_alloc.num_ts > 0); - if (fn != ul_tbf->ul_ass_fsm.tbf_starting_time || - !ul_tbf->ul_ass_fsm.phase1_alloc.ts[ts_nr].allocated) + if (!ul_tbf->ul_ass_fsm.phase1_alloc.ts[ts_nr].allocated) return; - + res = fn_cmp(fn, ul_tbf->ul_ass_fsm.tbf_starting_time); + if (res < 0) {/* fn BEFORE tbf_starting_time */ + LOGPTBFUL(ul_tbf, LOGL_DEBUG, "TS=%" PRIu8 " FN=%u Waiting for tbf_starting_time=%u\n", + ts_nr, fn, ul_tbf->ul_ass_fsm.tbf_starting_time); + return; + } + if (res > 0) /* fn AFTER tbf_starting time */ + LOGPTBFUL(ul_tbf, LOGL_ERROR, "TS=%" PRIu8 " FN=%u Received late tick for tbf_starting_time=%u!\n", + ts_nr, fn, ul_tbf->ul_ass_fsm.tbf_starting_time); + /* fn == tbf_starting time */ osmo_fsm_inst_dispatch(ul_tbf->ul_ass_fsm.fi, GPRS_RLCMAC_TBF_UL_ASS_EV_TBF_STARTING_TIME, NULL); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: If6b7766ee1ba6667db4e54e897f376f5b27ad73d Gerrit-Change-Number: 34046 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: Fix Starting Time fn->fn calculation

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34044 to look at the new patch set (#2). Change subject: rlcmac: Fix Starting Time fn->fn calculation ...................................................................... rlcmac: Fix Starting Time fn->fn calculation The Starting time contains a "frame number, FN modulo 42432", aka RFN. The translation to absolute FN was missing. Change-Id: I00741289333853a8db472950ee2ac38dc2c74fd3 --- M include/osmocom/gprs/rlcmac/rlcmac_dec.h M src/rlcmac/rlcmac_dec.c M tests/rlcmac/Makefile.am A tests/rlcmac/rlcmac_types_test.c A tests/rlcmac/rlcmac_types_test.err A tests/rlcmac/rlcmac_types_test.ok M tests/testsuite.at 7 files changed, 192 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/44/34044/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I00741289333853a8db472950ee2ac38dc2c74fd3 Gerrit-Change-Number: 34044 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: Fix rfn->fn calculation

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34044 ) Change subject: rlcmac: Fix rfn->fn calculation ...................................................................... rlcmac: Fix rfn->fn calculation Change-Id: I00741289333853a8db472950ee2ac38dc2c74fd3 --- M include/osmocom/gprs/rlcmac/rlcmac_dec.h M src/rlcmac/rlcmac_dec.c M tests/rlcmac/Makefile.am A tests/rlcmac/rlcmac_types_test.c A tests/rlcmac/rlcmac_types_test.err A tests/rlcmac/rlcmac_types_test.ok M tests/testsuite.at 7 files changed, 189 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/44/34044/1 diff --git a/include/osmocom/gprs/rlcmac/rlcmac_dec.h b/include/osmocom/gprs/rlcmac/rlcmac_dec.h index f707dcb..d07a9df 100644 --- a/include/osmocom/gprs/rlcmac/rlcmac_dec.h +++ b/include/osmocom/gprs/rlcmac/rlcmac_dec.h @@ -47,6 +47,13 @@ struct bitvec *bits, int *bsn_begin, int *bsn_end, struct gprs_rlcmac_rlc_ul_window *ulw); +#define RFN_MODULUS 42432 + +static inline uint16_t fn2rfn(uint32_t fn) +{ + return fn % RFN_MODULUS; +} + uint32_t TBF_StartingTime_to_fn(const StartingTime_t *tbf_start_time, uint32_t curr_fn); uint32_t TBF_Starting_Frame_Number_to_fn(const Starting_Frame_Number_t *tbf_start_fn, uint32_t curr_fn); diff --git a/src/rlcmac/rlcmac_dec.c b/src/rlcmac/rlcmac_dec.c index d607aae..56d444c 100644 --- a/src/rlcmac/rlcmac_dec.c +++ b/src/rlcmac/rlcmac_dec.c @@ -429,15 +429,57 @@ return num_blocks; } +#define RFN_THRESHOLD (RFN_MODULUS / 2) +/* Determine the full frame number from a relative frame number */ +static uint32_t rfn_to_fn(uint32_t rfn, uint32_t curr_fn) +{ + uint32_t curr_rfn; + uint32_t fn_rounded; + + /* Ensure that all following calculations are performed with the + * relative frame number */ + OSMO_ASSERT(rfn < RFN_MODULUS); + + /* Compute an internal relative frame number from the full internal + frame number */ + curr_rfn = fn2rfn(curr_fn); + + /* Compute a "rounded" version of the internal frame number, which + * exactly fits in the RFN_MODULUS raster */ + fn_rounded = GSM_TDMA_FN_SUB(curr_fn, curr_rfn); + + /* If the delta between the internal and the external relative frame + * number exceeds a certain limit, we need to assume that the incoming + * request belongs to a the previous rfn period. To correct this, + * we roll back the rounded frame number by one RFN_MODULUS */ + if (GSM_TDMA_FN_DIFF(rfn, curr_rfn) > RFN_THRESHOLD) { + LOGRLCMAC(LOGL_DEBUG, "Race condition between rfn (%u) and m_cur_fn (%u) detected: " + "rfn belongs to the previous modulus %u cycle, wrapping...\n", + rfn, curr_fn, RFN_MODULUS); + if (fn_rounded < RFN_MODULUS) { + LOGRLCMAC(LOGL_DEBUG, "Cornercase detected: wrapping crosses %u border\n", + GSM_MAX_FN); + fn_rounded = GSM_TDMA_FN_SUB(GSM_MAX_FN, (GSM_TDMA_FN_SUB(RFN_MODULUS, fn_rounded))); + } else { + fn_rounded = GSM_TDMA_FN_SUB(fn_rounded, RFN_MODULUS); + } + } + + /* The real frame number is the sum of the rounded frame number and the + * relative framenumber computed via RACH */ + return GSM_TDMA_FN_SUM(fn_rounded, rfn); +} + /* 12.21 Starting Frame Number Description */ uint32_t TBF_StartingTime_to_fn(const StartingTime_t *tbf_start_time, uint32_t curr_fn) { - const struct gsm_time g_time = { - .t1 = tbf_start_time->N32, - .t2 = tbf_start_time->N51, - .t3 = tbf_start_time->N26 - }; - return gsm_gsmtime2fn(&g_time); + const uint8_t t1 = tbf_start_time->N32; + const uint8_t t3 = tbf_start_time->N51; + const uint8_t t2 = tbf_start_time->N26; + const uint16_t rfn = (51 * ((t3 - t2) % 26)) + t3 + 51 * 26 * t1; + const uint32_t fn = rfn_to_fn(rfn, curr_fn); + LOGRLCMAC(LOGL_DEBUG, "curr_fn=%u + RFN=%u -> FN=%u\n", curr_fn, rfn, fn); + return fn; } diff --git a/tests/rlcmac/Makefile.am b/tests/rlcmac/Makefile.am index 9d1f5b0..c13d179 100644 --- a/tests/rlcmac/Makefile.am +++ b/tests/rlcmac/Makefile.am @@ -16,6 +16,7 @@ csn1_ts_44_018_test \ csn1_ts_44_060_test \ rlcmac_prim_test \ + rlcmac_types_test \ $(NULL) EXTRA_DIST = \ @@ -25,6 +26,8 @@ csn1_ts_44_060_test.err \ rlcmac_prim_test.ok \ rlcmac_prim_test.err \ + rlcmac_types_test.ok \ + rlcmac_types_test.err \ $(NULL) # Common LDADD entries @@ -44,3 +47,6 @@ rlcmac_prim_test_SOURCES = rlcmac_prim_test.c rlcmac_prim_test_LDADD = $(LDADD) + +rlcmac_types_test_SOURCES = rlcmac_types_test.c +rlcmac_types_test_LDADD = $(LDADD) \ No newline at end of file diff --git a/tests/rlcmac/rlcmac_types_test.c b/tests/rlcmac/rlcmac_types_test.c new file mode 100644 index 0000000..18ecda9 --- /dev/null +++ b/tests/rlcmac/rlcmac_types_test.c @@ -0,0 +1,87 @@ +/* rlcmac_types_test.c + * + * (C) 2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <stdint.h> +#include <stdio.h> + +#include <osmocom/core/application.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/fsm.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/select.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> +#include <osmocom/gsm/gsm48_rest_octets.h> + +#include <osmocom/gprs/rlcmac/rlcmac.h> +#include <osmocom/gprs/rlcmac/csn1_defs.h> +#include <osmocom/gprs/rlcmac/rlcmac_dec.h> + +static void *tall_ctx = NULL; + + +/* SGSN->PCU->BTS --PCH--> MS containing "Paging Request Type 1" asking for PS services. + * RLCMAC will send GMMRR-PAGE.ind to GMM layer, which is in charge of orchestrating the response. */ +static void test_tbf_starting_time_to_fn(const uint32_t cur_fn, const uint32_t fn) +{ + const uint16_t rfn = fn2rfn(fn); + StartingTime_t st; + + printf("=== %s(cur_fn=%u, fn=%u) start ===\n", __func__, cur_fn, fn); + + /* TBF_STARTING_TIME -- same as 3GPP TS 44.018 §10.5.2.38 Starting Time without tag: */ + st.N32 = (rfn / (26 * 51)) % 32; + st.N51 = rfn % 51; + st.N26 = rfn % 26; + + printf("cur_fn=%u fn=%u rfn=%u [T1'=%u T3=%u T2=%u]\n", + cur_fn, fn, rfn, st.N32, st.N51, st.N26); + + uint32_t res_fn = TBF_StartingTime_to_fn(&st, cur_fn); + printf("res_fn=%u\n", res_fn); + OSMO_ASSERT(res_fn == fn); + + printf("=== %s(cur_fn=%u, fn=%u) end ===\n", __func__, cur_fn, fn); +} + +static const struct log_info_cat test_log_categories[] = { }; +static const struct log_info test_log_info = { + .cat = test_log_categories, + .num_cat = ARRAY_SIZE(test_log_categories), +}; + +int main(int argc, char *argv[]) +{ + tall_ctx = talloc_named_const(NULL, 1, __FILE__); + + osmo_init_logging2(tall_ctx, &test_log_info); + log_parse_category_mask(osmo_stderr_target, "DLGLOBAL,1:"); + osmo_fsm_log_addr(false); + + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 1); + log_set_print_level(osmo_stderr_target, 1); + log_set_use_color(osmo_stderr_target, 0); + + test_tbf_starting_time_to_fn(0, 0); + test_tbf_starting_time_to_fn(0, 4); + test_tbf_starting_time_to_fn(2229729, 2229786); + test_tbf_starting_time_to_fn(2229777, 2229786); + test_tbf_starting_time_to_fn(1320458, 1320462); + + talloc_free(tall_ctx); +} diff --git a/tests/rlcmac/rlcmac_types_test.err b/tests/rlcmac/rlcmac_types_test.err new file mode 100644 index 0000000..fd860eb --- /dev/null +++ b/tests/rlcmac/rlcmac_types_test.err @@ -0,0 +1,5 @@ +DLGLOBAL DEBUG curr_fn=0 + RFN=0 -> FN=0 +DLGLOBAL DEBUG curr_fn=0 + RFN=4 -> FN=4 +DLGLOBAL DEBUG curr_fn=2229729 + RFN=23322 -> FN=2229786 +DLGLOBAL DEBUG curr_fn=2229777 + RFN=23322 -> FN=2229786 +DLGLOBAL DEBUG curr_fn=1320458 + RFN=5070 -> FN=1320462 diff --git a/tests/rlcmac/rlcmac_types_test.ok b/tests/rlcmac/rlcmac_types_test.ok new file mode 100644 index 0000000..2075682 --- /dev/null +++ b/tests/rlcmac/rlcmac_types_test.ok @@ -0,0 +1,20 @@ +=== test_tbf_starting_time_to_fn(cur_fn=0, fn=0) start === +cur_fn=0 fn=0 rfn=0 [T1'=0 T3=0 T2=0] +res_fn=0 +=== test_tbf_starting_time_to_fn(cur_fn=0, fn=0) end === +=== test_tbf_starting_time_to_fn(cur_fn=0, fn=4) start === +cur_fn=0 fn=4 rfn=4 [T1'=0 T3=4 T2=4] +res_fn=4 +=== test_tbf_starting_time_to_fn(cur_fn=0, fn=4) end === +=== test_tbf_starting_time_to_fn(cur_fn=2229729, fn=2229786) start === +cur_fn=2229729 fn=2229786 rfn=23322 [T1'=17 T3=15 T2=0] +res_fn=2229786 +=== test_tbf_starting_time_to_fn(cur_fn=2229729, fn=2229786) end === +=== test_tbf_starting_time_to_fn(cur_fn=2229777, fn=2229786) start === +cur_fn=2229777 fn=2229786 rfn=23322 [T1'=17 T3=15 T2=0] +res_fn=2229786 +=== test_tbf_starting_time_to_fn(cur_fn=2229777, fn=2229786) end === +=== test_tbf_starting_time_to_fn(cur_fn=1320458, fn=1320462) start === +cur_fn=1320458 fn=1320462 rfn=5070 [T1'=3 T3=21 T2=0] +res_fn=1320462 +=== test_tbf_starting_time_to_fn(cur_fn=1320458, fn=1320462) end === diff --git a/tests/testsuite.at b/tests/testsuite.at index 74fd43a..ce51e35 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -64,6 +64,13 @@ AT_CHECK([$abs_top_builddir/tests/rlcmac/rlcmac_prim_test], [0], [expout], [experr]) AT_CLEANUP +AT_SETUP([rlcmac/rlcmac_types]) +AT_KEYWORDS([rlcmac rlcmac_types]) +cat $abs_srcdir/rlcmac/rlcmac_types_test.ok > expout +cat $abs_srcdir/rlcmac/rlcmac_types_test.err > experr +AT_CHECK([$abs_top_builddir/tests/rlcmac/rlcmac_types_test], [0], [expout], [experr]) +AT_CLEANUP + AT_SETUP([sm/sm_prim]) AT_KEYWORDS([sm sm_prim]) cat $abs_srcdir/sm/sm_prim_test.ok > expout -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I00741289333853a8db472950ee2ac38dc2c74fd3 Gerrit-Change-Number: 34044 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmo-pcu[master]: pcu_l1_if.cpp: Fix gsmtap not sent in PCU_IF_SAPI_PCH_DT

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34019 ) Change subject: pcu_l1_if.cpp: Fix gsmtap not sent in PCU_IF_SAPI_PCH_DT ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: ping? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2cfa0486a3483140ce219b4645e0544e7923870a Gerrit-Change-Number: 34019 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Aug 2023 15:45:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: modem: gmm: Adapt log string about no TLLI found

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34031 ) Change subject: layer23: modem: gmm: Adapt log string about no TLLI found ...................................................................... layer23: modem: gmm: Adapt log string about no TLLI found During initial GMM Attach, the GMM layer generates an internal local TLLI and uses it to do the GMM Attach. Only at the time it receives the GMM Attach Accept with the assigned TLLI from the network then explicitly informs other layers about the TLLI update. Hence, the GMMREG user doesn't really know about the TLLI in use until the GMM Attach success happens (gmmreg-attach.cnf). During that time, the TLLI at the app is basically unassigned (0xffffffff). Hence, during that same time a TLLI update hook in GMMRR-Assign.req will not work since the app is unaware of the remporary local TLLI, so no match can be done. In that specific scenario, that's fine, since anyway it is waiting to receive the GMMREG-Attach.cnf, which will indicate the assigned TLLI to it. In summary, not being able to match the TLLI in GMMRR-Assign.req is not bad per se, so soften the log error there. Change-Id: I31c04288789393391084000fbdbcdcedb11d0b68 --- M src/host/layer23/src/modem/gmm.c 1 file changed, 26 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/host/layer23/src/modem/gmm.c b/src/host/layer23/src/modem/gmm.c index b8df38b..c0e6936 100644 --- a/src/host/layer23/src/modem/gmm.c +++ b/src/host/layer23/src/modem/gmm.c @@ -162,7 +162,7 @@ } } else { if (old_tlli != OSMO_GPRS_GMM_TLLI_UNASSIGNED) - LOGP(DGMM, LOGL_ERROR, "%s(): Unexpected Rx %s with unknown TLLI=0x%08x\n", + LOGP(DGMM, LOGL_NOTICE, "%s(): Rx %s with unknown TLLI=0x%08x, probably the MS is still attaching\n", __func__, pdu_name, old_tlli); } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I31c04288789393391084000fbdbcdcedb11d0b68 Gerrit-Change-Number: 34031 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: modem: gmm: Adapt log string about no TLLI found

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34031 ) Change subject: layer23: modem: gmm: Adapt log string about no TLLI found ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I31c04288789393391084000fbdbcdcedb11d0b68 Gerrit-Change-Number: 34031 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Aug 2023 15:44:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[M] Change in osmo-bts[master]: pcu_sock: forward downlink IMMEDAITE ASSIGNMENT with no IMSI to AGCH

by dexter

Attention is currently required from: laforge, fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33829 ) Change subject: pcu_sock: forward downlink IMMEDAITE ASSIGNMENT with no IMSI to AGCH ...................................................................... Patch Set 5: (1 comment) Patchset: PS5: > I have to admit I'm not able to follow the rationale of the PCU interface changes of the last 2-or-s […] Maybe it s worth considering to skip this work-around. The only reason why we are doing it this way is that we have no way to attach a TLLI for confirmation when using SAPI PCU_IF_SAPI_AGCH. To fix this properly we intend to add a PCU_IF_SAPI_AGCH_DT that works similar to PCU_IF_SAPI_PCH_DT. This will be a lot cleaner. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaa3e5cdcf86578821e149b3e23482a0bcee19f7b Gerrit-Change-Number: 33829 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Aug 2023 15:38:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years

1
0
0 0

[M] Change in osmo-ci[master]: jobs: remove endianness check

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34018 ) Change subject: jobs: remove endianness check ...................................................................... jobs: remove endianness check Related: OS#6122 Related: https://lists.osmocom.org/hyperkitty/list/openbsc@lists.osmocom.org/thread/… Change-Id: I2358e6bc8189f9c5bdca10aac28032cb7a4667fa --- D jobs/gerrit-pipeline-endianness.yml M jobs/gerrit-verifications.yml 2 files changed, 11 insertions(+), 134 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/gerrit-pipeline-endianness.yml b/jobs/gerrit-pipeline-endianness.yml deleted file mode 100644 index 19b9d61..0000000 --- a/jobs/gerrit-pipeline-endianness.yml +++ /dev/null @@ -1,110 +0,0 @@ -# This script runs struct_endianness.py from libosmocore.git. -# Add project's repositories to jobs/gerrit-verifications.yml. When -# pipeline_endianness is set for that project, the pipeline will call this job. - -- project: - name: gerrit-pipeline-endianness - jobs: - - 'gerrit-pipeline-endianness' - -- job: - name: 'gerrit-pipeline-endianness' - project-type: freestyle - node: osmocom-gerrit - retry-count: 3 # scm checkout - properties: - - build-discarder: - days-to-keep: 30 - num-to-keep: 1000 - description: | - Run <code>struct_endianness.py</code> from libosmocore.git on patches - sent to <a href="https://gerrit.osmocom.org">gerrit</a>. - </br></br> - Related issue: <a href="https://osmocom.org/issues/5884">OS#5884</a> - - parameters: - - string: - name: BRANCH_LIBOSMOCORE - description: | - libosmocore.git branch - default: 'master' - - string: - name: GERRIT_PROJECT - description: set by gerrit verification pipeline job - - string: - name: GERRIT_CHANGE_NUMBER - description: set by gerrit verification pipeline job - - string: - name: GERRIT_PATCHSET_NUMBER - description: set by gerrit verification pipeline job - - string: - name: GERRIT_BRANCH - description: set by gerrit verification pipeline job - - string: - name: GERRIT_HOST - description: set by gerrit verification pipeline job - - string: - name: GERRIT_PATCHSET_REVISION - description: set by gerrit verification pipeline job - - string: - name: GERRIT_PORT - description: set by gerrit verification pipeline job - - string: - name: GERRIT_REFSPEC - description: set by gerrit verification pipeline job - - string: - name: GERRIT_REPO_URL - description: set by gerrit verification pipeline job - - scm: - - git: - basedir: 'code-from-gerrit' - url: '$GERRIT_REPO_URL' - credentials-id: d5eda5e9-b59d-44ba-88d2-43473cb6e42d - branches: - - $GERRIT_BRANCH - refspec: $GERRIT_REFSPEC - choosing-strategy: gerrit - wipe-workspace: true - skip-tag: true - disable-submodules: true - - builders: - - shell: | - rm -rf libosmocore - git clone \ - --depth=1 \ - --branch="$BRANCH_LIBOSMOCORE" \ - https://gerrit.osmocom.org/libosmocore \ - libosmocore - git -C libosmocore log --oneline - - cd code-from-gerrit - ../libosmocore/contrib/struct_endianness.py - - case "$GERRIT_PROJECT" in - osmocom-bb) - # See https://gerrit.osmocom.org/c/osmocom-bb/+/31403 - EXCLUDE_ARG=":^src/shared/libosmocore" - ;; - esac - - git diff --color=always -- . $EXCLUDE_ARG - - if ! git diff --quiet -- . $EXCLUDE_ARG; then - set +x - echo '\033[1m' # bold font - echo "ERROR: auto-generated big-endian definitions missing or in unexpected format!" - echo - echo "Please run contrib/struct_endianness.py from libosmocore.git on your patch." - echo '\033[0m' # normal font - exit 1 - fi - wrappers: - - ansicolor: - colormap: xterm - - ssh-agent-credentials: - users: - - d5eda5e9-b59d-44ba-88d2-43473cb6e42d - -# vim: expandtab tabstop=2 shiftwidth=2 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index d2aaaae..c4e9e34 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -93,7 +93,6 @@ pipeline_build: true pipeline_lint: true pipeline_binpkgs: "almalinux:8 debian:10 debian:12" - pipeline_endianness: true # in alphabetical order repos: @@ -107,7 +106,6 @@ - docker-playground: pipeline_build: false pipeline_binpkgs: "" - pipeline_endianness: false - libasn1c - libgtpnl @@ -191,7 +189,6 @@ repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' - pipeline_endianness: false pipeline_binpkgs: "debian:10 debian:12" - osmo-e1-hardware: @@ -214,7 +211,6 @@ - osmo-ci: pipeline_build: false pipeline_binpkgs: "" - pipeline_endianness: false - osmo-ggsn: a1_name: GTP @@ -231,7 +227,6 @@ {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - osmo-gsm-manuals: - pipeline_endianness: false pipeline_binpkgs: "debian:10 debian:12" - osmo_gsup: @@ -293,7 +288,6 @@ - osmo-python-tests: repos_url: '{gerrit_url}/python/{repos}' gerrit_project: 'python/{repos}' - pipeline_endianness: false pipeline_binpkgs: "debian:10 debian:12" - osmo-sgsn: @@ -315,7 +309,6 @@ gerrit_project: 'erlang/{repos}' cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' pipeline_binpkgs: "" - pipeline_endianness: false - osmo-sip-connector @@ -418,7 +411,6 @@ ;; esac pipeline_binpkgs: "" - pipeline_endianness: false - osmo-ttcn3-hacks: slave_axis: !!python/tuple [ttcn3] @@ -436,7 +428,6 @@ su build -c 'make compile'; " pipeline_binpkgs: "" - pipeline_endianness: false - dahdi-tools: pipeline_lint: false @@ -471,10 +462,6 @@ distributions must have binary packages in the osmocom:master repository. default: '{obj:pipeline_binpkgs}' - - bool: - name: PIPELINE_ENDIANNESS - description: Run struct_endianness.py from libosmocore.git - default: '{obj:pipeline_endianness}' dsl: | def run_job(display_name, job_name, comment_type=null, distro=null) {{ try {{ @@ -579,17 +566,6 @@ }} }} - stage("Endianness") {{ - when {{ - expression {{ params.PIPELINE_ENDIANNESS }} - }} - steps {{ - script {{ - run_job("endianness", "gerrit-pipeline-endianness") - }} - }} - }} - }} // end of parallel }} // end of Verification stage -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2358e6bc8189f9c5bdca10aac28032cb7a4667fa Gerrit-Change-Number: 34018 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

[M] Change in osmo-ci[master]: jobs: remove endianness check

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34018 ) Change subject: jobs: remove endianness check ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2358e6bc8189f9c5bdca10aac28032cb7a4667fa Gerrit-Change-Number: 34018 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 02 Aug 2023 12:25:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in osmo-ci[master]: jobs/osmo-gsm-tester-runner: build debian-buster-jenkins

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34022 ) Change subject: jobs/osmo-gsm-tester-runner: build debian-buster-jenkins ...................................................................... jobs/osmo-gsm-tester-runner: build debian-buster-jenkins Fix the failing osmo-gsm-tester_virtual job by building the docker image it depends on first, debian-buster-jenkins. We are migrating most of the CI infrastructure away from old debian versions to debian 12, but this is not possible here as explained in OS#6126. Related: OS#6126 Change-Id: I5f7468a402d82e3b6ee03b4f792ae7e3aae3942b --- M jobs/osmo-gsm-tester-runner.yml 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index db0a491..83040dc 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -257,6 +257,7 @@ https://gerrit.osmocom.org/docker-playground \ docker-playground git -C docker-playground log --oneline + make -C docker-playground/debian-buster-jenkins # OS#6126 make -C docker-playground/osmo-gsm-tester unlink osmo-gsm-tester/sysmocom/resources.conf || true -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5f7468a402d82e3b6ee03b4f792ae7e3aae3942b Gerrit-Change-Number: 34022 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023