- gerrit-log - lists.osmocom.org

Change in osmo-bts[master]: osmo-bts-trx: amr_loop: allow upgrading codec mode > 0
by fixeria 14 Apr '22

14 Apr '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27775 ) Change subject: osmo-bts-trx: amr_loop: allow upgrading codec mode > 0 ...................................................................... osmo-bts-trx: amr_loop: allow upgrading codec mode > 0 With the current implementation the AMR loop is unable to upgrade the current codec mode unless it reaches the worst possible value. The problem is in the 'else' statement connection both 'if's. Change-Id: I4c0fb28813373c3d4addd28c66f5136d2c4f9ed8 Related: SYS#5917, OS#4984 --- M src/osmo-bts-trx/amr_loop.c 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/75/27775/1 diff --git a/src/osmo-bts-trx/amr_loop.c b/src/osmo-bts-trx/amr_loop.c index 90b156c..6afb5f3 100644 --- a/src/osmo-bts-trx/amr_loop.c +++ b/src/osmo-bts-trx/amr_loop.c @@ -71,6 +71,7 @@ chan_state->lqual_cb_num = 0; chan_state->lqual_cb_sum = 0; + /* If the current codec mode can be degraded */ if (mi > 0) { /* The threshold/hysteresis is in 0.5 dB steps, convert to cB: * 1dB is 10cB, so 0.5dB is 5cB - this is why we multiply by 5. */ @@ -83,8 +84,12 @@ mi, cfg->mode[mi].mode, mi - 1, cfg->mode[mi - 1].mode, lqual_cb, thresh_lower_cb); chan_state->dl_cmr--; + return; } - } else if (mi < chan_state->codecs - 1) { + } + + /* If the current codec mode can be upgraded */ + if (mi < chan_state->codecs - 1) { /* The threshold/hysteresis is in 0.5 dB steps, convert to cB: * 1dB is 10cB, so 0.5dB is 5cB - this is why we multiply by 5. */ const int thresh_upper_cb = cfg->mode[mi].threshold * 5 \ @@ -97,6 +102,7 @@ mi, cfg->mode[mi].mode, mi + 1, cfg->mode[mi + 1].mode, lqual_cb, thresh_upper_cb); chan_state->dl_cmr++; + return; } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4c0fb28813373c3d4addd28c66f5136d2c4f9ed8 Gerrit-Change-Number: 27775 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bts[master]: osmo-bts-trx: amr_loop: log if AMR mode remains unchanged
by fixeria 14 Apr '22

14 Apr '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27776 ) Change subject: osmo-bts-trx: amr_loop: log if AMR mode remains unchanged ...................................................................... osmo-bts-trx: amr_loop: log if AMR mode remains unchanged Change-Id: I0272d11cfaad0e1c13d2858b3bc61d6527898018 Related: SYS#5917, OS#4984 --- M src/osmo-bts-trx/amr_loop.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/76/27776/1 diff --git a/src/osmo-bts-trx/amr_loop.c b/src/osmo-bts-trx/amr_loop.c index 6afb5f3..1771d7a 100644 --- a/src/osmo-bts-trx/amr_loop.c +++ b/src/osmo-bts-trx/amr_loop.c @@ -105,6 +105,9 @@ return; } } + + LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Keeping the current AMR codec " + "mode[%u]=%u\n", mi, cfg->mode[mi].mode); } void trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0272d11cfaad0e1c13d2858b3bc61d6527898018 Gerrit-Change-Number: 27776 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bts[master]: osmo-bts-trx: amr_loop: simplify trx_loop_amr_set()
by fixeria 14 Apr '22

14 Apr '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27773 ) Change subject: osmo-bts-trx: amr_loop: simplify trx_loop_amr_set() ...................................................................... osmo-bts-trx: amr_loop: simplify trx_loop_amr_set() Change-Id: Ibeed00ef48450edfe1e0d4e179fb4c777b11beb9 Related: SYS#5917, OS#4984 --- M src/osmo-bts-trx/amr_loop.c 1 file changed, 4 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/73/27773/1 diff --git a/src/osmo-bts-trx/amr_loop.c b/src/osmo-bts-trx/amr_loop.c index d6e6aac..e5c7fec 100644 --- a/src/osmo-bts-trx/amr_loop.c +++ b/src/osmo-bts-trx/amr_loop.c @@ -99,18 +99,13 @@ void trx_loop_amr_set(struct l1sched_chan_state *chan_state, int loop) { - if (chan_state->amr_loop && !loop) { - chan_state->amr_loop = 0; + if (chan_state->amr_loop == loop) return; - } - - if (!chan_state->amr_loop && loop) { - chan_state->amr_loop = 1; - + if (!chan_state->amr_loop) { /* reset bit errors */ chan_state->ber_num = 0; chan_state->ber_sum = 0; - - return; } + + chan_state->amr_loop = loop; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibeed00ef48450edfe1e0d4e179fb4c777b11beb9 Gerrit-Change-Number: 27773 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bts[master]: struct amr_multirate_conf: remove ms_mode[], raname bts_mode[]
by fixeria 14 Apr '22

