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

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_uemux_uldl_nas_release

by fixeria

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39851?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: s1gw: add TC_uemux_uldl_nas_release ...................................................................... s1gw: add TC_uemux_uldl_nas_release So far all of our *_multi TCs have been running the test logic in multiple eNB connections. This is the first TC simulating activity of multiple virtual UEs within a single eNB connection. Change-Id: I8e5db55739241f89592a7d2a81a13e8028e90d1d Related: SYS#7288 --- M s1gw/S1GW_Tests.ttcn M s1gw/S1GW_UEMux.ttcn M s1gw/expected-results.xml 3 files changed, 202 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/39851/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39851?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8e5db55739241f89592a7d2a81a13e8028e90d1d Gerrit-Change-Number: 39851 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

3 months, 1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_uemux_uldl_nas_release

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39851?usp=email ) Change subject: s1gw: add TC_uemux_uldl_nas_release ...................................................................... Patch Set 2: (1 comment) File s1gw/S1GW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39851/comment/373c1bea_0976… : PS2, Line 674: f_UEMuxUE_trx_s1ap_from_enb(-, Sigh. This trick works with more recent TITAN: you can pass `-` (unused) to an out parameter when you don't need it. This way there is no need to create an unused variable and pass it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39851?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8e5db55739241f89592a7d2a81a13e8028e90d1d Gerrit-Change-Number: 39851 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 26 Mar 2025 07:13:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

3 months, 1 week

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: s1gw: add UE multiplex component

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39850?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: s1gw: add UE multiplex component ...................................................................... s1gw: add UE multiplex component The UEMux is built upon the ConnHdlr component, allowing to simulate concurrent activity of multiple virtual UEs. This new component will be used in follow-up patches. Change-Id: I60e6f5d2b9882c27cecd06a2450bda4909c0532a Related: SYS#7288 --- A s1gw/S1GW_UEMux.ttcn M s1gw/gen_links.sh 2 files changed, 328 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/39850/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39850?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I60e6f5d2b9882c27cecd06a2450bda4909c0532a Gerrit-Change-Number: 39850 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

3 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: derive altsteps from f_ConnHdlr_rx_s1ap_from_{enb,mme}()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39849?usp=email ) Change subject: s1gw: derive altsteps from f_ConnHdlr_rx_s1ap_from_{enb,mme}() ...................................................................... s1gw: derive altsteps from f_ConnHdlr_rx_s1ap_from_{enb,mme}() Change-Id: I8637a8abed0f0152abf2dce63ac28aa90f85bdc7 Related: SYS#7288 --- M s1gw/S1GW_ConnHdlr.ttcn 1 file changed, 22 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/39849/1 diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 3414315..d0dbc06 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -137,6 +137,12 @@ S1AP_CONN.send(pdu); } +altstep as_ConnHdlr_s1ap_from_enb(out S1AP_PDU pdu, + template (present) S1AP_PDU tr_pdu := ?) +runs on ConnHdlr { + [] S1AP_CONN.receive(tr_pdu) -> value pdu; +} + function f_ConnHdlr_rx_s1ap_from_enb(out S1AP_PDU pdu, template (present) S1AP_PDU tr_pdu := ?, float Tval := 3.0) @@ -145,11 +151,11 @@ T.start; alt { - [] S1AP_CONN.receive(tr_pdu) -> value pdu { + [] as_ConnHdlr_s1ap_from_enb(pdu, tr_pdu) { setverdict(pass); T.stop; } - [] S1AP_CONN.receive(S1AP_PDU:?) -> value pdu { + [] as_ConnHdlr_s1ap_from_enb(pdu) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Rx unexpected S1AP PDU from eNB: ", pdu)); } @@ -160,22 +166,29 @@ } } +altstep as_ConnHdlr_s1ap_from_mme(out S1AP_PDU pdu, + template (present) S1AP_PDU tr_pdu := ?) +runs on ConnHdlr { + var S1AP_RecvFrom recv; + + [] S1AP_ENB.receive(t_S1AP_RecvFrom(tr_pdu)) -> value recv { + pdu := recv.msg; + } +} + function f_ConnHdlr_rx_s1ap_from_mme(out S1AP_PDU pdu, template (present) S1AP_PDU tr_pdu := ?, float Tval := 3.0) runs on ConnHdlr { - var S1AP_RecvFrom recv; timer T := Tval; T.start; alt { - [] S1AP_ENB.receive(t_S1AP_RecvFrom(tr_pdu)) -> value recv { - pdu := recv.msg; + [] as_ConnHdlr_s1ap_from_mme(pdu, tr_pdu) { setverdict(pass); T.stop; } - [] S1AP_ENB.receive(t_S1AP_RecvFrom(?)) -> value recv { - pdu := recv.msg; + [] as_ConnHdlr_s1ap_from_mme(pdu) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Rx unexpected S1AP PDU from MME: ", pdu)); } @@ -204,7 +217,7 @@ T.start(Tval); alt { [] S1AP_CONN.receive(S1APSRV_Event:S1APSRV_EVENT_CONN_UP) { repeat; } - [] S1AP_CONN.receive(tr_S1AP_SetupReq) { + [] as_ConnHdlr_s1ap_from_enb(pdu, tr_S1AP_SetupReq) { var template (value) PLMNidentity plmn_id := '00f110'O; var template (value) MME_Group_ID mme_group_id := '0011'O; var template (value) MME_Code mme_code := '55'O; @@ -217,7 +230,7 @@ f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_SetupResp({ gummei }, 1)); T.stop; } - [] S1AP_CONN.receive(S1AP_PDU:?) -> value pdu { + [] as_ConnHdlr_s1ap_from_enb(pdu) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Rx unexpected S1AP PDU: ", pdu)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39849?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8637a8abed0f0152abf2dce63ac28aa90f85bdc7 Gerrit-Change-Number: 39849 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: library/s1ap: cosmetic: fix a typo

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39847?usp=email ) Change subject: library/s1ap: cosmetic: fix a typo ...................................................................... library/s1ap: cosmetic: fix a typo Change-Id: I50aceea2653c426d1f60542dbb6721b8c75ed3fb Related: SYS#7288 --- M library/s1ap/S1AP_Templates.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/39847/1 diff --git a/library/s1ap/S1AP_Templates.ttcn b/library/s1ap/S1AP_Templates.ttcn index 32ebfae..2ba2b36 100644 --- a/library/s1ap/S1AP_Templates.ttcn +++ b/library/s1ap/S1AP_Templates.ttcn @@ -425,7 +425,7 @@ } -/* 9.1.7.3 UPNLINK NAS TRANSPORT */ +/* 9.1.7.3 UPLINK NAS TRANSPORT */ template (value) S1AP_PDU ts_S1AP_UlNasTransport(template (value) MME_UE_S1AP_ID mme_id, template (value) ENB_UE_S1AP_ID enb_id, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39847?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I50aceea2653c426d1f60542dbb6721b8c75ed3fb Gerrit-Change-Number: 39847 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: library/s1ap: split PDU specific API to S1AP_Utils.ttcn

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39848?usp=email ) Change subject: library/s1ap: split PDU specific API to S1AP_Utils.ttcn ...................................................................... library/s1ap: split PDU specific API to S1AP_Utils.ttcn Change-Id: Id3ba089140093490abd0307addeb5d7287dc5894 Related: SYS#7288 --- M library/S1AP_Emulation.ttcn A library/S1AP_Utils.ttcn M mme/MME_Tests.ttcn M mme/gen_links.sh 4 files changed, 170 insertions(+), 152 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/39848/1 diff --git a/library/S1AP_Emulation.ttcn b/library/S1AP_Emulation.ttcn index f81441f..ed136e9 100644 --- a/library/S1AP_Emulation.ttcn +++ b/library/S1AP_Emulation.ttcn @@ -40,6 +40,7 @@ import from S1AP_PDU_Descriptions all; import from S1AP_IEs all; import from S1AP_Templates all; +import from S1AP_Utils all; import from SCTP_Templates all; import from NAS_EPS_Types all; @@ -710,155 +711,4 @@ return omit; } - -function f_S1AP_get_ENB_UE_S1AP_ID(S1AP_PDU s1ap) return template (omit) ENB_UE_S1AP_ID -{ - if (ischosen(s1ap.initiatingMessage)) { - var InitiatingMessage im := s1ap.initiatingMessage; - select (s1ap) { - case (tr_S1AP_InitialUE) { - return im.value_.InitialUEMessage.protocolIEs[0].value_.ENB_UE_S1AP_ID; - } - case (tr_S1AP_DlNasTransport) { - return im.value_.DownlinkNASTransport.protocolIEs[1].value_.ENB_UE_S1AP_ID; - } - case (tr_S1AP_UlNasTransport) { - return im.value_.UplinkNASTransport.protocolIEs[1].value_.ENB_UE_S1AP_ID; - } - case (tr_S1AP_IntialCtxSetupReq) { - return im.value_.initialContextSetupRequest.protocolIEs[1].value_.ENB_UE_S1AP_ID; - } - case (tr_S1AP_UeContextReleaseReq) { - return im.value_.UEContextReleaseRequest.protocolIEs[1].value_.ENB_UE_S1AP_ID; - } - case (tr_S1AP_UeContextReleaseCmd) { - if (ispresent(im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_S1AP_IDs.uE_S1AP_ID_pair)) { - return im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_S1AP_IDs.uE_S1AP_ID_pair.eNB_UE_S1AP_ID; - } else { - return omit; - } - } - case (tr_S1AP_ConnEstInd) { - return im.value_.ConnectionEstablishmentIndication.protocolIEs[1].value_.ENB_UE_S1AP_ID; - } - /* TODO */ - } - } else if (ischosen(s1ap.successfulOutcome)) { - var SuccessfulOutcome so := s1ap.successfulOutcome; - select (s1ap) { - case (tr_S1AP_InitialCtxSetupResp) { - return so.value_.initialContextSetupResponse.protocolIEs[1].value_.ENB_UE_S1AP_ID; - } - case (tr_S1AP_UeContextReleaseCompl) { - return so.value_.UEContextReleaseComplete.protocolIEs[1].value_.ENB_UE_S1AP_ID; - } - /* TODO */ - } - } else if (ischosen(s1ap.unsuccessfulOutcome)) { - var UnsuccessfulOutcome uo := s1ap.unsuccessfulOutcome; - select (s1ap) { - case (tr_S1AP_InitialCtxSetupFail) { - return uo.value_.initialContextSetupFailure.protocolIEs[1].value_.ENB_UE_S1AP_ID; - } - /* TODO */ - } - } - return omit; -} - -function f_S1AP_get_MME_UE_S1AP_ID(S1AP_PDU s1ap) return template (omit) MME_UE_S1AP_ID -{ - if (ischosen(s1ap.initiatingMessage)) { - var InitiatingMessage im := s1ap.initiatingMessage; - select (s1ap) { - case (tr_S1AP_DlNasTransport) { - return im.value_.DownlinkNASTransport.protocolIEs[0].value_.MME_UE_S1AP_ID; - } - case (tr_S1AP_UlNasTransport) { - return im.value_.UplinkNASTransport.protocolIEs[0].value_.MME_UE_S1AP_ID; - } - case (tr_S1AP_IntialCtxSetupReq) { - return im.value_.initialContextSetupRequest.protocolIEs[0].value_.MME_UE_S1AP_ID; - } - case (tr_S1AP_UeContextReleaseReq) { - return im.value_.UEContextReleaseRequest.protocolIEs[0].value_.MME_UE_S1AP_ID; - } - case (tr_S1AP_UeContextReleaseCmd) { - if (ispresent(im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_S1AP_IDs.uE_S1AP_ID_pair)) { - return im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_S1AP_IDs.uE_S1AP_ID_pair.mME_UE_S1AP_ID; - } else { - return im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_S1AP_IDs.mME_UE_S1AP_ID; - } - } - case (tr_S1AP_ConnEstInd) { - return im.value_.ConnectionEstablishmentIndication.protocolIEs[0].value_.MME_UE_S1AP_ID; - } - /* TODO */ - } - } else if (ischosen(s1ap.successfulOutcome)) { - var SuccessfulOutcome so := s1ap.successfulOutcome; - select (s1ap) { - case (tr_S1AP_InitialCtxSetupResp) { - return so.value_.initialContextSetupResponse.protocolIEs[0].value_.MME_UE_S1AP_ID; - } - case (tr_S1AP_UeContextReleaseCompl) { - return so.value_.UEContextReleaseComplete.protocolIEs[0].value_.MME_UE_S1AP_ID; - } - /* TODO */ - } - } else if (ischosen(s1ap.unsuccessfulOutcome)) { - var UnsuccessfulOutcome uo := s1ap.unsuccessfulOutcome; - select (s1ap) { - case (tr_S1AP_InitialCtxSetupFail) { - return uo.value_.initialContextSetupFailure.protocolIEs[0].value_.MME_UE_S1AP_ID; - } - /* TODO */ - } - } - return omit; -} - -function f_S1AP_get_NAS_PDU(S1AP_PDU s1ap) return template (omit) NAS_PDU -{ - var integer i, j; - - if (ischosen(s1ap.initiatingMessage)) { - var InitiatingMessage im := s1ap.initiatingMessage; - select (s1ap) { - case (tr_S1AP_DlNasTransport) { - var DownlinkNASTransport msg := im.value_.DownlinkNASTransport; - for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { - if (msg.protocolIEs[i].id == id_NAS_PDU) { - return msg.protocolIEs[i].value_.NAS_PDU; - } - } - } - case (tr_S1AP_UlNasTransport) { - var UplinkNASTransport msg := im.value_.UplinkNASTransport; - for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { - if (msg.protocolIEs[i].id == id_NAS_PDU) { - return msg.protocolIEs[i].value_.NAS_PDU; - } - } - } - case (tr_S1AP_IntialCtxSetupReq) { - var InitialContextSetupRequest msg := im.value_.initialContextSetupRequest; - for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { - if (msg.protocolIEs[i].id == id_E_RABToBeSetupListCtxtSUReq) { - var E_RABToBeSetupListCtxtSUReq rab_req := msg.protocolIEs[i].value_.E_RABToBeSetupListCtxtSUReq; - for (j := 0; j < lengthof(rab_req); j := j+1) { - var E_RABToBeSetupItemCtxtSUReq it := rab_req[j].value_.E_RABToBeSetupItemCtxtSUReq; - return it.nAS_PDU; - } - } - } - return omit; - } - } - } - return omit; -} - - - } diff --git a/library/S1AP_Utils.ttcn b/library/S1AP_Utils.ttcn new file mode 100644 index 0000000..52d7076 --- /dev/null +++ b/library/S1AP_Utils.ttcn @@ -0,0 +1,167 @@ +module S1AP_Utils { + +/* (C) 2019 by Harald Welte <laforge(a)gnumonks.org> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from S1AP_IEs all; +import from S1AP_Types all; +import from S1AP_Constants all; +import from S1AP_PDU_Contents all; +import from S1AP_PDU_Descriptions all; +import from S1AP_Templates all; + +function f_S1AP_get_ENB_UE_S1AP_ID(S1AP_PDU s1ap) return template (omit) ENB_UE_S1AP_ID +{ + if (ischosen(s1ap.initiatingMessage)) { + var InitiatingMessage im := s1ap.initiatingMessage; + select (s1ap) { + case (tr_S1AP_InitialUE) { + return im.value_.InitialUEMessage.protocolIEs[0].value_.ENB_UE_S1AP_ID; + } + case (tr_S1AP_DlNasTransport) { + return im.value_.DownlinkNASTransport.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + case (tr_S1AP_UlNasTransport) { + return im.value_.UplinkNASTransport.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + case (tr_S1AP_IntialCtxSetupReq) { + return im.value_.initialContextSetupRequest.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + case (tr_S1AP_UeContextReleaseReq) { + return im.value_.UEContextReleaseRequest.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + case (tr_S1AP_UeContextReleaseCmd) { + if (ispresent(im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_S1AP_IDs.uE_S1AP_ID_pair)) { + return im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_S1AP_IDs.uE_S1AP_ID_pair.eNB_UE_S1AP_ID; + } else { + return omit; + } + } + case (tr_S1AP_ConnEstInd) { + return im.value_.ConnectionEstablishmentIndication.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + /* TODO */ + } + } else if (ischosen(s1ap.successfulOutcome)) { + var SuccessfulOutcome so := s1ap.successfulOutcome; + select (s1ap) { + case (tr_S1AP_InitialCtxSetupResp) { + return so.value_.initialContextSetupResponse.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + case (tr_S1AP_UeContextReleaseCompl) { + return so.value_.UEContextReleaseComplete.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + /* TODO */ + } + } else if (ischosen(s1ap.unsuccessfulOutcome)) { + var UnsuccessfulOutcome uo := s1ap.unsuccessfulOutcome; + select (s1ap) { + case (tr_S1AP_InitialCtxSetupFail) { + return uo.value_.initialContextSetupFailure.protocolIEs[1].value_.ENB_UE_S1AP_ID; + } + /* TODO */ + } + } + return omit; +} + +function f_S1AP_get_MME_UE_S1AP_ID(S1AP_PDU s1ap) return template (omit) MME_UE_S1AP_ID +{ + if (ischosen(s1ap.initiatingMessage)) { + var InitiatingMessage im := s1ap.initiatingMessage; + select (s1ap) { + case (tr_S1AP_DlNasTransport) { + return im.value_.DownlinkNASTransport.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + case (tr_S1AP_UlNasTransport) { + return im.value_.UplinkNASTransport.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + case (tr_S1AP_IntialCtxSetupReq) { + return im.value_.initialContextSetupRequest.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + case (tr_S1AP_UeContextReleaseReq) { + return im.value_.UEContextReleaseRequest.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + case (tr_S1AP_UeContextReleaseCmd) { + if (ispresent(im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_S1AP_IDs.uE_S1AP_ID_pair)) { + return im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_S1AP_IDs.uE_S1AP_ID_pair.mME_UE_S1AP_ID; + } else { + return im.value_.uEContextReleaseCommand.protocolIEs[0].value_.uE_S1AP_IDs.mME_UE_S1AP_ID; + } + } + case (tr_S1AP_ConnEstInd) { + return im.value_.ConnectionEstablishmentIndication.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + /* TODO */ + } + } else if (ischosen(s1ap.successfulOutcome)) { + var SuccessfulOutcome so := s1ap.successfulOutcome; + select (s1ap) { + case (tr_S1AP_InitialCtxSetupResp) { + return so.value_.initialContextSetupResponse.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + case (tr_S1AP_UeContextReleaseCompl) { + return so.value_.UEContextReleaseComplete.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + /* TODO */ + } + } else if (ischosen(s1ap.unsuccessfulOutcome)) { + var UnsuccessfulOutcome uo := s1ap.unsuccessfulOutcome; + select (s1ap) { + case (tr_S1AP_InitialCtxSetupFail) { + return uo.value_.initialContextSetupFailure.protocolIEs[0].value_.MME_UE_S1AP_ID; + } + /* TODO */ + } + } + return omit; +} + +function f_S1AP_get_NAS_PDU(S1AP_PDU s1ap) return template (omit) NAS_PDU +{ + var integer i, j; + + if (ischosen(s1ap.initiatingMessage)) { + var InitiatingMessage im := s1ap.initiatingMessage; + select (s1ap) { + case (tr_S1AP_DlNasTransport) { + var DownlinkNASTransport msg := im.value_.DownlinkNASTransport; + for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { + if (msg.protocolIEs[i].id == id_NAS_PDU) { + return msg.protocolIEs[i].value_.NAS_PDU; + } + } + } + case (tr_S1AP_UlNasTransport) { + var UplinkNASTransport msg := im.value_.UplinkNASTransport; + for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { + if (msg.protocolIEs[i].id == id_NAS_PDU) { + return msg.protocolIEs[i].value_.NAS_PDU; + } + } + } + case (tr_S1AP_IntialCtxSetupReq) { + var InitialContextSetupRequest msg := im.value_.initialContextSetupRequest; + for (i := 0; i < lengthof(msg.protocolIEs); i := i+1) { + if (msg.protocolIEs[i].id == id_E_RABToBeSetupListCtxtSUReq) { + var E_RABToBeSetupListCtxtSUReq rab_req := msg.protocolIEs[i].value_.E_RABToBeSetupListCtxtSUReq; + for (j := 0; j < lengthof(rab_req); j := j+1) { + var E_RABToBeSetupItemCtxtSUReq it := rab_req[j].value_.E_RABToBeSetupItemCtxtSUReq; + return it.nAS_PDU; + } + } + } + return omit; + } + } + } + return omit; +} + +} diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index cc2e5e9..d0b77d5 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -16,6 +16,7 @@ import from Misc_Helpers all; import from S1AP_Types all; import from S1AP_Templates all; +import from S1AP_Utils all; import from S1AP_Emulation all; import from S1AP_PDU_Descriptions all; import from S1AP_IEs all; diff --git a/mme/gen_links.sh b/mme/gen_links.sh index d2b17ce..dacf13a 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -73,7 +73,7 @@ FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn IPCP_Templates.ttcn " FILES+="SGsAP_Templates.ttcn SGsAP_CodecPort.ttcn SGsAP_CodecPort_CtrlFunct.ttcn SGsAP_CodecPort_CtrlFunctDef.cc SGsAP_Emulation.ttcn DNS_Helpers.ttcn " FILES+="L3_Templates.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn " -FILES+="S1AP_CodecPort.ttcn S1AP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunct.ttcn S1AP_Emulation.ttcn " +FILES+="S1AP_CodecPort.ttcn S1AP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunct.ttcn S1AP_Utils.ttcn S1AP_Emulation.ttcn " FILES+="NAS_Templates.ttcn GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn " FILES+="DIAMETER_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39848?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id3ba089140093490abd0307addeb5d7287dc5894 Gerrit-Change-Number: 39848 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: s1gw: add UE multiplex component

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39850?usp=email ) Change subject: s1gw: add UE multiplex component ...................................................................... s1gw: add UE multiplex component The UEMux is built upon the ConnHdlr component, allowing to simulate concurrent activity of multiple virtual UEs. This new component will be used in follow-up patches. Change-Id: I60e6f5d2b9882c27cecd06a2450bda4909c0532a Related: SYS#7288 --- A s1gw/S1GW_UEMux.ttcn 1 file changed, 327 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/39850/1 diff --git a/s1gw/S1GW_UEMux.ttcn b/s1gw/S1GW_UEMux.ttcn new file mode 100644 index 0000000..228cf10 --- /dev/null +++ b/s1gw/S1GW_UEMux.ttcn @@ -0,0 +1,327 @@ +module S1GW_UEMux { + +/* UE Multiplexer, runs on top of ConnHdlr component, dispatches S1AP PDUs + * to/from the UE components. In order to receive S1AP PDUs, a UE component + * needs to subscribe for MME_UE_S1AP_ID and/or ENB_UE_S1AP_ID. + * + * (C) 2025 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> + * + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from General_Types all; +import from Osmocom_Types all; + +import from S1AP_IEs all; +import from S1AP_Types all; +import from S1AP_PDU_Contents all; +import from S1AP_PDU_Descriptions all; +import from S1AP_Utils all; +import from S1GW_ConnHdlr all; + +private type enumerated S1AP_PDU_DIR { + S1AP_PDU_DIR_FROM_MME, + S1AP_PDU_DIR_FROM_ENB +}; + +private type record S1AP_dPDU { + S1AP_PDU_DIR dir, + S1AP_PDU pdu +}; + +private altstep as_s1ap_dpdu(out S1AP_PDU pdu, + template (present) S1AP_PDU_DIR dir := ?, + template (present) S1AP_PDU tr_pdu := ?) +runs on UEMuxUE { + var S1AP_dPDU dpdu; + + [] UEMUX_CONN.receive(S1AP_dPDU:{dir, tr_pdu}) -> value dpdu { + pdu := dpdu.pdu; + } +} + +type port UEMUX_CONN_PT message { + inout S1AP_dPDU; +} with { extension "internal" }; + +type component UEMuxUE { + port UEMUX_CONN_PT UEMUX_CONN; + port UEMUX_PROC_PT UEMUX_PROC; +}; + +type component UEMux_CT extends ConnHdlr, UEMuxUE { + /* registered UE components */ + var UE_ConnList g_uemux_list := { }; +}; + + +/* represents a single UE connection */ +private type record UE_ConnData { + UEMuxUE vc_conn, + MME_UE_S1AP_ID mme_ue_id optional, + ENB_UE_S1AP_ID enb_ue_id optional +}; +private type record of UE_ConnData UE_ConnList; + +/*********************************************************************************** + * UE connection management API + **********************************************************************************/ + +/* find a UE connection [index] by an MME_UE_S1AP_ID */ +private function f_UEMux_find_ue_by_mme_ue_id(MME_UE_S1AP_ID mme_ue_id) +runs on UEMux_CT return integer { + for (var integer i := 0; i < lengthof(g_uemux_list); i := i + 1) { + if (g_uemux_list[i].mme_ue_id == mme_ue_id) { + return i; + } + } + + return -1; +} + +/* find a UE connection [index] by an ENB_UE_S1AP_ID */ +private function f_UEMux_find_ue_by_enb_ue_id(ENB_UE_S1AP_ID enb_ue_id) +runs on UEMux_CT return integer { + for (var integer i := 0; i < lengthof(g_uemux_list); i := i + 1) { + if (g_uemux_list[i].enb_ue_id == enb_ue_id) { + return i; + } + } + + return -1; +} + +/* find a UE connection [index] for the given S1AP PDU */ +private function f_UEMux_find_ue_for_pdu(in S1AP_PDU pdu) +runs on UEMux_CT return integer { + var template (omit) MME_UE_S1AP_ID mme_ue_id; + var template (omit) ENB_UE_S1AP_ID enb_ue_id; + var integer idx; + + mme_ue_id := f_S1AP_get_MME_UE_S1AP_ID(pdu); + if (isvalue(mme_ue_id)) { + idx := f_UEMux_find_ue_by_mme_ue_id(valueof(mme_ue_id)); + if (idx != -1) { + return idx; + } + } + + enb_ue_id := f_S1AP_get_ENB_UE_S1AP_ID(pdu); + if (isvalue(enb_ue_id)) { + idx := f_UEMux_find_ue_by_enb_ue_id(valueof(enb_ue_id)); + if (idx != -1) { + return idx; + } + } + + return -1; +} + +/* find a UE connection [index] by component reference */ +private function f_UEMux_find_ue_by_vc_conn(UEMuxUE vc_conn) +runs on UEMux_CT return integer { + for (var integer i := 0; i < lengthof(g_uemux_list); i := i + 1) { + if (g_uemux_list[i].vc_conn == vc_conn) { + return i; + } + } + + return -1; +} + +private function f_UEMux_route_pdu(S1AP_dPDU dpdu) +runs on UEMux_CT { + var integer idx; + + idx := f_UEMux_find_ue_for_pdu(dpdu.pdu); + if (idx >= 0) { + UEMUX_CONN.send(dpdu) to g_uemux_list[idx].vc_conn; + } else { + log("S1AP PDU cannot be routed: ", dpdu.pdu); + } +} + +/* add a new UE connection, return its index */ +private function f_UEMux_ue_add(UEMuxUE vc_conn) +runs on UEMux_CT return integer { + var integer idx; + + idx := f_UEMux_find_ue_by_vc_conn(vc_conn); + if (idx != -1) { /* already registered */ + return idx; + } + + idx := lengthof(g_uemux_list); + g_uemux_list[idx] := { vc_conn, omit, omit }; + log("UE ", vc_conn, " is registered (idx=", idx, ")"); + + return idx; +} + +/* subscribe a UE component for S1AP PDUs with the given MME-UE-ID */ +private function f_UEMux_subscribe_for_mme_ue_id(UEMuxUE vc_conn, + MME_UE_S1AP_ID mme_ue_id) +runs on UEMux_CT { + var integer idx; + + if (f_UEMux_find_ue_by_mme_ue_id(mme_ue_id) != -1) { + setverdict(fail, "MME-UE-ID ", mme_ue_id," is already used"); + mtc.stop; + } + + idx := f_UEMux_ue_add(vc_conn); + g_uemux_list[idx].mme_ue_id := mme_ue_id; +} + +/* subscribe a UE component for S1AP PDUs with the given ENB-UE-ID */ +private function f_UEMux_subscribe_for_enb_ue_id(UEMuxUE vc_conn, + ENB_UE_S1AP_ID enb_ue_id) +runs on UEMux_CT { + var integer idx; + + if (f_UEMux_find_ue_by_enb_ue_id(enb_ue_id) != -1) { + setverdict(fail, "ENB-UE-ID ", enb_ue_id," is already used"); + mtc.stop; + } + + idx := f_UEMux_ue_add(vc_conn); + g_uemux_list[idx].enb_ue_id := enb_ue_id; +} + +/* unsubscribe a UE component */ +private function f_UEMux_unsubscribe(UEMuxUE vc_conn) +runs on UEMux_CT { + var UE_ConnList ue_list := { }; + + for (var integer i := 0; i < lengthof(g_uemux_list); i := i + 1) { + if (g_uemux_list[i].vc_conn != vc_conn) { + ue_list := ue_list & { g_uemux_list[i] }; + } + } + + if (lengthof(ue_list) == lengthof(g_uemux_list)) { + setverdict(fail, "UE ", vc_conn, " is not known"); + mtc.stop; + } + + g_uemux_list := ue_list; + log("UE ", vc_conn, " is unregistered"); +} + +signature UEMux_subscribe_for_mme_ue_id(in MME_UE_S1AP_ID mme_ue_id); +signature UEMux_subscribe_for_enb_ue_id(in ENB_UE_S1AP_ID enb_ue_id); +signature UEMux_unsubscribe(); + +type port UEMUX_PROC_PT procedure { + inout UEMux_subscribe_for_mme_ue_id; + inout UEMux_subscribe_for_enb_ue_id; + inout UEMux_unsubscribe; +} with { extension "internal" }; + +/*********************************************************************************** + * public API + **********************************************************************************/ + +function f_UEMuxUE_subscribe_for_mme_ue_id(MME_UE_S1AP_ID mme_ue_id) +runs on UEMuxUE { + UEMUX_PROC.call(UEMux_subscribe_for_mme_ue_id:{mme_ue_id}) { + [] UEMUX_PROC.getreply(UEMux_subscribe_for_mme_ue_id:{mme_ue_id}); + } +} + +function f_UEMuxUE_subscribe_for_enb_ue_id(ENB_UE_S1AP_ID enb_ue_id) +runs on UEMuxUE { + UEMUX_PROC.call(UEMux_subscribe_for_enb_ue_id:{enb_ue_id}) { + [] UEMUX_PROC.getreply(UEMux_subscribe_for_enb_ue_id:{enb_ue_id}); + } +} + +function f_UEMuxUE_unsubscribe() +runs on UEMuxUE { + UEMUX_PROC.call(UEMux_unsubscribe:{}) { + [] UEMUX_PROC.getreply(UEMux_unsubscribe:{}); + } +} + +function f_UEMuxUE_tx_s1ap_from_mme(template (value) S1AP_PDU pdu) +runs on UEMuxUE { + var S1AP_dPDU dpdu := { S1AP_PDU_DIR_FROM_MME, valueof(pdu) }; + UEMUX_CONN.send(dpdu); +} + +function f_UEMuxUE_tx_s1ap_from_enb(template (value) S1AP_PDU pdu) +runs on UEMuxUE { + var S1AP_dPDU dpdu := { S1AP_PDU_DIR_FROM_ENB, valueof(pdu) }; + UEMUX_CONN.send(dpdu); +} + +altstep as_UEMuxUE_s1ap_from_mme(out S1AP_PDU pdu, + template (present) S1AP_PDU tr_pdu := ?) +runs on UEMuxUE { + [] as_s1ap_dpdu(pdu, S1AP_PDU_DIR_FROM_MME, tr_pdu); +} + +altstep as_UEMuxUE_s1ap_from_enb(out S1AP_PDU pdu, + template (present) S1AP_PDU tr_pdu := ?) +runs on UEMuxUE { + [] as_s1ap_dpdu(pdu, S1AP_PDU_DIR_FROM_ENB, tr_pdu); +} + +type function void_fn2(charstring id) runs on UEMux_CT; + +function f_UEMux_init(void_fn2 fn, charstring id, ConnHdlrPars pars) +runs on UEMux_CT { + g_pars := pars; + fn.apply(id); +} + +function main() runs on UEMux_CT { + while (true) { + var MME_UE_S1AP_ID mme_ue_id; + var ENB_UE_S1AP_ID enb_ue_id; + var UEMuxUE vc_conn; + var S1AP_PDU pdu; + + alt { + /* MME originated S1AP PDU to S1GW */ + [] as_s1ap_dpdu(pdu, S1AP_PDU_DIR_FROM_MME) { + f_ConnHdlr_tx_s1ap_from_mme(pdu); + } + /* eNB originated S1AP PDU to S1GW */ + [] as_s1ap_dpdu(pdu, S1AP_PDU_DIR_FROM_ENB) { + f_ConnHdlr_tx_s1ap_from_enb(pdu); + } + + /* MME originated S1AP PDU from S1GW */ + [] as_ConnHdlr_s1ap_from_mme(pdu) { + f_UEMux_route_pdu({S1AP_PDU_DIR_FROM_MME, pdu}); + } + /* eNB originated S1AP PDU from S1GW */ + [] as_ConnHdlr_s1ap_from_enb(pdu) { + f_UEMux_route_pdu({S1AP_PDU_DIR_FROM_ENB, pdu}); + } + + /* UE subsciption procedures */ + [] UEMUX_PROC.getcall(UEMux_subscribe_for_mme_ue_id:{?}) -> param(mme_ue_id) sender vc_conn { + f_UEMux_subscribe_for_mme_ue_id(vc_conn, mme_ue_id); + UEMUX_PROC.reply(UEMux_subscribe_for_mme_ue_id:{mme_ue_id}) to vc_conn; + } + [] UEMUX_PROC.getcall(UEMux_subscribe_for_enb_ue_id:{?}) -> param(enb_ue_id) sender vc_conn { + f_UEMux_subscribe_for_enb_ue_id(vc_conn, enb_ue_id); + UEMUX_PROC.reply(UEMux_subscribe_for_enb_ue_id:{enb_ue_id}) to vc_conn; + } + [] UEMUX_PROC.getcall(UEMux_unsubscribe:{}) -> sender vc_conn { + f_UEMux_unsubscribe(vc_conn); + UEMUX_PROC.reply(UEMux_unsubscribe:{}) to vc_conn; + } + } + } +} + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39850?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I60e6f5d2b9882c27cecd06a2450bda4909c0532a Gerrit-Change-Number: 39850 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: s1gw: disable Nagle for eNB and MME connections

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39852?usp=email ) Change subject: s1gw: disable Nagle for eNB and MME connections ...................................................................... s1gw: disable Nagle for eNB and MME connections Change-Id: Id89941659fd2763aad9262b05aa007370424f2c1 Related: SYS#7288 --- M s1gw/S1GW_Tests.default 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/39852/1 diff --git a/s1gw/S1GW_Tests.default b/s1gw/S1GW_Tests.default index 4ed872b..8f9cfdc 100644 --- a/s1gw/S1GW_Tests.default +++ b/s1gw/S1GW_Tests.default @@ -3,7 +3,8 @@ ConsoleMask := ERROR | WARNING | PARALLEL | VERDICTOP | USER; [TESTPORT_PARAMETERS] - +*.S1AP_ENB.noDelay := "yes" // eNB: turn off Nagle +*.S1AP.noDelay := "yes" // MME: turn off Nagle [MODULE_PARAMETERS] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39852?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id89941659fd2763aad9262b05aa007370424f2c1 Gerrit-Change-Number: 39852 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_uemux_uldl_nas_release

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39851?usp=email ) Change subject: s1gw: add TC_uemux_uldl_nas_release ...................................................................... s1gw: add TC_uemux_uldl_nas_release So far all of our *_multi TCs have been running the test logic in multiple eNB connections. This is the first TC simulating activity of multiple virtual UEs within a single eNB connection. Change-Id: I8e5db55739241f89592a7d2a81a13e8028e90d1d Related: SYS#7288 --- M s1gw/S1GW_Tests.ttcn M s1gw/S1GW_UEMux.ttcn M s1gw/expected-results.xml M s1gw/gen_links.sh 4 files changed, 201 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/39851/1 diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index e722a10..8e631c4 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -43,6 +43,7 @@ import from S1AP_Server all; import from S1GW_ConnHdlr all; +import from S1GW_UEMux all; modulepar { charstring mp_s1gw_enb_ip := "127.0.1.1"; /* eNB facing address of the S1GW */ @@ -58,6 +59,7 @@ charstring mp_statsd_prefix := "s1gw."; integer mp_multi_enb_num := 42; /* number of eNBs in _multi TCs */ + integer mp_multi_ue_num := 128; /* number of UEs in _multi TCs */ } type component test_CT extends StatsD_Checker_CT { @@ -168,12 +170,8 @@ return erabs; } -function f_ConnHdlr_spawn(void_fn fn, ConnHdlrPars pars) -runs on test_CT return ConnHdlr { - var ConnHdlr vc_conn; - var charstring id := "ConnHdlr-" & testcasename() & "-" & int2str(pars.idx); - - vc_conn := ConnHdlr.create(id) alive; +function f_ConnHdlr_connect(ConnHdlr vc_conn) +runs on test_CT { if (isbound(vc_STATSD) and vc_STATSD.running) { connect(vc_conn:STATSD_PROC, vc_STATSD:STATSD_PROC); } @@ -186,11 +184,81 @@ connect(vc_conn:PFCP_PROC, vc_PFCP:CLIENT_PROC); } f_MutexDisp_connect(vc_mutex_disp, vc_conn); +} + +function f_ConnHdlr_spawn(void_fn fn, ConnHdlrPars pars) +runs on test_CT return ConnHdlr { + var ConnHdlr vc_conn; + var charstring id := "ConnHdlr-" & testcasename() & "-" & int2str(pars.idx); + + vc_conn := ConnHdlr.create(id) alive; + f_ConnHdlr_connect(vc_conn); vc_conn.start(f_ConnHdlr_init(fn, id, pars)); return vc_conn; } +function f_UEMux_spawn(void_fn2 fn, ConnHdlrPars pars) +runs on test_CT return UEMux_CT { + var UEMux_CT vc_conn; + var charstring id := "UEMux-" & testcasename() & "-" & int2str(pars.idx); + + vc_conn := UEMux_CT.create(id) alive; + f_ConnHdlr_connect(vc_conn); + vc_conn.start(f_UEMux_init(fn, id, pars)); + + return vc_conn; +} + +function f_TC_UEMux_main(charstring id) runs on UEMux_CT { + f_ConnHdlr_s1ap_register(g_pars.genb_id); + f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); + f_ConnHdlr_s1ap_setup(g_pars.genb_id); + + S1GW_UEMux.main(); + + f_ConnHdlr_s1ap_disconnect(); + f_ConnHdlr_s1ap_unregister(g_pars.genb_id); +} + +function f_UEMuxUE_create(in UEMux_CT vc_uemux, + in ConnHdlrPars pars, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) +runs on test_CT return UEMuxUE { + var charstring id := "UEMuxUE-" & testcasename(); + var UEMuxUE vc_ue; + + vc_ue := UEMuxUE.create(id) alive; + connect(vc_ue:UEMUX_CONN, vc_uemux:UEMUX_CONN); + connect(vc_ue:UEMUX_PROC, vc_uemux:UEMUX_PROC); + + /* pre-initialize the component */ + vc_ue.start(f_UEMuxUE_init(pars, mme_ue_id, enb_ue_id)); + vc_ue.done; + + return vc_ue; +} + +function f_UEMuxUE_init(in ConnHdlrPars pars, + MME_UE_S1AP_ID mme_ue_id, + ENB_UE_S1AP_ID enb_ue_id) +runs on UEMuxUE { + g_mme_ue_id := mme_ue_id; + g_enb_ue_id := enb_ue_id; + + g_ies.tai := { + pLMNidentity := pars.genb_id.pLMNidentity, + tAC := int2oct(12345, 2), /* XXX: hard-coded */ + iE_Extensions := omit + }; + g_ies.eutran_cgi := { + pLMNidentity := pars.genb_id.pLMNidentity, + cell_ID := int2bit(pars.idx, 28), + iE_Extensions := omit + }; +} + /* wait for all ConnHdlr in the given list to be .done() */ function f_ConnHdlrList_all_done(in ConnHdlrList vc_conns) runs on test_CT { @@ -199,6 +267,14 @@ } } +/* wait for all UEMux_CT in the given list to be .done() */ +function f_UEMuxUEList_all_done(in UEMuxUEList vc_ues) +runs on test_CT { + for (var integer i := 0; i < lengthof(vc_ues); i := i + 1) { + vc_ues[i].done; + } +} + function f_TC_exec(void_fn fn, integer num_enbs := 1, integer num_erabs := 1) @@ -577,6 +653,70 @@ f_TC_exec(refers(f_TC_ue_ctx_release_cmd_compl), num_erabs := 3); } +/* Test multiple UEs concurrently doing the following: + * eNB -> MME: INITIAL UE MESSAGE + * eNB <- MME: DOWNLINK NAS TRANSPORT + * eNB -> MME: UPLINK NAS TRANSPORT + * eNB <- MME: DOWNLINK NAS TRANSPORT + * eNB <- MME: UE CONTEXT RELEASE COMMAND + * eNB -> MME: UE CONTEXT RELEASE COMPLETE + * All S1AP PDUs are expected to be forwarded as-is. */ +function f_TC_uemux_uldl_nas_release() +runs on UEMuxUE { + var template (value) S1AP_PDU pdu; + var float Tval := 5.0; + + f_UEMuxUE_subscribe_for_mme_ue_id(g_mme_ue_id); + f_UEMuxUE_subscribe_for_enb_ue_id(g_enb_ue_id); + + /* eNB -> MME: INITIAL UE MESSAGE */ + pdu := ts_S1AP_InitialUE(g_enb_ue_id, ''O, g_ies.tai, g_ies.eutran_cgi, mo_Signalling); + f_UEMuxUE_trx_s1ap_from_enb(-, pdu, pdu, Tval); + /* eNB <- MME: DOWNLINK NAS TRANSPORT */ + pdu := ts_S1AP_DlNasTransport(g_mme_ue_id, g_enb_ue_id, ''O); + f_UEMuxUE_trx_s1ap_from_mme(-, pdu, pdu, Tval); + /* eNB -> MME: UPLINK NAS TRANSPORT */ + pdu := ts_S1AP_UlNasTransport(g_mme_ue_id, g_enb_ue_id, ''O, g_ies.eutran_cgi, g_ies.tai); + f_UEMuxUE_trx_s1ap_from_enb(-, pdu, pdu, Tval); + /* eNB <- MME: DOWNLINK NAS TRANSPORT */ + pdu := ts_S1AP_DlNasTransport(g_mme_ue_id, g_enb_ue_id, ''O); + f_UEMuxUE_trx_s1ap_from_mme(-, pdu, pdu, Tval); + + var UE_S1AP_IDs ue_ids := { + uE_S1AP_ID_pair := { + mME_UE_S1AP_ID := g_mme_ue_id, + eNB_UE_S1AP_ID := g_enb_ue_id, + iE_Extensions := omit + } + }; + + /* eNB <- MME: UE CONTEXT RELEASE COMMAND */ + pdu := ts_S1AP_UeContextReleaseCmd(mme_ids := ue_ids, + cause := {nas := normal_release}); + f_UEMuxUE_trx_s1ap_from_mme(-, pdu, pdu, Tval); + /* eNB -> MME: UE CONTEXT RELEASE COMPLETE */ + pdu := ts_S1AP_UeContextReleaseCompl(g_mme_ue_id, g_enb_ue_id); + f_UEMuxUE_trx_s1ap_from_enb(-, pdu, pdu, Tval); + + f_UEMuxUE_unsubscribe(); +} +testcase TC_uemux_uldl_nas_release() runs on test_CT { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars); + var UEMuxUEList vc_ues; + var UEMux_CT vc_uemux; + + f_init(); + + vc_uemux := f_UEMux_spawn(refers(f_TC_UEMux_main), pars); + + for (var integer i := 0; i < mp_multi_ue_num; i := i + 1) { + vc_ues[i] := f_UEMuxUE_create(vc_uemux, pars, i, i); + vc_ues[i].start(f_TC_uemux_uldl_nas_release()); + } + + f_UEMuxUEList_all_done(vc_ues); +} + function f_TC_pfcp_heartbeat(charstring id) runs on ConnHdlr { var integer rts := f_PFCPEM_get_recovery_timestamp(); var PDU_PFCP pfcp_pdu; @@ -618,6 +758,7 @@ execute( TC_ue_ctx_release_req3() ); execute( TC_ue_ctx_release_cmd_compl() ); execute( TC_ue_ctx_release_cmd_compl3() ); + execute( TC_uemux_uldl_nas_release() ); execute( TC_pfcp_heartbeat() ); } diff --git a/s1gw/S1GW_UEMux.ttcn b/s1gw/S1GW_UEMux.ttcn index 228cf10..5e1e6d6 100644 --- a/s1gw/S1GW_UEMux.ttcn +++ b/s1gw/S1GW_UEMux.ttcn @@ -17,6 +17,7 @@ import from General_Types all; import from Osmocom_Types all; +import from Misc_Helpers all; import from S1AP_IEs all; import from S1AP_Types all; @@ -46,14 +47,48 @@ } } +private function f_trx_s1ap_pdu(out S1AP_PDU pdu, + S1AP_PDU_DIR dir, + template (value) S1AP_PDU ts_pdu, + template (present) S1AP_PDU tr_pdu, + float Tval) +runs on UEMuxUE { + timer T := Tval; + + UEMUX_CONN.send(S1AP_dPDU:{dir, ts_pdu}); + + T.start; + alt { + [] as_s1ap_dpdu(pdu, dir, tr_pdu); + [] as_s1ap_dpdu(pdu, dir) { + setverdict(fail, "Rx unexpected S1AP PDU (", dir, "): ", pdu); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } + [] T.timeout { + setverdict(fail, "Timeout waiting for S1AP PDU (", dir, "): ", pdu); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } + } +} + type port UEMUX_CONN_PT message { inout S1AP_dPDU; } with { extension "internal" }; +type record UEMuxUE_IEs { + S1AP_IEs.EUTRAN_CGI eutran_cgi, + S1AP_IEs.TAI tai +}; + type component UEMuxUE { port UEMUX_CONN_PT UEMUX_CONN; port UEMUX_PROC_PT UEMUX_PROC; + + var MME_UE_S1AP_ID g_mme_ue_id; + var ENB_UE_S1AP_ID g_enb_ue_id; + var UEMuxUE_IEs g_ies; }; +type record of UEMuxUE UEMuxUEList; type component UEMux_CT extends ConnHdlr, UEMuxUE { /* registered UE components */ @@ -273,6 +308,22 @@ [] as_s1ap_dpdu(pdu, S1AP_PDU_DIR_FROM_ENB, tr_pdu); } +function f_UEMuxUE_trx_s1ap_from_mme(out S1AP_PDU pdu, + template (value) S1AP_PDU ts_pdu, + template (present) S1AP_PDU tr_pdu := ?, + float Tval := 1.0) +runs on UEMuxUE { + f_trx_s1ap_pdu(pdu, S1AP_PDU_DIR_FROM_MME, ts_pdu, tr_pdu, Tval); +} + +function f_UEMuxUE_trx_s1ap_from_enb(out S1AP_PDU pdu, + template (value) S1AP_PDU ts_pdu, + template (present) S1AP_PDU tr_pdu := ?, + float Tval := 1.0) +runs on UEMuxUE { + f_trx_s1ap_pdu(pdu, S1AP_PDU_DIR_FROM_ENB, ts_pdu, tr_pdu, Tval); +} + type function void_fn2(charstring id) runs on UEMux_CT; function f_UEMux_init(void_fn2 fn, charstring id, ConnHdlrPars pars) diff --git a/s1gw/expected-results.xml b/s1gw/expected-results.xml index 74936f5..343ba48 100644 --- a/s1gw/expected-results.xml +++ b/s1gw/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='S1GW_Tests' tests='24' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='S1GW_Tests' tests='25' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='S1GW_Tests' name='TC_setup' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_setup_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_conn_term_by_mme' time='MASKED'/> @@ -23,5 +23,6 @@ <testcase classname='S1GW_Tests' name='TC_ue_ctx_release_req3' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_ue_ctx_release_cmd_compl' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_ue_ctx_release_cmd_compl3' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_uemux_uldl_nas_release' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_pfcp_heartbeat' time='MASKED'/> </testsuite> diff --git a/s1gw/gen_links.sh b/s1gw/gen_links.sh index 63c826e..5b803a5 100755 --- a/s1gw/gen_links.sh +++ b/s1gw/gen_links.sh @@ -30,7 +30,7 @@ DIR=../library FILES="Misc_Helpers.ttcn Mutex.ttcn General_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="PFCP_CodecPort.ttcn PFCP_CodecPort_CtrlFunct.ttcn PFCP_CodecPort_CtrlFunctDef.cc PFCP_Emulation.ttcn PFCP_Templates.ttcn " -FILES+="S1AP_CodecPort.ttcn S1AP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunct.ttcn " +FILES+="S1AP_CodecPort.ttcn S1AP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunct.ttcn S1AP_Utils.ttcn " FILES+="SCTP_Templates.ttcn " FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcnpp " gen_links $DIR $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39851?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8e5db55739241f89592a7d2a81a13e8028e90d1d Gerrit-Change-Number: 39851 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

