* [PATCH] genl: fix l_genl_family_cancel to wait for NLMSG_DONE
@ 2023-05-18 16:47 James Prestwood
2023-05-22 14:20 ` Denis Kenzior
0 siblings, 1 reply; 2+ messages in thread
From: James Prestwood @ 2023-05-18 16:47 UTC (permalink / raw)
To: ell; +Cc: James Prestwood
If a genl request was already sent to the kernel a call to
l_genl_family_cancel would remove it from the pending list
immediately. This then allowed l_genl_family_send to queue
another message before the previous/canceled message was
completed. This is not how l_genl is intended to work.
Instead we can clean up the request immediately in
l_genl_family_cancel but not remove it from the queue. This
will prevent any more messages from being sent until NLMSG_DONE
was received for the canceled message.
---
ell/genl.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/ell/genl.c b/ell/genl.c
index 4ed95df..006edf2 100644
--- a/ell/genl.c
+++ b/ell/genl.c
@@ -1910,11 +1910,23 @@ LIB_EXPORT bool l_genl_family_cancel(struct l_genl_family *family,
if (request)
goto done;
- request = l_queue_remove_if(genl->pending_list, match_request_id,
+ request = l_queue_find(genl->pending_list, match_request_id,
L_UINT_TO_PTR(id));
if (!request)
return false;
+ /*
+ * A message in-flight still needs to wait for NLMSG_DONE so clean up
+ * for the caller but keep the request queued until its done.
+ */
+ if (request->destroy)
+ request->destroy(request->user_data);
+
+ request->callback = NULL;
+ request->destroy = NULL;
+
+ return true;
+
done:
destroy_request(request);
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] genl: fix l_genl_family_cancel to wait for NLMSG_DONE
2023-05-18 16:47 [PATCH] genl: fix l_genl_family_cancel to wait for NLMSG_DONE James Prestwood
@ 2023-05-22 14:20 ` Denis Kenzior
0 siblings, 0 replies; 2+ messages in thread
From: Denis Kenzior @ 2023-05-22 14:20 UTC (permalink / raw)
To: James Prestwood, ell
Hi James,
On 5/18/23 11:47, James Prestwood wrote:
> If a genl request was already sent to the kernel a call to
> l_genl_family_cancel would remove it from the pending list
> immediately. This then allowed l_genl_family_send to queue
> another message before the previous/canceled message was
> completed. This is not how l_genl is intended to work.
>
> Instead we can clean up the request immediately in
> l_genl_family_cancel but not remove it from the queue. This
> will prevent any more messages from being sent until NLMSG_DONE
> was received for the canceled message.
> ---
> ell/genl.c | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
Applied, thanks.
Regards,
-Denis
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-22 14:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-18 16:47 [PATCH] genl: fix l_genl_family_cancel to wait for NLMSG_DONE James Prestwood
2023-05-22 14:20 ` Denis Kenzior
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).