- gerrit-log - lists.osmocom.org

[S] Change in osmocom-bb[master]: trx_toolkit/transceiver: Use with tx_queue_lock instead of manual acq...
by kirr 12 Feb '25

12 Feb '25

Attention is currently required from: pespin. kirr has posted comments on this change by kirr. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39535?usp=email ) Change subject: trx_toolkit/transceiver: Use with tx_queue_lock instead of manual acquire/release ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/39535/comment/6cce13bd_6d78589c?u… : PS1, Line 9: - it is a bit faster > I wonder why is it a bit faster? just because the calls are made directly by the compiler in the com […] I thought it should be a bit faster because of fewer attributes lookup, but unfortunately the version with `with` is slower: ```ipython In [1]: from threading import Lock In [2]: mu = Lock() In [3]: def f(): ...: mu.acquire() ...: pass ...: mu.release() ...: In [4]: def g(): ...: with mu: ...: pass ...: In [5]: from dis import dis In [6]: dis(f) 1 0 RESUME 0 2 2 LOAD_GLOBAL 0 (mu) 14 LOAD_METHOD 1 (acquire) 36 PRECALL 0 40 CALL 0 50 POP_TOP 3 52 NOP 4 54 LOAD_GLOBAL 0 (mu) 66 LOAD_METHOD 2 (release) 88 PRECALL 0 92 CALL 0 102 POP_TOP 104 LOAD_CONST 0 (None) 106 RETURN_VALUE In [7]: dis(g) 1 0 RESUME 0 2 2 LOAD_GLOBAL 0 (mu) 14 BEFORE_WITH 16 POP_TOP 3 18 NOP 2 20 LOAD_CONST 0 (None) 22 LOAD_CONST 0 (None) 24 LOAD_CONST 0 (None) 26 PRECALL 2 30 CALL 2 40 POP_TOP 42 LOAD_CONST 0 (None) 44 RETURN_VALUE >> 46 PUSH_EXC_INFO 48 WITH_EXCEPT_START 50 POP_JUMP_FORWARD_IF_TRUE 4 (to 60) 52 RERAISE 2 >> 54 COPY 3 56 POP_EXCEPT 58 RERAISE 1 >> 60 POP_TOP 62 POP_EXCEPT 64 POP_TOP 66 POP_TOP 68 LOAD_CONST 0 (None) 70 RETURN_VALUE ExceptionTable: 16 to 16 -> 46 [1] lasti 46 to 52 -> 54 [3] lasti 60 to 60 -> 54 [3] lasti In [8]: def fff(): ...: for i in range(1000): ...: mu.acquire() ...: pass ...: mu.release() ...: In [9]: def ggg(): ...: for i in range(1000): ...: with mu: ...: pass ...: In [10]: %timeit fff() 84.6 µs ± 3.46 µs per loop (mean ± std. dev. of 7 runs, 10,000 loops each) In [11]: %timeit ggg() 160 µs ± 1.61 µs per loop (mean ± std. dev. of 7 runs, 10,000 loops each) In [12]: %timeit fff() 83.6 µs ± 1.01 µs per loop (mean ± std. dev. of 7 runs, 10,000 loops each) In [13]: %timeit ggg() 160 µs ± 4.68 µs per loop (mean ± std. dev. of 7 runs, 10,000 loops each) ``` I appologize for misinformation. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39535?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I74b194120bcc518d44796b57e36368bdc8de4aab Gerrit-Change-Number: 39535 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Feb 2025 21:35:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: trx_toolkit/transceiver: Do not forward nor log from under tx_queue_lock
by kirr 12 Feb '25

12 Feb '25

Attention is currently required from: pespin. kirr has posted comments on this change by kirr. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39533?usp=email ) Change subject: trx_toolkit/transceiver: Do not forward nor log from under tx_queue_lock ...................................................................... Patch Set 1: (1 comment) File src/target/trx_toolkit/transceiver.py: https://gerrit.osmocom.org/c/osmocom-bb/+/39533/comment/921b8be5_d1f374e6?u… : PS1, Line 322: self._tx_queue = [msg for msg in self._tx_queue if msg.fn > fn] > Done Thanks for feedback. Indeed I did the change, including what you suggest, initially as a whole, and later splitted it to patches that each do one logical step. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39533?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7d10c972c45b2b5765e7c3a28f8646508b3c8a82 Gerrit-Change-Number: 39533 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Feb 2025 21:25:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: {erab_fsm,sctp_proxy}: handle_event/4: reply to unknown calls
by fixeria 12 Feb '25