[S] Change in upf-benchmark[master]: testsuites: upf: Support setting net iface irqs in c240 host

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39846?usp=email ) Change subject: testsuites: upf: Support setting net iface irqs in c240 host ...................................................................... testsuites: upf: Support setting net iface irqs in c240 host The Cisco C240 machines consist of 2 CPU packages, each with 20 cores (hyperthreading disabled). Those 2 CPUs packages are hence placed in 2 different NUMA zones. By default, mlx5 driver creates one rx-queue per core, in this case it creates 40 rx-queues with 40 irqs (one for each rx-queue/core). This means it doesn't take into account the fact that the network card is plugged into a given PCIe bus belonging to one of the 2 available NUMA zones. As a result, when a packet is received and put into the rx-queue+irq belonging to the other NUMA zone, a penalty in memory-bandwitch is incurred, which ends up in a performance throughput penalty. With 100 flows at ~70Gbps being sent to the host, by default load spread among all 40 cores can reach processing at 55Gbps 4.62 MPPS. By decreasing the rx-queues to 20 and pinning the irqs to the cores in the same NUMA node, using only those 20 CPUs we get a small gain reaching ~62 Gbps 5.22 MPPS. Change-Id: I26fce50c04b043b61ba418d7090b2573e7807b08 --- M testsuites/gtplab-sysmo2025/tunmap/upf/configure.sh 1 file changed, 30 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/46/39846/1 diff --git a/testsuites/gtplab-sysmo2025/tunmap/upf/configure.sh b/testsuites/gtplab-sysmo2025/tunmap/upf/configure.sh index 825e59f..947c465 100755 --- a/testsuites/gtplab-sysmo2025/tunmap/upf/configure.sh +++ b/testsuites/gtplab-sysmo2025/tunmap/upf/configure.sh @@ -1,8 +1,33 @@ #!/bin/bash -xe +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + # Interface towards UPF: -IFACE_RAN="enp2s0f1np1" -IFACE_CN="enp2s0f0np0" +case $(hostname) in +gtplab1) + IFACE_RAN="enp2s0f1np1" + IFACE_CN="enp2s0f0np0" + MAC_CN_PEER="ec:0d:9a:8a:27:53" + ;; +c240-2) + IFACE_RAN="ens2f0np0" + IFACE_CN="ens2f1np1" + MAC_CN_PEER="88:e9:a4:3b:f0:49" + # Adapt Rx/Tx Queues and IRQs to Numa Node of device: + # cat /sys/class/net/$IFACE_RAN/device/numa_node + # 0 + # cat /sys/class/net/$IFACE_RAN/device/local_cpulist + # 0-19 + sudo ethtool -L $IFACE_RAN combined 20 + sudo ethtool -L $IFACE_CN combined 20 + sudo "$SCRIPT_DIR/../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_RAN + sudo "$SCRIPT_DIR/../../../../scripts/set_irq_affinity_cpulist.sh" 0-19 $IFACE_CN + ;; +*) + echo "UNEXPECTED HOSTNAME: $(hostname)" + exit 1 + ;; +esac # Disable ethernet flow control: sudo ethtool -A $IFACE_RAN autoneg off rx off tx off @@ -26,7 +51,9 @@ # Set up UPF address: sudo ip addr add 172.16.32.1/24 dev $IFACE_RAN || true; +sudo ip link set up dev $IFACE_RAN || true; sudo ip addr add 172.16.31.2/24 dev $IFACE_CN || true; +sudo ip link set up dev $IFACE_CN || true; # TRex doesn't answer ARPs, so we need to set up the CN-side peer: -sudo ip neigh add 172.16.31.200 lladdr ec:0d:9a:8a:27:53 nud permanent dev $IFACE_CN || true; +sudo ip neigh add 172.16.31.200 lladdr "$MAC_CN_PEER" nud permanent dev $IFACE_CN || true; -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39846?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I26fce50c04b043b61ba418d7090b2573e7807b08 Gerrit-Change-Number: 39846 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2025