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

[L] Change in osmocom-bb[master]: ASCI: Add decoding of SYSTEM INFORMATION TYPE 10 $(ASCI)$
by laforge 05 Oct '23

05 Oct '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34614?usp=email ) Change subject: ASCI: Add decoding of SYSTEM INFORMATION TYPE 10 $(ASCI)$ ...................................................................... ASCI: Add decoding of SYSTEM INFORMATION TYPE 10 $(ASCI)$ Related: OS#5782 Change-Id: I81c7929f6d951d8eef7d08624f0b72830370c448 --- M src/host/layer23/include/osmocom/bb/common/sysinfo.h M src/host/layer23/src/common/sysinfo.c M src/host/layer23/src/mobile/gsm48_rr.c 3 files changed, 322 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/common/sysinfo.h b/src/host/layer23/include/osmocom/bb/common/sysinfo.h index 0368901..7b118ca 100644 --- a/src/host/layer23/include/osmocom/bb/common/sysinfo.h +++ b/src/host/layer23/include/osmocom/bb/common/sysinfo.h @@ -18,12 +18,27 @@ #define FREQ_TYPE_REP_5bis 0x40 /* sub channel of SI 5bis */ #define FREQ_TYPE_REP_5ter 0x80 /* sub channel of SI 5ter */ +struct si10_cell_info { + uint8_t index; /* frequency index of the frequencies received in SI5* */ + int16_t arfcn; /* ARFCN or -1 (if not found in SI5*) */ + uint8_t bsic; + bool barred; /* Cell is barred, values below are invalid. */ + bool la_different; /* Location area is different, so CRH is valid. */ + uint8_t cell_resel_hyst_db; + uint8_t ms_txpwr_max_cch; + uint8_t rxlev_acc_min_db; + uint8_t cell_resel_offset; + uint8_t temp_offset; + uint8_t penalty_time; +}; + /* structure of all received system information */ struct gsm48_sysinfo { /* flags of available information */ uint8_t si1, si2, si2bis, si2ter, si3, si4, si5, si5bis, si5ter, si6, si13; + bool si10; /* memory maps to simply detect change in system info messages */ uint8_t si1_msg[23]; @@ -36,6 +51,7 @@ uint8_t si5b_msg[18]; uint8_t si5t_msg[18]; uint8_t si6_msg[18]; + uint8_t si10_msg[21]; uint8_t si13_msg[23]; struct gsm_sysinfo_freq freq[1024]; /* all frequencies */ @@ -158,6 +174,10 @@ uint8_t nb_reest_denied; /* 1 = denied */ uint8_t nb_cell_barr; /* 1 = barred */ uint16_t nb_class_barr; /* bit 10 is emergency */ + + /* SI 10 */ + uint8_t si10_cell_num; /* number neighbor cells found in SI 10 */ + struct si10_cell_info si10_cell[32]; /* 32 neighbor cell descriptions */ }; char *gsm_print_arfcn(uint16_t arfcn); @@ -191,6 +211,8 @@ const struct gsm48_system_information_type_5ter *si, int len); int gsm48_decode_sysinfo6(struct gsm48_sysinfo *s, const struct gsm48_system_information_type_6 *si, int len); +int gsm48_decode_sysinfo10(struct gsm48_sysinfo *s, + const struct gsm48_system_information_type_10 *si, int len); int gsm48_decode_sysinfo13(struct gsm48_sysinfo *s, const struct gsm48_system_information_type_13 *si, int len); int gsm48_decode_mobile_alloc(struct gsm_sysinfo_freq *freq, diff --git a/src/host/layer23/src/common/sysinfo.c b/src/host/layer23/src/common/sysinfo.c index 12780c2..a728eb4 100644 --- a/src/host/layer23/src/common/sysinfo.c +++ b/src/host/layer23/src/common/sysinfo.c @@ -601,6 +601,187 @@ return 0; } +/* Decode "SI 10 Rest Octets" (10.5.2.44) */ +static int gsm48_decode_si10_rest_first(struct gsm48_sysinfo *s, struct bitvec *bv, + struct si10_cell_info *c) +{ + uint8_t ba_ind; + + /* <BA ind : bit(1)> */ + ba_ind = bitvec_get_uint(bv, 1); + if (ba_ind != s->nb_ba_ind_si5) { + LOGP(DRR, LOGL_NOTICE, "SI10: BA_IND %u != BA_IND %u of SI5!\n", ba_ind, s->nb_ba_ind_si5); + return EOF; + } + + /* { L <spare padding> | H <neighbour information> } */ + if (bitvec_get_bit_high(bv) != H) { + LOGP(DRR, LOGL_INFO, "SI10: No neighbor cell defined.\n"); + return EOF; + } + + /* <first frequency: bit(5)> */ + c->index = bitvec_get_uint(bv, 5); + + /* <bsic : bit(6)> */ + c->bsic = bitvec_get_uint(bv, 6); + + /* { H <cell parameters> | L } */ + if (bitvec_get_bit_high(bv) != H) { + LOGP(DRR, LOGL_NOTICE, "SI10: No cell parameters for first cell, cannot continue to decode!\n"); + return EOF; + } + + /* <cell barred (H)> | L <further cell info> */ + if (bitvec_get_bit_high(bv) == H) { + c->barred = true; + return 0; + } + + /* { H <cell reselect hysteresis : bit(3)> | L } */ + if (bitvec_get_bit_high(bv) == H) { + c->la_different = true; + c->cell_resel_hyst_db = bitvec_get_uint(bv, 3) * 2; + } + + /* <ms txpwr max cch : bit(5)> */ + c->ms_txpwr_max_cch = bitvec_get_uint(bv, 5); + /* <rxlev access min : bit(6)> */ + c->rxlev_acc_min_db = rxlev2dbm(bitvec_get_uint(bv, 6)); + /* <cell reselect offset : bit(6)> */ + c->cell_resel_offset = bitvec_get_uint(bv, 6); + /* <temporary offset : bit(3)> */ + c->temp_offset = bitvec_get_uint(bv, 3); + /* <penalty time : bit(5)> */ + c->penalty_time = bitvec_get_uint(bv, 5); + + return 0; +} + +static int gsm48_decode_si10_rest_other(struct gsm48_sysinfo *s, struct bitvec *bv, + struct si10_cell_info *c) +{ + int rc; + + /* { H <info field> }** L <spare padding> */ + if (bitvec_get_bit_high(bv) != H) + return EOF; + + c->index = (c->index + 1) & 0x1f; + /* <next frequency (H)>** L <differential cell info> */ + /* Increment frequency number for every <info field> and every <next frequency> occurrence. */ + while ((rc = bitvec_get_bit_high(bv)) == H) + c->index = (c->index + 1) & 0x1f; + if (rc < 0) + goto short_read; + + /* { H <BCC : bit(3)> | L <bsic : bit(6)> } */ + rc = bitvec_get_bit_high(bv); + if (rc < 0) + goto short_read; + if (rc == H) { + rc = bitvec_get_uint(bv, 3); + if (rc < 0) + goto short_read; + c->bsic = (c->bsic & 0x07) | rc; + } else { + rc = bitvec_get_uint(bv, 6); + if (rc < 0) + goto short_read; + c->bsic = rc; + } + + /* { H <diff cell pars> | L } */ + rc = bitvec_get_bit_high(bv); + if (rc < 0) + goto short_read; + if (rc != H) + return 0; + + /* <cell barred (H)> | L <further cell info> */ + rc = bitvec_get_bit_high(bv); + if (rc < 0) + goto short_read; + if (rc == H) { + c->barred = true; + return 0; + } + + /* { H <cell reselect hysteresis : bit(3)> | L } */ + rc = bitvec_get_bit_high(bv); + if (rc < 0) + goto short_read; + if (rc == H) { + c->la_different = true; + rc = bitvec_get_uint(bv, 3); + if (rc < 0) + goto short_read; + c->cell_resel_hyst_db = bitvec_get_uint(bv, 3) * 2; + } + + /* { H <ms txpwr max cch : bit(5)> | L } */ + rc = bitvec_get_bit_high(bv); + if (rc < 0) + goto short_read; + if (rc == H) { + rc = bitvec_get_uint(bv, 5); + if (rc < 0) + goto short_read; + c->ms_txpwr_max_cch = rc; + } + + /* { H <rxlev access min : bit(6)> | L } */ + rc = bitvec_get_bit_high(bv); + if (rc < 0) + goto short_read; + if (rc == H) { + rc = bitvec_get_uint(bv, 6); + if (rc < 0) + goto short_read; + c->rxlev_acc_min_db = rxlev2dbm(rc); + } else + c->rxlev_acc_min_db = -110; + + /* { H <cell reselect offset : bit(6)> | L } */ + rc = bitvec_get_bit_high(bv); + if (rc < 0) + goto short_read; + if (rc == H) { + rc = bitvec_get_uint(bv, 6); + if (rc < 0) + goto short_read; + c->cell_resel_offset = rc; + } + + /* { H <temporary offset : bit(3)> | L } */ + rc = bitvec_get_bit_high(bv); + if (rc < 0) + goto short_read; + if (rc == H) { + rc = bitvec_get_uint(bv, 3); + if (rc < 0) + goto short_read; + c->temp_offset = rc; + } + + /* { H <penalty time : bit(5)> | L } */ + rc = bitvec_get_bit_high(bv); + if (rc < 0) + goto short_read; + if (rc == H) { + rc = bitvec_get_uint(bv, 5); + if (rc < 0) + goto short_read; + c->penalty_time = rc; + } + + return 0; + +short_read: + LOGP(DRR, LOGL_NOTICE, "SI10: Short read of differential cell info.\n"); + return -EINVAL; +} + int gsm48_decode_sysinfo1(struct gsm48_sysinfo *s, const struct gsm48_system_information_type_1 *si, int len) { @@ -787,6 +968,7 @@ 0xce, FREQ_TYPE_REP_5); s->si5 = 1; + s->si10 = false; return 0; } @@ -804,6 +986,7 @@ 0xce, FREQ_TYPE_REP_5bis); s->si5bis = 1; + s->si10 = false; return 0; } @@ -821,6 +1004,7 @@ 0x8e, FREQ_TYPE_REP_5ter); s->si5ter = 1; + s->si10 = false; return 0; } @@ -852,6 +1036,83 @@ return 0; } +static int16_t arfcn_from_freq_index(struct gsm48_sysinfo *s, uint16_t index) +{ + uint16_t arfcn, i = 0; + + /* First, search for the P-GSM ARFCN. */ + for (arfcn = 1; arfcn < 124; arfcn++) { + if (!(s->freq[arfcn].mask & FREQ_TYPE_REP)) + continue; + if (index == i++) + return arfcn; + } + + /* Second, search for ARFCN 0. */ + if ((s->freq[arfcn].mask & FREQ_TYPE_REP)) { + if (index == i++) + return arfcn; + } + + /* Third, search for all other ARFCN. */ + for (arfcn = 125; arfcn < 1024; arfcn++) { + if (!(s->freq[arfcn].mask & FREQ_TYPE_REP)) + continue; + if (index == i++) + return arfcn; + } + + /* If not found, return EOF (-1) as idicator. */ + return EOF; +} + +int gsm48_decode_sysinfo10(struct gsm48_sysinfo *s, + const struct gsm48_system_information_type_10 *si, int len) +{ + int payload_len = len - sizeof(*si); + struct bitvec bv; + int i; + int rc; + + bv = (struct bitvec) { + .data_len = payload_len, + .data = (uint8_t *)si->rest_octets, + }; + + memcpy(s->si10_msg, si, OSMO_MIN(len, sizeof(s->si10_msg))); + + /* Clear cell list. */ + s->si10_cell_num = 0; + memset(s->si10_cell, 0, sizeof(s->si10_cell)); + + /* SI 10 Rest Octets of first neighbor cell, if included. */ + rc = gsm48_decode_si10_rest_first(s, &bv, &s->si10_cell[0]); + if (rc == EOF) { + s->si10 = true; + return 0; + } + if (rc < 0) + return rc; + s->si10_cell[0].arfcn = arfcn_from_freq_index(s, s->si10_cell[0].index); + s->si10_cell_num++; + + for (i = 1; i < ARRAY_SIZE(s->si10_cell); i++) { + /* Clone last cell info and then store differential elements. */ + memcpy(&s->si10_cell[i], &s->si10_cell[i - 1], sizeof(s->si10_cell[i])); + /* SI 10 Rest Octets of other neighbor cell, if included. */ + rc = gsm48_decode_si10_rest_other(s, &bv, &s->si10_cell[i]); + if (rc == EOF) + break; + if (rc < 0) + return rc; + s->si10_cell[i].arfcn = arfcn_from_freq_index(s, s->si10_cell[i].index); + s->si10_cell_num++; + } + + s->si10 = true; + return 0; +} + int gsm48_decode_sysinfo13(struct gsm48_sysinfo *s, const struct gsm48_system_information_type_13 *si, int len) { diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index a515338..8dca379 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -2897,13 +2897,38 @@ return gsm48_new_sysinfo(ms, si->system_information); } -/* Receive "SYSTEM INFORMATION TYPE 10" message (9.1.50). */ +/* Receive "SYSTEM INFORMATION 10" message (9.1.50). */ static int gsm48_rr_rx_sysinfo_10(struct osmocom_ms *ms, struct msgb *msg) { - LOGP(DRR, LOGL_INFO, "SYSINFO 10\n"); + /* NOTE: Short L2 header is included in this structure */ + struct gsm48_system_information_type_10 *si = msgb_l3(msg); + struct gsm48_sysinfo *s = ms->cellsel.si; + int payload_len = msgb_l3len(msg) - sizeof(*si); - /* Ignore content. */ - return -ENOTSUP; + if (!s) { + LOGP(DRR, LOGL_INFO, "No cell selected, SYSTEM INFORMATION 10 ignored.\n"); + return -EINVAL; + } + + if (payload_len < 20) { + LOGP(DRR, LOGL_NOTICE, "Short read of SYSTEM INFORMATION 10 message.\n"); + return -EINVAL; + } + + /* No complete SI5, cannot decode yet. */ + if (!s->si5 || !(s->si5bis || !s->nb_ext_ind_si5)) + return 0; + + /* We decode when changed or when SI10 could not decoded, due to missing neighbor cell infos. */ + if (!memcmp(si, s->si10_msg, OSMO_MIN(msgb_l3len(msg), sizeof(s->si10_msg))) && s->si10) + return 0; + + LOGP(DRR, LOGL_INFO, "New SYSTEM INFORMATION 10\n"); + + gsm48_decode_sysinfo10(s, si, msgb_l3len(msg)); + + /* We cannot call gsm48_new_sysinfo, because it requires regular message types. */ + return 0; } /* receive "SYSTEM INFORMATION 13" message (9.1.43a) */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34614?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I81c7929f6d951d8eef7d08624f0b72830370c448 Gerrit-Change-Number: 34614 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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-MessageType: merged

1 0

[M] Change in osmo-ci[master]: scripts/docker-cleanup: remove containers > 24h
by laforge 05 Oct '23

05 Oct '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email ) Change subject: scripts/docker-cleanup: remove containers > 24h ...................................................................... scripts/docker-cleanup: remove containers > 24h Remove containers starting with jenkins- or having ttcn3 in the name, if they have been running for more than 24 hours. This can happen with the ttcn3 testsuites, as they typically start multiple docker containers in the background (one per Osmocom program) before they start the testsuite docker container in the foreground. Usually the clean up trap makes sure that all containers get killed, but we have seen that a few containers have been running for a few months. One reason for this could be temporary loss of connection between the jenkins server and the node running the job. Extend the clean script to remove the containers that were not properly removed by the clean up trap. Historically we used to kill docker containers of the same name before starting a testsuite, but this had the downside that we could not start the same testsuite multiple times in parallel. This was refactored in docker-playground Ifcd384272c56d585e220e2588f2186dc110902ed. Change-Id: I58c17b57c998eaba411658e83b7295d7cfcf9a23 --- M scripts/docker-cleanup.sh 1 file changed, 61 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/scripts/docker-cleanup.sh b/scripts/docker-cleanup.sh index fe134d2..0d19d7d 100755 --- a/scripts/docker-cleanup.sh +++ b/scripts/docker-cleanup.sh @@ -1,6 +1,40 @@ #!/bin/sh -x # https://osmocom.org/projects/osmocom-servers/wiki/Docker_cache_clean_up +kill_docker_containers_running_longer_than_24h() { + docker ps + set +x + + local date_24h_ago="$(date "+%s" -d"24 hours ago")" + docker ps --format "{{.ID}}|{{.Names}}|{{.CreatedAt}}" | while read -r line; do + local id="$(echo "$line" | cut -d '|' -f 1)" + local name="$(echo "$line" | cut -d '|' -f 2)" + local created_at="$(echo "$line" | cut -d '|' -f 3 | cut -d ' ' -f 1-3)" + local date_created_at="$(date "+%s" -d "$created_at")" + + if [ "$date_created_at" -gt "$date_24h_ago" ]; then + echo "$name: not running for >24h" + continue + fi + + case "$name" in + jenkins-*|*ttcn3*) ;; + *) + echo "$name: does not match name pattern" + continue + ;; + esac + + echo "$name ($id): has been running for >24h, killing" + docker kill "$id" + done + + set -x + docker ps +} + +kill_docker_containers_running_longer_than_24h + # delete all containers where we forgot to use --rm with docker run, # older than 24 hours docker container prune --filter "until=24h" -f -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I58c17b57c998eaba411658e83b7295d7cfcf9a23 Gerrit-Change-Number: 34645 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ci[master]: scripts/docker-cleanup: remove containers > 24h
by laforge 05 Oct '23

05 Oct '23

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email ) Change subject: scripts/docker-cleanup: remove containers > 24h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I58c17b57c998eaba411658e83b7295d7cfcf9a23 Gerrit-Change-Number: 34645 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Oct 2023 05:55:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in osmo-bsc[master]: ASCI: Add System Information 10 support
by fixeria 04 Oct '23

04 Oct '23

Attention is currently required from: jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email ) Change subject: ASCI: Add System Information 10 support ...................................................................... Patch Set 2: (6 comments) Patchset: PS2: > I also don't like the timer. […] SI10 is actually not needed for the call establishment, it's needed for quicker cell change. Without SI10 a phone participating a group call would need to first tune to BCCH of each neighbor to see if the current group call is also ongoing there or not -- this would cause a gap in the call. IIUC, the payload of SI10 is expected to remain static as long as a) there are no neighbor list changes, b) no ongoing group calls being released, and c) no new group calls being established. Maybe we can trigger SI10 generation and sending if a), b), or c) happens? File src/osmo-bsc/system_information.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/abfe25bf_b72c4afd PS2, Line 1420: struct gsm_subscriber_connection *conn should be `const` https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/b988a2f5_69d6cfbe PS2, Line 1424: *n_bts, *l_bts cosmetic: better declare these two separately, so they're not hidden behind the `s_bts` assignment. Wait, they're only used within the for-loop? Then they should be moved there. https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/7c9d144a_cda5d3da PS2, Line 1428: unsigned int save_cur_bit; : struct gsm_subscriber_connection *c; both vars can be moved to the scope of use (for-loop) https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/7983ba8f_7fe8cfe7 PS2, Line 1447: 32 where this limit is coming from? is there a macro? if not, at least add a comment? https://gerrit.osmocom.org/c/osmo-bsc/+/34626/comment/668a1787_e10481d1 PS2, Line 1499: /* Do spare padding. We cannot do it earlier, because encoding might corrupt it if differenctial cell info > the same "differential cell info" mentioned a few lines above I guess... Indeed, SI10 employs so-called differential encoding: you encode all the info for the first BTS and then only those parameters that differ for the remaining BTSs. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34626?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icd3101e6dd935a57f003253aaef400c2cf95a0c3 Gerrit-Change-Number: 34626 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 Oct 2023 19:06:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-ci[master]: scripts/docker-cleanup: remove containers > 24h
by fixeria 04 Oct '23

