From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: [email protected], Anuj gupta <[email protected]>,
Jens Axboe <[email protected]>
Subject: [PATCH v2 6/6] io_uring/net: use io_is_compat()
Date: Mon, 24 Feb 2025 12:42:24 +0000 [thread overview]
Message-ID: <fff93d9d08243284c5db5d546be766a82e85c130.1740400452.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
Use io_is_compat() for consistency.
Signed-off-by: Pavel Begunkov <[email protected]>
---
io_uring/net.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/io_uring/net.c b/io_uring/net.c
index d22fa61539a3..e795253632d1 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -325,7 +325,7 @@ static int io_sendmsg_copy_hdr(struct io_kiocb *req,
iomsg->msg.msg_iter.nr_segs = 0;
#ifdef CONFIG_COMPAT
- if (unlikely(req->ctx->compat)) {
+ if (io_is_compat(req->ctx)) {
struct compat_msghdr cmsg;
ret = io_compat_msg_copy_hdr(req, iomsg, &cmsg, ITER_SOURCE);
@@ -436,10 +436,9 @@ int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
req->buf_list = NULL;
}
-#ifdef CONFIG_COMPAT
- if (req->ctx->compat)
+ if (io_is_compat(req->ctx))
sr->msg_flags |= MSG_CMSG_COMPAT;
-#endif
+
if (unlikely(!io_msg_alloc_async(req)))
return -ENOMEM;
if (req->opcode != IORING_OP_SENDMSG)
@@ -725,7 +724,7 @@ static int io_recvmsg_copy_hdr(struct io_kiocb *req,
iomsg->msg.msg_iter.nr_segs = 0;
#ifdef CONFIG_COMPAT
- if (unlikely(req->ctx->compat)) {
+ if (io_is_compat(req->ctx)) {
struct compat_msghdr cmsg;
ret = io_compat_msg_copy_hdr(req, iomsg, &cmsg, ITER_DEST);
@@ -837,10 +836,9 @@ int io_recvmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
return -EINVAL;
}
-#ifdef CONFIG_COMPAT
- if (req->ctx->compat)
+ if (io_is_compat(req->ctx))
sr->msg_flags |= MSG_CMSG_COMPAT;
-#endif
+
sr->nr_multishot_loops = 0;
return io_recvmsg_prep_setup(req);
}
@@ -1367,10 +1365,9 @@ int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
if (zc->msg_flags & MSG_DONTWAIT)
req->flags |= REQ_F_NOWAIT;
-#ifdef CONFIG_COMPAT
- if (req->ctx->compat)
+ if (io_is_compat(req->ctx))
zc->msg_flags |= MSG_CMSG_COMPAT;
-#endif
+
if (unlikely(!io_msg_alloc_async(req)))
return -ENOMEM;
if (req->opcode != IORING_OP_SENDMSG_ZC)
--
2.48.1
next prev parent reply other threads:[~2025-02-24 12:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-24 12:42 [PATCH v2 0/6] compile out ctx->compat reads Pavel Begunkov
2025-02-24 12:42 ` [PATCH v2 1/6] io_uring: introduce io_is_compat() Pavel Begunkov
2025-02-24 13:20 ` Anuj gupta
2025-02-24 12:42 ` [PATCH v2 2/6] io_uring/cmd: optimise !CONFIG_COMPAT flags setting Pavel Begunkov
2025-02-24 13:21 ` Anuj gupta
2025-02-24 12:42 ` [PATCH v2 3/6] io_uring/rw: compile out compat param passing Pavel Begunkov
2025-02-24 13:22 ` Anuj gupta
2025-02-24 12:42 ` [PATCH v2 4/6] io_uring/rw: shrink io_iov_compat_buffer_select_prep Pavel Begunkov
2025-02-24 12:42 ` [PATCH v2 5/6] io_uring/waitid: use io_is_compat() Pavel Begunkov
2025-02-24 13:23 ` Anuj gupta
2025-02-24 15:33 ` Caleb Sander Mateos
2025-02-24 16:12 ` Pavel Begunkov
2025-02-24 12:42 ` Pavel Begunkov [this message]
2025-02-24 13:23 ` [PATCH v2 6/6] io_uring/net: " Anuj gupta
2025-02-24 14:35 ` [PATCH v2 0/6] compile out ctx->compat reads Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fff93d9d08243284c5db5d546be766a82e85c130.1740400452.git.asml.silence@gmail.com \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox