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

Change in osmo-bsc[master]: bts: Simplify bts->paging initialization

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27858 ) Change subject: bts: Simplify bts->paging initialization ...................................................................... bts: Simplify bts->paging initialization Related: SYS#5922 Change-Id: Id103d5f3d437065abcd32788caef339343b1e96a --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/paging.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/paging.c 6 files changed, 28 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/58/27858/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index cd0f8cb..95d9b05 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -17,6 +17,7 @@ #include "osmocom/bsc/bts_trx.h" #include "osmocom/bsc/bts_sm.h" #include "osmocom/bsc/abis_om2000.h" +#include "osmocom/bsc/paging.h" enum bts_counter_id { BTS_CTR_CHREQ_TOTAL, diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 4a58c2b..b478ba0 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -962,26 +962,6 @@ #define GSM_LCHAN_SI(lchan, i) (void *)((lchan)->si.buf[i][0]) -/* - * This keeps track of the paging status of one BTS. It - * includes a number of pending requests, a back pointer - * to the gsm_bts, a timer and some more state. - */ -struct gsm_bts_paging_state { - /* pending requests */ - struct llist_head pending_requests; - struct gsm_bts *bts; - - struct osmo_timer_list work_timer; - struct osmo_timer_list credit_timer; - - /* free chans needed */ - int free_chans_need; - - /* load */ - uint16_t available_slots; -}; - struct gsm_envabtse { struct gsm_abis_mo mo; }; diff --git a/include/osmocom/bsc/paging.h b/include/osmocom/bsc/paging.h index 2d0f8da..c4381fa 100644 --- a/include/osmocom/bsc/paging.h +++ b/include/osmocom/bsc/paging.h @@ -89,6 +89,28 @@ enum bsc_paging_reason reason; }; +/* + * This keeps track of the paging status of one BTS. It + * includes a number of pending requests, a back pointer + * to the gsm_bts, a timer and some more state. + */ +struct gsm_bts_paging_state { + /* pending requests */ + struct llist_head pending_requests; + struct gsm_bts *bts; + + struct osmo_timer_list work_timer; + struct osmo_timer_list credit_timer; + + /* free chans needed */ + int free_chans_need; + + /* load */ + uint16_t available_slots; +}; + +void paging_init(struct gsm_bts *bts); + /* schedule paging request */ int paging_request_bts(const struct bsc_paging_params *params, struct gsm_bts *bts); diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 5976721..92fa64a 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1043,9 +1043,6 @@ { struct gsm_paging_request *pag; - if (!bts->paging.bts) - return; - llist_for_each_entry(pag, &bts->paging.pending_requests, entry) paging_dump_vty(vty, pag); } diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index f4c90e0..16fe547 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -268,8 +268,7 @@ bts->rach_b_thresh = -1; bts->rach_ldavg_slots = -1; - bts->paging.free_chans_need = -1; - INIT_LLIST_HEAD(&bts->paging.pending_requests); + paging_init(bts); bts->features.data = &bts->_features_data[0]; bts->features.data_len = sizeof(bts->_features_data); diff --git a/src/osmo-bsc/paging.c b/src/osmo-bsc/paging.c index 721ea31..d3b9f37 100644 --- a/src/osmo-bsc/paging.c +++ b/src/osmo-bsc/paging.c @@ -240,22 +240,14 @@ } /*! initialize the bts paging state, if it hasn't been initialized yet */ -static void paging_init_if_needed(struct gsm_bts *bts) +void paging_init(struct gsm_bts *bts) { - if (bts->paging.bts) - return; - bts->paging.bts = bts; - - /* This should be initialized only once. There is currently no code that sets bts->paging.bts - * back to NULL, so let's just assert this one instead of graceful handling. */ - OSMO_ASSERT(llist_empty(&bts->paging.pending_requests)); - - osmo_timer_setup(&bts->paging.work_timer, paging_worker, - &bts->paging); - + bts->paging.free_chans_need = -1; /* Large number, until we get a proper message */ bts->paging.available_slots = 20; + INIT_LLIST_HEAD(&bts->paging.pending_requests); + osmo_timer_setup(&bts->paging.work_timer, paging_worker, st); } /*! do we have any pending paging requests for given subscriber? */ @@ -379,9 +371,6 @@ if (!trx_is_usable(bts->c0)) return 0; - /* maybe it is the first time we use it */ - paging_init_if_needed(bts); - /* Trigger paging, pass any error to the caller */ rc = _paging_request(params, bts); if (rc < 0) @@ -405,8 +394,6 @@ *msc_p = NULL; *reason_p = BSC_PAGING_NONE; - paging_init_if_needed(bts); - llist_for_each_entry_safe(req, req2, &bts_entry->pending_requests, entry) { if (req->bsub != bsub) @@ -474,8 +461,6 @@ llist_for_each_entry(bts, &bsc_gsmnet->bts_list, list) { struct gsm_paging_request *req, *req2; - paging_init_if_needed(bts); - llist_for_each_entry_safe(req, req2, &bts->paging.pending_requests, entry) { if (req->bsub != bsub) continue; @@ -492,7 +477,6 @@ /*! Update the BTS paging buffer slots on given BTS */ void paging_update_buffer_space(struct gsm_bts *bts, uint16_t free_slots) { - paging_init_if_needed(bts); osmo_timer_del(&bts->paging.credit_timer); bts->paging.available_slots = free_slots; @@ -505,8 +489,6 @@ unsigned int requests = 0; struct gsm_paging_request *req; - paging_init_if_needed(bts); - llist_for_each_entry(req, &bts->paging.pending_requests, entry) ++requests; @@ -519,8 +501,6 @@ struct gsm_paging_request *req, *req2; int num_cancelled = 0; - paging_init_if_needed(bts); - llist_for_each_entry_safe(req, req2, &bts->paging.pending_requests, entry) { if (msc && req->msc != msc) continue; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id103d5f3d437065abcd32788caef339343b1e96a Gerrit-Change-Number: 27858 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in dahdi-linux[master]: icE1usb: Fix inverted logic for clock timing source

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27838 ) Change subject: icE1usb: Fix inverted logic for clock timing source ...................................................................... icE1usb: Fix inverted logic for clock timing source The 'struct dahdi_lineconfig.sync' parameter originates from the 'timing' field of system.conf. dahdi_cfg passes it via the SPANCONFIG ioctl into the kernel. The DAHDI docs say: > source of the master clock. If you choose 0, the port will never > be used as a source of timing. This is appropriate when you know the > far end should always be a slave to you. So if '0' we should use the local clock, and if > 0, the recovered remote clock. Thanks to Christoph Lauter for pointing this out. Change-Id: If35a5a52c094129c342d0f658f496b488d1826ad --- M drivers/dahdi/icE1usb/icE1usb.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified manawyrm: Looks good to me, but someone else must approve; Verified laforge: Looks good to me, approved diff --git a/drivers/dahdi/icE1usb/icE1usb.c b/drivers/dahdi/icE1usb/icE1usb.c index e829b2d..7ab751e 100644 --- a/drivers/dahdi/icE1usb/icE1usb.c +++ b/drivers/dahdi/icE1usb/icE1usb.c @@ -691,9 +691,9 @@ ieu->cfg.tx.mode = ICE1USB_TX_MODE_TS0; if (lc->sync > 0) - ieu->cfg.tx.timing = ICE1USB_TX_TIME_SRC_LOCAL; - else ieu->cfg.tx.timing = ICE1USB_TX_TIME_SRC_REMOTE; + else + ieu->cfg.tx.timing = ICE1USB_TX_TIME_SRC_LOCAL; /* (re-)set to sane defaults */ ieu->cfg.tx.ext_loopback = ICE1USB_TX_EXT_LOOPBACK_OFF; -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: If35a5a52c094129c342d0f658f496b488d1826ad Gerrit-Change-Number: 27838 Gerrit-PatchSet: 2 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-MessageType: merged