14 Apr '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27772 ) Change subject: struct amr_multirate_conf: remove ms_mode[], raname bts_mode[] ...................................................................... struct amr_multirate_conf: remove ms_mode[], raname bts_mode[] Looks like this structure was copied from openbsc/osmo-bsc as-is. The ms_mode[] makes no sense in the context of BTS, so remove it and rename bts_mode[] to mode[] for the sake of brevity. Change-Id: I7442360ed857554440a0b9854f2d2bbab9dc5a71 Related: SYS#5917, OS#4984 --- M include/osmo-bts/lchan.h M src/common/amr.c M src/osmo-bts-sysmo/tch.c M src/osmo-bts-trx/amr_loop.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/l1_if.c M tests/amr/amr_test.c 7 files changed, 37 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/72/27772/1 diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 3aaa75a..9cdc6f7 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -67,8 +67,7 @@ struct amr_multirate_conf { uint8_t gsm48_ie[2]; - struct amr_mode ms_mode[4]; - struct amr_mode bts_mode[4]; + struct amr_mode mode[4]; uint8_t num_modes; }; diff --git a/src/common/amr.c b/src/common/amr.c index acf1c37..47c9dcb 100644 --- a/src/common/amr.c +++ b/src/common/amr.c @@ -95,9 +95,9 @@ for (i = 0; i < amr_mrc->num_modes; i++) LOGPC(ss, logl, ", mode[%u] = %u/%u/%u", - i, amr_mrc->bts_mode[i].mode, - amr_mrc->bts_mode[i].threshold, - amr_mrc->bts_mode[i].hysteresis); + i, amr_mrc->mode[i].mode, + amr_mrc->mode[i].threshold, + amr_mrc->mode[i].hysteresis); LOGPC(ss, logl, "\n"); } @@ -106,7 +106,7 @@ { unsigned int i; for (i = 0; i < amr_mrc->num_modes; i++) { - if (amr_mrc->bts_mode[i].mode == cmi) + if (amr_mrc->mode[i].mode == cmi) return i; } return -EINVAL; @@ -196,7 +196,7 @@ for (i = 0; i < 8; i++) { if (mr_conf[1] & (1 << i)) { - amr_mrc->bts_mode[j++].mode = i; + amr_mrc->mode[j++].mode = i; } } @@ -204,18 +204,18 @@ mr_conf += 2; if (num_codecs >= 2) { - amr_mrc->bts_mode[0].threshold = mr_conf[0] & 0x3F; - amr_mrc->bts_mode[0].hysteresis = mr_conf[1] >> 4; + amr_mrc->mode[0].threshold = mr_conf[0] & 0x3F; + amr_mrc->mode[0].hysteresis = mr_conf[1] >> 4; } if (num_codecs >= 3) { - amr_mrc->bts_mode[1].threshold = + amr_mrc->mode[1].threshold = ((mr_conf[1] & 0xF) << 2) | (mr_conf[2] >> 6); - amr_mrc->bts_mode[1].hysteresis = (mr_conf[2] >> 2) & 0xF; + amr_mrc->mode[1].hysteresis = (mr_conf[2] >> 2) & 0xF; } if (num_codecs >= 4) { - amr_mrc->bts_mode[2].threshold = + amr_mrc->mode[2].threshold = ((mr_conf[2] & 0x3) << 4) | (mr_conf[3] >> 4); - amr_mrc->bts_mode[2].hysteresis = mr_conf[3] & 0xF; + amr_mrc->mode[2].hysteresis = mr_conf[3] & 0xF; } return num_codecs; @@ -272,7 +272,7 @@ memcpy(lchan->tch.amr_mr.gsm48_ie, mr_cfg, sizeof(lchan->tch.amr_mr.gsm48_ie)); - memcpy(&lchan->tch.amr_mr.bts_mode[0], &bts_mode[0], - sizeof(lchan->tch.amr_mr.bts_mode)); + memcpy(&lchan->tch.amr_mr.mode[0], &bts_mode[0], + sizeof(lchan->tch.amr_mr.mode)); lchan->tch.amr_mr.num_modes = num_modes; } diff --git a/src/osmo-bts-sysmo/tch.c b/src/osmo-bts-sysmo/tch.c index eb719f1..a390c8c 100644 --- a/src/osmo-bts-sysmo/tch.c +++ b/src/osmo-bts-sysmo/tch.c @@ -298,7 +298,7 @@ LOGP(DL1P, LOGL_NOTICE, "L1->RTP: overriding CMR IDX %u\n", cmr_idx); cmr = AMR_CMR_NONE; } else { - cmr = amr_mrc->bts_mode[cmr_idx].mode; + cmr = amr_mrc->mode[cmr_idx].mode; lchan->tch.last_cmr = cmr; } diff --git a/src/osmo-bts-trx/amr_loop.c b/src/osmo-bts-trx/amr_loop.c index afb9c37..d6e6aac 100644 --- a/src/osmo-bts-trx/amr_loop.c +++ b/src/osmo-bts-trx/amr_loop.c @@ -78,7 +78,7 @@ if (chan_state->dl_cmr > 0) { /* degrade, if ber is above threshold FIXME: C/I */ if (ber > - lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr-1].threshold) { + lchan->tch.amr_mr.mode[chan_state->dl_cmr-1].threshold) { LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Degrading due to BER %.6f " "from codec id %d to %d\n", ber, chan_state->dl_cmr, chan_state->dl_cmr - 1); @@ -87,8 +87,8 @@ } else if (chan_state->dl_cmr < chan_state->codecs - 1) { /* degrade, if ber is above threshold FIXME: C/I*/ if (ber < - lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].threshold - - lchan->tch.amr_mr.bts_mode[chan_state->dl_cmr].hysteresis) { + lchan->tch.amr_mr.mode[chan_state->dl_cmr].threshold + - lchan->tch.amr_mr.mode[chan_state->dl_cmr].hysteresis) { LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Upgrading due to BER %.6f " "from codec id %d to %d\n", ber, chan_state->dl_cmr, chan_state->dl_cmr + 1); diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 5ac3e31..92180b5 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -428,10 +428,10 @@ trx_sched_set_mode(lchan->ts, chan_nr, lchan->rsl_cmode, lchan->tch_mode, lchan->tch.amr_mr.num_modes, - lchan->tch.amr_mr.bts_mode[0].mode, - lchan->tch.amr_mr.bts_mode[1].mode, - lchan->tch.amr_mr.bts_mode[2].mode, - lchan->tch.amr_mr.bts_mode[3].mode, + lchan->tch.amr_mr.mode[0].mode, + lchan->tch.amr_mr.mode[1].mode, + lchan->tch.amr_mr.mode[2].mode, + lchan->tch.amr_mr.mode[3].mode, amr_get_initial_mode(lchan), (lchan->ho.active == 1)); /* set lchan active */ @@ -457,10 +457,10 @@ trx_sched_set_mode(lchan->ts, chan_nr, lchan->rsl_cmode, lchan->tch_mode, lchan->tch.amr_mr.num_modes, - lchan->tch.amr_mr.bts_mode[0].mode, - lchan->tch.amr_mr.bts_mode[1].mode, - lchan->tch.amr_mr.bts_mode[2].mode, - lchan->tch.amr_mr.bts_mode[3].mode, + lchan->tch.amr_mr.mode[0].mode, + lchan->tch.amr_mr.mode[1].mode, + lchan->tch.amr_mr.mode[2].mode, + lchan->tch.amr_mr.mode[3].mode, amr_get_initial_mode(lchan), 0); break; diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index 0d36db1..bba274d 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -384,10 +384,10 @@ trx_sched_set_mode(lchan->ts, chan_nr, lchan->rsl_cmode, lchan->tch_mode, lchan->tch.amr_mr.num_modes, - lchan->tch.amr_mr.bts_mode[0].mode, - lchan->tch.amr_mr.bts_mode[1].mode, - lchan->tch.amr_mr.bts_mode[2].mode, - lchan->tch.amr_mr.bts_mode[3].mode, + lchan->tch.amr_mr.mode[0].mode, + lchan->tch.amr_mr.mode[1].mode, + lchan->tch.amr_mr.mode[2].mode, + lchan->tch.amr_mr.mode[3].mode, amr_get_initial_mode(lchan), (lchan->ho.active == 1)); /* set lchan active */ @@ -410,10 +410,10 @@ trx_sched_set_mode(lchan->ts, chan_nr, lchan->rsl_cmode, lchan->tch_mode, lchan->tch.amr_mr.num_modes, - lchan->tch.amr_mr.bts_mode[0].mode, - lchan->tch.amr_mr.bts_mode[1].mode, - lchan->tch.amr_mr.bts_mode[2].mode, - lchan->tch.amr_mr.bts_mode[3].mode, + lchan->tch.amr_mr.mode[0].mode, + lchan->tch.amr_mr.mode[1].mode, + lchan->tch.amr_mr.mode[2].mode, + lchan->tch.amr_mr.mode[3].mode, amr_get_initial_mode(lchan), 0); break; diff --git a/tests/amr/amr_test.c b/tests/amr/amr_test.c index 941212a..480ff73 100644 --- a/tests/amr/amr_test.c +++ b/tests/amr/amr_test.c @@ -159,9 +159,9 @@ printf("amr_parse_mr_conf() -> num_modes=%u\n", mrc.num_modes); for (i = 0; i < mrc.num_modes; i++) { printf(" Mode[%u] = %u/%u/%u\n", - i, mrc.bts_mode[i].mode, - mrc.bts_mode[i].threshold, - mrc.bts_mode[i].hysteresis); + i, mrc.mode[i].mode, + mrc.mode[i].threshold, + mrc.mode[i].hysteresis); } mrc_enc[1] = 0xff; /* all codec modes active */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7442360ed857554440a0b9854f2d2bbab9dc5a71 Gerrit-Change-Number: 27772 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in docker-playground[master]: open5gs-latest: fix Dockerfile: avoid using curl for downloading keys
by pespin 14 Apr '22

