Commit Graph

47 Commits

Author SHA1 Message Date
Pau Espin a9da84ac9f rlcmac: Implement N3104
Related: OS#5500
Change-Id: Ia8c35aad7a537ab76447187847f8cee8c379352c
2023-02-21 17:11:00 +01:00
Pau Espin 7ff9597b43 rlcmac: tbf_ul: Allow sending UL data if in state FINISHED
This can happen for instance if MS sent al the data but PCU didn't
receive it all (some it was lost) so it can still keep asking the MS to
submit data. In this case, the MS shall attempt retransmit of some
unacked data.

Change-Id: I2333a0a432c0c6f223bc1043ddb0d9c34842a5a3
2023-02-20 13:28:55 +01:00
Pau Espin dfe49c5f44 rlcmac: Handle SI13 from L1CTL
Change-Id: Ifaddf0e6e5cad7ea25672804c83c254579874813
2023-02-20 12:31:25 +01:00
Pau Espin 175d251fb7 rlcmac: Implement T3166
Change-Id: I58dd757cbb5d8279fdf7fbdfb6f38ec0119c6156
2023-02-20 12:31:25 +01:00
Pau Espin 6a90da108a rlcmac: Implement T3164
Change-Id: I1a3d7b552b36b84d84ca27572ce313265810fd3d
2023-02-20 12:31:25 +01:00
Pau Espin b9e06c9955 rlcmac: tbf_*: Unlink the freeing tbf from its gre
Change-Id: I2079c4440a05f4b44c9b7bece383c69e84198302
2023-02-20 12:31:25 +01:00
Pau Espin b853424a28 rlcmac: tbf_ul: Fix wrong function called looking up msg size
Change-Id: I9d5afee36a633c311b5657181d0de7cbddd593e0
2023-02-20 12:31:25 +01:00
Pau Espin 8c2734fa43 rlcmac: Implement Rx of UL ACK/NACK
Related: OS#5500
Change-Id: I5e3d8e77042d3ad1618e6b62bc1a377a93239580
2023-02-20 12:31:25 +01:00
Pau Espin b3b0388f6b rlcmac: llc_queue: Fix access to null msgb during dequeue
Change-Id: I513aaef6ad0f44b5a6d32be512bdd8b4fdabb4e7
2023-02-20 12:31:25 +01:00
Pau Espin 4113903f63 rlcmac: Implement Tx of DL ACK/NACK
Measurement related functionality is not yet implemented and hence the
related fields cannot be filled in yet.

Related: OS#5500
Change-Id: I6ae2df07929fb6c4733e87b18cebe75a6f24f520
2023-02-20 12:31:25 +01:00
Pau Espin cccba723b4 rlcmac: Introduce initial poll answer infrastructure
This commit imports pdch_ul_controller.{c,h} from osmo-pcu.git
d8cea3c618dbd2a343e6c012e5545006d44fc244 and adapts it to be of use on
the MS side.

Related: OS#5500
Change-Id: I9d38a8de4240e65585cc8bbe3c044473af5a83e5
2023-02-20 12:31:25 +01:00
Pau Espin f4f69fbde0 rlcmac: Implement initial DL rx data path
This code imports code from osmo-pcu.git
d8cea3c618dbd2a343e6c012e5545006d44fc244 (heavy modified to adapt to
current code base).

With this patch the RLCMAC layer is already capable of decoding RLC/MAC
GPRS data blocks and submit them as LLC frames to the upper layer.

Related: OS#5500
Change-Id: Ie7535606916c0800c0e1bd9555be022c81ea257d
2023-02-20 12:31:25 +01:00
Pau Espin b1ec9a1973 rlcmac: Introduce DL TBF creation through PCH ImmAss
This patch only introduces the gprs_rlcmac_dl_tbf subclass and
allocates/frees it based on PCH ImmAss, and adds initial paths for
received blocks. It also provides a unit test to showcase the scenario.

Change-Id: I7f98e3456ef35d80becdad3481afeb771457b0ef
2023-02-20 12:31:25 +01:00
Pau Espin d80a7b1d2e rlcmac: Implement GMMRR-ASSIGN.req
Change-Id: I3178aa1af4a6c05c84253c6befcd4c786b8dd8e9
2023-02-13 10:51:12 +01:00
Pau Espin e8ad79e3a8 rlcmac: Initial ul_tbf data support
This is basically an import of relevant code from osmo-pcu.git
08523c2286dfe27402f8e2eb4b98da5a529c7915 which allows encoding LLC
frames into RLC/MAC uplink data blocks.

A 1-to-1 import was not possible for several reasons:
* osmo-pcu uses C++ in some places
* osmo-pcu implements encoding of DL data blocks, not UL data blocks
* Some osmo-pcu code is still not really polished and stuff is still
  mixed (for instance rlc_window(_ul).c/h were split into their own
  files here).
