fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34533?usp=email )
Change subject: bts: bts_tfi_find_free(): fix -Wmaybe-uninitialized (false positive)
......................................................................
bts: bts_tfi_find_free(): fix -Wmaybe-uninitialized (false positive)
We cannot see how uninitialized access is possible, but gcc v13.2.1
does complain about it. Let's work this around by assigning an
invalid value, like trx_count_free_tfi() does.
src/bts.cpp: In function 'int bts_tfi_find_free(const gprs_rlcmac_bts*,
gprs_rlcmac_tbf_direction,
uint8_t*, int8_t)':
warning: 'tmp_first_tfi' may be used uninitialized [-Wmaybe-uninitialized]
Change-Id: Ia446cdf573ee25e6da6b4aa917972c63472229bb
Fixes: OS#6190
---
M src/bts.cpp
1 file changed, 20 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/bts.cpp b/src/bts.cpp
index 0950f7a..50c21a3 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -642,7 +642,7 @@
/* find a TFI that is unused on all PDCH */
for (trx = trx_from; trx <= trx_to; trx++) {
- uint8_t tmp_first_tfi;
+ uint8_t tmp_first_tfi = 0xff; /* make gcc happy */
unsigned int tmp_cnt;
tmp_cnt = trx_count_free_tfi(&bts->trx[trx], dir, &tmp_first_tfi);
if (tmp_cnt > best_cnt) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34533?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: Ia446cdf573ee25e6da6b4aa917972c63472229bb
Gerrit-Change-Number: 34533
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
fixeria has submitted this change. ( 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
Depends: libosmocore.git Ie8bb9c49c6f81b8f4a1766547d6943f9880d1186
Related: OS#5500
---
M src/host/trxcon/src/sched_lchan_pdtch.c
1 file changed, 40 insertions(+), 12 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/src/host/trxcon/src/sched_lchan_pdtch.c b/src/host/trxcon/src/sched_lchan_pdtch.c
index 0f8a25f..915b060 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;
+ while (!llist_empty(&lchan->tx_prims)) {
+ struct msgb *msg = llist_first_entry(&lchan->tx_prims, struct msgb, list);
+ const struct l1sched_prim *prim = l1sched_prim_from_msgb(msg);
+ int ret = gsm0502_fncmp(prim->data_req.frame_nr, fn);
- msg = msgb_dequeue(&lchan->tx_prims);
- if (msg == NULL)
- return NULL;
- prim = l1sched_prim_from_msgb(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 */
- 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);
+ LOGP_LCHAND(lchan, LOGL_ERROR,
+ "%s(): dropping stale Tx primitive (current Fn=%u, prim Fn=%u)\n",
+ __func__, fn, prim->data_req.frame_nr);
+ llist_del(&msg->list);
+ 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: 4
Gerrit-Owner: fixeria <vyanitskiy(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
Attention is currently required from: jolly.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34484?usp=email )
Change subject: Refactoring encoding of mobile identity at mobile application
......................................................................
Patch Set 7: Code-Review+1
(2 comments)
Patchset:
PS7:
BTW, this is already the 2nd time we're migrating from old deprecated to a new (not yet deprecated) API. Let's see how long this new API will last :P
File src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h:
https://gerrit.osmocom.org/c/osmocom-bb/+/34484/comment/d6b33307_18808dba
PS7, Line 243: gsm48_encode_mi_lv
I am afraid we may end up having a naming conflict with libosmocore some day, since I am seeing plenty of `gsm48_encode_*` symbols in there. Not blocking, just wanted to point this out.
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34484?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: I9ff429bd50d718530fdad64a276053a35c8928f2
Gerrit-Change-Number: 34484
Gerrit-PatchSet: 7
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-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Comment-Date: Tue, 26 Sep 2023 14:14:10 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: arehbein, daniel, fixeria, osmith.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email )
Change subject: stream: Add client-side (segmentation) support for IPA
......................................................................
Patch Set 21: Code-Review+1
(3 comments)
Patchset:
PS20:
> After adapting `stream_test. […]
Is this just about the test? Are we using REUSEADDR and/or REUSEPORT?
Patchset:
PS21:
> The plan is to tackle this kind of task once these preliminary libosmo-netif changes have been submi […]
Done
PS21:
> The patch for fixing the aliasing problem has been merged. […]
Done
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6
Gerrit-Change-Number: 33198
Gerrit-PatchSet: 21
Gerrit-Owner: arehbein <arehbein(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-CC: daniel <dwillmann(a)sysmocom.de>
Gerrit-CC: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 26 Sep 2023 14:01:22 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de>
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: jolly.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34496?usp=email )
Change subject: ASCI: Show NCH position in VTY together with system information
......................................................................
Patch Set 9: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34496?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: I5e0a9d469eb70608502dca881808621fa153b666
Gerrit-Change-Number: 34496
Gerrit-PatchSet: 9
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Comment-Date: Tue, 26 Sep 2023 13:59:10 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment