November 2023 - gerrit-log - lists.osmocom.org

[M] Change in libosmo-sccp[master]: xua + ipa: Add support for I/O in OSMO_IO mode

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35070?usp=email ) Change subject: xua + ipa: Add support for I/O in OSMO_IO mode ...................................................................... xua + ipa: Add support for I/O in OSMO_IO mode This switches osmo_stream_{cli,srv} over to using the OSMO_IO mode instead of the classic OSMO_FD mode. The difference is that we no longer read/write directly to a file descriptor, but we pass message buffers to/from the library. This in turn allows the library to use more efficient I/O mechanisms as osmo_io backend, for example the Linux kernel io_uring. Change-Id: I7d02037990f4af405839309510dc6c04e36c3369 Depends: libosmo-netif.git I6cf5bad5f618e71c80017960c38009b089dbd6a1 Depends: libosmocore.git I89eb519b22d21011d61a7855b2364bc3c295df82 --- M src/osmo_ss7_asp.c M src/osmo_ss7_xua_srv.c M src/ss7_internal.h 3 files changed, 44 insertions(+), 100 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/70/35070/1 diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 0662085..3d335dc 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -554,8 +554,8 @@ talloc_free(asp); } -static int xua_cli_read_cb(struct osmo_stream_cli *conn); -static int ipa_cli_read_cb(struct osmo_stream_cli *conn); +static int xua_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg); +static int ipa_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg); static int xua_cli_connect_cb(struct osmo_stream_cli *cli); int osmo_ss7_asp_restart(struct osmo_ss7_asp *asp) @@ -594,10 +594,13 @@ osmo_stream_cli_set_proto(asp->client, ss7_asp_proto_to_ip_proto(asp->cfg.proto)); osmo_stream_cli_set_reconnect_timeout(asp->client, 5); osmo_stream_cli_set_connect_cb(asp->client, xua_cli_connect_cb); - if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) - osmo_stream_cli_set_read_cb(asp->client, ipa_cli_read_cb); - else - osmo_stream_cli_set_read_cb(asp->client, xua_cli_read_cb); + if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) { + osmo_stream_cli_set_read_cb2(asp->client, ipa_cli_read_cb); + osmo_stream_cli_set_segmentation_cb(asp->client, osmo_ipa_segmentation_cb); + } else { + osmo_stream_cli_set_read_cb2(asp->client, xua_cli_read_cb); + osmo_stream_cli_set_segmentation_cb(asp->client, NULL); + } osmo_stream_cli_set_data(asp->client, asp); byte = 1; /*AUTH is needed by ASCONF. enable, don't abort socket creation if AUTH can't be enabled */ osmo_stream_cli_set_param(asp->client, OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_AUTH_SUPPORTED, &byte, sizeof(byte)); @@ -727,50 +730,25 @@ } /* netif code tells us we can read something from the socket */ -int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn) +int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) { struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn); struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); - struct msgb *msg = NULL; - int rc; - /* read IPA message from socket and process it */ - rc = ipa_msg_recv_buffered(ofd->fd, &msg, &asp->pending_msg); - LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): ipa_msg_recv_buffered() returned %d\n", - __func__, rc); - if (rc <= 0) { - if (rc == -EAGAIN) { - /* more data needed */ - return 0; - } - osmo_stream_srv_destroy(conn); - return rc; - } - if (osmo_ipa_process_msg(msg) < 0) { - LOGPASP(asp, DLSS7, LOGL_ERROR, "Bad IPA message\n"); - osmo_stream_srv_destroy(conn); - msgb_free(msg); - return -1; - } msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); return ipa_rx_msg(asp, msg, ofd->fd & 0xf); } /* netif code tells us we can read something from the socket */ -int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn) +int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); - struct msgb *msg = m3ua_msgb_alloc("xUA Server Rx"); unsigned int ppid; int flags; - int rc; - - if (!msg) - return -ENOMEM; + int rc = 0; /* read xUA message from socket and process it */ - rc = osmo_stream_srv_recv(conn, msg); flags = msgb_sctp_msg_flags(msg); LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): sctp_recvmsg() returned %d (flags=0x%x)\n", @@ -789,22 +767,6 @@ default: break; } - - if (rc == 0) { - osmo_stream_srv_destroy(conn); - rc = -EBADF; - } else { - rc = 0; - } - goto out; - } - if (rc < 0) { - osmo_stream_srv_destroy(conn); - rc = -EBADF; - goto out; - } else if (rc == 0) { - osmo_stream_srv_destroy(conn); - rc = -EBADF; goto out; } @@ -875,49 +837,23 @@ } /* read call-back for IPA/SCCPlite socket */ -static int ipa_cli_read_cb(struct osmo_stream_cli *conn) +static int ipa_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg) { struct osmo_fd *ofd = osmo_stream_cli_get_ofd(conn); struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); - struct msgb *msg = NULL; - int rc; - /* read IPA message from socket and process it */ - rc = ipa_msg_recv_buffered(ofd->fd, &msg, &asp->pending_msg); - LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): ipa_msg_recv_buffered() returned %d\n", - __func__, rc); - if (rc <= 0) { - if (rc == -EAGAIN) { - /* more data needed */ - return 0; - } - xua_cli_close_and_reconnect(conn); - return rc; - } - if (osmo_ipa_process_msg(msg) < 0) { - LOGPASP(asp, DLSS7, LOGL_ERROR, "Bad IPA message\n"); - xua_cli_close_and_reconnect(conn); - msgb_free(msg); - return -1; - } msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); return ipa_rx_msg(asp, msg, ofd->fd & 0xf); } -static int xua_cli_read_cb(struct osmo_stream_cli *conn) +static int xua_cli_read_cb(struct osmo_stream_cli *conn, struct msgb *msg) { struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); - struct msgb *msg = m3ua_msgb_alloc("xUA Client Rx"); unsigned int ppid; int flags; int rc; - if (!msg) - return -ENOMEM; - - /* read xUA message from socket and process it */ - rc = osmo_stream_cli_recv(conn, msg); flags = msgb_sctp_msg_flags(msg); LOGPASP(asp, DLSS7, LOGL_DEBUG, "%s(): sctp_recvmsg() returned %d (flags=0x%x)\n", @@ -936,17 +872,6 @@ default: break; } - - if (rc == 0) - xua_cli_close_and_reconnect(conn); - rc = 0; - goto out; - } - if (rc < 0) { - xua_cli_close_and_reconnect(conn); - goto out; - } else if (rc == 0) { - xua_cli_close_and_reconnect(conn); goto out; } diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c index 32266ff..963783f 100644 --- a/src/osmo_ss7_xua_srv.c +++ b/src/osmo_ss7_xua_srv.c @@ -71,15 +71,7 @@ LOGP(DLSS7, LOGL_INFO, "%s: New %s connection accepted\n", sock_name, proto_name); - if (oxs->cfg.proto == OSMO_SS7_ASP_PROT_IPA) { - srv = osmo_stream_srv_create(oxs, link, fd, - ss7_asp_ipa_srv_conn_cb, - ss7_asp_xua_srv_conn_closed_cb, NULL); - } else { - srv = osmo_stream_srv_create(oxs, link, fd, - ss7_asp_xua_srv_conn_cb, - ss7_asp_xua_srv_conn_closed_cb, NULL); - } + srv = osmo_stream_srv_create2(oxs, link, fd, NULL); if (!srv) { LOGP(DLSS7, LOGL_ERROR, "%s: Unable to create stream server " "for connection\n", sock_name); @@ -87,6 +79,14 @@ talloc_free(sock_name); return -1; } + if (oxs->cfg.proto == OSMO_SS7_ASP_PROT_IPA) { + osmo_stream_srv_set_read_cb(srv, ss7_asp_ipa_srv_conn_cb); + osmo_stream_srv_set_segmentation_cb(srv, osmo_ipa_segmentation_cb); + } else { + osmo_stream_srv_set_read_cb(srv, ss7_asp_xua_srv_conn_cb); + osmo_stream_srv_set_segmentation_cb(srv, NULL); + } + osmo_stream_srv_set_closed_cb(srv, ss7_asp_xua_srv_conn_closed_cb); asp = ss7_asp_find_by_socket_addr(fd); if (asp) { diff --git a/src/ss7_internal.h b/src/ss7_internal.h index e2d78d8..827380d 100644 --- a/src/ss7_internal.h +++ b/src/ss7_internal.h @@ -22,8 +22,8 @@ struct osmo_ss7_asp *ss7_asp_find_by_socket_addr(int fd); int ss7_asp_proto_to_ip_proto(enum osmo_ss7_asp_protocol proto); -int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn); -int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn); +int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg); +int ss7_asp_xua_srv_conn_cb(struct osmo_stream_srv *conn, struct msgb *msg); int ss7_asp_xua_srv_conn_closed_cb(struct osmo_stream_srv *srv); int ss7_asp_apply_peer_primary_address(const struct osmo_ss7_asp *asp); int ss7_asp_apply_primary_address(const struct osmo_ss7_asp *asp); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35070?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I7d02037990f4af405839309510dc6c04e36c3369 Gerrit-Change-Number: 35070 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

[S] Change in libosmo-netif[master]: stream_{cli,srv}: Add support for SCTP in OSMO_IO mode

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35069?usp=email ) Change subject: stream_{cli,srv}: Add support for SCTP in OSMO_IO mode ...................................................................... stream_{cli,srv}: Add support for SCTP in OSMO_IO mode Let's enable the OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND mode for SCTP sockets, allowing OSMO_STREAM_MODE_OSMO_IO to be used with SCTP. Change-Id: I6cf5bad5f618e71c80017960c38009b089dbd6a1 Depends: libosmocore Change-Id: I89eb519b22d21011d61a7855b2364bc3c295df82 Closes: OS#5753 --- M TODO-RELEASE M src/stream_cli.c M src/stream_srv.c 3 files changed, 26 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/69/35069/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..8b70043 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-netif update-dependency libosmocore > 1.9.0 required for I89eb519b22d21011d61a7855b2364bc3c295df82 diff --git a/src/stream_cli.c b/src/stream_cli.c index ef571cc..0be897f 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -890,8 +890,12 @@ goto error_close_socket; break; case OSMO_STREAM_MODE_OSMO_IO: - if (!cli->iofd) - cli->iofd = osmo_iofd_setup(cli, fd, cli->name, OSMO_IO_FD_MODE_READ_WRITE, &osmo_stream_cli_ioops, cli); + if (!cli->iofd) { + enum osmo_io_fd_mode iofd_mode = OSMO_IO_FD_MODE_READ_WRITE; + if (cli->proto == IPPROTO_SCTP) + iofd_mode = OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND; + cli->iofd = osmo_iofd_setup(cli, fd, cli->name, iofd_mode, &osmo_stream_cli_ioops, cli); + } if (!cli->iofd) goto error_close_socket; configure_cli_segmentation_cb(cli->iofd, cli->segmentation_cb); diff --git a/src/stream_srv.c b/src/stream_srv.c index 1370e42..2677d38 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -724,9 +724,13 @@ osmo_stream_srv_create2(void *ctx, struct osmo_stream_srv_link *link, int fd, void *data) { struct osmo_stream_srv *conn; + enum osmo_io_fd_mode iofd_mode = OSMO_IO_FD_MODE_READ_WRITE; OSMO_ASSERT(link); + if (link->proto == IPPROTO_SCTP) + iofd_mode = OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND; + conn = talloc_zero(ctx, struct osmo_stream_srv); if (conn == NULL) return NULL; @@ -736,8 +740,7 @@ osmo_sock_get_name_buf(conn->sockname, sizeof(conn->sockname), fd); - conn->iofd = osmo_iofd_setup(conn, fd, conn->sockname, - OSMO_IO_FD_MODE_READ_WRITE, &srv_ioops, conn); + conn->iofd = osmo_iofd_setup(conn, fd, conn->sockname, iofd_mode, &srv_ioops, conn); if (!conn->iofd) { talloc_free(conn); return NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35069?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6cf5bad5f618e71c80017960c38009b089dbd6a1 Gerrit-Change-Number: 35069 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: WIP: osmo_io: SCTP support

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35068?usp=email ) Change subject: WIP: osmo_io: SCTP support ...................................................................... WIP: osmo_io: SCTP support Add support osmo_io operations resembling sctp_send() and sctp_recvmsg() that is provided by libsctp of lk-sctp. Change-Id: I89eb519b22d21011d61a7855b2364bc3c295df82 Related: OS#5751 --- M include/osmocom/core/osmo_io.h M src/core/osmo_io.c M src/core/osmo_io_internal.h M src/core/osmo_io_poll.c M src/core/osmo_io_uring.c 5 files changed, 158 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/35068/1 diff --git a/include/osmocom/core/osmo_io.h b/include/osmocom/core/osmo_io.h index 46e1a53..f144bef 100644 --- a/include/osmocom/core/osmo_io.h +++ b/include/osmocom/core/osmo_io.h @@ -14,6 +14,19 @@ #define LOGPIO(iofd, level, fmt, args...) \ LOGP(DLIO, level, "iofd(%s)" fmt, iofd->name, ## args) +// FIXME: This must avoid clashing with the existing definitions in libosmo-netif!!! +// +/*! \brief Access SCTP flags from the msgb control buffer */ +#define OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION 0x80 /* sctp_recvmsg() flags=MSG_NOTIFICATION, msgb_data() contains "union sctp_notification*" */ +#define msgb_sctp_msg_flags(msg) (msg)->cb[2] + +/*! \brief Access the SCTP PPID from the msgb control buffer */ +#define msgb_sctp_ppid(msg) (msg)->cb[3] +/*! \brief Access the SCTP Stream ID from the msgb control buffer */ +#define msgb_sctp_stream(msg) (msg)->cb[4] +// END FIXME + +struct sctp_sndrcvinfo; struct osmo_io_fd; enum osmo_io_fd_mode { @@ -66,6 +79,17 @@ struct msgb *msg, const struct osmo_sockaddr *daddr); }; + /* mode OSMO_IO_FD_MODE_SCTP_RECVMSG_SENDMSG: */ + struct { + /* call-back function emulating sctp_recvmsg */ + int (*sctp_recvmsg_cb)(struct osmo_io_fd *iofd, int res, + struct msgb *msg, + const struct osmo_sockaddr *saddr, + struct sctp_sndrcvinfo *sinfo); + + /* call-back function emulating sctp_send */ + int (*sctp_send_cb)(struct osmo_io_fd *iofd, int res, struct msgb *msg); + }; }; }; diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index c1a639a..5ff540f 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -329,6 +329,8 @@ * \param[in] hdr serialized msghdr containing state of completed I/O */ void iofd_handle_recv(struct osmo_io_fd *iofd, struct msgb *msg, int rc, struct iofd_msghdr *hdr) { + struct cmsghdr *cmsg = NULL; + talloc_steal(iofd->msgb_alloc.ctx, msg); switch (iofd->mode) { case OSMO_IO_FD_MODE_READ_WRITE: @@ -338,7 +340,25 @@ iofd->io_ops.recvfrom_cb(iofd, rc, msg, &hdr->osa); break; case OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND: - /* TODO Implement */ + msgb_sctp_msg_flags(msg) = 0; + if (hdr->hdr.msg_flags & MSG_NOTIFICATION) { + msgb_sctp_msg_flags(msg) = OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION; + } else { + for (cmsg = CMSG_FIRSTHDR(&hdr->hdr); cmsg != NULL; + cmsg = CMSG_NXTHDR(&hdr->hdr, cmsg)) { + if (cmsg->cmsg_level == IPPROTO_SCTP && cmsg->cmsg_type == SCTP_SNDRCV) { + struct sctp_sndrcvinfo *sinfo = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg); + msgb_sctp_ppid(msg) = htonl(sinfo->sinfo_ppid); + msgb_sctp_stream(msg) = sinfo->sinfo_stream; + break; + } + } + if (rc > 0 && !cmsg) + printf("sctp_recvmsg without SNDRCV cmsg?!?\n"); + } + iofd->io_ops.sctp_recvmsg_cb(iofd, rc, msg, &hdr->osa, cmsg ? (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg) : NULL); + break; + default: OSMO_ASSERT(false); break; } @@ -432,6 +452,63 @@ return 0; } +/*! Send a message through a connected SCTP socket, similar to sctp_sendmsg(). + * + * Appends the message to the internal transmit queue. + * If the function returns success (0), it will take ownership of the msgb and + * internally call msgb_free() after the write request completes. + * In case of an error the msgb needs to be freed by the caller. + * \param[in] iofd file descriptor to write to + * \param[in] msg message buffer to send; uses msgb_sctp_ppid/msg_sctp_stream + * \param[in] sendmsg_flags Flags to pass to the send call + * \returns 0 in case of success; a negative value in case of error + */ +int osmo_iofd_sctp_send_msgb(struct osmo_io_fd *iofd, struct msgb *msg, int sendmsg_flags) +{ + int rc; + struct cmsghdr *cmsg; + struct sctp_sndrcvinfo *sinfo; + + OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND); + if (OSMO_UNLIKELY(!iofd->io_ops.sctp_send_cb)) { + LOGPIO(iofd, LOGL_ERROR, "sctp_send_cb not set, Rejecting msgb\n"); + return -EINVAL; + } + + struct iofd_msghdr *msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_SCTP_SEND, msg); + if (!msghdr) + return -ENOMEM; + + msghdr->flags = sendmsg_flags; + msghdr->iov[0].iov_base = msgb_data(msghdr->msg); + msghdr->iov[0].iov_len = msgb_length(msghdr->msg); + msghdr->hdr.msg_iov = &msghdr->iov[0]; + msghdr->hdr.msg_iovlen = 1; + + /* put together sctp_sndrcvinfo, just like libsctp's sctp_sensmsg() */ + msghdr->hdr.msg_control = msghdr->cmsg; + msghdr->hdr.msg_controllen = sizeof(msghdr->cmsg); + + cmsg = CMSG_FIRSTHDR(&msghdr->hdr); + cmsg->cmsg_level = IPPROTO_SCTP; + cmsg->cmsg_type = SCTP_SNDRCV; + cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo)); + msghdr->hdr.msg_controllen = cmsg->cmsg_len; + sinfo = (struct sctp_sndrcvinfo *) CMSG_DATA(cmsg); + sinfo->sinfo_ppid = msgb_sctp_ppid(msg); + sinfo->sinfo_stream = msgb_sctp_stream(msg); + + rc = iofd_txqueue_enqueue(iofd, msghdr); + if (rc < 0) { + iofd_msghdr_free(msghdr); + LOGPIO(iofd, LOGL_ERROR, "enqueueing message failed (%d). Rejecting msgb\n", rc); + return rc; + } + + return 0; + +} + /*! Allocate and setup a new iofd. * \param[in] ctx the parent context from which to allocate * \param[in] fd the underlying system file descriptor @@ -452,6 +529,7 @@ switch (mode) { case OSMO_IO_FD_MODE_READ_WRITE: case OSMO_IO_FD_MODE_RECVFROM_SENDTO: + case OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND: break; default: return NULL; @@ -697,6 +775,11 @@ osmo_iofd_ops.read_disable(iofd); break; case OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND: + if (iofd->io_ops.sctp_recvmsg_cb) + osmo_iofd_ops.read_enable(iofd); + else + osmo_iofd_ops.read_disable(iofd); + break; default: OSMO_ASSERT(0); } @@ -707,7 +790,8 @@ * \param[in] iofd the file descriptor */ void osmo_iofd_notify_connected(struct osmo_io_fd *iofd) { - OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_READ_WRITE); + OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_READ_WRITE || + iofd->mode == OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND); osmo_iofd_ops.write_enable(iofd); } diff --git a/src/core/osmo_io_internal.h b/src/core/osmo_io_internal.h index 73a81e1..ccb3dfc 100644 --- a/src/core/osmo_io_internal.h +++ b/src/core/osmo_io_internal.h @@ -4,6 +4,7 @@ #include <unistd.h> #include <stdbool.h> +#include <netinet/sctp.h> #include <osmocom/core/osmo_io.h> #include <osmocom/core/linuxlist.h> @@ -107,7 +108,8 @@ IOFD_ACT_WRITE, IOFD_ACT_RECVFROM, IOFD_ACT_SENDTO, - // TODO: SCTP_* + IOFD_ACT_SCTP_RECVMSG, + IOFD_ACT_SCTP_SEND, }; @@ -123,6 +125,8 @@ /*! io-vector we need to pass as argument to sendmsg/recvmsg; is set up * to point into msg below */ struct iovec iov[1]; + /*! control message buffer for passing sctp_sndrcvinfo along */ + char cmsg[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))]; /*! flags we pass as argument to sendmsg / recvmsg */ int flags; diff --git a/src/core/osmo_io_poll.c b/src/core/osmo_io_poll.c index 2c1e422..0d10033 100644 --- a/src/core/osmo_io_poll.c +++ b/src/core/osmo_io_poll.c @@ -64,6 +64,10 @@ .msg_name = &hdr.osa.u.sa, .msg_namelen = sizeof(struct osmo_sockaddr), }; + if (iofd->mode == OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND) { + hdr.hdr.msg_control = hdr.cmsg; + hdr.hdr.msg_controllen = sizeof(hdr.cmsg); + } rc = recvmsg(ofd->fd, &hdr.hdr, flags); if (rc > 0) @@ -99,7 +103,7 @@ iofd->io_ops.sendto_cb(iofd, rc, msg, &msghdr->osa); break; case OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND: - OSMO_ASSERT(false); + iofd->io_ops.sctp_send_cb(iofd, rc, msg); break; } diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index c96d430..1fc11de 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -3,6 +3,7 @@ * * (C) 2022-2023 by sysmocom s.f.m.c. * Author: Daniel Willmann <daniel(a)sysmocom.de> + * (C) 2023 by Harald Welte <laforge(a)osmocom.org> * * All Rights Reserved. * @@ -35,6 +36,8 @@ #include <stdbool.h> #include <errno.h> +#include <netinet/in.h> +#include <netinet/sctp.h> #include <sys/eventfd.h> #include <liburing.h> @@ -126,6 +129,10 @@ switch (action) { case IOFD_ACT_READ: break; + case IOFD_ACT_SCTP_RECVMSG: + msghdr->hdr.msg_control = msghdr->cmsg; + msghdr->hdr.msg_controllen = sizeof(msghdr->cmsg); + /* fall-through */ case IOFD_ACT_RECVFROM: msghdr->hdr.msg_iov = &msghdr->iov[0]; msghdr->hdr.msg_iovlen = 1; @@ -146,6 +153,7 @@ case IOFD_ACT_READ: io_uring_prep_readv(sqe, iofd->fd, msghdr->iov, 1, 0); break; + case IOFD_ACT_SCTP_RECVMSG: case IOFD_ACT_RECVFROM: io_uring_prep_recvmsg(sqe, iofd->fd, &msghdr->hdr, msghdr->flags); break; @@ -211,12 +219,20 @@ goto out; } - if (msghdr->action == IOFD_ACT_WRITE) + switch (msghdr->action) { + case IOFD_ACT_WRITE: iofd->io_ops.write_cb(iofd, rc, msg); - else if (msghdr->action == IOFD_ACT_SENDTO) + break; + case IOFD_ACT_SENDTO: iofd->io_ops.sendto_cb(iofd, rc, msg, &msghdr->osa); - else + break; + case IOFD_ACT_SCTP_SEND: + iofd->io_ops.sctp_send_cb(iofd, rc, msg); + break; + default: OSMO_ASSERT(0); + break; + } out_free: msgb_free(msghdr->msg); @@ -239,10 +255,12 @@ switch (msghdr->action) { case IOFD_ACT_READ: case IOFD_ACT_RECVFROM: + case IOFD_ACT_SCTP_RECVMSG: iofd_uring_handle_recv(msghdr, res); break; case IOFD_ACT_WRITE: case IOFD_ACT_SENDTO: + case IOFD_ACT_SCTP_SEND: iofd_uring_handle_tx(msghdr, res); break; default: @@ -302,6 +320,7 @@ switch (msghdr->action) { case IOFD_ACT_WRITE: case IOFD_ACT_SENDTO: + case IOFD_ACT_SCTP_SEND: io_uring_prep_sendmsg(sqe, msghdr->iofd->fd, &msghdr->hdr, msghdr->flags); break; default: @@ -405,6 +424,9 @@ case OSMO_IO_FD_MODE_RECVFROM_SENDTO: iofd_uring_submit_recv(iofd, IOFD_ACT_RECVFROM); break; + case OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND: + iofd_uring_submit_recv(iofd, IOFD_ACT_SCTP_RECVMSG); + break; default: OSMO_ASSERT(0); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35068?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I89eb519b22d21011d61a7855b2364bc3c295df82 Gerrit-Change-Number: 35068 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