14 Apr '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27771 ) Change subject: open5gs-latest: fix Dockerfile: avoid using curl for downloading keys ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9757fcce084595341b1a68822bad454b64941eb1 Gerrit-Change-Number: 27771 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Apr 2022 20:59:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: OBS, ttcn3-testsuites: add 2022q1
by pespin 14 Apr '22

14 Apr '22

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27770 ) Change subject: OBS, ttcn3-testsuites: add 2022q1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idadb541b49e57b4403a6a6e4c966bcba9c6651db Gerrit-Change-Number: 27770 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, 13 Apr 2022 20:59:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: open5gs-latest: fix Dockerfile: avoid using curl for downloading keys
by fixeria 14 Apr '22

14 Apr '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27771 ) Change subject: open5gs-latest: fix Dockerfile: avoid using curl for downloading keys ...................................................................... open5gs-latest: fix Dockerfile: avoid using curl for downloading keys Since recently, curl fails to download the key from www.mongodb.org: ''' $ curl --verbose https://www.mongodb.org/static/pgp/server-4.2.asc GET /static/pgp/server-4.2.asc HTTP/1.1 Host: www.mongodb.org User-Agent: curl/7.82.0 Accept: */* Mark bundle as not supporting multiuse HTTP/1.1 301 Moved Permanently Content-Type: text/html Date: Wed, 13 Apr 2022 20:50:19 GMT Location: https://pgp.mongodb.com/server-4.2.asc Connection: Keep-Alive Content-Length: 0 ''' By default, curl would not follow redirects unless '-L' is specified. Let's use Docker's 'ADD' command instead, like many Dockerfiles do. Also, update the address as suggested in the server's response. Change-Id: I9757fcce084595341b1a68822bad454b64941eb1 Related: SYS#5602 --- M open5gs-latest/Dockerfile 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/71/27771/1 diff --git a/open5gs-latest/Dockerfile b/open5gs-latest/Dockerfile index 325062f..66683b9 100644 --- a/open5gs-latest/Dockerfile +++ b/open5gs-latest/Dockerfile @@ -6,15 +6,16 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends \ ca-certificates \ - gnupg \ - curl -RUN curl https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/D… | apt-key add - -RUN curl https://www.mongodb.org/static/pgp/server-4.2.asc | apt-key add - + gnupg + +ADD https://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/D… /tmp/Release.key +ADD https://pgp.mongodb.com/server-4.2.asc /tmp/server-4.2.asc RUN echo "deb http://download.opensuse.org/repositories/home:/acetcom:/open5gs:/latest/De… ./" \ > /etc/apt/sources.list.d/open5gs.list RUN echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.2 main" \ > /etc/apt/sources.list.d/mongodb-org.list +RUN apt-key add /tmp/Release.key && apt-key add /tmp/server-4.2.asc RUN apt-get update && \ apt-get install -y \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9757fcce084595341b1a68822bad454b64941eb1 Gerrit-Change-Number: 27771 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ci[master]: OBS, ttcn3-testsuites: add 2022q1
by osmith 14 Apr '22

14 Apr '22

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27770 ) Change subject: OBS, ttcn3-testsuites: add 2022q1 ...................................................................... OBS, ttcn3-testsuites: add 2022q1 Related: SYS#5887 Change-Id: Idadb541b49e57b4403a6a6e4c966bcba9c6651db --- M jobs/ttcn3-testsuites.yml M scripts/common-obs.sh M scripts/osmocom-nightly-packages.sh 3 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/70/27770/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 89915a2..4f92248 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -400,6 +400,29 @@ blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 30 14 * * * + # centos8 2022q1 (SYS#5887) + - TTCN3-centos-pcu-test-2022q1: + blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" + timer: 00 15 * * * + - TTCN3-centos-pcu-test-sns-2022q1: + blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" + timer: 15 15 * * * + - TTCN3-centos-bsc-test-2022q1: + blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" + timer: 30 15 * * * + - TTCN3-centos-mgw-test-2022q1: + blocking: "^(ttcn3|TTCN3-.*)-mgw-test.*" + timer: 45 15 * * * + - TTCN3-centos-bts-test-2022q1: + blocking: "^(ttcn3|TTCN3-.*)-bts-test.*" + timer: 00 16 * * * + - TTCN3-centos-smlc-test-2022q1: + blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*" + timer: 15 16 * * * + - TTCN3-centos-gbproxy-test-2022q1: + blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" + timer: 30 16 * * * + - job-template: name: '{job-name}' project-type: freestyle diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh index e53a7aa..2d3bea7 100644 --- a/scripts/common-obs.sh +++ b/scripts/common-obs.sh @@ -5,6 +5,7 @@ FEEDS_ALL=" 2021q1 2021q4 + 2022q1 latest next nightly diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 6fb8a1d..3f9fc4c 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -17,6 +17,7 @@ FEEDS=" 2021q1 2021q4 + 2022q1 next nightly " -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idadb541b49e57b4403a6a6e4c966bcba9c6651db Gerrit-Change-Number: 27770 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-uecups[master]: tun_device: Avoid deadlocks logging while thread is cancelled
by pespin 14 Apr '22

