January 2024 - gerrit-log - lists.osmocom.org

[M] Change in libosmocore[master]: ecu: fix alignment of fr_ecu_state
by dexter 04 Jan '24

04 Jan '24

Attention is currently required from: laforge, neels, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35212?usp=email ) Change subject: ecu: fix alignment of fr_ecu_state ...................................................................... Patch Set 7: (4 comments) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/35212/comment/3a391b30_23de5c8b PS5, Line 7: ecu: force alignment of member data in struct osmo_ecu_state > you probably need to update the whole commit description since the approach changed. I have now fixed it (hopefully). The description of the is-situation should still apply. File src/codec/ecu_fr.c: https://gerrit.osmocom.org/c/libosmocore/+/35212/comment/028d33bb_1cf98811 PS4, Line 92: struct osmo_ecu_state ecu_state; > Add a comment that ecu_state should be the first in the struct. […] Done https://gerrit.osmocom.org/c/libosmocore/+/35212/comment/3f5335ac_fffc3a17 PS4, Line 294: return (struct osmo_ecu_state*) fr; > Ah sorry, not in this precise line. But here it's simply a matter of doing: […] Done File src/codec/ecu_fr.c: https://gerrit.osmocom.org/c/libosmocore/+/35212/comment/781858f8_fd64fa1e PS5, Line 315: struct fr_ecu_state *fr = (struct fr_ecu_state *) st; > It removes the need of having one struct being the first field of the other one, plus avoid having p […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35212?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 Gerrit-Change-Number: 35212 Gerrit-PatchSet: 7 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Jan 2024 12:56:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: ecu: fix alignment of fr_ecu_state
by dexter 04 Jan '24

04 Jan '24

Attention is currently required from: laforge, neels, pespin. Hello Jenkins Builder, laforge, neels, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35212?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Code-Review-1 by pespin, Verified-1 by Jenkins Builder Change subject: ecu: fix alignment of fr_ecu_state ...................................................................... ecu: fix alignment of fr_ecu_state The member data[0] in struct osmo_ecu_state is used as an anchor to attach private structs for a concrete ECU implementation. This works by allocating more memory then struct osmo_ecu_state actually needs and then using the excess memory to store the private struct of the concrete ECU implementation. However, this poses a problem since data[0] is at the end of the struct it may land in an unaligned position. This also means that the struct we store there is also unaligned. We should fix this enclosing the public struct osmo_ecu_state into our private struct fr_ecu_state. Then we can use container_of to cast from osmo_ecu_state to fr_ecu_state and correct alignment is ensured as well. Related: OS#6286 Change-Id: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 --- M src/codec/ecu_fr.c 1 file changed, 37 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/12/35212/7 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35212?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I28672856e8e8f47e04ffe09ee3e07b577108cdc7 Gerrit-Change-Number: 35212 Gerrit-PatchSet: 7 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-bsc[master]: ctrl: Add radio link timeout
by matanp 04 Jan '24

04 Jan '24

matanp has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35483?usp=email ) Change subject: ctrl: Add radio link timeout ...................................................................... ctrl: Add radio link timeout Change-Id: Ic9532d4b051d34e71c91aaff545fb3dfa7d7c8b2 --- M src/osmo-bsc/bts_ctrl.c 1 file changed, 60 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified matanp: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index c038dbf..4312d9d 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -1144,6 +1144,56 @@ CTRL_CMD_DEFINE(bts_cell_reselection_hysteresis, "cell-reselection-hysteresis"); + +static int verify_bts_radio_link_timeout(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + int radio_link_timeout; + struct gsm_bts *bts = cmd->node; + + if (strcmp(value, "infinite") == 0) { + if (bts->type != GSM_BTS_TYPE_OSMOBTS) { + cmd->reply = "Infinite radio link timeout not supported by BTS"; + return 1; + } + return 0; + } + + radio_link_timeout = atoi(cmd->value); + + if (radio_link_timeout < 0 || radio_link_timeout > 64) { + cmd->reply = "Value is out of range"; + return 1; + } else if (radio_link_timeout % 4 != 0) { + cmd->reply = "Value must be a multiple of 4"; + return 1; + } + + return 0; +} + +static int get_bts_radio_link_timeout(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + + cmd->reply = talloc_asprintf(cmd, "%u", gsm_bts_get_radio_link_timeout(bts)); + if (!cmd->reply) { + cmd->reply = "OOM"; + return CTRL_CMD_ERROR; + } + + return CTRL_CMD_REPLY; +} + +static int set_bts_radio_link_timeout(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + gsm_bts_set_radio_link_timeout(bts, atoi(cmd->value)); + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE(bts_radio_link_timeout, "radio-link-timeout"); + static int verify_bts_rxlev_access_min(struct ctrl_cmd *cmd, const char *value, void *_data) { int rxlev_access_min = atoi(cmd->value); @@ -1431,6 +1481,7 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_cell_reselection_offset); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_cell_reselection_penalty_time); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_cell_reselection_hysteresis); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_radio_link_timeout); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rxlev_access_min); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_access_control_class); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_access_control_class_bar); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35483?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic9532d4b051d34e71c91aaff545fb3dfa7d7c8b2 Gerrit-Change-Number: 35483 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-bsc[master]: ctrl: Add radio link timeout
by matanp 04 Jan '24

04 Jan '24

matanp has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35483?usp=email ) Change subject: ctrl: Add radio link timeout ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35483?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic9532d4b051d34e71c91aaff545fb3dfa7d7c8b2 Gerrit-Change-Number: 35483 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Jan 2024 12:43:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: ctrl: Add radio link timeout
by pespin 04 Jan '24

04 Jan '24

Attention is currently required from: matanp. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35483?usp=email ) Change subject: ctrl: Add radio link timeout ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35483?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic9532d4b051d34e71c91aaff545fb3dfa7d7c8b2 Gerrit-Change-Number: 35483 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: matanp <matan1008(a)gmail.com> Gerrit-Comment-Date: Thu, 04 Jan 2024 12:36:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: fsm: fix OSMO_T_FMT_ARGS: add missing braces
by pespin 04 Jan '24

04 Jan '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35482?usp=email ) Change subject: fsm: fix OSMO_T_FMT_ARGS: add missing braces ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35482?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3ea7cbc8a51d310d9929ca5a805eb1d3d3880793 Gerrit-Change-Number: 35482 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Jan 2024 12:34:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: tests/tdef: improve test output (use OSMO_T_FMT[_ARGS])
by pespin 04 Jan '24

04 Jan '24

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35481?usp=email ) Change subject: tests/tdef: improve test output (use OSMO_T_FMT[_ARGS]) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie216bcf93b96610c46c6e616835a6793772e2baa Gerrit-Change-Number: 35481 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Jan 2024 12:34:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: core: osmo_tdef_fsm_inst_state_chg(): allow millisecond precision
by pespin 04 Jan '24

04 Jan '24

Attention is currently required from: fixeria, laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35466?usp=email ) Change subject: core: osmo_tdef_fsm_inst_state_chg(): allow millisecond precision ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35466?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4c4ee89e7e32e86f74cd215f5cbfa44ace5426c1 Gerrit-Change-Number: 35466 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 04 Jan 2024 12:34:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: ctrl: Add radio link timeout
by matanp 04 Jan '24

04 Jan '24

matanp has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35483?usp=email ) Change subject: ctrl: Add radio link timeout ...................................................................... ctrl: Add radio link timeout Change-Id: Ic9532d4b051d34e71c91aaff545fb3dfa7d7c8b2 --- M src/osmo-bsc/bts_ctrl.c 1 file changed, 60 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/83/35483/1 diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index c038dbf..4312d9d 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -1144,6 +1144,56 @@ CTRL_CMD_DEFINE(bts_cell_reselection_hysteresis, "cell-reselection-hysteresis"); + +static int verify_bts_radio_link_timeout(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + int radio_link_timeout; + struct gsm_bts *bts = cmd->node; + + if (strcmp(value, "infinite") == 0) { + if (bts->type != GSM_BTS_TYPE_OSMOBTS) { + cmd->reply = "Infinite radio link timeout not supported by BTS"; + return 1; + } + return 0; + } + + radio_link_timeout = atoi(cmd->value); + + if (radio_link_timeout < 0 || radio_link_timeout > 64) { + cmd->reply = "Value is out of range"; + return 1; + } else if (radio_link_timeout % 4 != 0) { + cmd->reply = "Value must be a multiple of 4"; + return 1; + } + + return 0; +} + +static int get_bts_radio_link_timeout(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + + cmd->reply = talloc_asprintf(cmd, "%u", gsm_bts_get_radio_link_timeout(bts)); + if (!cmd->reply) { + cmd->reply = "OOM"; + return CTRL_CMD_ERROR; + } + + return CTRL_CMD_REPLY; +} + +static int set_bts_radio_link_timeout(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + gsm_bts_set_radio_link_timeout(bts, atoi(cmd->value)); + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE(bts_radio_link_timeout, "radio-link-timeout"); + static int verify_bts_rxlev_access_min(struct ctrl_cmd *cmd, const char *value, void *_data) { int rxlev_access_min = atoi(cmd->value); @@ -1431,6 +1481,7 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_cell_reselection_offset); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_cell_reselection_penalty_time); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_cell_reselection_hysteresis); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_radio_link_timeout); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rxlev_access_min); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_access_control_class); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rach_access_control_class_bar); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35483?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic9532d4b051d34e71c91aaff545fb3dfa7d7c8b2 Gerrit-Change-Number: 35483 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: fsm: fix OSMO_T_FMT_ARGS: add missing braces
by fixeria 03 Jan '24

03 Jan '24

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35482?usp=email ) Change subject: fsm: fix OSMO_T_FMT_ARGS: add missing braces ...................................................................... fsm: fix OSMO_T_FMT_ARGS: add missing braces Change-Id: I3ea7cbc8a51d310d9929ca5a805eb1d3d3880793 --- M include/osmocom/core/fsm.h 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/82/35482/1 diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h index 5e5b091..a1ffd30 100644 --- a/include/osmocom/core/fsm.h +++ b/include/osmocom/core/fsm.h @@ -200,7 +200,7 @@ fmt, ## args) #define OSMO_T_FMT "%c%u" -#define OSMO_T_FMT_ARGS(T) ((T) >= 0 ? 'T' : 'X'), ((T) >= 0 ? T : -T) +#define OSMO_T_FMT_ARGS(T) ((T) >= 0 ? 'T' : 'X'), ((T) >= 0 ? (T) : -(T)) int osmo_fsm_register(struct osmo_fsm *fsm); void osmo_fsm_unregister(struct osmo_fsm *fsm); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35482?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3ea7cbc8a51d310d9929ca5a805eb1d3d3880793 Gerrit-Change-Number: 35482 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0