laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/36267?usp=email )

Change subject: io_uring: check all operations in osmo_iofd_uring_init() ......................................................................

io_uring: check all operations in osmo_iofd_uring_init()

check all operations in osmo_iofd_uring_init() and panic if any of them fails.

Change-Id: I03752c0114cc6fad0c31fff6fff43072f36a50a7 --- M src/core/osmo_io_uring.c 1 file changed, 29 insertions(+), 4 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/36267/1

diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index 7c9593e..29b18ca 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -88,7 +88,8 @@ /*! initialize the uring and tie it into our event loop */ void osmo_iofd_uring_init(void) { - int rc; + int rc, evfd; + rc = io_uring_queue_init(IOFD_URING_ENTRIES, &g_ring.ring, 0); if (rc < 0) osmo_panic("failure during io_uring_queue_init(): %s\n", strerror(-rc)); @@ -98,10 +99,22 @@ io_uring_queue_exit(&g_ring.ring); osmo_panic("failure creating eventfd(0, 0) for io_uring: %s\n", strerror(-rc)); } + evfd = rc;

- osmo_fd_setup(&g_ring.event_ofd, rc, OSMO_FD_READ, iofd_uring_poll_cb, &g_ring.ring, 0); - osmo_fd_register(&g_ring.event_ofd); - io_uring_register_eventfd(&g_ring.ring, rc); + osmo_fd_setup(&g_ring.event_ofd, evfd, OSMO_FD_READ, iofd_uring_poll_cb, &g_ring.ring, 0); + rc = osmo_fd_register(&g_ring.event_ofd); + if (rc < 0) { + close(evfd); + io_uring_queue_exit(&g_ring.ring); + osmo_panic("failure registering io_uring-eventfd as osmo_fd: %d\n", rc); + } + rc = io_uring_register_eventfd(&g_ring.ring, rc); + if (rc < 0) { + osmo_fd_unregister(&g_ring.event_ofd); + close(evfd); + io_uring_queue_exit(&g_ring.ring); + osmo_panic("failure registering eventfd with io_uring: %s\n", strerror(-rc)); + } }