Commit Graph

366 Commits

Author SHA1 Message Date
Harald Welte 1ca0c5f51b README.md: Improve formatting
Change-Id: Ide52989e241a1546e7ac2a46aa6c34e5e536e088
2024-03-23 18:45:08 +01:00
Harald Welte 8036746246 Add funding link to github mirror
see https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/displaying-a-sponsor-button-in-your-repository

Change-Id: I428cd9f4b1b15f5663756ca9e943c289f97ed8d9
2024-03-23 18:45:02 +01:00
Pau Espin 27d2c697e5 tbf_ul: Clean and assert code path generating new UL data block
Clarify the several paths when generating a new BSN (UL data block).
The function create_new_bsn() is only called if there's some LLC frame
ready to be transmitted and put in ul_tbf->llc_tx_msg, so the do while
{} condition checking for no llc_tx_msg is guaranteed to only be run in
the event some LLC frame chunks have been included in the UL RLC block.
This fact allows simplifying the code and at the same time fix a
Coverity CID regarding a code path which could not really happen. We now
guard this case with an ASSERT.

Related: Coverity CID#345063
Change-Id: I6d4ae377a60839f76295c0e7e6aaa1fe53e37315
2024-02-06 11:43:29 +01:00
Vadim Yanitskiy 053b5e73e8 rlcmac: refactor gprs_rlcmac_rlc_ul_window_move_window()
* drop unused variable 'i' (fixes -Wunused-but-set-variable)
* reduce nesting in the for-loop

Change-Id: Ic0efd2f84a17d287b73261c102bca84e8274bb2a
2024-02-05 23:31:37 +07:00
Pau Espin 8c98d1332e rlcmac: Fix Last RLC block (CV=0) not encoding >1 LLC frames
Before this patch, the last RLC block (CV=0) would only be filled with
up to 1 LLC frame, even if several LLC frames were enqueued and expected
to be put in that RLC frame (CV calculation).
Fixes the unit test provided in an earlier patch.

Related: OS#6351
Change-Id: Id51f595f967b721a5ebe9d44b4e31b6ef9c1b4ae
2024-02-05 16:04:06 +01:00
Pau Espin 1b2336df66 tests: rlcmac: Reproduce bug encoding 2 llc frames in 1 rlc block
Bug will be fixed in a follow-up patch.

Related: OS#6351
Change-Id: I2f654bcefd6a2f192b9742873b8cb70a63bbfbd1
2024-02-05 16:03:59 +01:00
Pau Espin 0f5d5a4836 rlcmac: tbf_ul: Fix wrong parenthesis around macro
The logic doesn't seem to be affected by the fact that the parenthesis
were wrong.

Change-Id: I3f4aeff45c3fd5a007b050bd78283baaca2a18d7
2024-02-05 16:02:36 +01:00
Pau Espin 20853c3bf9 rlcmac: Implement RLC_OCTET_COUNT in DL ACK/NACK
This helps debugging what's already in the MS tx queue when requesting a
new UL TBF.

Change-Id: Ie5f399fa0bffed8e39811075feba47a54054c8e5
2024-02-05 16:02:32 +01:00
Pau Espin ffc388ed4c Delay deleting UL TBF until last Pkt Ctrl Ack is fully transmitted
This in turn delays reconfiguring the lower layers (L1CTL-CFG_UL_TBF.req
mask=0x0) until the last block has been transmited.

Change-Id: Ic38b4207623ccbda3b77d4b0a47431c25de95034
2024-02-05 16:00:32 +01:00
Vadim Yanitskiy 5e0c5d990f rlcmac: add definition for OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA | Cnf
Change-Id: I145b9586f83ae0235b4648916bd44996e8dc57f0
2024-02-02 23:49:53 +01:00
Pau Espin d4c441f431 rlcmac: ul_tbf: Register UL ACK/NACK poll inside FSM
The poll is part of the FSM mechanism to get events to transit over the
different states. Register it from within the FSM to have more fine
grained control as well as have knowledge about the FN being reserved.

This knowledge will be used ina follow up patch for the UL TBF to wait
for the correct PKT CTRL ACK BLOCk.conf.

Change-Id: Iaa8ad8052b9f3b52b05af2b7fc9cb8172f1b6bb7
2024-02-02 23:49:53 +01:00
Pau Espin 31b298dfa5 rlcmac: Add new structure to allow passing FN+TN to TBF handling functions
The different paths will be updated as required as needed in the future.
Until now it was difficult while still valuable to have access to
current FN+TS, even if only for logging.

Follow up patch will use this info to be able to calculate poll FN from
RRBP more deep in the stack (ul_tbf_fsm).

Change-Id: Ifa09cd70c915aa3a2b799412cb02315aaebc0503
2024-02-02 23:49:48 +01:00
Pau Espin e9ea7fc768 cosmetic: tbf_ul_fsm: add missing state to tdef_state_timeout array
Change-Id: I6e825a105de4a49329912db6c79aaebbfd3ddf9f
2024-02-01 17:20:37 +01:00
Vadim Yanitskiy 00cd94161f build: include README.md into the release tarball
Change-Id: If690f02753fdb7b27f303901cbb0d6c7b1a71f5b
2024-01-26 23:24:21 +07:00
Vadim Yanitskiy be55e1fd83 llc: fix l3par check in gprs_llc_lle_generate_xid()
A NULL pointer dereference is possible if this function is called
with l3par being NULL, but l3par_len being greater than 0.

Change-Id: I80c18a45a248b85901d455bfb17e81734fa5961d
Fixes: CID#300602
2023-12-09 05:19:55 +07:00
Vadim Yanitskiy 0160c666fe llc: fix unsigned rc in gprs_llc_lle_tx_xid_resp()
Change-Id: I724a1052fff2a43484c8bbf58b115d0769050191
Fixes: CID#300608
2023-12-09 05:15:48 +07:00
Pau Espin b0aae5bcd1 rlcmac: ul_tbf: Implement T3180
Related: OS#6209
Change-Id: I350b277532d36ed7928b33ee3b77d98d083a3179
2023-10-17 12:10:21 +02:00
Pau Espin 4db9154457 rlcmac: tests: Account for T3180 existance in test_ul_tbf_t3166_timeout
Test test_ul_tbf_t3166_timeout needs to be modified in order to avoid
triggering T3180 once it is implemented in a follow-up patch.
Both T3180 and T3166 are armed at the same time, so modify the scenario
to really scenify the case where T3166 matters: the MS keeps receiving USF
indications but the PCU doesn't see them and hence never sends a PKT UL
ACK/NACK.

Related: OS#6209
Change-Id: Ib84ccfd89773913703e0ab3e09d0ce9eb123e994
2023-10-17 12:10:18 +02:00
Pau Espin 72598d2c7f rlcmac: tests: Account for T3180 existance in test_ul_tbf_t3182_timeout
Test test_ul_tbf_t3182_timeout needs to be modified in order to avoid
triggering T3180 once it is implemented in a follow-up patch.
Both T3180 and T3182 are armed at the same time, so modify the scenario
to really scenify the case where T3182 matters: the MS keeps receiving USF
indications but the PCU doesn't see them and hence never sends a PKT UL
ACK/NACK acking the last block.

Related: OS#6209
Change-Id: I73b648bc04d863b9eb67093e5fa510ba88d712c8
2023-10-17 10:09:19 +00:00
Pau Espin 8d347143ba rlcmac: Avoid re-arming T3182 in TBF Acknowledged mode
Re-arming upon retransmission of block CV=0 is only described in the
unacknowledged mode of operation.

Change-Id: I532def7f87367b446b5370daf8c81f511e26eb5f
2023-10-17 10:09:19 +00:00
Vadim Yanitskiy 701cd26f4c sm_ms_fsm: fix double timer_cb assignment
sm_ms_fsm.c:287:14: warning: initializer overrides prior initialization
                             of this subobject [-Winitializer-overrides]
        .timer_cb = sm_ms_fsm_timer_cb,
                    ^~~~~~~~~~~~~~~~~~
sm_ms_fsm.c:284:14: note: previous initialization is here
        .timer_cb = sm_ms_fsm_timer_cb,
                    ^~~~~~~~~~~~~~~~~~

Change-Id: Ic1bffe410a4ce5ddafe740185a5a894e056d7879
2023-10-17 08:12:58 +07:00
Pau Espin 383150fe06 tbf_ul_fsm: Avoid freeing tbf after 4 CV=0 retrans in acknowledged mode
The restriction to only to transmit last data block (CV=0) up to 4 times
only applies in Unacknowledged mode of operation, which we don't
support. Hence, simply comment it out so that it can be enabled if
unacknowledge mode is ever supported.

Related: OS#6208
Change-Id: Ie7cdb286b9c7255e3fbf9f936f103fab04acf96a
2023-10-06 19:45:40 +02:00
Pau Espin df4f1cf0a3 rlcmac: tbf_ul_ass_fsm: Fix logic delay starting time
The previous logic was wrongly written. We want:
* If PKT UL ASS didn't have a tbf_starting_time but had an S/P+RRBP,
  it means we have to delay completing the FSM until we send the PKT CTRL ACK (next_blk)
* If it contained tbf_starting_time, if it happens before next_blk, still wait until next_blk

Change-Id: I60cdc0315e28f71843c51eba88acc78780c6ab43
2023-10-05 17:49:01 +02:00
Pau Espin 7475f79fb5 rlcmac: tbf_ul_ass_fsm: Fix 'sba' field wrongly reset to true
Change-Id: Ibf0c60516c337f4428ff33afbfb65a39a37a3719
2023-10-05 15:14:14 +02:00
Vadim Yanitskiy 5162449b71 rlcmac: migrate from fn_cmp() to gsm0502_fncmp()
Change-Id: I3030d00c6881713a088b1739b2b5ba77bac84e46
Depends: libosmocore.git I9590f2e836fc48650decf1564b6ab46306c4fe2d
Depends: libosmocore.git Ie8bb9c49c6f81b8f4a1766547d6943f9880d1186
2023-10-04 11:40:57 +00:00
Pau Espin f81a7389f1 rlcmac: tbf_ul_ass_fsm: Fix state not reset after first UL-TBF re-assignment
The FSM can be reused several times to assign a UL TBF over its
lifespan, eg. if a DL TBF DL ACK/NACK is reuse to request allocation of
a UL TBF several times.

Some state like ctx->tbf_starting_time_exists was being left as =true
during the initial run of the FSM, and as a result subsequent runs going
through the check delaying completing after sending the PKT CTRL ACK.

Change-Id: Iaddbd1e3924036be1cf6eed41367031d3e127f57
2023-10-04 10:15:44 +00:00
Pau Espin 0e62f970dc rlcmac: tbf_ul: Fix wrong field assignment (no bug in practice)
Fixes following warning detected by clang:
"""
tbf_ul.c:1118:37: warning: implicit conversion from enumeration type
'enum gprs_rlcmac_rlc_egprs_ul_reseg_bsn_state' to different enumeration type
'enum gprs_rlcmac_rlc_egprs_dl_reseg_bsn_state' [-Wenum-conversion]
blk->spb_status.block_status_dl = reseg_status;
"""

In practice it's not much of a problem since both fields are put
together in a union, so it ends up in the same place in memory.

Change-Id: Iccd57b74640754f2aebf81a149a633f141c6e38f
2023-10-03 13:48:05 +02:00
Pau Espin 99d44fa8d7 rlcmac: Fix compilation error 'rlcmac_prim may be used uninitialized'
Change-Id: Ica93447bc1f2e60984be7c9c73b153b4eb508aaa
2023-09-26 14:41:00 +02:00
Vadim Yanitskiy fef4af9381 rlcmac: deal with RACH retransmissions (drop rach_req_ra)
The RA value does change during RACH retransmissions, so we cannot
expect a specific value in gprs_rlcmac_handle_ccch_imm_ass_ul_tbf()
anymore.  Offload checking it to the lower layers.

* Rename submit_rach_req() to submit_packet_access_req().
* Get rid of gen_chan_req(), indicate only the access cause.

