shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

Merge pull request #30764 from yuwata/network-queue-fix-assertion

Browse Source 
network/queue: exit from loop of processing request when a new request is queued
This commit is contained in:
Luca Boccassi 2024-01-10 19:27:57 +00:00 committed by GitHub
commit 311f80cee2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/network/networkd-manager.h
View File

@ -100,6 +100,7 @@ struct Manager {
FirewallContext *fw_ctx;
bool request_queued;
OrderedSet *request_queue;
Hashmap *tuntap_fds_by_name;

70
src/network/networkd-queue.c
View File

@ -168,6 +168,10 @@ static int request_new(
if (req->counter)
(*req->counter)++;
/* If this is called in the ORDERED_SET_FOREACH() loop of manager_process_requests(), we need to
* exit from the loop, due to the limitation of the iteration on OrderedSet. */
manager->request_queued = true;
if (ret)
*ret = req;
@ -215,51 +219,49 @@ int link_queue_request_full(
}
int manager_process_requests(Manager *manager) {
Request *req;
int r;
assert(manager);
for (;;) {
bool processed = false;
Request *req;
manager->request_queued = false;
ORDERED_SET_FOREACH(req, manager->request_queue) {
_cleanup_(link_unrefp) Link *link = link_ref(req->link);
ORDERED_SET_FOREACH(req, manager->request_queue) {
_cleanup_(link_unrefp) Link *link = link_ref(req->link);
assert(req->process);
assert(req->process);
if (req->waiting_reply)
continue; /* Waiting for netlink reply. */
if (req->waiting_reply)
continue; /* Waiting for netlink reply. */
/* Typically, requests send netlink message asynchronously. If there are many requests
* queued, then this event may make reply callback queue in sd-netlink full. */
if (netlink_get_reply_callback_count(manager->rtnl) >= REPLY_CALLBACK_COUNT_THRESHOLD ||
netlink_get_reply_callback_count(manager->genl) >= REPLY_CALLBACK_COUNT_THRESHOLD ||
fw_ctx_get_reply_callback_count(manager->fw_ctx) >= REPLY_CALLBACK_COUNT_THRESHOLD)
return 0;
/* Typically, requests send netlink message asynchronously. If there are many requests
* queued, then this event may make reply callback queue in sd-netlink full. */
if (netlink_get_reply_callback_count(manager->rtnl) >= REPLY_CALLBACK_COUNT_THRESHOLD ||
netlink_get_reply_callback_count(manager->genl) >= REPLY_CALLBACK_COUNT_THRESHOLD ||
fw_ctx_get_reply_callback_count(manager->fw_ctx) >= REPLY_CALLBACK_COUNT_THRESHOLD)
return 0;
r = req->process(req, link, req->userdata);
if (r == 0)
continue;
processed = true;
/* If the request sends netlink message, e.g. for Address or so, the Request object
* is referenced by the netlink slot, and will be detached later by its destroy callback.
* Otherwise, e.g. for DHCP client or so, detach the request from queue now. */
if (!req->waiting_reply)
request_detach(manager, req);
if (r < 0 && link) {
link_enter_failed(link);
/* link_enter_failed() may remove multiple requests,
* hence we need to exit from the loop. */
break;
}
r = req->process(req, link, req->userdata);
if (r == 0) { /* The request is not ready. */
if (manager->request_queued)
break; /* a new request is queued during processing the request. */
continue;
}
/* When at least one request is processed, then another request may be ready now. */
if (!processed)
/* If the request sends netlink message, e.g. for Address or so, the Request object is
* referenced by the netlink slot, and will be detached later by its destroy callback.
* Otherwise, e.g. for DHCP client or so, detach the request from queue now. */
if (!req->waiting_reply)
request_detach(manager, req);
if (r < 0 && link) {
link_enter_failed(link);
/* link_enter_failed() may remove multiple requests,
* hence we need to exit from the loop. */
break;
}
if (manager->request_queued)
break;
}