* [PATCH for-6.9] io_uring/net: restore msg_control on sendzc retry
@ 2024-04-08 17:11 Pavel Begunkov
2024-04-09 3:48 ` Jens Axboe
2024-04-09 21:00 ` Jens Axboe
0 siblings, 2 replies; 3+ messages in thread
From: Pavel Begunkov @ 2024-04-08 17:11 UTC (permalink / raw)
To: io-uring; +Cc: Jens Axboe, asml.silence
cac9e4418f4cb ("io_uring/net: save msghdr->msg_control for retries")
reinstatiates msg_control before every __sys_sendmsg_sock(), since the
function can overwrite the value in msghdr. We need to do same for
zerocopy sendmsg.
Cc: [email protected]
Link: https://github.com/axboe/liburing/issues/1067
Signed-off-by: Pavel Begunkov <[email protected]>
---
io_uring/net.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/io_uring/net.c b/io_uring/net.c
index 1e7665ff6ef7..4afb475d4197 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -1276,6 +1276,7 @@ int io_sendmsg_zc(struct io_kiocb *req, unsigned int issue_flags)
if (req_has_async_data(req)) {
kmsg = req->async_data;
+ kmsg->msg.msg_control_user = sr->msg_control;
} else {
ret = io_sendmsg_copy_hdr(req, &iomsg);
if (ret)
--
2.44.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH for-6.9] io_uring/net: restore msg_control on sendzc retry
2024-04-08 17:11 [PATCH for-6.9] io_uring/net: restore msg_control on sendzc retry Pavel Begunkov
@ 2024-04-09 3:48 ` Jens Axboe
2024-04-09 21:00 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2024-04-09 3:48 UTC (permalink / raw)
To: Pavel Begunkov, io-uring
On 4/8/24 11:11 AM, Pavel Begunkov wrote:
> cac9e4418f4cb ("io_uring/net: save msghdr->msg_control for retries")
> reinstatiates msg_control before every __sys_sendmsg_sock(), since the
> function can overwrite the value in msghdr. We need to do same for
> zerocopy sendmsg.
I added:
Fixes: 493108d95f146 ("io_uring/net: zerocopy sendmsg")
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH for-6.9] io_uring/net: restore msg_control on sendzc retry
2024-04-08 17:11 [PATCH for-6.9] io_uring/net: restore msg_control on sendzc retry Pavel Begunkov
2024-04-09 3:48 ` Jens Axboe
@ 2024-04-09 21:00 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2024-04-09 21:00 UTC (permalink / raw)
To: io-uring, Pavel Begunkov
On Mon, 08 Apr 2024 18:11:09 +0100, Pavel Begunkov wrote:
> cac9e4418f4cb ("io_uring/net: save msghdr->msg_control for retries")
> reinstatiates msg_control before every __sys_sendmsg_sock(), since the
> function can overwrite the value in msghdr. We need to do same for
> zerocopy sendmsg.
>
>
Applied, thanks!
[1/1] io_uring/net: restore msg_control on sendzc retry
commit: 4fe82aedeb8a8cb09bfa60f55ab57b5c10a74ac4
Best regards,
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-09 21:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-08 17:11 [PATCH for-6.9] io_uring/net: restore msg_control on sendzc retry Pavel Begunkov
2024-04-09 3:48 ` Jens Axboe
2024-04-09 21:00 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox