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

Change in osmo-e1d[master]: octoi: Terminate connection on too high RIFO OVERFLOW rates

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27842 ) Change subject: octoi: Terminate connection on too high RIFO OVERFLOW rates ...................................................................... octoi: Terminate connection on too high RIFO OVERFLOW rates If we are permanently overflowing the RIFO in IP->E1 direction, the peer clock is consistently faster than our E1 clock. There's no smart way to recover from this. Log an error and disconnect. This is the opposite situation from the high RIFO UNDERFLOW situation whose logging + disconnect handling was added in Ie3fffa1c1c20962b40320c8cc088c140b8d64e77 Change-Id: Iecd294b0174c9a0572df3dad612cb4efbd9cde07 --- M src/octoi/e1oip.h M src/octoi/octoi_clnt_fsm.c M src/octoi/octoi_srv_fsm.c 3 files changed, 33 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index 54d299a..41f35cb 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -13,6 +13,8 @@ #define iline_stat_set(iline, idx, add) \ osmo_stat_item_set(osmo_stat_item_group_get_item((iline)->stats, idx), add) +#define FRAMES_PER_SEC_THRESHOLD 7500 + enum e1oip_line_ctr { LINE_CTR_E1oIP_UNDERRUN, LINE_CTR_E1oIP_SUBSTITUTED, diff --git a/src/octoi/octoi_clnt_fsm.c b/src/octoi/octoi_clnt_fsm.c index a3d0518..697ff77 100644 --- a/src/octoi/octoi_clnt_fsm.c +++ b/src/octoi/octoi_clnt_fsm.c @@ -279,15 +279,25 @@ } rate = iline_ctr_get_rate_1s(st->peer->iline, LINE_CTR_E1oIP_UNDERRUN); - if (rate > 7500) { - LOGPFSML(fi, LOGL_ERROR, "More than 7500 RIFO underruns per second: " - "Your clock appears to be too fast. Disconnecting.\n"); - osmo_fsm_inst_state_chg(fi, CLNT_ST_WAIT_RECONNECT, 10, 0); - osmo_fsm_inst_dispatch(fi, OCTOI_CLNT_EV_REQUEST_SERVICE, NULL); - return; + if (rate > FRAMES_PER_SEC_THRESHOLD) { + LOGPFSML(fi, LOGL_ERROR, "More than %u RIFO underruns per second: " + "Your clock appears to be too fast. Disconnecting.\n", FRAMES_PER_SEC_THRESHOLD); + goto reconnect; + } + + rate = iline_ctr_get_rate_1s(st->peer->iline, LINE_CTR_E1oIP_E1T_OVERFLOW); + if (rate > FRAMES_PER_SEC_THRESHOLD) { + LOGPFSML(fi, LOGL_ERROR, "More than %u RIFO overflows per second: " + "Your clock appears to be too slow. Disconnecting.\n", FRAMES_PER_SEC_THRESHOLD); + goto reconnect; } osmo_timer_schedule(&st->rx_alive_timer, 3, 0); + return; + +reconnect: + osmo_fsm_inst_state_chg(fi, CLNT_ST_WAIT_RECONNECT, 10, 0); + osmo_fsm_inst_dispatch(fi, OCTOI_CLNT_EV_REQUEST_SERVICE, NULL); } diff --git a/src/octoi/octoi_srv_fsm.c b/src/octoi/octoi_srv_fsm.c index 5f51003..c9fa66e 100644 --- a/src/octoi/octoi_srv_fsm.c +++ b/src/octoi/octoi_srv_fsm.c @@ -356,14 +356,24 @@ } rate = iline_ctr_get_rate_1s(st->peer->iline, LINE_CTR_E1oIP_UNDERRUN); - if (rate > 7500) { - LOGPFSML(fi, LOGL_ERROR, "More than 7500 RIFO underruns per second: " - "Peer clock is too slow. Disconnecting.\n"); - osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); - return; + if (rate > FRAMES_PER_SEC_THRESHOLD) { + LOGPFSML(fi, LOGL_ERROR, "More than %u RIFO underruns per second: " + "Peer clock is too slow. Disconnecting.\n", FRAMES_PER_SEC_THRESHOLD); + goto term; + } + + rate = iline_ctr_get_rate_1s(st->peer->iline, LINE_CTR_E1oIP_E1T_OVERFLOW); + if (rate > FRAMES_PER_SEC_THRESHOLD) { + LOGPFSML(fi, LOGL_ERROR, "More than %u RIFO overflows per second: " + "Peer clock is too fast. Disconnecting.\n", FRAMES_PER_SEC_THRESHOLD); + goto term; } osmo_timer_schedule(&st->rx_alive_timer, 3, 0); + return; + +term: + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); } /* call-back function for every received OCTOI socket message for given peer */ -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Iecd294b0174c9a0572df3dad612cb4efbd9cde07 Gerrit-Change-Number: 27842 Gerrit-PatchSet: 8 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: cosmetic: remove dead code {fifo,rifo}_dump() functions

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27849 ) Change subject: cosmetic: remove dead code {fifo,rifo}_dump() functions ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I8c6fc5fe82bc3a045a9e5d23965ca6d5532d6112 Gerrit-Change-Number: 27849 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 20 Apr 2022 19:39:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: e1oip: Add stat items for number of timeslots

by laforge

Attention is currently required from: manawyrm, roox. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27844 ) Change subject: e1oip: Add stat items for number of timeslots ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I6858e0773a348193bb4839c247294cef5ab4df5f Gerrit-Change-Number: 27844 Gerrit-PatchSet: 8 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Comment-Date: Wed, 20 Apr 2022 19:39:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: octoi: add new counter every time a connection is accepted

by laforge

Attention is currently required from: manawyrm, roox. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27843 ) Change subject: octoi: add new counter every time a connection is accepted ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I8baac768289f7e01d943f5205afa824f367a3a61 Gerrit-Change-Number: 27843 Gerrit-PatchSet: 8 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Comment-Date: Wed, 20 Apr 2022 19:38:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: octoi: Fix client re-start after clock drift disconnect

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27855 ) Change subject: octoi: Fix client re-start after clock drift disconnect ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I1d913a8153adaf87b2c3dadcf98382ff0b9fc2fb Gerrit-Change-Number: 27855 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 20 Apr 2022 19:38:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: octoi: Terminate connection on too high RIFO OVERFLOW rates

by laforge

Attention is currently required from: manawyrm, roox. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27842 ) Change subject: octoi: Terminate connection on too high RIFO OVERFLOW rates ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Iecd294b0174c9a0572df3dad612cb4efbd9cde07 Gerrit-Change-Number: 27842 Gerrit-PatchSet: 8 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Comment-Date: Wed, 20 Apr 2022 19:38:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: e1oip: Add rate_ctr for IP->E1 RIFO overflows

by laforge

Attention is currently required from: manawyrm, roox, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27841 ) Change subject: e1oip: Add rate_ctr for IP->E1 RIFO overflows ...................................................................... Patch Set 7: Code-Review+2 (1 comment) Patchset: PS7: decided to merge this now, we can split it up in separate patch -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ie0e8bb2f5d2ae4256952f6bf69e514d5c2627a76 Gerrit-Change-Number: 27841 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 20 Apr 2022 19:38:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: e1oip: Add rate_ctr for IP->E1 RIFO overflows

by laforge

Attention is currently required from: manawyrm, roox, tnt. Hello Jenkins Builder, manawyrm, roox, tnt, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/27841 to look at the new patch set (#7). Change subject: e1oip: Add rate_ctr for IP->E1 RIFO overflows ...................................................................... e1oip: Add rate_ctr for IP->E1 RIFO overflows This typically happens if the remote IP peer is transmitting at a faster rate than the E1 side is consuming. Let's add a way to monitor it. Change-Id: Ie0e8bb2f5d2ae4256952f6bf69e514d5c2627a76 --- M src/octoi/e1oip.c M src/octoi/e1oip.h 2 files changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/41/27841/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ie0e8bb2f5d2ae4256952f6bf69e514d5c2627a76 Gerrit-Change-Number: 27841 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: octoi: Fix client re-start after clock drift disconnect

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27855 ) Change subject: octoi: Fix client re-start after clock drift disconnect ...................................................................... octoi: Fix client re-start after clock drift disconnect We have to issue the OCTOI_CLNT_EV_REQUEST_SERVICE event to the FSM only after it has switched back to INIT state. Change-Id: I1d913a8153adaf87b2c3dadcf98382ff0b9fc2fb --- M src/octoi/octoi_clnt_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/55/27855/1 diff --git a/src/octoi/octoi_clnt_fsm.c b/src/octoi/octoi_clnt_fsm.c index 697ff77..6b1d1d3 100644 --- a/src/octoi/octoi_clnt_fsm.c +++ b/src/octoi/octoi_clnt_fsm.c @@ -245,6 +245,7 @@ case CLNT_ST_WAIT_RECONNECT: LOGPFSML(fi, LOGL_INFO, "Re-starting connection\n"); osmo_fsm_inst_state_chg(fi, CLNT_ST_INIT, 0, 0); + osmo_fsm_inst_dispatch(fi, OCTOI_CLNT_EV_REQUEST_SERVICE, NULL); } return 0; } @@ -297,7 +298,6 @@ reconnect: osmo_fsm_inst_state_chg(fi, CLNT_ST_WAIT_RECONNECT, 10, 0); - osmo_fsm_inst_dispatch(fi, OCTOI_CLNT_EV_REQUEST_SERVICE, NULL); } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I1d913a8153adaf87b2c3dadcf98382ff0b9fc2fb Gerrit-Change-Number: 27855 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-e1d[master]: e1oip: Add rate_ctr for IP->E1 RIFO overflows

by laforge

Attention is currently required from: manawyrm, roox, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27841 ) Change subject: e1oip: Add rate_ctr for IP->E1 RIFO overflows ...................................................................... Patch Set 6: (1 comment) File src/octoi/e1oip.c: https://gerrit.osmocom.org/c/osmo-e1d/+/27841/comment/3edb64d7_d984298f PS2, Line 255: rc = frame_rifo_in(&iline->e1t.rifo, frame_buf, fn32+i); > Yeah, I think it's too much of a misnomer because in the stat in case of a desync we'll end up with […] we already have "pkts_out_of_win" for outside the fn16 window at the packet receive time, so my out_of_win suggestion is a bad idea. I don't really like any of the choices particularly well :/ Two counters sounds like the best approach. The overhead is minimal I guess. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ie0e8bb2f5d2ae4256952f6bf69e514d5c2627a76 Gerrit-Change-Number: 27841 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Wed, 20 Apr 2022 17:57:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022