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

[L] Change in upf-benchmark[master]: Add scripts/ dir with helpers to operate on net iface irqs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39845?usp=email ) Change subject: Add scripts/ dir with helpers to operate on net iface irqs ...................................................................... Add scripts/ dir with helpers to operate on net iface irqs Fetched from https://github.com/Mellanox/mlnx-tools b25ae28bb0f55375390c71a3f32f67c1264cf6c9, they can be used either as BSD or GPL2 license. Change-Id: I646f57cb3940dbbd4e6606e013651116c38c9534 --- A scripts/common_irq_affinity.sh A scripts/set_irq_affinity_cpulist.sh A scripts/show_irq_affinity.sh A scripts/show_irq_affinity_hints.sh 4 files changed, 326 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/45/39845/1 diff --git a/scripts/common_irq_affinity.sh b/scripts/common_irq_affinity.sh new file mode 100644 index 0000000..df42833 --- /dev/null +++ b/scripts/common_irq_affinity.sh @@ -0,0 +1,132 @@ +#!/bin/bash +# +# Copyright (c) 2017 Mellanox Technologies. All rights reserved. +# +# This Software is licensed under one of the following licenses: +# +# 1) under the terms of the "Common Public License 1.0" a copy of which is +# available from the Open Source Initiative, see +# http://www.opensource.org/licenses/cpl.php. +# +# 2) under the terms of the "The BSD License" a copy of which is +# available from the Open Source Initiative, see +# http://www.opensource.org/licenses/bsd-license.php. +# +# 3) under the terms of the "GNU General Public License (GPL) Version 2" a +# copy of which is available from the Open Source Initiative, see +# http://www.opensource.org/licenses/gpl-license.php. +# +# Licensee has the right to choose one of the above licenses. +# +# Redistributions of source code must retain the above copyright +# notice and one of the license notices. +# +# Redistributions in binary form must reproduce both the above copyright +# notice, one of the license notices in the documentation +# and/or other materials provided with the distribution. +# +# Fetched from https://github.com/Mellanox/mlnx-tools/blob/mlnx_ofed/sbin/common_irq_affin… b25ae28bb0f55375390c71a3f32f67c1264cf6c9 + +function add_comma_every_eight +{ + echo " $1 " | sed -r ':L;s=\b([0-9]+)([0-9]{8})\b=\1,\2=g;t L' +} + +function int2hex +{ + CHUNKS=$(( $1/64 )) + COREID=$1 + HEX="" + for (( CHUNK=0; CHUNK<${CHUNKS} ; CHUNK++ )) + do + HEX=$HEX"0000000000000000" + COREID=$((COREID-64)) + done + printf "%x$HEX" $(echo $((2**$COREID)) ) +} + + +function core_to_affinity +{ + echo $( add_comma_every_eight $( int2hex $1) ) +} + +function get_irq_list +{ + interface=$1 + pci_dev=$(ethtool -i $interface | grep "bus-info:" | cut -d ' ' -f 2) + infiniband_device_irqs_path="/sys/class/infiniband/$interface/device/msi_irqs" + net_device_irqs_path="/sys/class/net/$interface/device/msi_irqs" + interface_in_proc_interrupts=$(grep -P "$interface[^0-9,a-z,A-Z]" /proc/interrupts | cut -d":" -f1) + pci_in_proc_interrupts=$(grep "$pci_dev" /proc/interrupts | grep -v "async" | cut -d":" -f1) + + if [ -d "$infiniband_device_irqs_path" ]; then + irq_list=$(/bin/ls -1 "$infiniband_device_irqs_path" | tail -n +2) + elif [ "$interface_in_proc_interrupts" != "" ]; then + irq_list=$interface_in_proc_interrupts + elif [ "$pci_in_proc_interrupts" != "" ]; then + irq_list=$pci_in_proc_interrupts + elif [ -d "$net_device_irqs_path" ]; then + irq_list=$(/bin/ls -1 "$net_device_irqs_path" | tail -n +2) + else + echo "Error - interface or device \"$interface\" does not exist" 1>&2 + exit 1 + fi + sorted_irq_list=$(echo "$irq_list" | sort -g) + echo "$sorted_irq_list" +} + +function show_irq_affinity +{ + irq_num=$1 + show_cpu_number=$2 + smp_affinity_path="/proc/irq/$irq_num/smp_affinity" + cpu_number_path="/proc/irq/$irq_num/smp_affinity_list" + if [ -f $smp_affinity_path ]; then + if [ -f $cpu_number_path ] && [ "$show_cpu_number" == "show_cpu_number" ]; then + echo -n "$irq_num (cpu #`cat $cpu_number_path`): " + else + echo -n "$irq_num: " + fi + cat $smp_affinity_path + fi +} + +function show_irq_affinity_hints +{ + irq_num=$1 + affinity_hint_path="/proc/irq/$irq_num/affinity_hint" + if [ -f $affinity_hint_path ]; then + echo -n "$irq_num: " + cat $affinity_hint_path + fi +} + +function set_irq_affinity +{ + irq_num=$1 + affinity_mask=$2 + smp_affinity_path="/proc/irq/$irq_num/smp_affinity" + if [ -f $smp_affinity_path ]; then + echo $affinity_mask > $smp_affinity_path + fi +} + +function is_affinity_hint_set +{ + irq_num=$1 + hint_not_set=0 + affinity_hint_path="/proc/irq/$irq_num/affinity_hint" + if [ -f $affinity_hint_path ]; then + TOTAL_CHAR=$( wc -c < $affinity_hint_path ) + NUM_OF_COMMAS=$( grep -o "," $affinity_hint_path | wc -l ) + NUM_OF_ZERO=$( grep -o "0" $affinity_hint_path | wc -l ) + NUM_OF_F=$( grep -i -o "f" $affinity_hint_path | wc -l ) + if [[ $((TOTAL_CHAR-1-NUM_OF_COMMAS)) -eq $NUM_OF_ZERO || $((TOTAL_CHAR-1-NUM_OF_COMMAS)) -eq $NUM_OF_F ]]; then + hint_not_set=1 + fi + else + hint_not_set=1 + fi + return $hint_not_set +} diff --git a/scripts/set_irq_affinity_cpulist.sh b/scripts/set_irq_affinity_cpulist.sh new file mode 100755 index 0000000..5e7a5fc --- /dev/null +++ b/scripts/set_irq_affinity_cpulist.sh @@ -0,0 +1,94 @@ +#! /bin/bash +# +# Copyright (c) 2017 Mellanox Technologies. All rights reserved. +# +# This Software is licensed under one of the following licenses: +# +# 1) under the terms of the "Common Public License 1.0" a copy of which is +# available from the Open Source Initiative, see +# http://www.opensource.org/licenses/cpl.php. +# +# 2) under the terms of the "The BSD License" a copy of which is +# available from the Open Source Initiative, see +# http://www.opensource.org/licenses/bsd-license.php. +# +# 3) under the terms of the "GNU General Public License (GPL) Version 2" a +# copy of which is available from the Open Source Initiative, see +# http://www.opensource.org/licenses/gpl-license.php. +# +# Licensee has the right to choose one of the above licenses. +# +# Redistributions of source code must retain the above copyright +# notice and one of the license notices. +# +# Redistributions in binary form must reproduce both the above copyright +# notice, one of the license notices in the documentation +# and/or other materials provided with the distribution. +# +# Fetched from https://raw.githubusercontent.com/Mellanox/mlnx-tools/refs/heads/mlnx_ofed/… b25ae28bb0f55375390c71a3f32f67c1264cf6c9 + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +if [ -z $2 ]; then + echo "usage: $0 <cpu list> <interface or IB device> " + echo " <cpu list> can be either a comma separated list of single core numbers (0,1,2,3) or core groups (0-3)" + exit 1 +fi +cpulist=$1 +interface=$2 +NCPUS=$(cat /proc/cpuinfo | grep -c processor) +ONLINE_CPUS=$(cat /proc/cpuinfo | grep processor | cut -d ":" -f 2) + +source "$SCRIPT_DIR/common_irq_affinity.sh" + +IRQS=$( get_irq_list $interface ) + +if [ -z "$IRQS" ] ; then + echo No IRQs found for $interface. + exit 1 +fi + +CORES=$( echo $cpulist | sed 's/,/ /g' | wc -w ) +for word in $(seq 1 $CORES) +do + SEQ=$(echo $cpulist | cut -d "," -f $word | sed 's/-/ /') + if [ "$(echo $SEQ | wc -w)" != "1" ]; then + CPULIST="$CPULIST $( echo $(seq $SEQ) | sed 's/ /,/g' )" + fi +done +if [ "$CPULIST" != "" ]; then + cpulist=$(echo $CPULIST | sed 's/ /,/g') +fi +CORES=$( echo $cpulist | sed 's/,/ /g' | wc -w ) + + +echo Discovered irqs for $interface: $IRQS +I=1 +for IRQ in $IRQS +do + core_id=$(echo $cpulist | cut -d "," -f $I) + online=1 + if [ $core_id -ge $NCPUS ] + then + online=0 + for online_cpu in $ONLINE_CPUS + do + if [ "$online_cpu" == "$core_id" ] + then + online=1 + break + fi + done + fi + if [ $online -eq 0 ] + then + echo "irq $IRQ: Error - core $core_id does not exist" + else + echo Assign irq $IRQ core_id $core_id + affinity=$( core_to_affinity $core_id ) + set_irq_affinity $IRQ $affinity + fi + I=$(( (I%CORES) + 1 )) +done +echo +echo done. diff --git a/scripts/show_irq_affinity.sh b/scripts/show_irq_affinity.sh new file mode 100755 index 0000000..24535d8 --- /dev/null +++ b/scripts/show_irq_affinity.sh @@ -0,0 +1,51 @@ +#! /bin/bash +# +# Copyright (c) 2017 Mellanox Technologies. All rights reserved. +# +# This Software is licensed under one of the following licenses: +# +# 1) under the terms of the "Common Public License 1.0" a copy of which is +# available from the Open Source Initiative, see +# http://www.opensource.org/licenses/cpl.php. +# +# 2) under the terms of the "The BSD License" a copy of which is +# available from the Open Source Initiative, see +# http://www.opensource.org/licenses/bsd-license.php. +# +# 3) under the terms of the "GNU General Public License (GPL) Version 2" a +# copy of which is available from the Open Source Initiative, see +# http://www.opensource.org/licenses/gpl-license.php. +# +# Licensee has the right to choose one of the above licenses. +# +# Redistributions of source code must retain the above copyright +# notice and one of the license notices. +# +# Redistributions in binary form must reproduce both the above copyright +# notice, one of the license notices in the documentation +# and/or other materials provided with the distribution. +# +# Fetched from https://raw.githubusercontent.com/Mellanox/mlnx-tools/refs/heads/mlnx_ofed/… b25ae28bb0f55375390c71a3f32f67c1264cf6c9 + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +if [ -z $1 ]; then + echo "usage: $0 <interface or IB device> [show_cpu_number]" + exit 1 +fi + +source "$SCRIPT_DIR/common_irq_affinity.sh" + +IRQS=$( get_irq_list $1 ) +if [ -z "$IRQS" ] ; then + echo No IRQs found for $1. + exit 1 +fi + +show_cpu=$2 + +for irq in $IRQS +do + show_irq_affinity $irq $show_cpu +done + diff --git a/scripts/show_irq_affinity_hints.sh b/scripts/show_irq_affinity_hints.sh new file mode 100755 index 0000000..ec26cf1 --- /dev/null +++ b/scripts/show_irq_affinity_hints.sh @@ -0,0 +1,49 @@ +#! /bin/bash +# +# Copyright (c) 2017 Mellanox Technologies. All rights reserved. +# +# This Software is licensed under one of the following licenses: +# +# 1) under the terms of the "Common Public License 1.0" a copy of which is +# available from the Open Source Initiative, see +# http://www.opensource.org/licenses/cpl.php. +# +# 2) under the terms of the "The BSD License" a copy of which is +# available from the Open Source Initiative, see +# http://www.opensource.org/licenses/bsd-license.php. +# +# 3) under the terms of the "GNU General Public License (GPL) Version 2" a +# copy of which is available from the Open Source Initiative, see +# http://www.opensource.org/licenses/gpl-license.php. +# +# Licensee has the right to choose one of the above licenses. +# +# Redistributions of source code must retain the above copyright +# notice and one of the license notices. +# +# Redistributions in binary form must reproduce both the above copyright +# notice, one of the license notices in the documentation +# and/or other materials provided with the distribution. +# +# Fetched from https://raw.githubusercontent.com/Mellanox/mlnx-tools/refs/heads/mlnx_ofed/… b25ae28bb0f55375390c71a3f32f67c1264cf6c9 + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +if [ -z $1 ]; then + echo "usage: $0 <interface or IB device> " + exit 1 +fi + +source "$SCRIPT_DIR/common_irq_affinity.sh" + +IRQS=$( get_irq_list $1 ) +if [ -z "$IRQS" ] ; then + echo No IRQs found for $1. + exit 1 +fi + +for irq in $IRQS +do + show_irq_affinity_hints $irq +done + -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39845?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: I646f57cb3940dbbd4e6606e013651116c38c9534 Gerrit-Change-Number: 39845 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

