Skip to contentSkip to conversation

lapi/io_uring: Add IORING_OP_READ/WRITE constants

PATCH Applied Martin Doucha 3 participants 4 messages Apr 27 – Apr 28

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 lapi/io_uring: Add IORING_OP_READ/WRITE constants

Add fallback definitions for IORING_OP_READ and IORING_OP_WRITE. These constants have been added in kernel v5.6 and older systems may lack them, which results in LTP build failures.

Fixes fcc4887e73 ("io_uring: Test IORING READ and WRITE operations")

---

Changes since v1:
- Fixed preprocessor conditions in io_uring.h

 configure.ac            |  2 ++
 include/lapi/io_uring.h | 10 ++++++++++
 2 files changed, 12 insertions(+)
configure.ac +2 -0
index 812f17d8b..4b789bfe3 100644
@@ -46,6 +46,8 @@ AC_CHECK_DECLS([MADV_MERGEABLE],,,[#include <sys/mman.h>])
 AC_CHECK_DECLS([NFTA_CHAIN_ID, NFTA_VERDICT_CHAIN_ID],,,[#include <linux/netfilter/nf_tables.h>])
 AC_CHECK_DECLS([PR_CAPBSET_DROP, PR_CAPBSET_READ],,,[#include <sys/prctl.h>])
 AC_CHECK_DECLS([SEM_STAT_ANY],,,[#include <sys/sem.h>])
+AC_CHECK_DECLS([IORING_OP_READ],,,[#include <linux/io_uring.h>])
+AC_CHECK_DECLS([IORING_OP_WRITE],,,[#include <linux/io_uring.h>])
 
 AC_CHECK_HEADERS_ONCE([ \
     aio.h \
include/lapi/io_uring.h +10 -0
index c05517595..2026863a2 100644
@@ -253,6 +253,16 @@ struct io_uring_probe {
 	struct io_uring_probe_op ops[0];
 };
 
+#else /* IOSQE_FIXED_FILE */
+
+#if !HAVE_DECL_IORING_OP_READ
+#define IORING_OP_READ 22
+#endif
+
+#if !HAVE_DECL_IORING_OP_WRITE
+#define IORING_OP_WRITE 23
+#endif
+
 #endif /* IOSQE_FIXED_FILE */
 
 #ifndef IOSQE_IO_HADRLINK
Signature · 5 lines
2.53.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
Reviewed-by LTP AI Reviewer on v2 1/1
#1 lore raw

Hi Martin,

include/lapi/io_uring.h struct io_uring_probe { · line 264

Quoted 11 lines · Martin Doucha

lapi/io_uring: Add IORING_OP_READ/WRITE constants

include/lapi/io_uring.h +9 -0
+#else /* IOSQE_FIXED_FILE */
+
+#if !HAVE_DECL_IORING_OP_READ
+#define IORING_OP_READ 22
+#endif
+
+#if !HAVE_DECL_IORING_OP_WRITE
+#define IORING_OP_WRITE 23
+#endif

Placement and values are correct: IOSQE_FIXED_FILE was introduced in v5.1, IORING_OP_READ/WRITE in v5.6, so this handles the v5.1-v5.5 gap cleanly.

---
Note:

Our agent completed the review of the patch.

The agent can sometimes produce false positives although often its findings are genuine. If you find issues with the review, please comment this email or ignore the suggestions.

Regards,
LTP AI Reviewer

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp