cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

common: Have PCU socket connection use osmo_wqueue 

Fixes memleak in case of connected PCU process being suspended without proper close on socket

Related: OS#5774
Change-Id: Ia6e61dda4b3cd4bba76e6acb7771d70335062fe1
This commit is contained in:
arehbein 2023-02-27 01:26:36 +01:00
parent 4c3b4e2868
commit c938a95e25
2 changed files with 38 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osmo-bts/bts.h
View File

@ -137,6 +137,8 @@ struct bsc_oml_host {
char *addr; char *addr;
}; };
#define BTS_PCU_SOCK_WQUEUE_LEN_DEFAULT 10
/* One BTS */ /* One BTS */
struct gsm_bts { struct gsm_bts {
/* list header in g_bts_sm->bts_list */ /* list header in g_bts_sm->bts_list */

89
src/common/pcu_sock.c
View File

@ -31,6 +31,7 @@
#include <osmocom/core/utils.h> #include <osmocom/core/utils.h>
#include <osmocom/core/select.h> #include <osmocom/core/select.h>
#include <osmocom/core/socket.h> #include <osmocom/core/socket.h>
#include <osmocom/core/write_queue.h>
#include <osmocom/gsm/gsm23003.h> #include <osmocom/gsm/gsm23003.h>
#include <osmocom/gsm/abis_nm.h> #include <osmocom/gsm/abis_nm.h>
#include <osmo-bts/logging.h> #include <osmo-bts/logging.h>
@ -962,15 +963,17 @@ static int pcu_rx(uint8_t msg_type, struct gsm_pcu_if *pcu_prim, size_t prim_len
struct pcu_sock_state { struct pcu_sock_state {
struct osmo_fd listen_bfd; /* fd for listen socket */ struct osmo_fd listen_bfd; /* fd for listen socket */
struct osmo_fd conn_bfd; /* fd for connection to lcr */ struct osmo_wqueue upqueue; /* For sending messages; has fd for conn. to PCU */
struct llist_head upqueue; /* queue for sending messages */
}; };
static void pcu_sock_close(struct pcu_sock_state *state);
int pcu_sock_send(struct msgb *msg) int pcu_sock_send(struct msgb *msg)
{ {
struct pcu_sock_state *state = g_bts_sm->gprs.pcu_state; struct pcu_sock_state *state = g_bts_sm->gprs.pcu_state;
struct osmo_fd *conn_bfd; struct osmo_fd *conn_bfd;
struct gsm_pcu_if *pcu_prim = (struct gsm_pcu_if *) msg->data; struct gsm_pcu_if *pcu_prim = (struct gsm_pcu_if *) msg->data;
int rc;
if (!state) { if (!state) {
if (pcu_prim->msg_type != PCU_IF_MSG_TIME_IND && if (pcu_prim->msg_type != PCU_IF_MSG_TIME_IND &&
@ -980,7 +983,7 @@ int pcu_sock_send(struct msgb *msg)
msgb_free(msg); msgb_free(msg);
return -EINVAL; return -EINVAL;
} }
conn_bfd = &state->conn_bfd; conn_bfd = &state->upqueue.bfd;
if (conn_bfd->fd <= 0) { if (conn_bfd->fd <= 0) {
if (pcu_prim->msg_type != PCU_IF_MSG_TIME_IND && if (pcu_prim->msg_type != PCU_IF_MSG_TIME_IND &&
pcu_prim->msg_type != PCU_IF_MSG_INTERF_IND) pcu_prim->msg_type != PCU_IF_MSG_INTERF_IND)
@ -989,15 +992,22 @@ int pcu_sock_send(struct msgb *msg)
msgb_free(msg); msgb_free(msg);
return -EIO; return -EIO;
} }
msgb_enqueue(&state->upqueue, msg);
osmo_fd_write_enable(conn_bfd);
rc = osmo_wqueue_enqueue(&state->upqueue, msg);
if (rc < 0) {
if (rc == -ENOSPC)
LOGP(DPCU, LOGL_NOTICE, "PCU not reacting (more than %u messages waiting). Closing connection\n",
state->upqueue.max_length);
pcu_sock_close(state);
msgb_free(msg);
return rc;
}
return 0; return 0;
} }
static void pcu_sock_close(struct pcu_sock_state *state) static void pcu_sock_close(struct pcu_sock_state *state)
{ {
struct osmo_fd *bfd = &state->conn_bfd; struct osmo_fd *bfd = &state->upqueue.bfd;
struct gsm_bts *bts; struct gsm_bts *bts;
struct gsm_bts_trx *trx; struct gsm_bts_trx *trx;
unsigned int tn; unsigned int tn;
@ -1043,11 +1053,7 @@ static void pcu_sock_close(struct pcu_sock_state *state)
} }
} }
/* flush the queue */ osmo_wqueue_clear(&state->upqueue);
while (!llist_empty(&state->upqueue)) {
struct msgb *msg = msgb_dequeue(&state->upqueue);
msgb_free(msg);
}
} }
static int pcu_sock_read(struct osmo_fd *bfd) static int pcu_sock_read(struct osmo_fd *bfd)
@ -1096,59 +1102,34 @@ close:
return -1; return -1;
} }
static int pcu_sock_write(struct osmo_fd *bfd) static int pcu_sock_write(struct osmo_fd *bfd, struct msgb *msg)
{ {
struct pcu_sock_state *state = bfd->data; struct pcu_sock_state *state = bfd->data;
struct msgb *msg;
int rc; int rc;
while ((msg = msgb_dequeue(&state->upqueue))) { /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */
/* bug hunter 8-): maybe someone forgot msgb_put(...) ? */ OSMO_ASSERT(msgb_length(msg) > 0);
OSMO_ASSERT(msgb_length(msg) > 0); /* try to send it over the socket */
rc = write(bfd->fd, msgb_data(msg), msgb_length(msg));
/* try to send it over the socket */ if (OSMO_UNLIKELY(rc == 0))
rc = write(bfd->fd, msgb_data(msg), msgb_length(msg)); goto close;
if (OSMO_UNLIKELY(rc == 0)) if (OSMO_UNLIKELY(rc < 0)) {
goto close; if (errno == EAGAIN)
if (OSMO_UNLIKELY(rc < 0)) { return -EAGAIN;
if (errno == EAGAIN) { return -1;
/* Re-insert at the start of the queue, skip disabling fd WRITE */
llist_add(&msg->list, &state->upqueue);
return 0;
}
goto close;
}
msgb_free(msg);
} }
osmo_fd_write_disable(bfd);
return 0; return 0;
close: close:
msgb_free(msg);
pcu_sock_close(state); pcu_sock_close(state);
return -1; return -1;
} }
static int pcu_sock_cb(struct osmo_fd *bfd, unsigned int flags)
{
int rc = 0;
if (flags & OSMO_FD_READ)
rc = pcu_sock_read(bfd);
if (rc < 0)
return rc;
if (flags & OSMO_FD_WRITE)
rc = pcu_sock_write(bfd);
return rc;
}
/* accept connection coming from PCU */ /* accept connection coming from PCU */
static int pcu_sock_accept(struct osmo_fd *bfd, unsigned int flags) static int pcu_sock_accept(struct osmo_fd *bfd, unsigned int flags)
{ {
struct pcu_sock_state *state = (struct pcu_sock_state *)bfd->data; struct pcu_sock_state *state = (struct pcu_sock_state *)bfd->data;
struct osmo_fd *conn_bfd = &state->conn_bfd; struct osmo_fd *conn_bfd = &state->upqueue.bfd;
struct sockaddr_un un_addr; struct sockaddr_un un_addr;
socklen_t len; socklen_t len;
int fd; int fd;
@ -1168,7 +1149,7 @@ static int pcu_sock_accept(struct osmo_fd *bfd, unsigned int flags)
return 0; return 0;
} }
osmo_fd_setup(conn_bfd, fd, OSMO_FD_READ, pcu_sock_cb, state, 0); osmo_fd_setup(conn_bfd, fd, OSMO_FD_READ, osmo_wqueue_bfd_cb, state, 0);
if (osmo_fd_register(conn_bfd) != 0) { if (osmo_fd_register(conn_bfd) != 0) {
LOGP(DPCU, LOGL_ERROR, "Failed to register new connection fd\n"); LOGP(DPCU, LOGL_ERROR, "Failed to register new connection fd\n");
@ -1195,8 +1176,10 @@ int pcu_sock_init(const char *path)
if (!state) if (!state)
return -ENOMEM; return -ENOMEM;
INIT_LLIST_HEAD(&state->upqueue); osmo_wqueue_init(&state->upqueue, BTS_PCU_SOCK_WQUEUE_LEN_DEFAULT);
state->conn_bfd.fd = -1; state->upqueue.read_cb = pcu_sock_read;
state->upqueue.write_cb = pcu_sock_write;
state->upqueue.bfd.fd = -1;
bfd = &state->listen_bfd; bfd = &state->listen_bfd;
@ -1237,7 +1220,7 @@ void pcu_sock_exit(void)
return; return;
osmo_signal_unregister_handler(SS_GLOBAL, pcu_if_signal_cb, NULL); osmo_signal_unregister_handler(SS_GLOBAL, pcu_if_signal_cb, NULL);
conn_bfd = &state->conn_bfd; conn_bfd = &state->upqueue.bfd;
if (conn_bfd->fd > 0) if (conn_bfd->fd > 0)
pcu_sock_close(state); pcu_sock_close(state);
bfd = &state->listen_bfd; bfd = &state->listen_bfd;
@ -1252,7 +1235,7 @@ bool pcu_connected(void) {
if (!state) if (!state)
return false; return false;
if (state->conn_bfd.fd <= 0) if (state->upqueue.bfd.fd <= 0)
return false; return false;
return true; return true;
} }