3 years, 2 months

1
0
0 0

Change in dahdi-linux[master]: icE1usb: Fix inverted logic for clock timing source

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27838 ) Change subject: icE1usb: Fix inverted logic for clock timing source ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: If35a5a52c094129c342d0f658f496b488d1826ad Gerrit-Change-Number: 27838 Gerrit-PatchSet: 2 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-Comment-Date: Thu, 21 Apr 2022 07:26:47 +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: Support setting IP DSCP and socket priority via VTY

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27857 ) Change subject: octoi: Support setting IP DSCP and socket priority via VTY ...................................................................... octoi: Support setting IP DSCP and socket priority via VTY Let's allow setting IP DSCP and socket priority via the VTY. Note that you must still manually add a kernel egress QoS map from socket priority to IEEE P802.1p PCP (Priority Code Point) like this: ip link set dev eth0.7 type vlan egress-qos-map 0:0 1:1 5:5 6:6 7:7 This will create 1:1 mappings for socket priorities 0, 1, 5, 6 and 7 to the respective IEEE PCP. A higher PCP typically means higher priority, where voice is traditionally using "5". Change-Id: Ic5a6c5a0ec67beb40be4ca95326aca5072a28958 --- M include/osmocom/octoi/octoi.h M src/octoi/octoi_clnt_vty.c M src/octoi/octoi_sock.c M src/octoi/octoi_sock.h M src/octoi/octoi_srv_vty.c 5 files changed, 155 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/57/27857/1 diff --git a/include/osmocom/octoi/octoi.h b/include/osmocom/octoi/octoi.h index 48ec122..e7ebcaa 100644 --- a/include/osmocom/octoi/octoi.h +++ b/include/osmocom/octoi/octoi.h @@ -42,6 +42,8 @@ struct { struct llist_head accounts; /* list of octoi_account */ struct osmo_sockaddr_str local; /* local socket bind address/port */ + uint8_t dscp; /* IP DSCP value */ + uint8_t priority; /* Socket Priority value */ } cfg; }; @@ -54,6 +56,9 @@ struct osmo_sockaddr_str local; /* local socket bind address/port */ struct octoi_account *account; + + uint8_t dscp; /* IP DSCP value */ + uint8_t priority; /* Socket Priority value */ } cfg; }; diff --git a/src/octoi/octoi_clnt_vty.c b/src/octoi/octoi_clnt_vty.c index 1f8f7d1..756cc9a 100644 --- a/src/octoi/octoi_clnt_vty.c +++ b/src/octoi/octoi_clnt_vty.c @@ -148,6 +148,68 @@ } clnt->sock->rx_cb = octoi_clnt_fsm_rx_cb; + if (clnt->cfg.dscp) { + rc = octoi_sock_set_dscp(clnt->sock, clnt->cfg.dscp); + if (rc < 0) { + vty_out(vty, "%% failed to set DSCP on socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + } + + if (clnt->cfg.priority) { + rc = octoi_sock_set_priority(clnt->sock, clnt->cfg.priority); + if (rc < 0) { + vty_out(vty, "%% failed to set priority on socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_clnt_dscp, cfg_clnt_dscp_cmd, + "ip-dscp <0-63>", + "Set IP DSCP value for outbound packets\n" + "IP DSCP Value to use\n") +{ + struct octoi_client *clnt = vty->index; + int rc; + + clnt->cfg.dscp = atoi(argv[0]); + + if (!clnt->sock) + return CMD_SUCCESS; + + /* apply to already-existing server */ + rc = octoi_sock_set_dscp(clnt->sock, clnt->cfg.dscp); + if (rc < 0) { + vty_out(vty, "%% failed to set DSCP on socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_clnt_prio, cfg_clnt_prio_cmd, + "socket-priority <0-255>", + "Set socket priority value for outbound packets\n" + "Socket Priority\n") +{ + struct octoi_client *clnt = vty->index; + int rc; + + clnt->cfg.priority = atoi(argv[0]); + + if (!clnt->sock) + return CMD_SUCCESS; + + /* apply to already-existing server */ + rc = octoi_sock_set_priority(clnt->sock, clnt->cfg.priority); + if (rc < 0) { + vty_out(vty, "%% failed to set priority on socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + return CMD_SUCCESS; } @@ -197,6 +259,11 @@ vty_out(vty, " local-bind %s %u%s", clnt->cfg.local.ip, clnt->cfg.local.port, VTY_NEWLINE); } + if (clnt->cfg.dscp) + vty_out(vty, " ip-dscp %u%s", clnt->cfg.dscp, VTY_NEWLINE); + if (clnt->cfg.priority) + vty_out(vty, " socket-priority %u%s", clnt->cfg.priority, VTY_NEWLINE); + octoi_vty_write_one_account(vty, clnt->cfg.account); } @@ -215,5 +282,7 @@ install_node(&clnt_node, config_write_octoi_clnt); install_element(CONFIG_NODE, &cfg_client_cmd); install_element(OCTOI_CLNT_NODE, &cfg_clnt_local_cmd); + install_element(OCTOI_CLNT_NODE, &cfg_clnt_dscp_cmd); + install_element(OCTOI_CLNT_NODE, &cfg_clnt_prio_cmd); install_element(OCTOI_CLNT_NODE, &cfg_clnt_account_cmd); } diff --git a/src/octoi/octoi_sock.c b/src/octoi/octoi_sock.c index 943270a..4805d7e 100644 --- a/src/octoi/octoi_sock.c +++ b/src/octoi/octoi_sock.c @@ -450,6 +450,16 @@ return sock; } +int octoi_sock_set_dscp(struct octoi_sock *sock, uint8_t dscp) +{ + return osmo_sock_set_dscp(sock->ofd.fd, dscp); +} + +int octoi_sock_set_priority(struct octoi_sock *sock, uint8_t priority) +{ + return osmo_sock_set_priority(sock->ofd.fd, priority); +} + void octoi_sock_destroy(struct octoi_sock *sock) { struct octoi_peer *p1, *p2; diff --git a/src/octoi/octoi_sock.h b/src/octoi/octoi_sock.h index cf7b74b..b251864 100644 --- a/src/octoi/octoi_sock.h +++ b/src/octoi/octoi_sock.h @@ -66,6 +66,9 @@ struct octoi_peer *octoi_sock_client_get_peer(struct octoi_sock *sock); +int octoi_sock_set_dscp(struct octoi_sock *sock, uint8_t dscp); +int octoi_sock_set_priority(struct octoi_sock *sock, uint8_t priority); + void octoi_peer_destroy(struct octoi_peer *peer); int octoi_tx(struct octoi_peer *peer, uint8_t msg_type, uint8_t flags, diff --git a/src/octoi/octoi_srv_vty.c b/src/octoi/octoi_srv_vty.c index c9f63cb..f616af5 100644 --- a/src/octoi/octoi_srv_vty.c +++ b/src/octoi/octoi_srv_vty.c @@ -182,6 +182,68 @@ } srv->sock->rx_cb = octoi_srv_fsm_rx_cb; + if (srv->cfg.dscp) { + rc = octoi_sock_set_dscp(srv->sock, srv->cfg.dscp); + if (rc < 0) { + vty_out(vty, "%% failed to set DSCP on socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + } + + if (srv->cfg.priority) { + rc = octoi_sock_set_priority(srv->sock, srv->cfg.priority); + if (rc < 0) { + vty_out(vty, "%% failed to set priority on socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_srv_dscp, cfg_srv_dscp_cmd, + "ip-dscp <0-63>", + "Set IP DSCP value for outbound packets\n" + "IP DSCP Value to use\n") +{ + struct octoi_server *srv = vty->index; + int rc; + + srv->cfg.dscp = atoi(argv[0]); + + if (!srv->sock) + return CMD_SUCCESS; + + /* apply to already-existing server */ + rc = octoi_sock_set_dscp(srv->sock, srv->cfg.dscp); + if (rc < 0) { + vty_out(vty, "%% failed to set DSCP on socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + +DEFUN(cfg_srv_prio, cfg_srv_prio_cmd, + "socket-priority <0-255>", + "Set socket priority value for outbound packets\n" + "Socket Priority\n") +{ + struct octoi_server *srv = vty->index; + int rc; + + srv->cfg.priority = atoi(argv[0]); + + if (!srv->sock) + return CMD_SUCCESS; + + /* apply to already-existing server */ + rc = octoi_sock_set_priority(srv->sock, srv->cfg.priority); + if (rc < 0) { + vty_out(vty, "%% failed to set priority on socket: %s%s", strerror(errno), VTY_NEWLINE); + return CMD_WARNING; + } + return CMD_SUCCESS; } @@ -347,6 +409,10 @@ vty_out(vty, " local-bind %s %u%s", srv->cfg.local.ip, srv->cfg.local.port, VTY_NEWLINE); } + if (srv->cfg.dscp) + vty_out(vty, " ip-dscp %u%s", srv->cfg.dscp, VTY_NEWLINE); + if (srv->cfg.priority) + vty_out(vty, " socket-priority %u%s", srv->cfg.priority, VTY_NEWLINE); llist_for_each_entry(acc, &srv->cfg.accounts, list) octoi_vty_write_one_account(vty, acc); @@ -385,6 +451,8 @@ install_element(CONFIG_NODE, &cfg_server_cmd); //install_element(CONFIG_NODE, &cfg_no_server_cmd); install_element(OCTOI_SRV_NODE, &cfg_srv_local_cmd); + install_element(OCTOI_SRV_NODE, &cfg_srv_dscp_cmd); + install_element(OCTOI_SRV_NODE, &cfg_srv_prio_cmd); install_element(OCTOI_SRV_NODE, &cfg_srv_account_cmd); //install_element(CONFIG_SRV_NODE, &cfg_srv_no_account_cmd); } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ic5a6c5a0ec67beb40be4ca95326aca5072a28958 Gerrit-Change-Number: 27857 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in dahdi-linux[master]: icE1usb: Fix inverted logic for clock timing source

by manawyrm

Attention is currently required from: laforge. manawyrm has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27838 ) Change subject: icE1usb: Fix inverted logic for clock timing source ...................................................................... Patch Set 2: Verified+1 Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: If35a5a52c094129c342d0f658f496b488d1826ad Gerrit-Change-Number: 27838 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 21 Apr 2022 06:44:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in dahdi-linux[master]: icE1usb: Fix inverted logic for clock timing source

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/dahdi-linux/+/27838 to look at the new patch set (#2). Change subject: icE1usb: Fix inverted logic for clock timing source ...................................................................... icE1usb: Fix inverted logic for clock timing source The 'struct dahdi_lineconfig.sync' parameter originates from the 'timing' field of system.conf. dahdi_cfg passes it via the SPANCONFIG ioctl into the kernel. The DAHDI docs say: > source of the master clock. If you choose 0, the port will never > be used as a source of timing. This is appropriate when you know the > far end should always be a slave to you. So if '0' we should use the local clock, and if > 0, the recovered remote clock. Thanks to Christoph Lauter for pointing this out. Change-Id: If35a5a52c094129c342d0f658f496b488d1826ad --- M drivers/dahdi/icE1usb/icE1usb.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/38/27838/2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: If35a5a52c094129c342d0f658f496b488d1826ad Gerrit-Change-Number: 27838 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: check if scheduling of [dummy] FACCH/H is allowed

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27836 ) Change subject: osmo-bts-trx: check if scheduling of [dummy] FACCH/H is allowed ...................................................................... osmo-bts-trx: check if scheduling of [dummy] FACCH/H is allowed Currently (without this patch) if tch_dl_dequeue() yields nothing we're scheduling dummy FACCH/H *regardless* if it's permitted to start at the given TDMA FN or not. This may result in misaligned FACCH transmission, so the MS will not able to decode anything and will report BER>0. With this patch applied we schedule FACCH/H if it's allowed to start at the current TDMA FN; otherwise send half-filled bursts with even numbered bits contaning 232 encoded bits of the previous L2 frame and 232 odd numbered bits all set to 0. This patch does not guard against sporadic gaps in the Downlink TCH queue. However when tch_dl_dequeue() constantly yields nothing, e.g. when we end up with a codec mismatch, then this additional check saves us from starting misaligned FACCH/H transmission. If we start at a wrong TDMA offset, then all subsequent FACCH frames will be scheduled at wrong offsets and thus none of them will be decoded by the MS. Change-Id: I6f8af140a6ccf3d5fd7b98f6cb5c18e2c5e2f61b Related: SYS#5919, OS#4823 --- M src/common/scheduler.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 13 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 8ec9ccf..d166909 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -998,7 +998,7 @@ /* FACCH/H channel mapping for Downlink (see 3GPP TS 45.002, table 1). * This mapping is valid for both FACCH/H(0) and FACCH/H(1). */ -static const uint8_t sched_tchh_dl_facch_map[26] = { +const uint8_t sched_tchh_dl_facch_map[26] = { [4] = 1, /* FACCH/H(0): B0(4,6,8,10,13,15) */ [5] = 1, /* FACCH/H(1): B0(5,7,9,11,14,16) */ [13] = 1, /* FACCH/H(0): B1(13,15,17,19,21,23) */ diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 55a185e..fe166ae 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -75,6 +75,9 @@ [3] = 1, /* FACCH/H(1): B2(18,20,22,24,1,3) */ }; +/* TDMA frame number of burst 'a' is used as the table index. */ +extern const uint8_t sched_tchh_dl_facch_map[26]; + /*! \brief a single TCH/H burst was received by the PHY, process it */ int rx_tchh_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi) { @@ -407,6 +410,15 @@ }; LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No TCH or FACCH prim for transmit.\n"); + + /* FACCH/H can only be scheduled at specific TDMA offset */ + if (!sched_tchh_dl_facch_map[br->fn % 26]) { + /* FACCH/H is not allowed, send half-filled bursts with even numbered + * bits contaning 232 encoded bits of the previous L2 frame, and 232 + * odd numbered bits all set to 0. */ + goto send_burst; + } + gsm0503_tch_hr_encode(*bursts_p, dummy, sizeof(dummy)); chan_state->dl_ongoing_facch = 1; chan_state->dl_facch_bursts = 6; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6f8af140a6ccf3d5fd7b98f6cb5c18e2c5e2f61b Gerrit-Change-Number: 27836 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: check if scheduling of [dummy] FACCH/H is allowed

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27836 ) Change subject: osmo-bts-trx: check if scheduling of [dummy] FACCH/H is allowed ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6f8af140a6ccf3d5fd7b98f6cb5c18e2c5e2f61b Gerrit-Change-Number: 27836 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Apr 2022 06:23:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: VTY: fix NULL-pointer dereference in 'show transceiver'

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27693 ) Change subject: VTY: fix NULL-pointer dereference in 'show transceiver' ...................................................................... VTY: fix NULL-pointer dereference in 'show transceiver' Change-Id: I403a027f064a4898eb74a11381bab3c884ec8ccf --- M src/osmo-bts-trx/trx_vty.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index bd6b3b1..70e9b36 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -89,11 +89,16 @@ else vty_out(vty, " bsic : undefined%s", VTY_NEWLINE); + /* trx->ts[tn].priv is NULL in absence of the A-bis connection */ + if (trx->rsl_link == NULL) + continue; + for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { const struct gsm_bts_trx_ts *ts = &trx->ts[tn]; const struct l1sched_ts *l1ts = ts->priv; const struct trx_sched_multiframe *mf; + OSMO_ASSERT(l1ts != NULL); mf = &trx_sched_multiframes[l1ts->mf_index]; vty_out(vty, " timeslot #%u (%s)%s", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I403a027f064a4898eb74a11381bab3c884ec8ccf Gerrit-Change-Number: 27693 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: VTY: fix NULL-pointer dereference in 'show transceiver'

by laforge

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27693 ) Change subject: VTY: fix NULL-pointer dereference in 'show transceiver' ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I403a027f064a4898eb74a11381bab3c884ec8ccf Gerrit-Change-Number: 27693 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 21 Apr 2022 06:22:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022