[S] Change in osmo-ci[master]: ansible: add raspbian11build container on lx2 machine

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35059?usp=email ) Change subject: ansible: add raspbian11build container on lx2 machine ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35059?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I739e40cf6ef8d77585dfeb067ed75e258d94bbb3 Gerrit-Change-Number: 35059 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 20 Nov 2023 06:58:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in osmo-ci[master]: ansible/jenkins-slave/osmo-ci: Install 'make' required for osmo-ci

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35060?usp=email ) Change subject: ansible/jenkins-slave/osmo-ci: Install 'make' required for osmo-ci ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35060?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I785e4224e729accec15beaa3aef8e01f12624d9d Gerrit-Change-Number: 35060 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 20 Nov 2023 06:58:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in osmo-ci[master]: ttcn3-slave: Install sudo

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35058?usp=email ) Change subject: ttcn3-slave: Install sudo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35058?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2d50ef2dee8e060ff4f84810f2bba62d4801d638 Gerrit-Change-Number: 35058 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 20 Nov 2023 06:57:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in osmo-ci[master]: hosts: Add build4-obsworker

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35057?usp=email ) Change subject: hosts: Add build4-obsworker ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35057?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0c663fa281042aa98822d27a67add8ba07dca172 Gerrit-Change-Number: 35057 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 20 Nov 2023 06:57:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in osmo-ci[master]: obs-worker: support more recent opensuse versions

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35056?usp=email ) Change subject: obs-worker: support more recent opensuse versions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35056?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I96f9896c0eeab120633d5800198d8b93371f7a5a Gerrit-Change-Number: 35056 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 20 Nov 2023 06:56:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in osmo-ci[master]: obs-mirror: rsync over from remote server via rsync

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35016?usp=email ) Change subject: obs-mirror: rsync over from remote server via rsync ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35016?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id490690394db9eb773f945ad4d7e65fe7fd5e17a Gerrit-Change-Number: 35016 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 20 Nov 2023 06:56:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc: split off f_mo_call_establish__handle_assignment_request()

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35052?usp=email ) Change subject: msc: split off f_mo_call_establish__handle_assignment_request() ...................................................................... Patch Set 2: (1 comment) File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35052/comment/209e3952_ea40… PS2, Line 1557: f_mo_call_establish__handle_assignment_request > yes, the idea is that it is a sub-part of f_mo_call_establish(), and to not confuse the reader into […] Fine with me, just wanted to clarify :) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35052?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I98c6171a592dfe1573e15136c4ecf4ff234048d7 Gerrit-Change-Number: 35052 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 20 Nov 2023 05:59:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2023