04 Oct '23

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email ) Change subject: scripts/docker-cleanup: remove containers > 24h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I58c17b57c998eaba411658e83b7295d7cfcf9a23 Gerrit-Change-Number: 34645 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: Wed, 04 Oct 2023 17:21:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ci[master]: scripts/docker-cleanup: remove containers > 24h
by pespin 04 Oct '23

04 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email ) Change subject: scripts/docker-cleanup: remove containers > 24h ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I58c17b57c998eaba411658e83b7295d7cfcf9a23 Gerrit-Change-Number: 34645 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 Oct 2023 15:59:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ci[master]: scripts/docker-cleanup: remove containers > 24h
by osmith 04 Oct '23

04 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email ) Change subject: scripts/docker-cleanup: remove containers > 24h ...................................................................... scripts/docker-cleanup: remove containers > 24h Remove containers starting with jenkins- or having ttcn3 in the name, if they have been running for more than 24 hours. This can happen with the ttcn3 testsuites, as they typically start multiple docker containers in the background (one per Osmocom program) before they start the testsuite docker container in the foreground. Usually the clean up trap makes sure that all containers get killed, but we have seen that a few containers have been running for a few months. One reason for this could be temporary loss of connection between the jenkins server and the node running the job. Extend the clean script to remove the containers that were not properly removed by the clean up trap. Historically we used to kill docker containers of the same name before starting a testsuite, but this had the downside that we could not start the same testsuite multiple times in parallel. This was refactored in docker-playground Ifcd384272c56d585e220e2588f2186dc110902ed. Change-Id: I58c17b57c998eaba411658e83b7295d7cfcf9a23 --- M scripts/docker-cleanup.sh 1 file changed, 61 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/45/34645/1 diff --git a/scripts/docker-cleanup.sh b/scripts/docker-cleanup.sh index fe134d2..0d19d7d 100755 --- a/scripts/docker-cleanup.sh +++ b/scripts/docker-cleanup.sh @@ -1,6 +1,40 @@ #!/bin/sh -x # https://osmocom.org/projects/osmocom-servers/wiki/Docker_cache_clean_up +kill_docker_containers_running_longer_than_24h() { + docker ps + set +x + + local date_24h_ago="$(date "+%s" -d"24 hours ago")" + docker ps --format "{{.ID}}|{{.Names}}|{{.CreatedAt}}" | while read -r line; do + local id="$(echo "$line" | cut -d '|' -f 1)" + local name="$(echo "$line" | cut -d '|' -f 2)" + local created_at="$(echo "$line" | cut -d '|' -f 3 | cut -d ' ' -f 1-3)" + local date_created_at="$(date "+%s" -d "$created_at")" + + if [ "$date_created_at" -gt "$date_24h_ago" ]; then + echo "$name: not running for >24h" + continue + fi + + case "$name" in + jenkins-*|*ttcn3*) ;; + *) + echo "$name: does not match name pattern" + continue + ;; + esac + + echo "$name ($id): has been running for >24h, killing" + docker kill "$id" + done + + set -x + docker ps +} + +kill_docker_containers_running_longer_than_24h + # delete all containers where we forgot to use --rm with docker run, # older than 24 hours docker container prune --filter "until=24h" -f -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34645?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I58c17b57c998eaba411658e83b7295d7cfcf9a23 Gerrit-Change-Number: 34645 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy
by pespin 04 Oct '23

