1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
|
Description: Handle backlog of UNIX socket too
Author: Pierre Ducroquet <pducroquet@entrouvert.com>
Source: upstream, https://github.com/unbit/uwsgi/pull/2493
Forwarded: https://github.com/unbit/uwsgi/pull/2493
The cheaper subsystem specifies that "backlog is only available on Linux
and only on TCP sockets (not UNIX domain sockets)."
This commit specifically implement this: UNIX domain socket support for
backlog on Linux, using Netlink to call the kernel and get the queue status.
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- uwsgi.git.orig/core/master.c 2025-02-07 14:18:16.922375818 +0100
+++ uwsgi.git/core/master.c 2025-02-07 14:18:16.918375745 +0100
@@ -232,6 +232,13 @@
#ifdef UNBIT
#define SIOBKLGQ 0x8908
+#else
+
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#include <linux/unix_diag.h>
+#include <linux/sock_diag.h>
+
#endif
#ifdef SIOBKLGQ
@@ -245,7 +252,141 @@
uwsgi_sock->max_queue = (uint64_t) uwsgi.listen_queue;
}
}
+#else
+
+static int get_socket_inode_from_fd(int fd) {
+ int inode = -1;
+ char source_link_path[32];
+ char link_target[32];
+ sprintf(source_link_path, "/proc/self/fd/%i", fd);
+ if (readlink(source_link_path, link_target, 32) > 0)
+ sscanf(link_target, "socket:[%i]", &inode);
+ return inode;
+}
+
+static void send_netlink_query_for_inode(int fd, int target_ino) {
+ struct sockaddr_nl nladdr = {.nl_family = AF_NETLINK};
+ struct {
+ struct nlmsghdr nlh;
+ struct unix_diag_req udr;
+ } req = {
+ .nlh = {
+ .nlmsg_len = sizeof(req),
+ .nlmsg_type = SOCK_DIAG_BY_FAMILY,
+ .nlmsg_flags = NLM_F_REQUEST
+ },
+ .udr = {
+ .sdiag_family = AF_UNIX,
+ .udiag_show = UDIAG_SHOW_RQLEN,
+ .udiag_ino = target_ino,
+ .udiag_cookie = {-1, -1}
+ }
+ };
+ struct iovec iov = {.iov_base = &req, .iov_len = sizeof(req)};
+ struct msghdr msg = {
+ .msg_name = &nladdr,
+ .msg_namelen = sizeof(nladdr),
+ .msg_iov = &iov,
+ .msg_iovlen = 1
+ };
+
+ for (;;) {
+ if (sendmsg(fd, &msg, 0) < 0) {
+ if (errno == EINTR)
+ continue;
+
+ perror("sendmsg");
+ return;
+ }
+
+ return;
+ }
+}
+
+static int receive_netlink_answers(int fd, uint64_t *current_queue, uint64_t *max_queue) {
+ long buf[8192 / sizeof(long)];
+ struct sockaddr_nl nladdr;
+ struct iovec iov = {.iov_base = buf, .iov_len = sizeof(buf)};
+ int flags = 0;
+
+ for (;;) {
+ struct msghdr msg = {
+ .msg_name = &nladdr,
+ .msg_namelen = sizeof(nladdr),
+ .msg_iov = &iov,
+ .msg_iovlen = 1
+ };
+
+ ssize_t ret = recvmsg(fd, &msg, flags);
+
+ if (ret < 0) {
+ if (errno == EINTR)
+ continue;
+
+ perror("recvmsg");
+ return -1;
+ }
+ if (ret == 0)
+ return 0;
+
+ if (nladdr.nl_family != AF_NETLINK) {
+ fputs("!AF_NETLINK\n", stderr);
+ return -1;
+ }
+
+ const struct nlmsghdr *h = (struct nlmsghdr *)buf;
+
+ if (!NLMSG_OK(h, ret)) {
+ fputs("!NLMSG_OK\n", stderr);
+ return -1;
+ }
+
+ for (; NLMSG_OK(h, ret); h = NLMSG_NEXT(h, ret)) {
+ if (h->nlmsg_type == NLMSG_DONE)
+ return 0;
+ if (h->nlmsg_type == NLMSG_ERROR) {
+ const struct nlmsgerr *err = NLMSG_DATA(h);
+ if (h->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) {
+ fputs("NLMSG_ERROR\n", stderr);
+ } else {
+ errno = -err->error;
+ perror("NLMSG_ERROR");
+ }
+ return -1;
+ }
+ if (h->nlmsg_type != SOCK_DIAG_BY_FAMILY) {
+ fprintf(stderr, "unexpected nlmsg_type %u\n", (unsigned)h->nlmsg_type);
+ return -1;
+ }
+
+ // Now extract queue len from results
+ const struct unix_diag_msg *diag = NLMSG_DATA(h);
+ unsigned int rta_len = h->nlmsg_len - NLMSG_LENGTH(sizeof(*diag));
+
+ for (struct rtattr *attr = (struct rtattr *)(diag + 1); RTA_OK(attr, rta_len); attr = RTA_NEXT(attr, rta_len)) {
+ switch (attr->rta_type) {
+ case UNIX_DIAG_RQLEN:
+ *current_queue = ((struct unix_diag_rqlen *) RTA_DATA(attr))->udiag_rqueue;
+ *max_queue = ((struct unix_diag_rqlen *) RTA_DATA(attr))->udiag_wqueue;
+ break;
+ }
+ }
+ }
+ return 0;
+ }
+}
+
+static void get_linux_unix_socket_queue(struct uwsgi_socket *uwsgi_sock) {
+ int fd = uwsgi_sock->fd;
+ int inode = get_socket_inode_from_fd(fd);
+ int diag_socket = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_SOCK_DIAG);
+ send_netlink_query_for_inode(diag_socket, inode);
+ receive_netlink_answers(diag_socket, &uwsgi_sock->queue, &uwsgi_sock->max_queue);
+ close(diag_socket);
+}
+
#endif
+
#endif
static void master_check_listen_queue() {
@@ -255,15 +396,16 @@
while(uwsgi_sock) {
if (uwsgi_sock->family == AF_INET || uwsgi_sock->family == AF_INET6) {
get_tcp_info(uwsgi_sock);
- }
+ }
+ else if (uwsgi_sock->family == AF_UNIX) {
#ifdef __linux__
#ifdef SIOBKLGQ
- else if (uwsgi_sock->family == AF_UNIX) {
- get_linux_unbit_SIOBKLGQ(uwsgi_sock);
- }
+ get_linux_unbit_SIOBKLGQ(uwsgi_sock);
+#else
+ get_linux_unix_socket_queue(uwsgi_sock);
#endif
#endif
-
+ }
if (uwsgi_sock->queue > backlog) {
backlog = uwsgi_sock->queue;
}
|
