fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/42911?usp=email )
Change subject: common: stop buffering UL measurements when SACCH is deactivated
......................................................................
common: stop buffering UL measurements when SACCH is deactivated
When the BSC sends RSL DEACT SACCH, the per-SACCH UL measurement drain
stops (it runs on SACCH timing), but the producer in lchan_new_ul_meas()
keeps appending the measurement contributions from every received
TCH/SDCCH burst. After one SACCH period (104 frames) the 104-slot
uplink measurement buffer fills up, yielding a flood of:
NOTICE measurement.c:336 no space for uplink measurement, num_ul_meas=104
Add a bool sacch_active flag to gsm_lchan, set to true in the common
l1sap_chan_act() and clear in l1sap_chan_deact_sacch(). Guard
lchan_new_ul_meas() with this flag so that measurements are silently
discarded while SACCH is inactive - there is nothing to drain the
buffer and no SACCH channel on which to report the results to the BSC.
Change-Id: I3943c788cab5d2411b06ac681d4d412852bac0a7
AI-Assisted: yes (Claude)
---
M include/osmo-bts/lchan.h
M src/common/l1sap.c
M src/common/measurement.c
3 files changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/11/42911/1
diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h
index 071197d..909768d 100644
--- a/include/osmo-bts/lchan.h
+++ b/include/osmo-bts/lchan.h
@@ -210,6 +210,7 @@
* want_dl_sacch_active indicates whether dl SACCH should be activated on CHAN ACT.
*/
bool want_dl_sacch_active;
+ bool ul_sacch_active; /* UL SACCH measurements active (cleared by RSL DEACT SACCH) */
/* Number of different GsmL1_Sapi_t used in osmo_bts_sysmo is 23.
* Currently we don't share these headers so this is a magic number. */
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index f11bb2c..ae89d23 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -2982,6 +2982,7 @@
LOGPLCHAN(lchan, DL1C, LOGL_INFO, "Activating channel %s\n", rsl_chan_nr_str(chan_nr));
radio_link_timeout_reset(lchan);
+ lchan->ul_sacch_active = true;
rc = l1sap_chan_act_dact_modify(trx, chan_nr, PRIM_INFO_ACTIVATE, 0);
if (rc)
@@ -3055,6 +3056,8 @@
LOGPLCHAN(lchan, DL1C, LOGL_INFO, "Deactivating SACCH on channel %s\n",
rsl_chan_nr_str(chan_nr));
+ lchan->ul_sacch_active = false;
+
return l1sap_chan_act_dact_modify(trx, chan_nr, PRIM_INFO_DEACTIVATE,
1);
}
diff --git a/src/common/measurement.c b/src/common/measurement.c
index afbdc84..8bb3e6e 100644
--- a/src/common/measurement.c
+++ b/src/common/measurement.c
@@ -332,6 +332,11 @@
gsm_lchans_name(lchan->state), lchan->meas.num_ul_meas, fn_mod);
}
+ /* No point buffering measurements when SACCH is deactivated: the drain
+ * runs on SACCH timing, so the buffer would fill up and overflow. */
+ if (!lchan->ul_sacch_active)
+ return 0;
+
if (lchan->meas.num_ul_meas >= ARRAY_SIZE(lchan->meas.uplink)) {
LOGPLCFN(lchan, fn, DMEAS, LOGL_NOTICE,
"no space for uplink measurement, num_ul_meas=%d, fn_mod=%u\n", lchan->meas.num_ul_meas,
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/42911?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I3943c788cab5d2411b06ac681d4d412852bac0a7
Gerrit-Change-Number: 42911
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42904?usp=email )
Change subject: drivers/dahdi/dahdi-base: fix linux 7.1 compat
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
Passes for all except current linux master. See the follow-up patch for fixing what fails there.
--
To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/42904?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: dahdi-linux
Gerrit-Branch: master
Gerrit-Change-Id: Ia17190e4bd8bcc480cbe98b55f930149e554a576
Gerrit-Change-Number: 42904
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Mon, 29 Jun 2026 13:40:25 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/42905?usp=email )
Change subject: lint: ignore LINUX_VERSION_CODE
......................................................................
lint: ignore LINUX_VERSION_CODE
When running the linter against dahdi-linux.git or potentially other
repositories with out-of-tree linux kernel modules, it should not
complain about the LINUX_VERSION_CODE being used there:
> drivers/dahdi/dahdi-base.c:6397: WARNING:LINUX_VERSION_CODE:
> LINUX_VERSION_CODE should be avoided, code should be for the version to
> which it is merged
Change-Id: I82d64d43c04561b1643785cb71cfee92e513e560
---
M lint/checkpatch/checkpatch_osmo.sh
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/05/42905/1
diff --git a/lint/checkpatch/checkpatch_osmo.sh b/lint/checkpatch/checkpatch_osmo.sh
index 50551b0..ec10b0c 100755
--- a/lint/checkpatch/checkpatch_osmo.sh
+++ b/lint/checkpatch/checkpatch_osmo.sh
@@ -68,6 +68,7 @@
# * INITIALISED_STATIC: we use this, see also http://lkml.iu.edu/hypermail/linux/kernel/0808.1/2235.html
# * LINE_CONTINUATIONS: false positives
# * LINE_SPACING: we don't always put a blank line after declarations
+# * LINUX_VERSION_CODE: warns about using LINUX_VERSION_CODE, which doesn't make sense outside of the kernel
# * LONG_LINE*: should be 120 chars, but exceptions are done often so don't fail here
# * MACRO_WITH_FLOW_CONTROL: not followed
# * MISSING_SPACE: warns about breaking strings at space characters, not useful for long strings of hex chars
@@ -106,6 +107,7 @@
--ignore INITIALISED_STATIC \
--ignore LINE_CONTINUATIONS \
--ignore LINE_SPACING \
+ --ignore LINUX_VERSION_CODE \
--ignore LONG_LINE \
--ignore LONG_LINE_COMMENT \
--ignore LONG_LINE_STRING \
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/42905?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I82d64d43c04561b1643785cb71cfee92e513e560
Gerrit-Change-Number: 42905
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>