14 Apr '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-uecups/+/27769 ) Change subject: tun_device: Avoid deadlocks logging while thread is cancelled ...................................................................... tun_device: Avoid deadlocks logging while thread is cancelled We cannot garantee that LOGP will not end up calling a syscall which can be a cancellation point. Since the syscall will be probably called while having the logging mutex locked, an eventuall cancellation of the thread would leave the logging mutex locked forever, hence making all other threads deadlock as soon as they try to write anything to the log. Change-Id: I72a0b536c8f39857960f132a5b84cdf5b8519732 --- M daemon/tun_device.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-uecups refs/changes/69/27769/1 diff --git a/daemon/tun_device.c b/daemon/tun_device.c index 5993856..e9c0400 100644 --- a/daemon/tun_device.c +++ b/daemon/tun_device.c @@ -139,12 +139,17 @@ uint8_t *buffer = base_buffer + sizeof(struct gtp1_header); struct sockaddr_storage daddr; + int old_cancelst_unused; /* initialize the fixed part of the GTP header */ gtph->flags = 0x30; gtph->type = GTP_TPDU; pthread_cleanup_push(tun_device_pthread_cleanup_routine, tun); + /* IMPORTANT!: All logging functions in this function block must be called with + * PTHREAD_CANCEL_DISABLE set, otherwise the thread could be cancelled while + * holding the logging mutex, hence causing deadlock with main (or other) + * thread. */ while (1) { struct gtp_tunnel *t; @@ -154,6 +159,7 @@ /* 1) read from tun */ rc = read(tun->fd, buffer, MAX_UDP_PACKET); if (rc < 0) { + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); LOGTUN(tun, LOGL_FATAL, "Error readingfrom tun device: %s\n", strerror(errno)); exit(1); } @@ -162,8 +168,10 @@ rc = parse_pkt(&pinfo, buffer, nread); if (rc < 0) { + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); LOGTUN(tun, LOGL_NOTICE, "Error parsing IP packet: %s\n", osmo_hexdump(buffer, nread)); + pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelst_unused); continue; } @@ -181,7 +189,9 @@ getnameinfo((const struct sockaddr *)&pinfo.saddr, sizeof(pinfo.saddr), host, sizeof(host), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV); + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); LOGTUN(tun, LOGL_NOTICE, "No tunnel found for source address %s:%s\n", host, port); + pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelst_unused); continue; } outfd = t->gtp_ep->fd; @@ -193,6 +203,7 @@ rc = sendto(outfd, base_buffer, nread+sizeof(*gtph), 0, (struct sockaddr *)&daddr, sizeof(daddr)); if (rc < 0) { + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelst_unused); LOGTUN(tun, LOGL_FATAL, "Error Writing to UDP socket: %s\n", strerror(errno)); exit(1); } -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/27769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I72a0b536c8f39857960f132a5b84cdf5b8519732 Gerrit-Change-Number: 27769 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: Avoid generating zero-length packets
by laforge 14 Apr '22

14 Apr '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27763 ) Change subject: Avoid generating zero-length packets ...................................................................... Avoid generating zero-length packets I used the construct like f_rnd_octstring(f_rnd_int(100)) in a number of places to generate random-length packets with randomized length. The problem I didn't realize is that f_rnd_int() of course can also return '0', which would generate zero-length packets. This may be permitted in some protocols, but it leads to problems e.g. when trying to send a UDP packet of zero length (which the kernel will not do). So let's introduce * f_rnd_int_nonzero() for returning non-zero randomized integers * f_rnd_octstring_rnd_len() for returning a random-length random payload octet string * replace all f_rnd_octstring(f_rnd_int()) call sites with the new function. Change-Id: I818a113ff8d2a2f7cab2ec7d9c8661607c6331d6 Closes: OS#5528 --- M fr/FR_Tests.ttcn M library/Osmocom_Types.ttcn M pcap-client/OPCAP_CLIENT_Tests.ttcn M remsim/RemsimClient_Tests.ttcn M sccp/SCCP_Tests_RAW.ttcn M stp/STP_Tests.ttcn M stp/STP_Tests_M3UA.ttcn 7 files changed, 29 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/fr/FR_Tests.ttcn b/fr/FR_Tests.ttcn index b7a56c3..65029c1 100644 --- a/fr/FR_Tests.ttcn +++ b/fr/FR_Tests.ttcn @@ -276,7 +276,7 @@ var integer ran_index := 0; var template (value) PDU_LLC llc_tx; var template (present) PDU_LLC llc_rx_exp; - var octetstring llc_payload := f_rnd_octstring(f_rnd_int(max_llc_payload_len)); + var octetstring llc_payload := f_rnd_octstring_rnd_len(max_llc_payload_len); var PDU_LLC llc_rx; timer T := 5.0; diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index b698a2e..2edec36 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -65,6 +65,11 @@ return float2int(rnd()*int2float(max)); } +/* return random integer 1 <= ret < max */ +function f_rnd_int_nonzero(integer max) return integer { + return float2int(1.0 + rnd()*int2float(max-1)); +} + /* return hexstring composed of random digits */ function f_rnd_hexstring(in integer len, in integer max := 16) return hexstring { var integer i; @@ -85,6 +90,11 @@ return ret; } +/* return ocetstring composed of random bytes, at least 1, maximum 'maxlen' bytes long */ +function f_rnd_octstring_rnd_len(in integer maxlen) return octetstring { + return f_rnd_octstring(f_rnd_int_nonzero(maxlen)); +} + /* return bitstring composed of random bits */ function f_rnd_bitstring(in integer len) return bitstring { var octetstring oct := f_rnd_octstring(len / 8 + 1); diff --git a/pcap-client/OPCAP_CLIENT_Tests.ttcn b/pcap-client/OPCAP_CLIENT_Tests.ttcn index e9fe406..1efc343 100644 --- a/pcap-client/OPCAP_CLIENT_Tests.ttcn +++ b/pcap-client/OPCAP_CLIENT_Tests.ttcn @@ -144,7 +144,7 @@ var octetstring udp_payload; /* we assume 1400 is low enough to avoid IP fragmentation */ - udp_payload := f_rnd_octstring(f_rnd_int(1400)); + udp_payload := f_rnd_octstring_rnd_len(1400); f_trafic_pkt_ab(udp_payload); f_opcap_exp_udp(udp_payload, 0); @@ -173,7 +173,7 @@ var octetstring udp_payload; /* we assume 1400 is low enough to avoid IP fragmentation */ - udp_payload := f_rnd_octstring(f_rnd_int(1400)); + udp_payload := f_rnd_octstring_rnd_len(1400); f_trafic_pkt_ab(udp_payload); /* expect packet to arrive on both simulated servers */ diff --git a/remsim/RemsimClient_Tests.ttcn b/remsim/RemsimClient_Tests.ttcn index d7d6bc7..219573c 100644 --- a/remsim/RemsimClient_Tests.ttcn +++ b/remsim/RemsimClient_Tests.ttcn @@ -299,8 +299,8 @@ integer count := 100, integer i := 0) runs on client_test_CT { for (var integer j := 0; j < count; j := j+1) { - var octetstring c_apdu := f_rnd_octstring(f_rnd_int(270)); - var octetstring r_apdu := f_rnd_octstring(f_rnd_int(270)); + var octetstring c_apdu := f_rnd_octstring_rnd_len(270); + var octetstring r_apdu := f_rnd_octstring_rnd_len(270); f_client2bank(cslot, bslot, c_apdu, i:=i); f_bank2client(bslot, cslot, r_apdu, i:=i); } @@ -345,8 +345,8 @@ f_set_atr(cslot, '3B9F96801FC78031A073BE21136743200718000001A5'O, i:=1); - var octetstring c_apdu := f_rnd_octstring(f_rnd_int(270)); - var octetstring r_apdu := f_rnd_octstring(f_rnd_int(270)); + var octetstring c_apdu := f_rnd_octstring_rnd_len(270); + var octetstring r_apdu := f_rnd_octstring_rnd_len(270); /* Send C-APDU from correct ClientId/Slot to simulated bankd */ f_client2bank(cslot, bslot, c_apdu, i:=1); /* respond with R-APDU from correct bankId/Slot but stating wrong ClientId */ @@ -372,8 +372,8 @@ f_set_atr(cslot, '3B9F96801FC78031A073BE21136743200718000001A5'O, i:=1); - var octetstring c_apdu := f_rnd_octstring(f_rnd_int(270)); - var octetstring r_apdu := f_rnd_octstring(f_rnd_int(270)); + var octetstring c_apdu := f_rnd_octstring_rnd_len(270); + var octetstring r_apdu := f_rnd_octstring_rnd_len(270); /* Send C-APDU from correct ClientId/Slot to simulated bankd */ f_client2bank(cslot, bslot, c_apdu, i:=1); /* respond with R-APDU from wrong bankId but stating correct ClientId */ diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 5013ddf..fd6bad9 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -182,7 +182,7 @@ testcase TC_udt_without_cr_cc() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; var SCCP_MTP3_TRANSFERind rx; - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); /* Keep recommended ratio of T(iar) >= T(ias)*2, but anyway no IT should be received in this case. */ @@ -215,7 +215,7 @@ testcase TC_tiar_timeout() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; var OCT3 remote_lref; - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); /* Set T(iar) in sccp_demo_user low enough that it will trigger before other side has time to keep alive with a T(ias). Keep recommended ratio of @@ -320,7 +320,7 @@ /* Test if the IUT SCCP code processes an XUDT [treat it like UDT] and answers back. */ testcase TC_process_rx_xudt() runs on SCCP_Test_RAW_CT { var SCCP_PAR_Address calling, called; - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); f_init_raw(mp_sccp_cfg[0]); f_sleep(1.0); diff --git a/stp/STP_Tests.ttcn b/stp/STP_Tests.ttcn index 004af05..ac45b1d 100644 --- a/stp/STP_Tests.ttcn +++ b/stp/STP_Tests.ttcn @@ -73,7 +73,7 @@ f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx /* send a well-formed, encoded SCCP message via M3UA */ - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); @@ -105,7 +105,7 @@ f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx /* send a well-formed, encoded SCCP message via IPA */ - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); @@ -137,7 +137,7 @@ f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx /* send a well-formed, encoded SCCP message via IPA */ - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); @@ -173,7 +173,7 @@ f_M3UA_asp_up_act(0, omit, omit); // TODO: rctx /* send a well-formed, encoded SCCP message via IPA */ - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var SCCP_PAR_Address called := valueof(ts_SccpAddr_GT('1234'H)); var SCCP_PAR_Address calling := valueof(ts_SccpAddr_GT('5678'H)); var PDU_SCCP sccp := valueof(ts_SCCP_UDT(called, calling, data)); diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 31bab93..08fc9c9 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -407,7 +407,7 @@ integer idx_rx, template (omit) OCT4 rctx_receiver, OCT4 pc_rx, OCT1 si := '23'O, OCT1 ni := '00'O, OCT1 mp := '00'O, OCT1 sls := '00'O) runs on RAW_M3UA_CT { - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); f_M3UA_send(idx_tx, ts_M3UA_DATA(rctx_sender, ts_M3UA_protocol_data(pc_tx, pc_rx, si, ni, mp, sls, data)), 1); f_M3UA_exp(idx_rx, tr_M3UA_DATA(rctx_receiver, @@ -482,7 +482,7 @@ const integer iter_per_asp := 5; var integer num_rx[NR_M3UA] := { 0, 0, 0 }; for (i := 0; i < 2*iter_per_asp; i := i+1) { - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var template (value) M3UA_Protocol_Data tx_pd; var template (present) M3UA_Protocol_Data rx_pd; tx_pd := ts_M3UA_protocol_data(pc_sender, pc_receiver, '23'O, '00'O, '00'O, '00'O, data); @@ -533,7 +533,7 @@ /* verify traffic is routed from sender to new receiver */ for (i := 0; i < 10; i := i+1) { - var octetstring data := f_rnd_octstring(f_rnd_int(100)); + var octetstring data := f_rnd_octstring_rnd_len(100); var template (value) M3UA_Protocol_Data tx_pd; var template (present) M3UA_Protocol_Data rx_pd; tx_pd := ts_M3UA_protocol_data(pc_sender, pc_receiver, '23'O, '00'O, '00'O, '00'O, data); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27763 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: I818a113ff8d2a2f7cab2ec7d9c8661607c6331d6 Gerrit-Change-Number: 27763 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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

2026

2025

2024

2023

2022

gerrit-log