February 2025 - gerrit-log - lists.osmocom.org

[S] Change in ...osmo-s1gw[master]: erab_fsm: make erab_release_{cmd,ind}/1 non-blocking

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/39523?usp=email ) Change subject: erab_fsm: make erab_release_{cmd,ind}/1 non-blocking ...................................................................... erab_fsm: make erab_release_{cmd,ind}/1 non-blocking There's no practical benefit(s) in blocking the caller while waiting for the PFCP Session Deletion Response from the UPF. The response does not contain any useful information for the caller. Make the release related API non-blocking by using gen_statem:cast/2 instead of gen_statem:call/2. Adjust state functions to not reply. Change-Id: If519334359c3ef331720cb87bdba2d969601816e Related: SYS#7318 --- M src/erab_fsm.erl M test/erab_fsm_test.erl 2 files changed, 15 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/23/39523/1 diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index 9ee9abe..bbb6dad 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -136,7 +136,7 @@ -spec erab_release_cmd(pid()) -> ok. erab_release_cmd(Pid) -> - gen_statem:call(Pid, ?FUNCTION_NAME). + gen_statem:cast(Pid, ?FUNCTION_NAME). -spec erab_release_rsp(pid()) -> ok. @@ -146,7 +146,7 @@ -spec erab_release_ind(pid()) -> ok. erab_release_ind(Pid) -> - gen_statem:call(Pid, ?FUNCTION_NAME). + gen_statem:cast(Pid, ?FUNCTION_NAME). -spec fetch_info(pid()) -> proplists:proplist(). @@ -305,21 +305,17 @@ ?LOG_DEBUG("State change: ~p -> ~p", [OldState, ?FUNCTION_NAME]), {keep_state, S}; -erab_setup({call, From}, - erab_release_cmd, +erab_setup(cast, erab_release_cmd, #erab_state{} = S) -> ?LOG_DEBUG("Rx E-RAB RELEASE Cmd"), {next_state, session_delete, - S#erab_state{from = From, - rel_kind = cmd}}; + S#erab_state{rel_kind = cmd}}; -erab_setup({call, From}, - erab_release_ind, +erab_setup(cast, erab_release_ind, #erab_state{} = S) -> ?LOG_DEBUG("Rx E-RAB RELEASE Ind"), {next_state, session_delete, - S#erab_state{from = From, - rel_kind = ind}}; + S#erab_state{rel_kind = ind}}; erab_setup(Event, EventData, S) -> handle_event(?FUNCTION_NAME, Event, EventData, S). @@ -335,36 +331,27 @@ S#erab_state{seid_rem = undefined}, [{state_timeout, ?ERAB_T_SESSION_DELETE, ?FUNCTION_NAME}]}; -session_delete(state_timeout, _Timeout, - #erab_state{from = From}) -> +session_delete(state_timeout, _Timeout, _S) -> ?LOG_ERROR("PFCP session deletion timeout"), - {stop_and_reply, - {shutdown, timeout}, - {reply, From, {error, {timeout, ?FUNCTION_NAME}}}}; + {stop, {shutdown, timeout}}; session_delete(info, #pfcp{} = PDU, - #erab_state{from = From, - seid_loc = SEID_Rsp, + #erab_state{seid_loc = SEID_Rsp, rel_kind = RelKind} = S) -> case PDU of #pfcp{type = session_deletion_response, seid = SEID_Rsp, %% matches F-SEID we sent in the ESTABLISH Req ie = #{pfcp_cause := 'Request accepted'}} -> ?LOG_DEBUG("PFCP session deleted"), - Reply = {reply, From, ok}, case RelKind of cmd -> %% E-RAB RELEASE CMD => wait for the RSP - {next_state, erab_wait_release_rsp, - S#erab_state{from = undefined}, - [Reply]}; + {next_state, erab_wait_release_rsp, S}; ind -> %% E-RAB RELEASE IND => terminate immediately - {stop_and_reply, normal, [Reply]} + {stop, normal} end; _ -> ?LOG_ERROR("Rx unexpected PFCP PDU: ~p", [PDU]), - {stop_and_reply, - {shutdown, unexp_pdu}, - {reply, From, {error, {unexp_pdu, ?FUNCTION_NAME}}}} + {stop, {shutdown, unexp_pdu}} end; session_delete(Event, EventData, S) -> diff --git a/test/erab_fsm_test.erl b/test/erab_fsm_test.erl index e406e88..ec40e2e 100644 --- a/test/erab_fsm_test.erl +++ b/test/erab_fsm_test.erl @@ -125,10 +125,11 @@ PDU = pfcp_mock:pdu_rsp_reject(session_deletion_response, ?SEID_Loc), pfcp_mock:mock_req(session_delete_req, PDU), unlink(Pid), %% we expect the FSM to terminate abnormally - Error = {unexp_pdu, session_delete}, [?_assertEqual({ok, ?A2U}, erab_fsm:erab_setup_req(Pid, ?U2C)), ?_assertEqual({ok, ?C2U}, erab_fsm:erab_setup_rsp(Pid, ?U2A)), - ?_assertEqual({error, Error}, erab_fsm:erab_release_cmd(Pid)), + %% erab_fsm:erab_release_cmd/1 is non-blocking, + %% so we get ok before the error happens + ?_assertEqual(ok, erab_fsm:erab_release_cmd(Pid)), ?_assertNot(erlang:is_process_alive(Pid))]. -- 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: newchange 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>