Ideally, we should also rename the OSMO_GPRS_RLCMAC_L1CTL_RACH
to something like OSMO_GPRS_RLCMAC_L1CTL_PKT_CHAN_ACCESS, but
let's better do this separately.

Change-Id: If0de3ed86b1e2897d70183f3b0f4fbfd7d2bda80
Related: osmocom-bb.git Iab6d9147f6e0aeb99239affacf318a3897fd6ffe
Related: OS#5500, OS#6131
2023-09-23 03:28:31 +07:00
Pau Espin 5d806d88e3 rlcmac: tbf_dl: Log with FN request of UL TBF through PKT DL ACK/NACK
Change-Id: Ib81f1003361ca6501ce5a0e16ab2cdafc8ed66d3
2023-09-05 19:03:52 +02:00
Pau Espin 330b7c078f rlcmac: Log RTS.ind
Change-Id: I678f2aaea419a0cb5dad58610784144538914cf5
2023-09-05 17:23:30 +02:00
Pau Espin f815b8f690 tbf_ul_ass_fsm: Listen only on 1 TS for PKT UL ASS when assignment done from DL TBF
This also fixes a memcpy writing out of bounds reported by Coverity
CID#323120 in gprs_rlcmac_tbf_ul_ass_start_from_dl_tbf_ack_nack(), due
to the difference of size between struct gprs_rlcmac_ul_tbf_allocation
and struct gprs_rlcmac_dl_tbf_allocation.
While fixing it, actually properly implement passing of the 1 only
interesting TS to the tbf_ul_ass_fsm at that point in time.

Change-Id: I89b15982b73f00599183981142495d7b9befbb78
2023-09-05 11:55:25 +02:00
Pau Espin 5eafbdcafe rlcmac: Several fixes and improvements to have 2phase access working
Some solutions are not meant to be final ones, but some small
workarounds to have the whole thing running until the lower layers are
fixed/improved.

Related: OS#5500
Change-Id: I94bd0de6917b004cba73d2fffc7cf69b3b5c305d
2023-09-04 16:56:15 +02:00
Eric Wild 55dcfd0730 configure.ac: fix libtool issue with clang and sanitizer
[this fix already exists in most of the other repos]

As pointed out at https://github.com/libexpat/libexpat/issues/312
libtool does not play nice with clang sanitizer builds at all.
For those builds LD shoud be set to clang too (and LDFLAGS needs the
sanitizer flags as well), because the clang compiler driver knows how
linking to the sanitizer libs works, but then at a later stage libtool
fails to actually produce the shared libraries and the build fails. This
is fixed by this patch.

Addtionally LD_LIBRARY_PATH has no effect on conftest runs during
configure time, so the rpath needs to be set to the asan library path to
ensure the configure run does not fail due to a missing asan library,
i.e.:

SANS='-fsanitize=memory -fsanitize-recover=all -shared-libsan'
export CC=clang-10
ASANPATH=$(dirname `$CC -print-file-name=libclang_rt.asan-x86_64.so`)
export LDFLAGS="-Wl,-rpath,$ASANPATH $SANS $LDFLAGS"

Change-Id: I577e7d7b07acf76e5d97dcce5da206d10f5e2aeb
2023-08-24 13:04:17 +02:00
Pau Espin 1e2779652b rlcmac: Move FN related helper functions to private header inside libosmo-gprs
These may be handy in other tests or inside the library.

Change-Id: I87393239b05a1c11498323139866aec9f6550f3b
2023-08-21 18:10:02 +02:00
Pau Espin ffb7833ce7 tbf_ul_ass: Don't check USF during SingleBlock Allocation
Change-Id: Icc2c17dc1933ad95da1b6b050f38a769909b23e5
2023-08-21 18:10:02 +02:00
Pau Espin 7419d04213 rlcmac: ul_tbf: Implement TBF_Starting time (phase1)
This is unfortunately not yet working since lower layers are always
sending hardcoded fn=0 and hence ctx->tbf_starting_time calculated in
handle_imm_ass()->TBF_StartingTime_to_fn() is wrong.

