<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/23865">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx: enlarge and share TRXD message buffer<br><br>Starting from TRXDv2, several PDUs may be batched together and sent in<br>all together a single datagram. This requires us to increase the buffer<br>size that we use for sending and receiving TRXD messages. Let's use<br>65536 matching the default MTU value for 'lo' interface on Linux.<br><br>Given that 65536 is quite a big number, let's allocate a shared Rx/Tx<br>buffer statically to avoid [potential] stack overflow.<br><br>Change-Id: I729451c8ecdc7ff2631beb423f15523db16b3ee3<br>Related: SYS#4895, OS#4941, OS#4006<br>---<br>M src/osmo-bts-trx/trx_if.c<br>M src/osmo-bts-trx/trx_if.h<br>2 files changed, 23 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/65/23865/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c</span><br><span>index 8169f8f..30c74dd 100644</span><br><span>--- a/src/osmo-bts-trx/trx_if.c</span><br><span>+++ b/src/osmo-bts-trx/trx_if.c</span><br><span>@@ -902,20 +902,24 @@</span><br><span> return buf;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* TRXD buffer used by Rx/Tx handlers */</span><br><span style="color: hsl(120, 100%, 40%);">+static uint8_t trx_data_buf[TRXD_MSG_BUF_SIZE];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Parse TRXD message from transceiver, compose an UL burst indication. */</span><br><span> static int trx_data_read_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *ptr = &trx_data_buf[0];</span><br><span> struct trx_l1h *l1h = ofd->data;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t buf[TRXD_MSG_BUF_SIZE];</span><br><span> struct trx_ul_burst_ind bi;</span><br><span> ssize_t hdr_len, buf_len;</span><br><span> uint8_t pdu_ver;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- buf_len = recv(ofd->fd, buf, sizeof(buf), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ buf_len = recv(ofd->fd, trx_data_buf, sizeof(trx_data_buf), 0);</span><br><span> if (buf_len <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- strerror_r(errno, (char *)buf, sizeof(buf));</span><br><span style="color: hsl(120, 100%, 40%);">+ strerror_r(errno, (char *) trx_data_buf, sizeof(trx_data_buf));</span><br><span> LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "recv() failed on TRXD with rc=%zd (%s)\n", buf_len, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ "recv() failed on TRXD with rc=%zd (%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ buf_len, trx_data_buf);</span><br><span> return buf_len;</span><br><span> }</span><br><span> </span><br><span>@@ -923,7 +927,7 @@</span><br><span> bi.flags = 0x00;</span><br><span> </span><br><span> /* Parse PDU version first */</span><br><span style="color: hsl(0, 100%, 40%);">- pdu_ver = buf[0] >> 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ pdu_ver = ptr[0] >> 4;</span><br><span> </span><br><span> /* Make sure that PDU version matches our expectations */</span><br><span> if (pdu_ver != l1h->config.trxd_pdu_ver_use) {</span><br><span>@@ -944,10 +948,10 @@</span><br><span> /* Parse header depending on the PDU version */</span><br><span> switch (pdu_ver) {</span><br><span> case 0: /* TRXDv0 */</span><br><span style="color: hsl(0, 100%, 40%);">- hdr_len = trx_data_handle_hdr_v0(l1h->phy_inst, &bi, buf, buf_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr_len = trx_data_handle_hdr_v0(l1h->phy_inst, &bi, ptr, buf_len);</span><br><span> break;</span><br><span> case 1: /* TRXDv1 */</span><br><span style="color: hsl(0, 100%, 40%);">- hdr_len = trx_data_handle_hdr_v1(l1h->phy_inst, &bi, buf, buf_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr_len = trx_data_handle_hdr_v1(l1h->phy_inst, &bi, ptr, buf_len);</span><br><span> break;</span><br><span> default:</span><br><span> /* Shall not happen */</span><br><span>@@ -969,7 +973,7 @@</span><br><span> buf_len -= hdr_len;</span><br><span> </span><br><span> /* Calculate burst length and parse it (if present) */</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx_data_handle_burst(&bi, buf + hdr_len, buf_len) != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx_data_handle_burst(&bi, ptr + hdr_len, buf_len) != 0) {</span><br><span> LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR,</span><br><span> "Rx malformed TRXDv%u PDU: odd burst length=%zd\n",</span><br><span> pdu_ver, buf_len);</span><br><span>@@ -995,7 +999,7 @@</span><br><span> {</span><br><span> ssize_t snd_len;</span><br><span> uint8_t pdu_ver = l1h->config.trxd_pdu_ver_use;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t buf[TRXD_MSG_BUF_SIZE];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *ptr = &trx_data_buf[0];</span><br><span> </span><br><span> if ((br->burst_len != GSM_BURST_LEN) && (br->burst_len != EGPRS_BURST_LEN)) {</span><br><span> LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR, "Tx burst length %zu invalid\n",</span><br><span>@@ -1019,20 +1023,21 @@</span><br><span> return -ENOTSUP;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- buf[0] = ((pdu_ver & 0x0f) << 4) | br->tn;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_store32be(br->fn, buf + 1);</span><br><span style="color: hsl(0, 100%, 40%);">- buf[5] = br->att;</span><br><span style="color: hsl(120, 100%, 40%);">+ ptr[0] = ((pdu_ver & 0x0f) << 4) | br->tn;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_store32be(br->fn, ptr + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ ptr[5] = br->att;</span><br><span> </span><br><span> /* copy ubits {0,1} */</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(buf + 6, br->burst, br->burst_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(ptr + 6, br->burst, br->burst_len);</span><br><span> </span><br><span> /* we must be sure that TRX is on */</span><br><span> if (trx_if_powered(l1h)) {</span><br><span style="color: hsl(0, 100%, 40%);">- snd_len = send(l1h->trx_ofd_data.fd, buf, br->burst_len + 6, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ snd_len = send(l1h->trx_ofd_data.fd, trx_data_buf, br->burst_len + 6, 0);</span><br><span> if (snd_len <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- strerror_r(errno, (char *)buf, sizeof(buf));</span><br><span style="color: hsl(120, 100%, 40%);">+ strerror_r(errno, (char *) trx_data_buf, sizeof(trx_data_buf));</span><br><span> LOGPPHI(l1h->phy_inst, DTRX, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "send() failed on TRXD with rc=%zd (%s)\n", snd_len, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ "send() failed on TRXD with rc=%zd (%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ snd_len, trx_data_buf);</span><br><span> return -2;</span><br><span> }</span><br><span> } else</span><br><span>diff --git a/src/osmo-bts-trx/trx_if.h b/src/osmo-bts-trx/trx_if.h</span><br><span>index ca3d51b..f40dbb5 100644</span><br><span>--- a/src/osmo-bts-trx/trx_if.h</span><br><span>+++ b/src/osmo-bts-trx/trx_if.h</span><br><span>@@ -2,8 +2,8 @@</span><br><span> </span><br><span> /* TRXC read/send buffer size */</span><br><span> #define TRXC_MSG_BUF_SIZE 1500</span><br><span style="color: hsl(0, 100%, 40%);">-/* TRXD read/send buffer size */</span><br><span style="color: hsl(0, 100%, 40%);">-#define TRXD_MSG_BUF_SIZE 512</span><br><span style="color: hsl(120, 100%, 40%);">+/* TRXD read/send buffer size (max. lo MTU) */</span><br><span style="color: hsl(120, 100%, 40%);">+#define TRXD_MSG_BUF_SIZE 65536</span><br><span> </span><br><span> struct trx_dl_burst_req;</span><br><span> struct trx_l1h;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/23865">change 23865</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/23865"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I729451c8ecdc7ff2631beb423f15523db16b3ee3 </div>
<div style="display:none"> Gerrit-Change-Number: 23865 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>