12 Feb '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39522?usp=email ) Change subject: {erab_fsm,sctp_proxy}: handle_event/4: reply to unknown calls ...................................................................... {erab_fsm,sctp_proxy}: handle_event/4: reply to unknown calls Change-Id: Ic02e3cb390e7d8a7865b4027c29cd0115a94e14e Related: SYS#7318 --- M src/erab_fsm.erl M src/sctp_proxy.erl 2 files changed, 8 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 9a654e5..9ee9abe 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -405,6 +405,10 @@ Reply = lists:filter(fun({_, V}) -> V =/= undefined end, Info), {keep_state_and_data, {reply, From, Reply}}; +handle_event(State, {call, From}, EventData, _S) -> + ?LOG_ERROR("Unexpected call in state ~p: ~p", [State, EventData]), + {keep_state_and_data, {reply, From, {error, {unexpected_call, State}}}}; + handle_event(State, Event, EventData, _S) -> ?LOG_ERROR("Unexpected event ~p in state ~p: ~p", [Event, State, EventData]), keep_state_and_data. diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index ed4af02..1c3228a 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -216,6 +216,10 @@ Reply = proplists:from_map(S2), {keep_state_and_data, {reply, From, Reply}}; +handle_event(State, {call, From}, EventData, _S) -> + ?LOG_ERROR("Unexpected call in state ~p: ~p", [State, EventData]), + {keep_state_and_data, {reply, From, {error, {unexpected_call, State}}}}; + handle_event(State, Event, EventData, _S) -> ?LOG_ERROR("Unexpected event ~p in state ~p: ~p", [Event, State, EventData]), keep_state_and_data. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39522?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ic02e3cb390e7d8a7865b4027c29cd0115a94e14e Gerrit-Change-Number: 39522 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>

1 0

[XS] Change in ...osmo-s1gw[master]: {erab_fsm,sctp_proxy}: handle_event/4: fix return value
by fixeria 12 Feb '25

12 Feb '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39521?usp=email ) Change subject: {erab_fsm,sctp_proxy}: handle_event/4: fix return value ...................................................................... {erab_fsm,sctp_proxy}: handle_event/4: fix return value When we do not reply, it must be an atom alone, not a tuple: https://www.erlang.org/doc/apps/stdlib/gen_statem#t:state_callback_result/2 This patch fixes errors like this: State machine <0.406.0> terminating. Reason: {bad_return_from_state_function,{keep_state_and_data}} Change-Id: Ib8c10e0b1d888e005a593644c0ecead560b2f2ce Related: SYS#7318 --- M src/erab_fsm.erl M src/sctp_proxy.erl 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index e2f86c5..9a654e5 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -407,7 +407,7 @@ handle_event(State, Event, EventData, _S) -> ?LOG_ERROR("Unexpected event ~p in state ~p: ~p", [Event, State, EventData]), - {keep_state_and_data}. + keep_state_and_data. code_change(_Vsn, State, S, _Extra) -> diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl index 755d2a3..ed4af02 100644 --- a/src/sctp_proxy.erl +++ b/src/sctp_proxy.erl @@ -218,7 +218,7 @@ handle_event(State, Event, EventData, _S) -> ?LOG_ERROR("Unexpected event ~p in state ~p: ~p", [Event, State, EventData]), - {keep_state_and_data}. + keep_state_and_data. code_change(_Vsn, State, S, _Extra) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39521?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ib8c10e0b1d888e005a593644c0ecead560b2f2ce Gerrit-Change-Number: 39521 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>

1 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: handle RELEASE.{cmd,ind} in state erab_wait_setup_rsp
by pespin 12 Feb '25

12 Feb '25

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39524?usp=email ) Change subject: erab_fsm: handle RELEASE.{cmd,ind} in state erab_wait_setup_rsp ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39524?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I91a010f304456c1593ef257051a912f0fe8ae2a1 Gerrit-Change-Number: 39524 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, 12 Feb 2025 19:39:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: handle RELEASE.{cmd,ind} in state erab_wait_setup_rsp
by fixeria 12 Feb '25

