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

Change in osmo-bts[master]: osmo-bts-trx: make use of OSMO_UNLIKELY() when handling TRXD PDUs

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27407 ) Change subject: osmo-bts-trx: make use of OSMO_UNLIKELY() when handling TRXD PDUs ...................................................................... osmo-bts-trx: make use of OSMO_UNLIKELY() when handling TRXD PDUs Given how often we send and receive TRXD PDUs, I believe it maks sense to use OSMO_UNLIKELY() in the error checking conditions. Theoretically this should improve performance. Change-Id: I9266aaf2bbc0acfe21e9bfb12c9f38621d120553 --- M src/osmo-bts-trx/trx_if.c 1 file changed, 12 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index 9232e64..bff10d7 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -862,7 +862,7 @@ /* MTS (Modulation and Training Sequence) */ rc = trx_data_parse_mts(phy_inst, bi, buf[0]); - if (rc < 0) + if (OSMO_UNLIKELY(rc < 0)) return rc; /* C/I: Carrier-to-Interference ratio (in centiBels) */ @@ -893,7 +893,7 @@ /* MTS (Modulation and Training Sequence) */ rc = trx_data_parse_mts(phy_inst, bi, buf[2]); - if (rc < 0) + if (OSMO_UNLIKELY(rc < 0)) return rc; bi->rssi = -(int8_t)buf[3]; @@ -903,7 +903,7 @@ /* TDMA frame number is absent in batched PDUs */ if (bi->_num_pdus == 0) { - if (buf_len < sizeof(bi->fn) + TRX_UL_V2HDR_LEN) { + if (OSMO_UNLIKELY(buf_len < sizeof(bi->fn) + TRX_UL_V2HDR_LEN)) { LOGPPHI(phy_inst, DTRX, LOGL_ERROR, "Rx malformed TRXDv2 PDU: not enough bytes " "to parse TDMA frame number\n"); @@ -936,7 +936,7 @@ }; bi->burst_len = bl[bi->mod]; - if (buf_len < bi->burst_len) + if (OSMO_UNLIKELY(buf_len < bi->burst_len)) return -EINVAL; /* Convert unsigned soft-bits [254..0] to soft-bits [-127..127] */ @@ -1009,7 +1009,7 @@ uint8_t pdu_ver; buf_len = recv(ofd->fd, trx_data_buf, sizeof(trx_data_buf), 0); - if (buf_len <= 0) { + if (OSMO_UNLIKELY(buf_len <= 0)) { strerror_r(errno, (char *) trx_data_buf, sizeof(trx_data_buf)); LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR, "recv() failed on TRXD with rc=%zd (%s)\n", @@ -1021,7 +1021,7 @@ pdu_ver = buf[0] >> 4; /* Make sure that PDU version matches our expectations */ - if (pdu_ver != l1h->config.trxd_pdu_ver_use) { + if (OSMO_UNLIKELY(pdu_ver != l1h->config.trxd_pdu_ver_use)) { LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR, "Rx TRXD PDU with unexpected version %u (expected %u)\n", pdu_ver, l1h->config.trxd_pdu_ver_use); @@ -1037,7 +1037,7 @@ bi.flags = 0x00; /* Make sure that we have enough bytes to parse the header */ - if (buf_len < trx_data_rx_hdr_len[pdu_ver]) { + if (OSMO_UNLIKELY(buf_len < trx_data_rx_hdr_len[pdu_ver])) { LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR, "Rx malformed TRXDv%u PDU: len=%zd < expected %u\n", pdu_ver, buf_len, trx_data_rx_hdr_len[pdu_ver]); @@ -1061,10 +1061,10 @@ } /* Header parsing error */ - if (hdr_len < 0) + if (OSMO_UNLIKELY(hdr_len < 0)) return hdr_len; - if (bi.fn >= GSM_TDMA_HYPERFRAME) { + if (OSMO_UNLIKELY(bi.fn >= GSM_TDMA_HYPERFRAME)) { LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR, "Rx malformed TRXDv%u PDU: illegal TDMA fn=%u\n", pdu_ver, bi.fn); @@ -1076,7 +1076,7 @@ buf += hdr_len; /* Calculate burst length and parse it (if present) */ - if (trx_data_handle_burst(&bi, buf, buf_len) != 0) { + if (OSMO_UNLIKELY(trx_data_handle_burst(&bi, buf, buf_len) != 0)) { LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR, "Rx malformed TRXDv%u PDU: odd burst length=%zd\n", pdu_ver, buf_len); @@ -1117,7 +1117,7 @@ ssize_t snd_len, buf_len; /* Make sure that the PHY is powered on */ - if (!trx_if_powered(l1h)) { + if (OSMO_UNLIKELY(!trx_if_powered(l1h))) { LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR, "Ignoring Tx data, transceiver is powered off\n"); return -ENODEV; @@ -1190,7 +1190,7 @@ pdu_num = 0; snd_len = send(l1h->trx_ofd_data.fd, trx_data_buf, buf_len, 0); - if (snd_len <= 0) { + if (OSMO_UNLIKELY(snd_len <= 0)) { strerror_r(errno, (char *) trx_data_buf, sizeof(trx_data_buf)); LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR, "send() failed on TRXD with rc=%zd (%s)\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9266aaf2bbc0acfe21e9bfb12c9f38621d120553 Gerrit-Change-Number: 27407 Gerrit-PatchSet: 1 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, 3 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: make use of OSMO_UNLIKELY() when handling TRXD PDUs

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27407 ) Change subject: osmo-bts-trx: make use of OSMO_UNLIKELY() when handling TRXD PDUs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9266aaf2bbc0acfe21e9bfb12c9f38621d120553 Gerrit-Change-Number: 27407 Gerrit-PatchSet: 1 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-Comment-Date: Wed, 09 Mar 2022 07:21:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in simtrace2[master]: firmware: usb: call USBD_HAL_DISCONNECT while usb init to recover fro...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/27406 ) Change subject: firmware: usb: call USBD_HAL_DISCONNECT while usb init to recover from resets ...................................................................... firmware: usb: call USBD_HAL_DISCONNECT while usb init to recover from resets The firmware doesn't recover from a OSMO_ASSERT() which direct reset the board. After the reset the firmware will waits forever for the USBD state USBD_STATE_CONFIGURED. By adding the explicit USBD_HAL_DISCONNECT the board always recovers. Fixes: OS#5478 Related: SYS#5752 Change-Id: I600a26025166d20b6b27c191f24e4023efdaadf6 --- M firmware/libcommon/source/usb.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/firmware/libcommon/source/usb.c b/firmware/libcommon/source/usb.c index 7a99b15..25b35cf 100644 --- a/firmware/libcommon/source/usb.c +++ b/firmware/libcommon/source/usb.c @@ -689,6 +689,7 @@ { unsigned int i; /* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */ + USBD_HAL_Disconnect(); USBD_HAL_Suspend(); mdelay(500); USBD_HAL_Activate(); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I600a26025166d20b6b27c191f24e4023efdaadf6 Gerrit-Change-Number: 27406 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tsaitgaist <kredon(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in simtrace2[master]: firmware: usb: call USBD_HAL_DISCONNECT while usb init to recover fro...

by laforge

Attention is currently required from: Hoernchen, lynxis lazus, tsaitgaist. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/27406 ) Change subject: firmware: usb: call USBD_HAL_DISCONNECT while usb init to recover from resets ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I600a26025166d20b6b27c191f24e4023efdaadf6 Gerrit-Change-Number: 27406 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tsaitgaist <kredon(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: tsaitgaist <kredon(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Mar 2022 07:20:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in simtrace2[master]: Reduce bInterval of interrupt endpoints to avoid interrupt misses

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/27400 ) Change subject: Reduce bInterval of interrupt endpoints to avoid interrupt misses ...................................................................... Reduce bInterval of interrupt endpoints to avoid interrupt misses Particularly the VCC/RST/CLK changes can happen quite frequent, and we were seeing quite a number of overflows of the usb_buf queue for EP06 (interrupt endpoint) in cardem. I first tried increasing the maximum queue size to up to 10, but that still didn't resolve those EP06 overflow error log messages. Reducing the bInterval from 16 to 1 made them go away in all my tests. Change-Id: I5c272c31983de7201cfbd445c4484f6832d878ab --- M firmware/libcommon/source/usb.c 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libcommon/source/usb.c b/firmware/libcommon/source/usb.c index d86fc92..7a99b15 100644 --- a/firmware/libcommon/source/usb.c +++ b/firmware/libcommon/source/usb.c @@ -206,7 +206,7 @@ SIMTRACE_USB_EP_CARD_INT), .bmAttributes = USBEndpointDescriptor_INTERRUPT, .wMaxPacketSize = USBEndpointDescriptor_MAXINTERRUPTSIZE_FS, - .bInterval = 0x10, + .bInterval = 1, }, DFURT_IF_DESCRIPTOR(1, 0), }; @@ -382,7 +382,7 @@ SIMTRACE_CARDEM_USB_EP_USIM1_INT), .bmAttributes = USBEndpointDescriptor_INTERRUPT, .wMaxPacketSize = USBEndpointDescriptor_MAXINTERRUPTSIZE_FS, - .bInterval = 0x10 + .bInterval = 1 }, #ifdef CARDEMU_SECOND_UART /* Communication class interface standard descriptor */ @@ -429,7 +429,7 @@ SIMTRACE_CARDEM_USB_EP_USIM2_INT), .bmAttributes = USBEndpointDescriptor_INTERRUPT, .wMaxPacketSize = USBEndpointDescriptor_MAXINTERRUPTSIZE_FS, - .bInterval = 0x10, + .bInterval = 1, }, DFURT_IF_DESCRIPTOR(2, 0), #else @@ -547,7 +547,7 @@ CCID_EPT_NOTIFICATION), .bmAttributes = USBEndpointDescriptor_INTERRUPT, .wMaxPacketSize = USBEndpointDescriptor_MAXINTERRUPTSIZE_FS, - .bInterval = 0x10, + .bInterval = 1, }, /* Communication class interface standard descriptor */ @@ -593,7 +593,7 @@ SIMTRACE_USB_EP_PHONE_INT), .bmAttributes = USBEndpointDescriptor_INTERRUPT, .wMaxPacketSize = USBEndpointDescriptor_MAXINTERRUPTSIZE_FS, - .bInterval = 0x10 + .bInterval = 1 }, DFURT_IF_DESCRIPTOR(2, 0), }; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I5c272c31983de7201cfbd445c4484f6832d878ab Gerrit-Change-Number: 27400 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in simtrace2[master]: Reduce bInterval of interrupt endpoints to avoid interrupt misses

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/27400 ) Change subject: Reduce bInterval of interrupt endpoints to avoid interrupt misses ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I5c272c31983de7201cfbd445c4484f6832d878ab Gerrit-Change-Number: 27400 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 09 Mar 2022 07:20:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn-ogs: Change diameter node id to pcrf

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27422 ) Change subject: ttcn3-ggsn-ogs: Change diameter node id to pcrf ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4c9f90de1456cf1515c9a0608b44a44fa8acb311 Gerrit-Change-Number: 27422 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Mar 2022 07:19:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-ggsn[master]: gtp: Fix typo in comment

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27419 ) Change subject: gtp: Fix typo in comment ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I0e38e0966081d8b37c3f816f5330b4f52f81b7fa Gerrit-Change-Number: 27419 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Mar 2022 07:18:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-ggsn[master]: gtp: Log retrans queue register&free entries

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27417 ) Change subject: gtp: Log retrans queue register&free entries ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I4e12376652fc7a6a96fbdcb579dbe916c1473012 Gerrit-Change-Number: 27417 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Mar 2022 07:18:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-ggsn[master]: gtp: Specify retrans queue name & seqnum in log lines

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27416 ) Change subject: gtp: Specify retrans queue name & seqnum in log lines ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I4f193d7a482ace33afd8526b5f50d2d03467d5fa Gerrit-Change-Number: 27416 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Mar 2022 07:17:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022