April 2023 - gerrit-log - lists.osmocom.org

[XL] Change in libosmocore[master]: Add osmo_io with initial poll backend
by daniel 04 Apr '23

04 Apr '23

Attention is currently required from: osmith, Hoernchen, neels, pespin, fixeria. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30934 ) Change subject: Add osmo_io with initial poll backend ...................................................................... Patch Set 8: (2 comments) File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/f516f35b_750d09f6 PS8, Line 169: llist_add_tail(&msghdr->list, &iofd->tx_queue.msg_queue); > Could be msgb_enqueue_count(), but it can stay this way too. I had that at first, but msgb_enqueue_count() takes a struct msgb * and derefereces the ->list pointer in msgb_enqueue(). So this would require casting a msghdr * to a msgb * and relying on the fact that the list member is in the same position in both structs which I quite dislike. File src/core/osmo_io_poll.c: https://gerrit.osmocom.org/c/libosmocore/+/30934/comment/b043b551_197e07ec PS8, Line 85: if (iofd->closed) > is this the new -EBADF to handle case where recvmsg_cb closes th iofd? What if iofd is freed by recv […] closed, in_callback, and to_free Closed is the early-return that prevents the write from being considered when the fd is already closed. in_callback is set to true while inside this function. If osmo_iofd_free() is called while in_callback is true then it will only close the fd and defer actually freeing the data and just set to_free to true. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I50d73cf550d6ce8154bf827bf47408131cf5b0a0 Gerrit-Change-Number: 30934 Gerrit-PatchSet: 8 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 11:43:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: bts_model_apply_oml(): Improve definition of parameter
by pespin 04 Apr '23

04 Apr '23

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/32204 ) Change subject: bts_model_apply_oml(): Improve definition of parameter ...................................................................... bts_model_apply_oml(): Improve definition of parameter The param is usually called obj_class, but here it is called kind. In any case, change the param to pass the related struct gsm_abis_mo (which still contains mo->obj_class), similar to what's done in other bts_model functions such as bts_model_opstart(). Change-Id: Ife2e98a791455d5f7e7052356d559af2f1d4d185 --- M include/osmo-bts/bts_model.h M src/common/nm_bb_transc_fsm.c M src/common/nm_bts_fsm.c M src/common/nm_channel_fsm.c M src/common/nm_radio_carrier_fsm.c M src/osmo-bts-lc15/oml.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/bts_model.c M tests/stubs.c 13 files changed, 38 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/04/32204/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ife2e98a791455d5f7e7052356d559af2f1d4d185 Gerrit-Change-Number: 32204 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-msc[master]: msc_main: close SMS db on startup error
by osmith 04 Apr '23

04 Apr '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32085 ) Change subject: msc_main: close SMS db on startup error ...................................................................... Patch Set 2: (2 comments) File src/osmo-msc/msc_main.c: https://gerrit.osmocom.org/c/osmo-msc/+/32085/comment/49f431fb_de36029c PS1, Line 805: db_fini(); > really looks like you want to use a goto here.... Done https://gerrit.osmocom.org/c/osmo-msc/+/32085/comment/58b44ff4_ae0949ac PS1, Line 829: db_fini(); > to here.... Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9bb799048db5fcdb2a2520107bd75d5f7a865459 Gerrit-Change-Number: 32085 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 11:30:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-msc[master]: msc_main: close SMS db on startup error
by pespin 04 Apr '23

04 Apr '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32085 ) Change subject: msc_main: close SMS db on startup error ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9bb799048db5fcdb2a2520107bd75d5f7a865459 Gerrit-Change-Number: 32085 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 11:29:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-msc[master]: msc_main: close SMS db on startup error
by osmith 04 Apr '23

04 Apr '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32085 ) Change subject: msc_main: close SMS db on startup error ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9bb799048db5fcdb2a2520107bd75d5f7a865459 Gerrit-Change-Number: 32085 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Apr 2023 11:28:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: nm: Apply BTS/TRX/TS OML Attributes through NM FSMs
by pespin 04 Apr '23

04 Apr '23

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32194 ) Change subject: nm: Apply BTS/TRX/TS OML Attributes through NM FSMs ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id68868e25bbf96227ab6459fcd3c9181852ed28e Gerrit-Change-Number: 32194 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Apr 2023 11:26:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: bts-trx: Drop unused param to internal function
by pespin 04 Apr '23

04 Apr '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32202 ) Change subject: bts-trx: Drop unused param to internal function ...................................................................... bts-trx: Drop unused param to internal function Change-Id: Id7ad7629ec13bcec618055c41083cdac0a3102be --- M src/osmo-bts-trx/l1_if.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/02/32202/1 diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 2ed1868..5f800ae 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -206,7 +206,7 @@ } /* set bts attributes */ -static uint8_t trx_set_bts(struct gsm_bts *bts, struct tlv_parsed *new_attr) +static uint8_t trx_set_bts(struct gsm_bts *bts) { struct phy_instance *pinst = trx_phy_instance(bts->c0); struct trx_l1h *l1h = pinst->u.osmotrx.hdl; @@ -569,7 +569,7 @@ switch (foh->msg_type) { case NM_MT_SET_BTS_ATTR: - ev_data.cause = trx_set_bts(obj, new_attr); + ev_data.cause = trx_set_bts(obj); break; case NM_MT_SET_RADIO_ATTR: ev_data.cause = trx_set_trx(obj); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32202 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id7ad7629ec13bcec618055c41083cdac0a3102be Gerrit-Change-Number: 32202 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bts[master]: nm: Drop NM_EV_SETATTR_{ACK/NACK}
by pespin 04 Apr '23

04 Apr '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/32196 to look at the new patch set (#2). Change subject: nm: Drop NM_EV_SETATTR_{ACK/NACK} ...................................................................... nm: Drop NM_EV_SETATTR_{ACK/NACK} Simply return error codes from lower layer implementations, and do the OML handling in the common NM TS 12.21 FSMs. As a result, we simplify the logic in the lower layers. Change-Id: I281c07bb5ad88ee03542f092141cebe036d10aee --- M include/osmo-bts/nm_common_fsm.h M src/common/nm_bb_transc_fsm.c M src/common/nm_bts_fsm.c M src/common/nm_bts_sm_fsm.c M src/common/nm_channel_fsm.c M src/common/nm_common_fsm.c M src/common/nm_radio_carrier_fsm.c M src/osmo-bts-lc15/oml.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/bts_model.c 14 files changed, 70 insertions(+), 120 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/32196/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I281c07bb5ad88ee03542f092141cebe036d10aee Gerrit-Change-Number: 32196 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-bts[master]: bts_model_apply_oml(): Drop unneded code
by pespin 04 Apr '23

04 Apr '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/32195 to look at the new patch set (#2). Change subject: bts_model_apply_oml(): Drop unneded code ...................................................................... bts_model_apply_oml(): Drop unneded code Only calls to bts_model_apply_oml() are done from BTS, RCARRIER and RCHANNEL NM Objects only in their respective Rx code paths (and they will be moved to respective FSMs in follow up patches). This function is never called with any of the GPRS NM objects. These NM Objectes have the NM_MT_IPACC_SET_ATTR msg ACKED/NACKED in its own path: oml_ipa_set_attr() rc = oml_ipa_mo_set_attr() return oml_fom_ack_nack(msg, rc); Change-Id: I1a0d38a122f50ffe749ebc4f1cc11235ca516586 --- M src/osmo-bts-lc15/oml.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/bts_model.c 7 files changed, 20 insertions(+), 56 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/95/32195/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1a0d38a122f50ffe749ebc4f1cc11235ca516586 Gerrit-Change-Number: 32195 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-bts[master]: bts_model_apply_oml(): Improve definition of parameter
by pespin 04 Apr '23

04 Apr '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32204 ) Change subject: bts_model_apply_oml(): Improve definition of parameter ...................................................................... bts_model_apply_oml(): Improve definition of parameter The param is usually called obj_class. Furthermore, we have an enum for it, so let's use it to make it clear what this param is. Change-Id: Ife2e98a791455d5f7e7052356d559af2f1d4d185 --- M include/osmo-bts/bts_model.h M src/osmo-bts-lc15/oml.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-omldummy/bts_model.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/bts_model.c M tests/stubs.c 9 files changed, 31 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/04/32204/1 diff --git a/include/osmo-bts/bts_model.h b/include/osmo-bts/bts_model.h index 168930e..3baa416 100644 --- a/include/osmo-bts/bts_model.h +++ b/include/osmo-bts/bts_model.h @@ -5,6 +5,7 @@ #include <osmocom/gsm/tlv.h> #include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gsm/protocol/gsm_12_21.h> #include <osmo-bts/gsm_data.h> @@ -20,7 +21,8 @@ struct tlv_parsed *old_attr, struct tlv_parsed *new_attr, void *obj); -int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int obj_kind, void *obj); +int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, + enum abis_nm_obj_class obj_class, void *obj); int bts_model_opstart(struct gsm_bts *bts, struct gsm_abis_mo *mo, void *obj); diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c index 1402483..bdafbcf 100644 --- a/src/osmo-bts-lc15/oml.c +++ b/src/osmo-bts-lc15/oml.c @@ -1801,7 +1801,8 @@ } /* callback from OML */ -int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int kind, void *obj) +int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, + enum abis_nm_obj_class obj_class, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); int rc; diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c index ac4fe46..367d0bb 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -1810,7 +1810,8 @@ } /* callback from OML */ -int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int kind, void *obj) +int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, + enum abis_nm_obj_class obj_class, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); int rc; diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c index f51252e..5e07f85 100644 --- a/src/osmo-bts-octphy/l1_oml.c +++ b/src/osmo-bts-octphy/l1_oml.c @@ -1742,7 +1742,8 @@ } /* callback from OML */ -int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int kind, void *obj) +int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, + enum abis_nm_obj_class obj_class, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); int rc; diff --git a/src/osmo-bts-omldummy/bts_model.c b/src/osmo-bts-omldummy/bts_model.c index 55e43d3..10172a0 100644 --- a/src/osmo-bts-omldummy/bts_model.c +++ b/src/osmo-bts-omldummy/bts_model.c @@ -93,7 +93,8 @@ return 0; } -int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int kind, void *obj) +int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, + enum abis_nm_obj_class obj_class, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); int rc; diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index 8b2669f..5c7aa45 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -1714,7 +1714,8 @@ } /* callback from OML */ -int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int kind, void *obj) +int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, + enum abis_nm_obj_class obj_class, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); int rc; diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 5e6a22c..8c1dc2e 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -548,7 +548,8 @@ } /* callback from OML */ -int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int kind, void *obj) +int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, + enum abis_nm_obj_class obj_class, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); int rc; diff --git a/src/osmo-bts-virtual/bts_model.c b/src/osmo-bts-virtual/bts_model.c index 91a1ec8..66c2336 100644 --- a/src/osmo-bts-virtual/bts_model.c +++ b/src/osmo-bts-virtual/bts_model.c @@ -128,7 +128,8 @@ return 0; } -int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int kind, void *obj) +int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, + enum abis_nm_obj_class obj_class, void *obj) { struct abis_om_fom_hdr *foh = msgb_l3(msg); int rc; diff --git a/tests/stubs.c b/tests/stubs.c index 00617cd..5f8cc99 100644 --- a/tests/stubs.c +++ b/tests/stubs.c @@ -18,7 +18,8 @@ { return 0; } int bts_model_trx_init(struct gsm_bts_trx *trx) { return 0; } -int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, int kind, void *obj) +int bts_model_apply_oml(struct gsm_bts *bts, struct msgb *msg, + enum abis_nm_obj_class obj_class, void *obj) { return 0; } int bts_model_trx_deact_rf(struct gsm_bts_trx *trx) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ife2e98a791455d5f7e7052356d559af2f1d4d185 Gerrit-Change-Number: 32204 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0