4 months, 3 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: {erab_fsm,sctp_proxy}: handle_event/4: fix return value

by fixeria

fixeria has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/21/39521/1 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: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ib8c10e0b1d888e005a593644c0ecead560b2f2ce Gerrit-Change-Number: 39521 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[M] Change in libosmo-abis[master]: Bump version: 1.6.0.52-ab0df-dirty → 2.0.0

by pespin

Attention is currently required from: laforge, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/libosmo-abis/+/39506?usp=email ) Change subject: Bump version: 1.6.0.52-ab0df-dirty → 2.0.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/39506?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7704ab60898ab188fb383adc9b3b77b535f3d135 Gerrit-Change-Number: 39506 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 12 Feb 2025 12:28:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: Bump version: 1.12.1.47-87507-dirty → 1.13.0

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39519?usp=email ) Change subject: Bump version: 1.12.1.47-87507-dirty → 1.13.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39519?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9685a47a15b4636306dd1162c4aae27a6ae1022a Gerrit-Change-Number: 39519 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, 12 Feb 2025 12:27:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: Bump version: 1.5.0.7-f8e4 → 1.5.1

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39516?usp=email ) Change subject: Bump version: 1.5.0.7-f8e4 → 1.5.1 ...................................................................... Bump version: 1.5.0.7-f8e4 → 1.5.1 Change-Id: I97c65d1a98c576a2879a5682cc80386934f6e4c4 --- M debian/changelog 1 file changed, 21 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 0ee5e5c..8fb6a66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +osmo-pcu (1.5.1) unstable; urgency=medium + + [ Mychaela N. Falconia ] + * fix E1 TS output when used with osmo-e1d + + [ Pau Espin Pedrol ] + * tbf_ul_ass_fsm: Clarify use of X2000 timer + * rcv_control_ack(): Improve logging of confirmation of Pkt Dl/Ul Ass + * X2001 timeout: Update UL TBF's dl_ass_fsm state + + [ Oliver Smith ] + * contrib/jenkins: libosmo-abis after libosmo-netif + + [ Philipp Maier ] + * pcuif: add comment on TXT_IND/PCU_VERSION BTS initialization behavior + + [ Vadim Yanitskiy ] + * Add .checkpatch.conf, ignore src/gsm_rlcmac.c + + -- Oliver Smith <osmith(a)sysmocom.de> Wed, 12 Feb 2025 12:46:23 +0100 + osmo-pcu (1.5.0) unstable; urgency=medium [ Oliver Smith ] -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39516?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I97c65d1a98c576a2879a5682cc80386934f6e4c4 Gerrit-Change-Number: 39516 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[S] Change in osmo-trx[master]: Bump version: 1.7.0.2-8a71 → 1.7.1

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/39515?usp=email ) Change subject: Bump version: 1.7.0.2-8a71 → 1.7.1 ...................................................................... Bump version: 1.7.0.2-8a71 → 1.7.1 Change-Id: Iad491e6608206f21e5ed8a95d2985fa53db4dd20 --- M debian/changelog 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 81fad32..3abfb32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +osmo-trx (1.7.1) unstable; urgency=medium + + [ Oliver Smith ] + * contrib/jenkins: remove broken chroot + qemu code + + [ Neels Hofmeyr ] + * comma_delimited_to_vector() optimization CID#465430 + + -- Oliver Smith <osmith(a)sysmocom.de> Wed, 12 Feb 2025 12:43:24 +0100 + osmo-trx (1.7.0) unstable; urgency=medium [ Eric ] -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/39515?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iad491e6608206f21e5ed8a95d2985fa53db4dd20 Gerrit-Change-Number: 39515 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[M] Change in osmo-bts[master]: Bump version: 1.8.0.29-b032-dirty → 1.9.0

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-bts/+/39518?usp=email ) Change subject: Bump version: 1.8.0.29-b032-dirty → 1.9.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/39518?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibef4a94a6c7bb3a2b9acb3ebb1aaf50ff7a060ba Gerrit-Change-Number: 39518 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, 12 Feb 2025 12:26:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

[M] Change in osmo-pcap[master]: Bump version: 0.5.0.63-222b-dirty → 0.6.0

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39517?usp=email ) Change subject: Bump version: 0.5.0.63-222b-dirty → 0.6.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39517?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I3bceee1838aa5e5a2830726dd21b3914efffc487 Gerrit-Change-Number: 39517 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, 12 Feb 2025 12:25:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: Bump version: 1.5.0.7-f8e4 → 1.5.1

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-pcu/+/39516?usp=email ) Change subject: Bump version: 1.5.0.7-f8e4 → 1.5.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/39516?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I97c65d1a98c576a2879a5682cc80386934f6e4c4 Gerrit-Change-Number: 39516 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, 12 Feb 2025 12:24:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

[S] Change in osmo-trx[master]: Bump version: 1.7.0.2-8a71 → 1.7.1

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-trx/+/39515?usp=email ) Change subject: Bump version: 1.7.0.2-8a71 → 1.7.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/39515?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iad491e6608206f21e5ed8a95d2985fa53db4dd20 Gerrit-Change-Number: 39515 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, 12 Feb 2025 12:24:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2025