Related: OS#6130
Change-Id: If6b7766ee1ba6667db4e54e897f376f5b27ad73d
2023-08-21 18:10:02 +02:00
Pau Espin 7c6773f6ff rlcmac: ul_tbf: Factor out function configuring TBF to lower layers
This code part will also be used by tbf_ul_ass_fsm.c to temporarily
configure lower layers with ctx->phase1_alloc in order to receive RTS
indications which the RLC/MAC uses to tick the FSM in state
GPRS_RLCMAC_TBF_UL_ASS_ST_WAIT_TBF_STARTING_TIME1.

Change-Id: I174327b25b726662a6b5902008e205ddb3de2fe0
2023-08-21 18:10:02 +02:00
Vadim Yanitskiy 9fd9d34e44 rlcmac: l1ctl_prim: add 'start_rfn' field to cfg_{ul,dl}_tbf_req
Change-Id: I27a7a896fe3839fa4f9b8cd9500c4ab7867bbaa0
Related: OS#5500
2023-08-21 18:10:02 +02:00
Pau Espin fe2a399be6 rlcmac: Fix Starting Time rfn->fn calculation
The Starting time contains a "frame number, FN modulo 42432", aka RFN.
The translation to absolute FN was missing.

Depends: libosmocore.git Change-Id Ib71e8da976f6cc84c3a4ab17b0a8c2101492e243
Change-Id: I00741289333853a8db472950ee2ac38dc2c74fd3
2023-08-21 18:09:45 +02:00
Vadim Yanitskiy a4a34acd91 README.md: upade the list of libraries
Change-Id: I0572e9435330c15469f6609505867c21be9c3483
2023-08-13 18:17:38 +07:00
Pau Espin a1f0842b38 llc,sndcp: Add missing hex prefix to log line printing TLLI
Change-Id: I8d31ed7cf89555a1ec3cbd91a77cc00cc42b546f
2023-07-31 18:24:10 +02:00
Pau Espin 200725e609 rlcmac: rx pkt_uk_ack_nack: Use correct field containing UL TFI
Change-Id: If0bbd9989413a550243a6496bce16b6eb04508db
2023-07-31 18:24:10 +02:00
Pau Espin eb2e073db9 llc: Silently discard UI Dummy commands
Change-Id: I807e140b96de7140d8f6922417f3eaf0eadeed84
2023-07-31 18:24:06 +02:00
Pau Espin dee6d1b43f llc: Log rx PDUs with invalid FCS
Change-Id: Ie52ced7e074a3d4451447551e1ac166397ee8a48
2023-07-31 16:22:29 +02:00
Pau Espin 58342fdbe2 rlcmac: keep looking up GRE based on old TLLI
This is needed after RAU Update since the PCU may still be using the old
TLLI to reference the MS for a while until it finds out about the TLLI update.

Change-Id: I2653db3dac58342df02a1b4d0c76e69e0e8d583f
2023-07-31 16:12:58 +02:00
Pau Espin 0f51adb03e rlcmac: Fix OSMO_GPRS_RLCMAC_GMMRR_LLC_TRANSMITTED declared in wrong offset
This enum should match osmo_gprs_gmm_gmmrr_prim_type, and I placed that
osmocom-specific enum at the wrong place in the rlcmac counterpart.

Change-Id: I3f198c756866417f8f975373f84fd3ec4da608fa
2023-07-31 14:55:25 +02:00
Pau Espin b4a6069f82 gmm: Several fixes for radio_prio
The "Radio Priority" received in GMM Attach Accept are for SMS and TOM8
SAPs only. For GMM/SM unitdata transferred to LLC, use highest
radio_prio=1.

Change-Id: Ie583c433547fb5ecbb6b6077c39a157961f73cfc
2023-07-31 14:37:34 +02:00
Pau Espin acec4a7fc4 llc: Fix potential null ptr dereference in LL-Xid.Ind
Closes: Coverity CID#322365
Change-Id: Icc65af3ea9a44a5daf80e47717564f6adf37444b
2023-07-31 10:42:24 +02:00
Pau Espin ee091182c5 rlcmac: Initial selection of packet-access-procedure mode based on originating cause
Change-Id: I930a1fcf23506f75562a6795f9a6e42b187d2974
2023-07-28 17:56:45 +02:00