Hence this was not a "copy all files and leave as they are" import, but
rather looking at the encode path starting on osmo-pcu.git scheduler and
see which code had to be pulled in to encode the RLC/MAC blocks.

Due to the slightly different requerirements for UL and DL blocks, it is
well possible that further work in needed in order to have the code
produce correct blocks. This is only a first step to pull in all code so
that stuff can be fixed in smallish incremental steps.

Related: OS#5500
Change-Id: I0a01d79d16bbfc63aa88e6bb0f432f3772645730
2023-02-13 10:51:07 +01:00
Pau Espin 60bd08e44d rlcmac: Make sure entities are freed if lib is re-initialized
This allows proper memory cleanup of the whole library everytime we want
to run a new unit test in the same proces.

Change-Id: I568e2f783a575ae457f0845eca34951ae9822eeb
2023-02-13 10:44:30 +01:00
Pau Espin 0984044e1c rlcmac: Initial implementation of UL TBF assignment and scheduler
This patch is another step towards a working RLC/MAC implementation. It adds:
* An initial data model with MS (gprs_rlcmac_entity) and ul_tbf.
* A UL_TBF state FSM from initial to FLOW status
* A UL_TBF assignemnt FSM, covering both 1phase and 2phase assignments.
* Triggering of UL_TBF allocation and assignment FSM when new LLC data
  is pushed from upper layers.
* A scheduler generating some ctrl messages (PktResReq and UlDummyCtrlBlk)
  when indicated by the network.

This patch is pushed as a WIP state since it already contains a
considerable amount of code and lots of new files, which can be
used/extended at a later point, making parallel contribution easier.

Related: OS#5500
Change-Id: I420c57a9d0b63f9c2805a7c2ae8ce85532a48eef
2023-02-13 10:43:29 +01:00
Pau Espin eeac4ad43c rlcmac: Introduce lower primitive layer API
This primitive API allows the application to drive the RLCMAC layer
based on a lower L1CTL interface.

* RACH req are requested to the lower layers by the RLCMAC through the
  RACH.req primitive.
* Received ImmAss, SI are fed to the RLC/MAC layer through CCCH_DATA.ind
* The RLCMAC registers DL and UL TBFs in the lower part (firwmare,
  L1CTL):
** The lower part will trigger PDCH_RTS.ind in every TS in the
  "(dl_slotmask|ul_slotmask)" superset, with the received USF. This
  allows UL uplink to transmit blocks when requested by USF, or UL/DL TBF
  to answer polls from PCU at a specific N+X FN (RRBP). This also allows
  the RLCMAC layer to update its GSM clock and trigger internall
  timeouts.
** The lower part will trigger PDCH_DATA.ind in every TS in the
  dl_slotmask if either a CTRL block is received or a data block
  matching the configured dl_tfi is received.
** Upon receival of PDCH_DATA.ind, the RLCMAC layer updates its FN clock
  and submits PDCH_DATA.req based on USF.

This commit only adds the primitive set and API to submit/receive them,
but doesn't really implement them yet internally.

Related: OS#5500
Change-Id: I3d97425ec75059ceae983de869419230e8c4df01
2023-02-13 10:37:30 +01:00
Pau Espin 9dc9da3ea6 rlcmac: llc_queue: Make sure queue is cleared before freeing mem
Change-Id: Iadd08c727d46dfb5cac4df5219ecbcbacf6482eb
2023-02-10 13:13:58 +01:00
Pau Espin 88c52f1af9 rlcmac: Fix prim memleak passing GRR-UNITDATA.req
Change-Id: I16d737e6691fd964026260f829230106abcc7ef1
2023-02-06 20:25:23 +01:00
Pau Espin 168629eb24 rlcmac: Refactor msg_type enums and value_string
Add prefixes, clean formatting, move to proper place, etc.

Change-Id: Ic55782d90c0d7876fc37d1da130b859857c11447
2023-02-01 18:28:11 +01:00
Pau Espin 94e32c4bdf rlcmac: Move spec related definitions for general use to types.h
Move types defined by spec not directly/solely intended for the CSN1
encoder/decoder operation to a separate types.h header.
More and more types will be added there which will be used by the data
domain inside and outside the library.

Change-Id: Ib0fdae48fc3e76d701d21644826e5ffd8553fecb
2023-02-01 18:23:41 +01:00
Pau Espin 4e0a9770ec rlcmac: Rename ts_*.c -> csn1_ts_*.c
Done for files containing mostly (99%) of CSN1 related structrs and
encdec functions.

File ts_44_064.c is kept as is since it's not CSN1 related.
File csn1_ts_44_060.c still contains some enums and value_string which will
be split into ts_44_060.c in a follow up commit.

Change-Id: I93ad9f90e7496b81ccfe679a614589373f244166
2023-02-01 18:23:17 +01:00
Pau Espin 6d30091174 rlcmac: Rename gprs_rlcmac.h -> csn1_defs.h
That header is used (and should only be used) to contain CSN1 related
code for the encoder/decoder.
Hence rename it, otherwise it looks like a general placeholder for any
kind of stuff.

Change-Id: I84ea63ed0b804699fd995a2e0c07ced17b3ad4c8
2023-02-01 18:20:29 +01:00
Pau Espin 134840b003 rlcmac: Enqueue LLC PDUs based on RadioPriority and SAPI
llc_queue and codel code has been taken from osmo-pcu.git
6a5b1b1f3ef83f87a9df1d4511e22f59039e11ed and have been refactored to fit
in libosmo-gprs (removed llc_pdu structs, reworked struct types being
enqueued, etc.). Support for queues based on radio_prio has also been
added.

Related: OS#5500
Change-Id: Icdaa046fb6a71367f10beee16dcf9a5b7b61022e
2023-01-30 17:56:09 +01:00
Pau Espin 1b25684110 rlcmac: Introduce primitives for SAPs towards higher layers
The GRR primitives and types are kept 1-to-1 ABI compatible
to those at libosmo-gprs-llc so that they can be forwarded as pointers.
Still, we want to keep the types duplicated in order to avoid having to
depend one library on another, since the forwarding of one layer to the
other is done by the app and can use whatever it wishes on either side.

Related: OS#5500
Change-Id: I1870fa6a264612c5a669bfb832e6e8c0a892cb74
2023-01-25 23:37:09 +01:00
Pau Espin 28dd01ed25 rlcmac: Support extending log categories in the future
An initial header structure and LOG defines is created in a similar way
to those already existing for libosmo-gprs-llc and sndcp.

Related: OS#5500
Change-Id: Ic9ba207cafeada1b174f1b085e0d1d9a38c66b0a
2023-01-25 23:33:57 +01:00
Vadim Yanitskiy 36a6ff60f0 rlcmac: rename s/SI_13_t/SI13_RestOctets_t/
Change-Id: I74ed534b9b52b70cdf8e4e2d4d960bb1d9aaf27b
2023-01-02 12:56:38 +00:00
Vadim Yanitskiy 79a945feba rlcmac: use OSMO_ASSERT instead of plain assert()
Change-Id: Ia834285cbaba34e2f0783bf83bd2f3934d74d778
2023-01-02 12:56:38 +00:00
Vadim Yanitskiy 3095b63610 rlcmac: remove unneeded includes
Change-Id: Ie82fb9e5fe607f925bb8a698a789ef79f168add2
2023-01-02 12:56:38 +00:00
Vadim Yanitskiy caef6c1b13 rlcmac: implement the missing IA_MultiBlock_PktDlAss_t
Add missing definition for the <Multiple Blocks Packet Downlink
Assignment> structure.  It's not 100% complete, but should serve
a good starting point if we ever need to support this.

Change-Id: I544245f690fdd14a94f858a5f3cd8f8d39d17611
Related: OS#5500
2023-01-02 12:56:38 +00:00
Vadim Yanitskiy d2edff76d0 rlcmac: rename s/IA_EGPRS_00_t/IA_EGPRS_PktUlAss_t/
Use a self-explanatory name instead of the one with magic numbers.
It's safe to rename it because this API is not used anywhere yet.

Change-Id: I884cba359bfda21cf45fa846e5b7ff20d129bdf7
Related: OS#5500
2023-01-02 12:56:38 +00:00
Vadim Yanitskiy 376f2a1297 rlcmac: fix coding of EGPRS Packet Uplink Assignment in IA RestOctets
Thanks to the unit tests, it was found that decoding of the LH part,
specifically the EGPRS Packet Uplink Assignment structure, is done
incorrectly.  This patch fixes incorrect decoding.

Double usage of the UnionType element in the IA_EGPRS_t has a side
effect: the M_UINT actually consumes one bit, so the remaining bit
stream is shifted and decoded incorrectly.

Replace a combination of M_UINT and M_CHOICE with two M_UNIONs.
Remove struct IA_EGPRS_t, which is not used anywhere yet.

For reference, see 3GPP TS 44.018, table 10.5.2.16.1.

Change-Id: I7fedbad1ac4d744d1d3941553e573d4202e9d24a
Fixes: I39a29dc9b5b22ce4374ae33336696014e326d012
Related: OS#5500
2023-01-02 12:56:38 +00:00
Vadim Yanitskiy 84b385d15c rlcmac: add decoder and test vectors for IA Rest Octets
This new API is needed for the MS side GPRS implementation in order
to be able to establish an Uplink TBF.  Both wireshark and osmo-pcu
rely on hand-written code for parsing and generating the IA Rest
Octets IE, making no use of the CSN.1 codec.

We already have some (mostly commented out) CSN.1 definitions needed
for decoding the IA Rest Octets IE, inherited as-is from wireshark.
Ths patch adds the missing bits and a few unit test vectors.

Note that decoding of the LH part, specifically the EGPRS Packet
Uplink Assignment structure, is currently done incorrectly because
there is a problem in the IA_EGPRS_t definition.  This will be
fixed in a follow-up patch.

For reference, see 3GPP TS 44.018, table 10.5.2.16.1.

Change-Id: I39a29dc9b5b22ce4374ae33336696014e326d012
Related: OS#5500
2023-01-02 12:56:38 +00:00
Vadim Yanitskiy 4e50861ea0 rlcmac/ts_44_018: add missing M_PADDING_BITS to SI_13_t
According to table 10.5.2.37b.1, SI 13 Rest Octets IE does contain
spare padding.  Adding M_PADDING_BITS fixes decoder warnings about
unhandled remaining bits.

Change-Id: I44fb7e2a60da022ee99f1a6cd4f2635bef2bfe1e
2022-08-24 21:15:56 +07:00
Vadim Yanitskiy 74ec6d9cb6 rlcmac: add osmo_gprs_rlcmac_decode_si13ro()
Change-Id: Ic8446509ef474b8496e5557aab3d2a9e94e11897
2022-08-24 21:15:56 +07:00
Vadim Yanitskiy 4a04f1d5ab rlcmac: split ts_24_008.c out of ts_44_060.c
Change-Id: Idedf52423fef18b929e8096fbe4e130b5a6c7d2c
2022-08-24 21:15:53 +07:00
Vadim Yanitskiy 931b64ee79 rlcmac: split gprs_rlcmac.c onto ts_44_{060,018}.c
Change-Id: I2b941f06a70a25e92ba3fd2638f87360a5aa5435
2022-08-24 21:03:51 +07:00
Vadim Yanitskiy 8e3f0fd84a rlcmac: make logging category configurable
Change-Id: Icfef6de126304da81120f1d7b212992ead3409aa
2022-08-24 20:56:17 +07:00
Vadim Yanitskiy 56a2d28f59 csn1: #include <stddef.h> in csn1.h for offsetof()
Do not require the API user to include <stddef.h>:

  note: 'offsetof' is defined in header '<stddef.h>';
        did you forget to '#include <stddef.h>'?

Change-Id: I2a144c9967b90d78d95db103eebce83822d8c64d
2022-08-22 06:00:28 +07:00
Vadim Yanitskiy 00498acb16 rlcmac: add -export-symbols-regex '^osmo_' to LDFLAGS
Change-Id: I17c0f1d7b7f3ec07eb880e4db46e316a5753edd3
2022-08-07 17:51:26 +07:00
Vadim Yanitskiy 2b4c0972b8 rlcmac: expose [osmo_gprs_rlcmac_]egprs_pkt_ch_req_type_names[]
Change-Id: Ieb8046b16e1b992dc20055539988af6c3a9a7a4e
2022-08-07 17:51:26 +07:00
Vadim Yanitskiy 2532d04f17 rlcmac: properly expose osmo_gprs_rlcmac_encode_ms_ra_cap()
Change-Id: Ib5660f3a384ae8eea976197ad7b7135dbae180e5
2022-08-07 17:51:26 +07:00
Vadim Yanitskiy 6e7618e575 rlcmac: prefix enc/dec function names with 'osmo_gprs_'
Change-Id: Ibd8038582699f1f8e7b159898fd431208f13dd9b
2022-08-07 17:51:26 +07:00
Vadim Yanitskiy 4c5163c6f1 rlcmac: do not expose internal CSN.1 callbacks and dissectors
Change-Id: Ida9d16b41a2241d72cf5650ad4757ca3ca1da5f3
2022-08-07 17:51:26 +07:00
Vadim Yanitskiy 812b95e444 rlcmac: do not expose PSI1_AdditionsR6_t and EGPRS_PacketChannelRequest_t
Change-Id: I1917148ae384b0995c79107a688b02b4997b0c76
2022-08-07 17:51:26 +07:00
Vadim Yanitskiy ed06cbbfbc libosmo-gprs-rlcmac: check-in PDU definitions from osmo-pcu.git
This commit introduces a new library called 'libosmo-gprs-rlcmac',
which is going to be used by osmo-pcu and osmocom-bb for parsing
and generation of PDUs defined using CSN.1 (see 3GPP TS 24.007).

The actual RLC/MAC definitions are imported from osmo-pcu.git [1].

Change-Id: Ic322543e6d9a870beec83fa1166352e4a51366e7
Related: [1] osmo-pcu.git 0eaa3d379828517b5478d0202a26f6f3eb561a4e
2022-08-07 17:51:26 +07:00