04 Oct '23

Attention is currently required from: dexter, fixeria, fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... Patch Set 3: (1 comment) File src/gprs_rlcmac_sched.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/34575/comment/22488527_24303197 PS2, Line 491: if (bts->trx[trx].fl1h) { > When we want to send the information which BTS model is used down to the PCU we might consider to us […] I'd go for having a define in pcuif which doesn't need to necessarily be the same as present/used in osmo-bts or osmo-bsc. They could convert to it. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <axilirator(a)gmail.com> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <axilirator(a)gmail.com> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 04 Oct 2023 15:31:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy
by dexter 04 Oct '23

04 Oct '23

Attention is currently required from: fixeria, fixeria, osmith, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... Patch Set 3: (1 comment) File src/gprs_rlcmac_sched.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/34575/comment/8e461daa_8c11c6db PS2, Line 491: if (bts->trx[trx].fl1h) { > I think actually the first would be to decouple the feature "direct-phy" from "this bts doesn't supp […] When we want to send the information which BTS model is used down to the PCU we might consider to use enum gsm_bts_type_variant: https://gitea.osmocom.org/cellular-infrastructure/osmo-bts/src/branch/maste… Unfortunately I am not entirely sure how to set this up. The enum is defined in bts.h. We may move it to pcuif_proto.h so that it becomes available to for all entities. Or we just define a new one, but this would be redundant. Any ideas to solve this in a more elegant way? Or is there even something in libosmocore? I couldn't find anything. Even more unfotunately: its already a mess, osmo-bsc already has its own definition of that same enum: https://gitea.osmocom.org/cellular-infrastructure/osmo-bsc/src/branch/maste… Maybe it could even have a healthy effect to define that enum in pcuif_proto.h so that we always can be sure that all entities have the same definition. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <axilirator(a)gmail.com> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <axilirator(a)gmail.com> Gerrit-Comment-Date: Wed, 04 Oct 2023 15:25:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: rename sysmo_direct_dsp to direct_phy
by dexter 04 Oct '23

04 Oct '23

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34585?usp=email ) Change subject: rename sysmo_direct_dsp to direct_phy ...................................................................... rename sysmo_direct_dsp to direct_phy The name sysmo_direct_dsp is not entirely correct. It should be just "sysmo" if we follow the rules that the "PCU_IF_FLAG_" prefix is supposed to be chopped off here. In pcuif_proto.h, we have renamed PCU_IF_FLAG_SYSMO to PCU_IF_FLAG_DIRECT_PHY. (see Depends), so let's rename the flag here to "direct_phy". Related: OS#6191 Depends: osmo-pcu.git I29b7b78a3a91d062b9ea3cd72623d30618cd3f0b Change-Id: Ib67c4441d0077822d0f9cbf29338fedeb916f287 --- M library/PCUIF_Types.ttcn 1 file changed, 22 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 6be45df..8fb0be3 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -60,7 +60,7 @@ type record PCUIF_Flags { boolean bts_active, - boolean sysmo_direct_dsp, + boolean direct_phy, BIT14 spare, boolean cs1, boolean cs2, @@ -819,7 +819,7 @@ const PCUIF_Flags c_PCUIF_Flags_default := { bts_active := true, - sysmo_direct_dsp := false, + direct_phy := false, spare := '00000000000000'B, cs1 := true, cs2 := true, @@ -839,7 +839,7 @@ const PCUIF_Flags c_PCUIF_Flags_noMCS := { bts_active := true, - sysmo_direct_dsp := false, + direct_phy := false, spare := '00000000000000'B, cs1 := true, cs2 := true, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34585?usp=email 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: Ib67c4441d0077822d0f9cbf29338fedeb916f287 Gerrit-Change-Number: 34585 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0