12 Feb '25

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39524?usp=email ) Change subject: erab_fsm: handle RELEASE.{cmd,ind} in state erab_wait_setup_rsp ...................................................................... Patch Set 1: (1 comment) File src/erab_fsm.erl: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39524/comment/7d6ab708_c19b… : PS1, Line 266: {next_state, session_delete, > imho this may be wrong. You probably need to wait first for create resolution The PFCP session has already been created at this state, it's just not modified yet. In other words, we have received E-RAB SETUP.req from the core network, created a PFCP session, and forwarded modified F-TEID to the eNB. But we haven't heard from the eNB yet. As we have seen in the field, it may happen that the core network orders E-RAB SETUP, and then releases the UE CONTEXT before the eNB response with E-RAB SETUP.rsp. This patch helps to tear the FSMs down properly in such case. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39524?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I91a010f304456c1593ef257051a912f0fe8ae2a1 Gerrit-Change-Number: 39524 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Feb 2025 18:43:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in ...osmo-s1gw[master]: erab_fsm: make erab_release_{cmd,ind}/1 non-blocking
by fixeria 12 Feb '25

12 Feb '25

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39523?usp=email ) Change subject: erab_fsm: make erab_release_{cmd,ind}/1 non-blocking ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39523/comment/e0d5f266_f730… : PS1, Line 9: There's no practical benefit(s) in blocking the caller while waiting > specially since doing this while tons of sessions are allocated can take in the order of 100-200ms : […] Indeed. The current blocking behavior looked logical at the early development stages, but reports from the field show the opposite :) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39523?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If519334359c3ef331720cb87bdba2d969601816e Gerrit-Change-Number: 39523 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Feb 2025 18:32:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmocom-bb[master]: Revert "Revert "trx_toolkit/transceiver.py: implement the transmit bu...
by pespin 12 Feb '25

12 Feb '25

Attention is currently required from: fixeria, kirr. pespin has posted comments on this change by kirr. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39328?usp=email ) Change subject: Revert "Revert "trx_toolkit/transceiver.py: implement the transmit burst queue"" ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39328?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I41291708effdd2c767be680fff22ffbd9a56815e Gerrit-Change-Number: 39328 Gerrit-PatchSet: 5 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: kirr <kirr(a)nexedi.com> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Feb 2025 18:20:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmocom-bb[master]: trx_toolkit/*: Try to avoid copying burst data where possible
by pespin 12 Feb '25

12 Feb '25

Attention is currently required from: kirr. pespin has posted comments on this change by kirr. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39537?usp=email ) Change subject: trx_toolkit/*: Try to avoid copying burst data where possible ...................................................................... Patch Set 1: Code-Review+1 (2 comments) File src/target/trx_toolkit/data_msg.py: https://gerrit.osmocom.org/c/osmocom-bb/+/39537/comment/5c08da22_a5c2e889?u… : PS1, Line 230: msg_burst = memoryview(msg)[self.HDR_LEN:] Not sure if it's really noticeable, you may even skip the memoryview/slice here by checking: if len(msg) == self.HDR_LEN: self.burst = None return msg_burst = memoryview(msg)[self.HDR_LEN:] self.parse_burst(msg_burst) https://gerrit.osmocom.org/c/osmocom-bb/+/39537/comment/988ed215_075ad04d?u… : PS1, Line 336: burst = burst[:EDGE_BURST_LEN] Can you maybe use the memoryview() thing here too? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39537?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I147da2f110dedc863361059c931f609c28a69e9c Gerrit-Change-Number: 39537 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: kirr <kirr(a)nexedi.com> Gerrit-Comment-Date: Wed, 12 Feb 2025 18:19:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in osmocom-bb[master]: trx_toolkit/*: Represent bursts as arrays instead of lists
by pespin 12 Feb '25

12 Feb '25

Attention is currently required from: kirr. pespin has posted comments on this change by kirr. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39536?usp=email ) Change subject: trx_toolkit/*: Represent bursts as arrays instead of lists ...................................................................... Patch Set 1: Code-Review+1 (4 comments) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/39536/comment/9f680289_2b3a4fd7?u… : PS1, Line 13: item as just byte, and by leveraging bytearray.translate, we can sped sped -> speed up? File src/target/trx_toolkit/data_msg.py: https://gerrit.osmocom.org/c/osmocom-bb/+/39536/comment/5c4d3857_f9657b3c?u… : PS1, Line 71: self.burst = burst # bytes|bytearray for ubit, array[b] for sbit, array[B] for usbit I don't really understand what you mean with this comment here. https://gerrit.osmocom.org/c/osmocom-bb/+/39536/comment/aae995a1_6d58e490?u… : PS1, Line 134: def usbit2sbit(bits): # array[B] -> array[b] sou one cannot declare a param type for an array as done previously by List? https://gerrit.osmocom.org/c/osmocom-bb/+/39536/comment/55548750_3c79688e?u… : PS1, Line 672: burst = array('B', burst) I wonder whether we'll probably want to have all this encapsulated into eg. SBits, UBits, etc. objects in the future, so that it does all this array mangling internally and conversion to other objects internally in the class. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39536?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7314e9e79752e06fa86b9e346a9beacc5e59579e Gerrit-Change-Number: 39536 Gerrit-PatchSet: 1 Gerrit-Owner: kirr <kirr(a)nexedi.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: kirr <kirr(a)nexedi.com> Gerrit-Comment-Date: Wed, 12 Feb 2025 18:10:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log