[XS] Change in upf-benchmark[master]: doc: trex_setup.adoc: Add missing dep python3-distutils

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39844?usp=email ) Change subject: doc: trex_setup.adoc: Add missing dep python3-distutils ...................................................................... doc: trex_setup.adoc: Add missing dep python3-distutils This is needed to run "./dpdk_setup_ports.py -s" later on. Change-Id: Iddfa0e3f2b6e359615d2a7a599890d35648320db --- M doc/manuals/chapters/trex_setup.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/44/39844/1 diff --git a/doc/manuals/chapters/trex_setup.adoc b/doc/manuals/chapters/trex_setup.adoc index 398f2c3..ed7340b 100644 --- a/doc/manuals/chapters/trex_setup.adoc +++ b/doc/manuals/chapters/trex_setup.adoc @@ -29,7 +29,7 @@ Install dependencies: ---- -# apt install build-essential zlib1g-dev +# apt install build-essential zlib1g-dev python3-distutils ---- -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39844?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: Iddfa0e3f2b6e359615d2a7a599890d35648320db Gerrit-Change-Number: 39844 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

[XS] Change in upf-benchmark[master]: testsuites/gtplab-sysmo2025/tunmap/README.md: Improve diagram

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/upf-benchmark/+/39843?usp=email ) Change subject: testsuites/gtplab-sysmo2025/tunmap/README.md: Improve diagram ...................................................................... testsuites/gtplab-sysmo2025/tunmap/README.md: Improve diagram Change-Id: I098593b41488f669d6e4eca712fa9dae3d57c977 --- M testsuites/gtplab-sysmo2025/tunmap/README.md 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/43/39843/2 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39843?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I098593b41488f669d6e4eca712fa9dae3d57c977 Gerrit-Change-Number: 39843 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder

3 months, 2 weeks

1
0
0 0

[XS] Change in upf-benchmark[master]: testsuites/gtplab-sysmo2025/tunmap/README.md: Improve diagram

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/upf-benchmark/+/39843?usp=email ) Change subject: testsuites/gtplab-sysmo2025/tunmap/README.md: Improve diagram ...................................................................... testsuites/gtplab-sysmo2025/tunmap/README.md: Improve diagram Change-Id: I098593b41488f669d6e4eca712fa9dae3d57c977 --- M testsuites/gtplab-sysmo2025/tunmap/README.md 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/upf-benchmark refs/changes/43/39843/1 diff --git a/testsuites/gtplab-sysmo2025/tunmap/README.md b/testsuites/gtplab-sysmo2025/tunmap/README.md index 24b0f61..f3c8a12 100644 --- a/testsuites/gtplab-sysmo2025/tunmap/README.md +++ b/testsuites/gtplab-sysmo2025/tunmap/README.md @@ -10,9 +10,9 @@ UPF. ---- -[trex-ran](172.16.32.{2-101}) ----GTPU--> ()[upf] - | -[trex-cn](172.16.31.200) <---GTPU---- ()[upf] +[trex-ran](172.16.32.{2-101}) ---GTPU--\ + |--> ()[upf](172.16.31.2) <--PFCP --> (172.16.31.1)[osmo-upf-load-gen] +[trex-cn](172.16.31.200) <--GTPU--/ ---- See topoology.dot for a more detailed graph. \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/39843?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: I098593b41488f669d6e4eca712fa9dae3d57c977 Gerrit-Change-Number: 39843 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: mme: Take into account KSI update by Network

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39841?usp=email ) Change subject: mme: Take into account KSI update by Network ...................................................................... mme: Take into account KSI update by Network Since recently, open5gs updates the KSI received from the UE in order to comply better with 4G Core expectancies. Track assigned KSI in ttcn3 code and update it according to expectancies. Depends: open5gs.git 70310979c58fe186e9eaa06bec9d9a31f24ff7a1 Change-Id: Ie97788c5d9996370cd3e24cc0ff7c003adff1a65 --- M library/NAS_Templates.ttcn M mme/MME_Tests.ttcn 2 files changed, 47 insertions(+), 23 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/NAS_Templates.ttcn b/library/NAS_Templates.ttcn index a3e01f7..1ad9268 100644 --- a/library/NAS_Templates.ttcn +++ b/library/NAS_Templates.ttcn @@ -399,8 +399,13 @@ const BIT1 c_NAS_TSC_NATIVE_SEC_CTX := '0'B; const BIT1 c_NAS_TSC_MAPPED_SEC_CTX := '1'B; template (value) NAS_KeySetIdentifierV ts_NAS_KeySetIdentifierV(BIT3 identifier := c_NAS_KEY_SET_ID_NO_KEY, BIT1 tSC := c_NAS_TSC_NATIVE_SEC_CTX) := { - identifier := identifier, - tSC := tSC + identifier := identifier, + tSC := tSC +} +template (present) NAS_KeySetIdentifierV tr_NAS_KeySetIdentifierV(template (present) BIT3 identifier := ?, + template (present) BIT1 tSC := ?) := { + identifier := identifier, + tSC := tSC } /* 8.2.26 Tracking Area Update Accept */ @@ -480,6 +485,7 @@ /* 8.2.29 Tracking Area Update Request */ template (value) PDU_NAS_EPS ts_PDU_NAS_EPS_TrackingAreaUpdateRequest(template (value) EPS_MobileIdentityLV old_guti, + template (value) NAS_KeySetIdentifierV kset_id := ts_NAS_KeySetIdentifierV, template (omit) P_TMSISignatureTV old_ptmsi_sig := omit, template (omit) GUTI_TypeTV old_guti_type := omit, template (omit) NonceTV nonce_ue := omit, @@ -492,7 +498,7 @@ securityHeaderType := c_EPS_SEC_NONE, messageType := '01001000'B, ePSupdateType := ts_EPS_UpdateTypeV, - nasKeySetId := ts_NAS_KeySetIdentifierV, + nasKeySetId := kset_id, oldGUTI := old_guti, nonCurrentNative_nasKeySetId := omit, gprsCipheringKeySequenceNumber := gprs_cksn, @@ -565,7 +571,7 @@ /* 8.2.4 Attach Request */ template (value) PDU_NAS_EPS ts_NAS_AttachRequest(template (value) BIT3 att_type, - template (value) BIT3 kset_id, + template (value) NAS_KeySetIdentifierV kset_id, template (value) EPS_MobileIdentityV mobile_id, template (value) UENetworkCapabilityV ue_net_cap, template (value) octetstring esm_enc) := { @@ -579,10 +585,7 @@ typeOfAttach := att_type, spare := '0'B }, - nasKeySetId := { - identifier := kset_id, - tSC := '1'B - }, + nasKeySetId := kset_id, ePSMobileId := { lengthIndicator := 0, ePS_MobileIdentity := mobile_id @@ -618,7 +621,7 @@ } template (present) PDU_NAS_EPS tr_NAS_AttachRequest(template (present) BIT3 att_type := ?, - template (present) BIT3 kset_id := ?, + template (present) NAS_KeySetIdentifierV kset_id := ?, template (present) EPS_MobileIdentityV mobile_id := ?, template (present) UENetworkCapabilityV ue_net_cap := ?, template (present) octetstring esm_enc := ?) := { @@ -632,10 +635,7 @@ typeOfAttach := att_type, spare := ? }, - nasKeySetId := { - identifier := kset_id, - tSC := ? - }, + nasKeySetId := kset_id, ePSMobileId := { lengthIndicator := ?, ePS_MobileIdentity := mobile_id diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index 934a251..cc2e5e9 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -166,7 +166,9 @@ /* copied over from MTC_CT on start of component */ UeParams ue_pars, /* currently used MME (index into enb_pars, S1AP, ...) */ - integer mme_idx + integer mme_idx, + /* Currently set KSI */ + NAS_KeySetIdentifierV kset_id } modulepar { @@ -399,7 +401,8 @@ var ConnHdlrPars pars := { enb_pars := g_enb_pars, ue_pars := g_ue_pars[ue_idx], - mme_idx := 0 + mme_idx := 0, + kset_id := valueof(ts_NAS_KeySetIdentifierV('000'B, c_NAS_TSC_NATIVE_SEC_CTX)) }; return pars; } @@ -567,9 +570,21 @@ private const octetstring c_NAS_defaultAPN := '00'O; +private function f_tr_ConnHdlr_kset_id() runs on ConnHdlr return template (present) NAS_KeySetIdentifierV { + /* KSI not yet set, expect whatever assignment from network: */ + if (g_pars.kset_id.identifier == c_NAS_KEY_SET_ID_NO_KEY) { + return tr_NAS_KeySetIdentifierV(?, ?); + } else { + /* Expect specific kset_id. Upon transmitting it UE->Network, f_attach() + * has updated it to the expected value. */ + return g_pars.kset_id; + } +} private altstep as_s1ap_handle_auth() runs on ConnHdlr { var PDU_NAS_EPS rx_nas; - [] S1AP.receive(tr_NAS_AuthReq) -> value rx_nas { + var template (present) NAS_KeySetIdentifierV kset_id := f_tr_ConnHdlr_kset_id(); + [] S1AP.receive(tr_NAS_AuthReq(kset_id := kset_id)) -> value rx_nas { + g_pars.kset_id := rx_nas.ePS_messages.ePS_MobilityManagement.pDU_NAS_EPS_AuthenticationRequest.nasKeySetId; /* static XRES result as we fixed the HSS RAND value and always have the following RAND: 20080c3818183b522614162c07601d0d AUTN: f11b89a2a8be00001f9c526f3d75d44c @@ -610,11 +625,7 @@ typeOfCiphering := '000'B, spare2 := '0'B }; - var NAS_KeySetIdentifierV kset_id := { - identifier := '000'B, - tSC := '0'B - }; - [] S1AP.receive(tr_NAS_SecModeCmd(alg, kset_id, ?)) { + [] S1AP.receive(tr_NAS_SecModeCmd(alg, f_tr_ConnHdlr_kset_id(), ?)) { /* TODO: apply below integrity and ciphering based on * Security Mode Command field "NAS security algorithms - Selected NAS security algorithms"*/ @@ -1032,7 +1043,7 @@ nas_esm := ts_NAS_PdnConnReq(bearer_id := '0000'B, proc_tid := int2bit(1,8), pdn_type := NAS_PDN_T_IPv4, req_type := '001'B); - nas_emm := ts_NAS_AttachRequest(att_type := '000'B, kset_id := '000'B, mobile_id := mi, + nas_emm := ts_NAS_AttachRequest(att_type := '000'B, kset_id := g_pars.kset_id, mobile_id := mi, ue_net_cap := c_NAS_defaultUeNetCap, esm_enc := enc_PDU_NAS_EPS(valueof(nas_esm))); var template (value) S1AP_PDU tx; @@ -1042,6 +1053,16 @@ p_rrcCause := mo_Signalling); S1AP.send(tx); + /* Expect updated KSI from network following 5G Core standards + *(open5gs.git 70310979c58fe186e9eaa06bec9d9a31f24ff7a1): */ + if (g_pars.kset_id.identifier != c_NAS_KEY_SET_ID_NO_KEY) { + if (g_pars.kset_id.identifier == '110'B) { + g_pars.kset_id.identifier := '000'B; + } else { + g_pars.kset_id.identifier := int2bit(bit2int(g_pars.kset_id.identifier) + 1, 3); + } + } + as_DIA_AuthInfo(); as_s1ap_handle_auth(); alt { @@ -1407,7 +1428,7 @@ var hexstring mcc_mnc := f_convert_plmn(g_pars.enb_pars[g_pars.mme_idx].global_enb_id.pLMNidentity); var EPS_MobileIdentityLV old_guti := valueof(ts_EPS_MobileId_GUTI(mcc_mnc, '0001'O, '01'O, 'AABBCCDD'O)); - nas_tau := ts_PDU_NAS_EPS_TrackingAreaUpdateRequest(old_guti); + nas_tau := ts_PDU_NAS_EPS_TrackingAreaUpdateRequest(old_guti, g_pars.kset_id); tx := ts_S1AP_InitialUE(p_eNB_value := 0, p_nasPdu := enc_PDU_NAS_EPS(valueof(nas_tau)), p_tAI := ts_enb_S1AP_TAI(g_pars.enb_pars[g_pars.mme_idx]), @@ -1534,6 +1555,7 @@ old_guti := ts_EPS_MobileId_GUTI_(guti_val); nas_tau := ts_PDU_NAS_EPS_TrackingAreaUpdateRequest(old_guti, + g_pars.kset_id, ts_PTMSI_SignatureTV(ptmsi_sig), ts_GUTI_TypeTV(GUTI_TYPE_MAPPED), ts_NonceTV('12345678'O), @@ -1588,6 +1610,8 @@ var ConnHdlrPars pars := f_init_pars(ue_idx := 0); var ConnHdlr vc_conn; + pars.kset_id := valueof(ts_NAS_KeySetIdentifierV(identifier := c_NAS_KEY_SET_ID_NO_KEY, + tSC := c_NAS_TSC_NATIVE_SEC_CTX)); vc_conn := f_start_handler_with_pars(refers(f_TC_ue_cell_reselect_geran_to_eutran), pars); vc_conn.done; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39841?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie97788c5d9996370cd3e24cc0ff7c003adff1a65 Gerrit-Change-Number: 39841 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: mme: Take into account KSI update by Network

by fixeria

Attention is currently required from: daniel, lynxis lazus, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39841?usp=email ) Change subject: mme: Take into account KSI update by Network ...................................................................... Patch Set 1: Code-Review+2 (2 comments) File mme/MME_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39841/comment/213b5838_9cc7… : PS1, Line 405: c_NAS_TSC_NATIVE_SEC_CTX > It's the default param value, but I prefer keeping it here so it explicitly shows what we are using […] Then there's a little sense in using the template here, you could do: ``` kset_id := { '000'B, c_NAS_TSC_NATIVE_SEC_CTX } ``` or even more explicit: ``` kset_id := { identifier := '000'B, tSC := c_NAS_TSC_NATIVE_SEC_CTX } ``` but this is all cosmetics and I am not blocking here. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39841/comment/2e66d9cc_a1f3… : PS1, Line 405: '000'B > '000'B, guess what, means 0, which is basically one of the 2^3-1 you can select to start with, and w […] Ok, I just thought it might be a special kind of value like '111'B. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39841?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: Ie97788c5d9996370cd3e24cc0ff7c003adff1a65 Gerrit-Change-Number: 39841 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 24 Mar 2025 15:16:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: mme: Replace TC_s1ap_setup_wrong_plmn with test with different expect...

by fixeria

Attention is currently required from: daniel, fixeria, lynxis lazus, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39842?usp=email ) Change subject: mme: Replace TC_s1ap_setup_wrong_plmn with test with different expectancies ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39842?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: I3aba3d642e3bc70f08b6e0713514fb8906da775d Gerrit-Change-Number: 39842 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 24 Mar 2025 15:10:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: mme: Take into account KSI update by Network

by pespin

Attention is currently required from: daniel, fixeria, lynxis lazus. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39841?usp=email ) Change subject: mme: Take into account KSI update by Network ...................................................................... Patch Set 1: (2 comments) File mme/MME_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39841/comment/0fb92c9e_bdfe… : PS1, Line 405: '000'B > What does `'000'B` mean? Can we have a constant value for that? '000'B, guess what, means 0, which is basically one of the 2^3-1 you can select to start with, and which was already being selected before. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39841/comment/4dd74967_c530… : PS1, Line 405: c_NAS_TSC_NATIVE_SEC_CTX > cosmetic: this is the default param value, so can be omitted. It's the default param value, but I prefer keeping it here so it explicitly shows what we are using here by default in all tests. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39841?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: Ie97788c5d9996370cd3e24cc0ff7c003adff1a65 Gerrit-Change-Number: 39841 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 24 Mar 2025 15:10:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: mme: Take into account KSI update by Network

by fixeria

Attention is currently required from: daniel, lynxis lazus, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39841?usp=email ) Change subject: mme: Take into account KSI update by Network ...................................................................... Patch Set 1: Code-Review+1 (2 comments) File mme/MME_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39841/comment/5599c19c_d2f7… : PS1, Line 405: '000'B What does `'000'B` mean? Can we have a constant value for that? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39841/comment/bdd929b1_d0b8… : PS1, Line 405: c_NAS_TSC_NATIVE_SEC_CTX cosmetic: this is the default param value, so can be omitted. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39841?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: Ie97788c5d9996370cd3e24cc0ff7c003adff1a65 Gerrit-Change-Number: 39841 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 24 Mar 2025 15:08:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

3 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: mme: Replace TC_s1ap_setup_wrong_plmn with test with different expect...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39842?usp=email ) Change subject: mme: Replace TC_s1ap_setup_wrong_plmn with test with different expectancies ...................................................................... mme: Replace TC_s1ap_setup_wrong_plmn with test with different expectancies This test was written following previous open5gs behavior, which was wrong and updated in https://github.com/open5gs/open5gs/issues/3544. Expect test to trigger a successful S1 setup procedure. Rename the test to reflect the new expectancies. Related: OS#6634 Change-Id: I3aba3d642e3bc70f08b6e0713514fb8906da775d --- M mme/MME_Tests.ttcn M mme/expected-results.xml 2 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/39842/1 diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index cc2e5e9..2192775 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -496,12 +496,13 @@ } } -/* Unsuccessful S1 Setup procedure to MME (wrong PLMN) */ -testcase TC_s1ap_setup_wrong_plmn() runs on MTC_CT { +/* S1 Setup procedure to MME using a Global eNB ID containing unknown/foreign PLMN. + * Related: https://github.com/open5gs/open5gs/issues/3544 */ +testcase TC_s1ap_setup_unknown_global_enb_id_plmn() runs on MTC_CT { var charstring id := testcasename(); f_init_s1ap(id, 1); g_enb_pars[0].global_enb_id.pLMNidentity := '62F224'O; - f_s1ap_setup(0, {misc:=unknown_PLMN}); + f_s1ap_setup(0); } /* Unsuccessful S1 Setup procedure to MME (wrong PLMN) */ @@ -1617,7 +1618,7 @@ } control { - execute( TC_s1ap_setup_wrong_plmn() ); + execute( TC_s1ap_setup_unknown_global_enb_id_plmn() ); execute( TC_s1ap_setup_wrong_tac() ); execute( TC_s1ap_setup() ); execute( TC_s1ap_attach() ); diff --git a/mme/expected-results.xml b/mme/expected-results.xml index 48496a4..370aa0e 100644 --- a/mme/expected-results.xml +++ b/mme/expected-results.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <testsuite name='Titan' tests='71' failures='8' errors='0' skipped='0' inconc='0' time='MASKED'> - <testcase classname='MME_Tests' name='TC_s1ap_setup_wrong_plmn' time='MASKED'/> + <testcase classname='MME_Tests' name='TC_s1ap_setup_unknown_global_enb_id_plmn' time='MASKED'/> <testcase classname='MME_Tests' name='TC_s1ap_setup_wrong_tac' time='MASKED'/> <testcase classname='MME_Tests' name='TC_s1ap_setup' time='MASKED'/> <testcase classname='MME_Tests' name='TC_s1ap_attach' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39842?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: I3aba3d642e3bc70f08b6e0713514fb8906da775d Gerrit-Change-Number: 39842 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