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

[M] Change in libosmocore[master]: gsm: add gsm0502_fn_compare() for comparing TDMA FNs

by laforge

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34520?usp=email ) Change subject: gsm: add gsm0502_fn_compare() for comparing TDMA FNs ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34520?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9590f2e836fc48650decf1564b6ab46306c4fe2d Gerrit-Change-Number: 34520 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Sep 2023 19:07:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-msc[master]: SMS over GSUP: set source_name in GSUP reply messages

by laforge

Attention is currently required from: falconia, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34518?usp=email ) Change subject: SMS over GSUP: set source_name in GSUP reply messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34518?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0b7f4760bdce8a38d43d3860086c6dfb7b390701 Gerrit-Change-Number: 34518 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Sep 2023 19:07:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-msc[master]: SMS over GSUP: correctly route GSUP responses to MT SMS

by laforge

Attention is currently required from: falconia. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34517?usp=email ) Change subject: SMS over GSUP: correctly route GSUP responses to MT SMS ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34517?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I436e333035b8f6e27f86a49fe293ea48ea07a013 Gerrit-Change-Number: 34517 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Mon, 25 Sep 2023 19:07:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-msc[master]: gsup_client_mux: set destination_name in error reply function

by laforge

Attention is currently required from: falconia. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34516?usp=email ) Change subject: gsup_client_mux: set destination_name in error reply function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34516?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I892fe87a733a78ed9d5761a8ce238caa135dea1e Gerrit-Change-Number: 34516 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Mon, 25 Sep 2023 19:06:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in libosmocore[master]: gsm: add gsm0502_fn_compare() for comparing TDMA FNs

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34520?usp=email ) Change subject: gsm: add gsm0502_fn_compare() for comparing TDMA FNs ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34520?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9590f2e836fc48650decf1564b6ab46306c4fe2d Gerrit-Change-Number: 34520 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 25 Sep 2023 17:42:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmocom-bb[master]: l1gprs: migrate to gsm0502_fn_compare()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34522?usp=email ) Change subject: l1gprs: migrate to gsm0502_fn_compare() ...................................................................... l1gprs: migrate to gsm0502_fn_compare() Change-Id: I10261aa114b5dce3efee26ea84a1caa50c49a1d2 Depends: libosmocore.git I9590f2e836fc48650decf1564b6ab46306c4fe2d Related: OS#5500 --- M src/shared/l1gprs.c 1 file changed, 12 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/22/34522/1 diff --git a/src/shared/l1gprs.c b/src/shared/l1gprs.c index bfbda59..5f45614 100644 --- a/src/shared/l1gprs.c +++ b/src/shared/l1gprs.c @@ -344,19 +344,6 @@ LOG_TBF_ARGS(preq), preq->start_fn); } -/* Check if the current TDMA Fn is past the start TDMA Fn. - * Based on fn_cmp() implementation from osmo-pcu.git, simplified. */ -static bool l1gprs_check_fn(uint32_t current, uint32_t start) -{ - const uint32_t thresh = GSM_TDMA_HYPERFRAME / 2; - - if ((current < start && (start - current) < thresh) || - (current > start && (current - start) > thresh)) - return false; - - return true; -} - /* Check the list of pending TBFs and move those with expired Fn to the active list */ static void l1gprs_check_pending_tbfs(struct l1gprs_state *gprs, uint32_t fn) { @@ -364,7 +351,7 @@ struct l1gprs_tbf *tbf; llist_for_each_entry_safe(preq, tmp, &gprs->tbf_list_pending, list) { - if (!l1gprs_check_fn(fn, preq->start_fn)) + if (gsm0502_fn_compare(fn, preq->start_fn) < 0) continue; LOGP_GPRS(gprs, LOGL_INFO, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34522?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: I10261aa114b5dce3efee26ea84a1caa50c49a1d2 Gerrit-Change-Number: 34522 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: rework dequeueing of PDCH Tx prims

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34523?usp=email ) Change subject: trxcon/l1sched: rework dequeueing of PDCH Tx prims ...................................................................... trxcon/l1sched: rework dequeueing of PDCH Tx prims When an UL BLOCK.req is received late, i.e. after the first Tx burst of the respective TDMA Fn was requested by the PHY, a domino effect can be observed: the stale Tx primitive remains in the queue and prevents transmission of the next primitive, even if the later was received in time. This breaks transmission of consecutive UL blocks. Don't let stale primitives poison the Tx queue: drop them like before, but keep looking for a primitive with the matching TDMA Fn. If found a primitive with TDMA Fn past the current one, stop the iteration. Change-Id: I439615639b8e840b9fd4f3af6934d9f298f32216 Depends: libosmocore.git I9590f2e836fc48650decf1564b6ab46306c4fe2d Related: OS#5500 --- M src/host/trxcon/src/sched_lchan_pdtch.c 1 file changed, 38 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/23/34523/1 diff --git a/src/host/trxcon/src/sched_lchan_pdtch.c b/src/host/trxcon/src/sched_lchan_pdtch.c index 0f8a25f..d1f426b 100644 --- a/src/host/trxcon/src/sched_lchan_pdtch.c +++ b/src/host/trxcon/src/sched_lchan_pdtch.c @@ -26,6 +26,7 @@ #include <osmocom/core/logging.h> #include <osmocom/core/bits.h> +#include <osmocom/gsm/gsm0502.h> #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/coding/gsm0503_coding.h> @@ -104,20 +105,25 @@ static struct msgb *prim_dequeue_pdtch(struct l1sched_lchan_state *lchan, uint32_t fn) { - const struct l1sched_prim *prim; struct msgb *msg; - msg = msgb_dequeue(&lchan->tx_prims); - if (msg == NULL) - return NULL; - prim = l1sched_prim_from_msgb(msg); + llist_for_each_entry(msg, &lchan->tx_prims, list) { + const struct l1sched_prim *prim = l1sched_prim_from_msgb(msg); + int ret = gsm0502_fn_compare(prim->data_req.frame_nr, fn); - if (OSMO_LIKELY(prim->data_req.frame_nr == fn)) - return msg; - LOGP_LCHAND(lchan, LOGL_ERROR, - "%s(): dropping Tx primitive (current Fn=%u, prim Fn=%u)\n", - __func__, fn, prim->data_req.frame_nr); - msgb_free(msg); + if (OSMO_LIKELY(ret == 0)) { /* it's a match! */ + llist_del(msg->list); + return msg; + } else if (ret > 0) { /* not now, come back later */ + break; + } /* else: the ship has sailed, drop your ticket */ + + LOGP_LCHAND(lchan, LOGL_ERROR, + "%s(): dropping stale Tx primitive (current Fn=%u, prim Fn=%u)\n", + __func__, fn, prim->data_req.frame_nr); + msgb_free(msg); + } + return NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34523?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: I439615639b8e840b9fd4f3af6934d9f298f32216 Gerrit-Change-Number: 34523 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in osmo-pcu[master]: pdch_ul_controller: migrate from fn_cmp() to gsm0502_fn_compare()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34521?usp=email ) Change subject: pdch_ul_controller: migrate from fn_cmp() to gsm0502_fn_compare() ...................................................................... pdch_ul_controller: migrate from fn_cmp() to gsm0502_fn_compare() This function is also needed in osmocom-bb.git, so it becomes a library function (part of libosmogsm). Change-Id: I6a8502c2b2015ca7d0452ab9f5da0484a03ce91e Depends: libosmocore.git I9590f2e836fc48650decf1564b6ab46306c4fe2d --- M src/pdch_ul_controller.c 1 file changed, 17 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/21/34521/1 diff --git a/src/pdch_ul_controller.c b/src/pdch_ul_controller.c index c0e26de..85bfdc9 100644 --- a/src/pdch_ul_controller.c +++ b/src/pdch_ul_controller.c @@ -43,20 +43,6 @@ { 0, NULL } }; -#define GSM_MAX_FN_THRESH (GSM_MAX_FN >> 1) -/* 0: equal, -1: fn1 BEFORE fn2, 1: fn1 AFTER fn2 */ -static inline int fn_cmp(uint32_t fn1, uint32_t fn2) -{ - if (fn1 == fn2) - return 0; - /* FN1 goes before FN2: */ - if ((fn1 < fn2 && (fn2 - fn1) < GSM_MAX_FN_THRESH) || - (fn1 > fn2 && (fn1 - fn2) > GSM_MAX_FN_THRESH)) - return -1; - /* FN1 goes after FN2: */ - return 1; -} - struct pdch_ulc *pdch_ulc_alloc(struct gprs_rlcmac_pdch *pdch, void *ctx) { struct pdch_ulc* ulc; @@ -78,7 +64,7 @@ while (node) { it = rb_entry(node, struct pdch_ulc_node, node); - res = fn_cmp(it->fn, fn); + res = gsm0502_fn_compare(it->fn, fn); if (res > 0) /* it->fn AFTER fn */ node = node->rb_left; else if (res < 0) /* it->fn BEFORE fn */ @@ -167,7 +153,7 @@ for (node = rb_first(&ulc->tree_root); node; node = rb_next(node)) { it = container_of(node, struct pdch_ulc_node, node); - res = fn_cmp(it->fn, check_fn); + res = gsm0502_fn_compare(it->fn, check_fn); if (res > 0) { /* it->fn AFTER check_fn */ /* Next reserved FN is passed check_fn, hence it means check_fn is free */ return check_fn; @@ -203,7 +189,7 @@ it = container_of(*n, struct pdch_ulc_node, node); parent = *n; - res = fn_cmp(item->fn, it->fn); + res = gsm0502_fn_compare(item->fn, it->fn); if (res < 0) { /* item->fn "BEFORE" it->fn */ n = &((*n)->rb_left); } else if (res > 0) { /* item->fn "AFTER" it->fn */ @@ -305,7 +291,7 @@ struct rb_node *first; while ((first = rb_first(&ulc->tree_root))) { item = container_of(first, struct pdch_ulc_node, node); - res = fn_cmp(item->fn, fn); + res = gsm0502_fn_compare(item->fn, fn); if (res > 0) /* item->fn AFTER fn */ break; if (res < 0) { /* item->fn BEFORE fn */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34521?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: I6a8502c2b2015ca7d0452ab9f5da0484a03ce91e Gerrit-Change-Number: 34521 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in libosmocore[master]: gsm: add gsm0502_fn_is_greater() for comparing TDMA FNs

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34520?usp=email ) Change subject: gsm: add gsm0502_fn_is_greater() for comparing TDMA FNs ...................................................................... gsm: add gsm0502_fn_is_greater() for comparing TDMA FNs We need this function in: * osmocom-bb.git for trxcon and l1gprs, * osmo-pcu.git replacing fn_cmp(). Change-Id: I9590f2e836fc48650decf1564b6ab46306c4fe2d Related: OS#5500 --- M include/osmocom/gsm/gsm0502.h M tests/gsm0502/gsm0502_test.c 2 files changed, 49 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/20/34520/1 diff --git a/include/osmocom/gsm/gsm0502.h b/include/osmocom/gsm/gsm0502.h index ffd6e20..0d70aaf 100644 --- a/include/osmocom/gsm/gsm0502.h +++ b/include/osmocom/gsm/gsm0502.h @@ -6,6 +6,7 @@ #pragma once #include <stdint.h> +#include <stdbool.h> #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/protocol/gsm_08_58.h> @@ -64,6 +65,20 @@ #define GSM_NBITS_AB_GMSK_TAIL GSM_NBITS_NB_GMSK_TAIL #define GSM_NBITS_AB_GMSK_BURST GSM_NBITS_NB_GMSK_BURST +/* Check if the given TDMA Fn 'fn1' is greater than TDMA Fn 'fn2', + * taking the wrapping into account (i.e. 0 is greater than 2715647). + * Based on fn_cmp() implementation from osmo-pcu.git, simplified. */ +static inline bool gsm0502_fn_is_greater(uint32_t fn1, uint32_t fn2) +{ + const uint32_t thresh = GSM_TDMA_HYPERFRAME / 2; + + if ((fn1 < fn2 && (fn2 - fn1) < thresh) || + (fn1 > fn2 && (fn1 - fn2) > thresh)) + return false; + + return true; +} + /* Table 5 Clause 7 TS 05.02 */ static inline unsigned int gsm0502_get_n_pag_blocks(const struct gsm48_control_channel_descr *chan_desc) diff --git a/tests/gsm0502/gsm0502_test.c b/tests/gsm0502/gsm0502_test.c index e9deaa9..6390d8b 100644 --- a/tests/gsm0502/gsm0502_test.c +++ b/tests/gsm0502/gsm0502_test.c @@ -148,8 +148,27 @@ printf("\n"); } +static void test_gsm0502_fn_is_greater(void) +{ + OSMO_ASSERT(gsm0502_fn_is_greater(42, 1337) == false); + OSMO_ASSERT(gsm0502_fn_is_greater(1337, 42) == true); + OSMO_ASSERT(gsm0502_fn_is_greater(42, 0) == true); + + /* 2715642 is very close to the Fn period (GSM_TDMA_HYPERFRAME) */ + OSMO_ASSERT(gsm0502_fn_is_greater(2715642, 42) == false); + OSMO_ASSERT(gsm0502_fn_is_greater(42, 2715642) == true); + OSMO_ASSERT(gsm0502_fn_is_greater(0, 2715642) == true); + + /* 1357824 is half of the Fn period (GSM_TDMA_HYPERFRAME) */ + OSMO_ASSERT(gsm0502_fn_is_greater(1357820, 1357824) == false); + OSMO_ASSERT(gsm0502_fn_is_greater(1357820, 1357825) == false); + OSMO_ASSERT(gsm0502_fn_is_greater(1357824, 1357820) == true); + OSMO_ASSERT(gsm0502_fn_is_greater(1357825, 1357820) == true); +} + int main(int argc, char **argv) { test_gsm0502_fn_remap(); + test_gsm0502_fn_is_greater(); return EXIT_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34520?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9590f2e836fc48650decf1564b6ab46306c4fe2d Gerrit-Change-Number: 34520 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in osmo-msc[master]: SMS over GSUP: set source_name in GSUP reply messages

by fixeria

Attention is currently required from: falconia, neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34518?usp=email ) Change subject: SMS over GSUP: set source_name in GSUP reply messages ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34518?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0b7f4760bdce8a38d43d3860086c6dfb7b390701 Gerrit-Change-Number: 34518 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Sep 2023 14:11:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023