* [PATCH] io_uring/net: clear msg_controllen on partial sendmsg retry
@ 2023-06-19 15:38 Jens Axboe
2023-06-20 7:56 ` Stefan Metzmacher
0 siblings, 1 reply; 3+ messages in thread
From: Jens Axboe @ 2023-06-19 15:38 UTC (permalink / raw)
To: io-uring; +Cc: Stefan Metzmacher
If we have cmsg attached AND we transferred partial data at least, clear
msg_controllen on retry so we don't attempt to send that again.
Cc: [email protected] # 5.10+
Fixes: cac9e4418f4c ("io_uring/net: save msghdr->msg_control for retries")
Reported-by: Stefan Metzmacher <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
---
diff --git a/io_uring/net.c b/io_uring/net.c
index 51b0f7fbb4f5..fe1c478c7dec 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -326,6 +326,7 @@ int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags)
if (ret == -EAGAIN && (issue_flags & IO_URING_F_NONBLOCK))
return io_setup_async_msg(req, kmsg, issue_flags);
if (ret > 0 && io_net_retry(sock, flags)) {
+ kmsg->msg.msg_controllen = 0;
sr->done_io += ret;
req->flags |= REQ_F_PARTIAL_IO;
return io_setup_async_msg(req, kmsg, issue_flags);
--
Jens Axboe
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] io_uring/net: clear msg_controllen on partial sendmsg retry
2023-06-19 15:38 [PATCH] io_uring/net: clear msg_controllen on partial sendmsg retry Jens Axboe
@ 2023-06-20 7:56 ` Stefan Metzmacher
2023-06-20 13:06 ` Jens Axboe
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Metzmacher @ 2023-06-20 7:56 UTC (permalink / raw)
To: Jens Axboe, io-uring
Hi Jens,
> If we have cmsg attached AND we transferred partial data at least, clear
> msg_controllen on retry so we don't attempt to send that again.
>
> Cc: [email protected] # 5.10+
> Fixes: cac9e4418f4c ("io_uring/net: save msghdr->msg_control for retries")
> Reported-by: Stefan Metzmacher <[email protected]>
> Signed-off-by: Jens Axboe <[email protected]>
>
> ---
>
> diff --git a/io_uring/net.c b/io_uring/net.c
> index 51b0f7fbb4f5..fe1c478c7dec 100644
> --- a/io_uring/net.c
> +++ b/io_uring/net.c
> @@ -326,6 +326,7 @@ int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags)
> if (ret == -EAGAIN && (issue_flags & IO_URING_F_NONBLOCK))
> return io_setup_async_msg(req, kmsg, issue_flags);
> if (ret > 0 && io_net_retry(sock, flags)) {
> + kmsg->msg.msg_controllen = 0;
> sr->done_io += ret;
> req->flags |= REQ_F_PARTIAL_IO;
> return io_setup_async_msg(req, kmsg, issue_flags);
>
Should we also set 'kmsg->msg.msg_control' to NULL?
metze
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] io_uring/net: clear msg_controllen on partial sendmsg retry
2023-06-20 7:56 ` Stefan Metzmacher
@ 2023-06-20 13:06 ` Jens Axboe
0 siblings, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2023-06-20 13:06 UTC (permalink / raw)
To: Stefan Metzmacher, io-uring
On 6/20/23 1:56?AM, Stefan Metzmacher wrote:
> Hi Jens,
>
>> If we have cmsg attached AND we transferred partial data at least, clear
>> msg_controllen on retry so we don't attempt to send that again.
>>
>> Cc: [email protected] # 5.10+
>> Fixes: cac9e4418f4c ("io_uring/net: save msghdr->msg_control for retries")
>> Reported-by: Stefan Metzmacher <[email protected]>
>> Signed-off-by: Jens Axboe <[email protected]>
>>
>> ---
>>
>> diff --git a/io_uring/net.c b/io_uring/net.c
>> index 51b0f7fbb4f5..fe1c478c7dec 100644
>> --- a/io_uring/net.c
>> +++ b/io_uring/net.c
>> @@ -326,6 +326,7 @@ int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags)
>> if (ret == -EAGAIN && (issue_flags & IO_URING_F_NONBLOCK))
>> return io_setup_async_msg(req, kmsg, issue_flags);
>> if (ret > 0 && io_net_retry(sock, flags)) {
>> + kmsg->msg.msg_controllen = 0;
>> sr->done_io += ret;
>> req->flags |= REQ_F_PARTIAL_IO;
>> return io_setup_async_msg(req, kmsg, issue_flags);
>>
>
> Should we also set 'kmsg->msg.msg_control' to NULL?
We could, but I don't think it matters as we gate any checks on that
anyway. But in terms of completeness, may as well I suppose.
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-20 13:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-19 15:38 [PATCH] io_uring/net: clear msg_controllen on partial sendmsg retry Jens Axboe
2023-06-20 7:56 ` Stefan Metzmacher
2023-06-20 13:06 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox