ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev_linuxaio.c
(Generate patch)

Comparing libev/ev_linuxaio.c (file contents):
Revision 1.23 by root, Mon Jun 24 21:34:47 2019 UTC vs.
Revision 1.30 by root, Tue Jun 25 17:54:02 2019 UTC

… …
35 * and other provisions required by the GPL. If you do not delete the 35 * and other provisions required by the GPL. If you do not delete the
36 * provisions above, a recipient may use your version of this file under 36 * provisions above, a recipient may use your version of this file under
37 * either the BSD or the GPL. 37 * either the BSD or the GPL.
38 */ 38 */
39 39
40#define EPOLL_FALLBACK 1 40/*
41 * general notes about linux aio:
42 *
43 * a) at first, the linux aio IOCB_CMD_POLL functionality introduced in
44 * 4.18 looks too good to be true: both watchers and events can be
45 * batched, and events can even be handled in userspace using
46 * a ring buffer shared with the kernel. watchers can be canceled
47 * regardless of whether the fd has been closed. no problems with fork.
48 * ok, the ring buffer is 200% undocumented (there isn't even a
49 * header file), but otherwise, it's pure bliss!
50 * b) ok, watchers are one-shot, so you have to re-arm active ones
51 * on every iteration. so much for syscall-less event handling,
52 * but at least these re-arms can be batched, no big deal, right?
53 * c) well, linux as usual: the documentation lies to you: io_submit
54 * sometimes returns EINVAL because the kernel doesn't feel like
55 * handling your poll mask - ttys can be polled for POLLOUT,
56 * POLLOUT|POLLIN, but polling for POLLIN fails. just great,
57 * so we have to fall back to something else (hello, epoll),
58 * but at least the fallback can be slow, because these are
59 * exceptional cases, right?
60 * d) hmm, you have to tell the kernel the maximum number of watchers
61 * you want to queue when initialising the aio context. but of
62 * course the real limit is magically calculated in the kernel, and
63 * is often higher then we asked for. so we just have to destroy
64 * the aio context and re-create it a bit larger if we hit the limit.
65 * (starts to remind you of epoll? well, it's a bit more deterministic
66 * and less gambling, but still ugly as hell).
67 * e) that's when you find out you can also hit an arbitrary system-wide
68 * limit. or the kernel simply doesn't want to handle your watchers.
69 * what the fuck do we do then? you guessed it, in the middle
70 * of event handling we have to switch to 100% epoll polling. and
71 * that better is as fast as normal epoll polling, so you practically
72 * have to use the normal epoll backend with all its quirks.
73 * f) end result of this train wreck: it inherits all the disadvantages
74 * from epoll, while adding a number on its own. why even bother to use
75 * it? because if conditions are right and your fds are supported and you
76 * don't hit a limit, this backend is actually faster, doesn't gamble with
77 * your fds, batches watchers and events and doesn't require costly state
78 * recreates. well, until it does.
79 * g) all of this makes this backend use almost twice as much code as epoll.
80 * which in turn uses twice as much code as poll. and that#s not counting
81 * the fact that this backend also depends on the epoll backend, making
82 * it three times as much code as poll, or kqueue.
83 * h) bleah. why can't linux just do kqueue. sure kqueue is ugly, but by now
84 * it's clear that whatever linux comes up with is far, far, far worse.
85 */
41 86
42#include <sys/time.h> /* actually linux/time.h, but we must assume they are compatible */ 87#include <sys/time.h> /* actually linux/time.h, but we must assume they are compatible */
43#include <poll.h> 88#include <poll.h>
44#include <linux/aio_abi.h> 89#include <linux/aio_abi.h>
45 90
46#if EPOLL_FALLBACK
47# include <sys/epoll.h>
48#endif
49
50/* we try to fill 4kB pages exactly.
51 * the ring buffer header is 32 bytes, every io event is 32 bytes.
52 * the kernel takes the io event number, doubles it, adds 2, adds the ring buffer.
53 * therefore the calculation below will use "exactly" 4kB for the ring buffer
54 */
55#define EV_LINUXAIO_DEPTH (128 / 2 - 2 - 1) /* max. number of io events per batch */
56
57/*****************************************************************************/ 91/*****************************************************************************/
58/* syscall wrapdadoop - this section has the raw syscall definitions */ 92/* syscall wrapdadoop - this section has the raw api/abi definitions */
59 93
60#include <sys/syscall.h> /* no glibc wrappers */ 94#include <sys/syscall.h> /* no glibc wrappers */
61 95
62/* aio_abi.h is not versioned in any way, so we cannot test for its existance */ 96/* aio_abi.h is not versioned in any way, so we cannot test for its existance */
63#define IOCB_CMD_POLL 5 97#define IOCB_CMD_POLL 5
64 98
65/* taken from linux/fs/aio.c */ 99/* taken from linux/fs/aio.c. yup, that's a .c file.
100 * not only is this totally undocumented, not even the source code
101 * can tell you what the future semantics of compat_features and
102 * incompat_features are, or what header_length actually is for.
103 */
66#define AIO_RING_MAGIC 0xa10a10a1 104#define AIO_RING_MAGIC 0xa10a10a1
67#define AIO_RING_INCOMPAT_FEATURES 0 105#define AIO_RING_INCOMPAT_FEATURES 0
68struct aio_ring 106struct aio_ring
69{ 107{
70 unsigned id; /* kernel internal index number */ 108 unsigned id; /* kernel internal index number */
… …
78 unsigned header_length; /* size of aio_ring */ 116 unsigned header_length; /* size of aio_ring */
79 117
80 struct io_event io_events[0]; 118 struct io_event io_events[0];
81}; 119};
82 120
121/*
122 * define some syscall wrappers for common architectures
123 * this is mostly for nice looks during debugging, not performance.
124 * our syscalls return < 0, not == -1, on error. which is good
125 * enough for linux aio.
126 * TODO: arm is also common nowadays, maybe even mips and x86
127 * TODO: after implementing this, it suddenly looks like overkill, but its hard to remove...
128 */
129#if __GNUC__ && __linux && ECB_AMD64
130
131 #define ev_syscall(nr,narg,arg1,arg2,arg3,arg4,arg5) \
132 ({ \
133 long res; \
134 register unsigned long r5 __asm__ ("r8" ); \
135 register unsigned long r4 __asm__ ("r10"); \
136 register unsigned long r3 __asm__ ("rdx"); \
137 register unsigned long r2 __asm__ ("rsi"); \
138 register unsigned long r1 __asm__ ("rdi"); \
139 if (narg >= 5) r5 = (unsigned long)(arg5); \
140 if (narg >= 4) r4 = (unsigned long)(arg4); \
141 if (narg >= 3) r3 = (unsigned long)(arg3); \
142 if (narg >= 2) r2 = (unsigned long)(arg2); \
143 if (narg >= 1) r1 = (unsigned long)(arg1); \
144 __asm__ __volatile__ ( \
145 "syscall\n\t" \
146 : "=a" (res) \
147 : "0" (nr), "r" (r1), "r" (r2), "r" (r3), "r" (r4), "r" (r5) \
148 : "cc", "r11", "cx", "memory"); \
149 errno = -res; \
150 res; \
151 })
152
153#endif
154
155#ifdef ev_syscall
156 #define ev_syscall0(nr) ev_syscall (nr, 0, 0, 0, 0, 0, 0
157 #define ev_syscall1(nr,arg1) ev_syscall (nr, 1, arg1, 0, 0, 0, 0)
158 #define ev_syscall2(nr,arg1,arg2) ev_syscall (nr, 2, arg1, arg2, 0, 0, 0)
159 #define ev_syscall3(nr,arg1,arg2,arg3) ev_syscall (nr, 3, arg1, arg2, arg3, 0, 0)
160 #define ev_syscall4(nr,arg1,arg2,arg3,arg4) ev_syscall (nr, 3, arg1, arg2, arg3, arg4, 0)
161 #define ev_syscall5(nr,arg1,arg2,arg3,arg4,arg5) ev_syscall (nr, 5, arg1, arg2, arg3, arg4, arg5)
162#else
163 #define ev_syscall0(nr) syscall (nr)
164 #define ev_syscall1(nr,arg1) syscall (nr, arg1)
165 #define ev_syscall2(nr,arg1,arg2) syscall (nr, arg1, arg2)
166 #define ev_syscall3(nr,arg1,arg2,arg3) syscall (nr, arg1, arg2, arg3)
167 #define ev_syscall4(nr,arg1,arg2,arg3,arg4) syscall (nr, arg1, arg2, arg3, arg4)
168 #define ev_syscall5(nr,arg1,arg2,arg3,arg4,arg5) syscall (nr, arg1, arg2, arg3, arg4, arg5)
169#endif
170
83inline_size 171inline_size
84int 172int
85evsys_io_setup (unsigned nr_events, aio_context_t *ctx_idp) 173evsys_io_setup (unsigned nr_events, aio_context_t *ctx_idp)
86{ 174{
87 return syscall (SYS_io_setup, nr_events, ctx_idp); 175 return ev_syscall2 (SYS_io_setup, nr_events, ctx_idp);
88} 176}
89 177
90inline_size 178inline_size
91int 179int
92evsys_io_destroy (aio_context_t ctx_id) 180evsys_io_destroy (aio_context_t ctx_id)
93{ 181{
94 return syscall (SYS_io_destroy, ctx_id); 182 return ev_syscall1 (SYS_io_destroy, ctx_id);
95} 183}
96 184
97inline_size 185inline_size
98int 186int
99evsys_io_submit (aio_context_t ctx_id, long nr, struct iocb *cbp[]) 187evsys_io_submit (aio_context_t ctx_id, long nr, struct iocb *cbp[])
100{ 188{
101 return syscall (SYS_io_submit, ctx_id, nr, cbp); 189 return ev_syscall3 (SYS_io_submit, ctx_id, nr, cbp);
102} 190}
103 191
104inline_size 192inline_size
105int 193int
106evsys_io_cancel (aio_context_t ctx_id, struct iocb *cbp, struct io_event *result) 194evsys_io_cancel (aio_context_t ctx_id, struct iocb *cbp, struct io_event *result)
107{ 195{
108 return syscall (SYS_io_cancel, ctx_id, cbp, result); 196 return ev_syscall3 (SYS_io_cancel, ctx_id, cbp, result);
109} 197}
110 198
111inline_size 199inline_size
112int 200int
113evsys_io_getevents (aio_context_t ctx_id, long min_nr, long nr, struct io_event *events, struct timespec *timeout) 201evsys_io_getevents (aio_context_t ctx_id, long min_nr, long nr, struct io_event *events, struct timespec *timeout)
114{ 202{
115 return syscall (SYS_io_getevents, ctx_id, min_nr, nr, events, timeout); 203 return ev_syscall5 (SYS_io_getevents, ctx_id, min_nr, nr, events, timeout);
116} 204}
117 205
118/*****************************************************************************/ 206/*****************************************************************************/
119/* actual backed implementation */ 207/* actual backed implementation */
120 208
209ecb_cold
210static int
211linuxaio_nr_events (EV_P)
212{
213 /* we start with 16 iocbs and incraese from there
214 * that's tiny, but the kernel has a rather low system-wide
215 * limit that can be reached quickly, so let's be parsimonious
216 * with this resource.
217 * Rest assured, the kernel generously rounds up small and big numbers
218 * in different ways (but doesn't seem to charge you for it).
219 * The 15 here is because the kernel usually has a power of two as aio-max-nr,
220 * and this helps to take advantage of that limit.
221 */
222
223 /* we try to fill 4kB pages exactly.
224 * the ring buffer header is 32 bytes, every io event is 32 bytes.
225 * the kernel takes the io requests number, doubles it, adds 2
226 * and adds the ring buffer.
227 * the way we use this is by starting low, and then roughly doubling the
228 * size each time we hit a limit.
229 */
230
231 int requests = 15 << linuxaio_iteration;
232 int one_page = (4096
233 / sizeof (struct io_event) ) / 2; /* how many fit into one page */
234 int first_page = ((4096 - sizeof (struct aio_ring))
235 / sizeof (struct io_event) - 2) / 2; /* how many fit into the first page */
236
237 /* if everything fits into one page, use count exactly */
238 if (requests > first_page)
239 /* otherwise, round down to full pages and add the first page */
240 requests = requests / one_page * one_page + first_page;
241
242 return requests;
243}
244
121/* we use out own wrapper structure in acse we ever want to do something "clever" */ 245/* we use out own wrapper structure in case we ever want to do something "clever" */
122typedef struct aniocb 246typedef struct aniocb
123{ 247{
124 struct iocb io; 248 struct iocb io;
125 /*int inuse;*/ 249 /*int inuse;*/
126} *ANIOCBP; 250} *ANIOCBP;
… …
129void 253void
130linuxaio_array_needsize_iocbp (ANIOCBP *base, int offset, int count) 254linuxaio_array_needsize_iocbp (ANIOCBP *base, int offset, int count)
131{ 255{
132 while (count--) 256 while (count--)
133 { 257 {
134 /* TODO: quite the overhead to allocate every iocb separately, maybe use our own alocator? */ 258 /* TODO: quite the overhead to allocate every iocb separately, maybe use our own allocator? */
135 ANIOCBP iocb = (ANIOCBP)ev_malloc (sizeof (*iocb)); 259 ANIOCBP iocb = (ANIOCBP)ev_malloc (sizeof (*iocb));
136 260
137 /* full zero initialise is probably not required at the moment, but 261 /* full zero initialise is probably not required at the moment, but
138 * this is not well documented, so we better do it. 262 * this is not well documented, so we better do it.
139 */ 263 */
… …
161linuxaio_modify (EV_P_ int fd, int oev, int nev) 285linuxaio_modify (EV_P_ int fd, int oev, int nev)
162{ 286{
163 array_needsize (ANIOCBP, linuxaio_iocbps, linuxaio_iocbpmax, fd + 1, linuxaio_array_needsize_iocbp); 287 array_needsize (ANIOCBP, linuxaio_iocbps, linuxaio_iocbpmax, fd + 1, linuxaio_array_needsize_iocbp);
164 ANIOCBP iocb = linuxaio_iocbps [fd]; 288 ANIOCBP iocb = linuxaio_iocbps [fd];
165 289
166#if EPOLL_FALLBACK
167 if (iocb->io.aio_reqprio < 0) 290 if (iocb->io.aio_reqprio < 0)
168 { 291 {
292 /* we handed this fd over to epoll, so undo this first */
293 /* we do it manually because the optimisations on epoll_modfy won't do us any good */
169 epoll_ctl (backend_fd, EPOLL_CTL_DEL, fd, 0); 294 epoll_ctl (backend_fd, EPOLL_CTL_DEL, fd, 0);
295 anfds [fd].emask = 0;
170 iocb->io.aio_reqprio = 0; 296 iocb->io.aio_reqprio = 0;
171 } 297 }
172#endif
173 298
174 if (iocb->io.aio_buf) 299 if (iocb->io.aio_buf)
175 evsys_io_cancel (linuxaio_ctx, &iocb->io, (struct io_event *)0); /* always returns an error relevant kernels */ 300 /* io_cancel always returns some error on relevant kernels, but works */
301 evsys_io_cancel (linuxaio_ctx, &iocb->io, (struct io_event *)0);
176 302
177 if (nev) 303 if (nev)
178 { 304 {
179 iocb->io.aio_buf = 305 iocb->io.aio_buf =
180 (nev & EV_READ ? POLLIN : 0) 306 (nev & EV_READ ? POLLIN : 0)
… …
186 array_needsize (struct iocb *, linuxaio_submits, linuxaio_submitmax, linuxaio_submitcnt, array_needsize_noinit); 312 array_needsize (struct iocb *, linuxaio_submits, linuxaio_submitmax, linuxaio_submitcnt, array_needsize_noinit);
187 linuxaio_submits [linuxaio_submitcnt - 1] = &iocb->io; 313 linuxaio_submits [linuxaio_submitcnt - 1] = &iocb->io;
188 } 314 }
189} 315}
190 316
191#if EPOLL_FALLBACK
192
193static void
194linuxaio_rearm_epoll (EV_P_ struct iocb *iocb, int op)
195{
196 struct epoll_event eev;
197
198 eev.events = EPOLLONESHOT;
199 if (iocb->aio_buf & POLLIN ) eev.events |= EPOLLIN ;
200 if (iocb->aio_buf & POLLOUT) eev.events |= EPOLLOUT;
201 eev.data.fd = iocb->aio_fildes;
202
203 if (epoll_ctl (backend_fd, op, iocb->aio_fildes, &eev) < 0)
204 ev_syserr ("(libeio) linuxaio epoll_ctl");
205}
206
207static void 317static void
208linuxaio_epoll_cb (EV_P_ struct ev_io *w, int revents) 318linuxaio_epoll_cb (EV_P_ struct ev_io *w, int revents)
209{ 319{
210 struct epoll_event events[16]; 320 epoll_poll (EV_A_ 0);
211
212 for (;;)
213 {
214 int idx;
215 int res = epoll_wait (backend_fd, events, sizeof (events) / sizeof (events [0]), 0);
216
217 if (expect_false (res < 0))
218 ev_syserr ("(libev) linuxaio epoll_wait");
219 else if (!res)
220 break;
221
222 for (idx = res; idx--; )
223 {
224 int fd = events [idx].data.fd;
225 uint32_t ev = events [idx].events;
226
227 assert (("libev: iocb fd must be in-bounds", fd >= 0 && fd < anfdmax));
228
229 linuxaio_rearm_epoll (EV_A_ &linuxaio_iocbps [fd]->io, EPOLL_CTL_MOD);
230
231 fd_event (EV_A_ fd,
232 (ev & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
233 | (ev & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0));
234 }
235
236 if (res < sizeof (events) / sizeof (events [0]))
237 break;
238 }
239} 321}
240 322
241#endif 323static void
324linuxaio_fd_rearm (EV_P_ int fd)
325{
326 anfds [fd].events = 0;
327 linuxaio_iocbps [fd]->io.aio_buf = 0;
328 fd_change (EV_A_ fd, EV_ANFD_REIFY);
329}
242 330
243static void 331static void
244linuxaio_parse_events (EV_P_ struct io_event *ev, int nr) 332linuxaio_parse_events (EV_P_ struct io_event *ev, int nr)
245{ 333{
246 while (nr) 334 while (nr)
247 { 335 {
248 int fd = ev->data; 336 int fd = ev->data;
249 int res = ev->res; 337 int res = ev->res;
250 338
251 assert (("libev: iocb fd must be in-bounds", fd >= 0 && fd < anfdmax)); 339 assert (("libev: iocb fd must be in-bounds", fd >= 0 && fd < anfdmax));
252
253 /* linux aio is oneshot: rearm fd. TODO: this does more work than needed */
254 linuxaio_iocbps [fd]->io.aio_buf = 0;
255 anfds [fd].events = 0;
256 fd_change (EV_A_ fd, 0);
257 340
258 /* feed events, we do not expect or handle POLLNVAL */ 341 /* feed events, we do not expect or handle POLLNVAL */
259 fd_event ( 342 fd_event (
260 EV_A_ 343 EV_A_
261 fd, 344 fd,
262 (res & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0) 345 (res & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0)
263 | (res & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0) 346 | (res & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
264 ); 347 );
265 348
349 /* linux aio is oneshot: rearm fd. TODO: this does more work than needed */
350 linuxaio_fd_rearm (EV_A_ fd);
351
266 --nr; 352 --nr;
267 ++ev; 353 ++ev;
268 } 354 }
269} 355}
270 356
271/* get any events from ringbuffer, return true if any were handled */ 357/* get any events from ring buffer, return true if any were handled */
272static int 358static int
273linuxaio_get_events_from_ring (EV_P) 359linuxaio_get_events_from_ring (EV_P)
274{ 360{
275 struct aio_ring *ring = (struct aio_ring *)linuxaio_ctx; 361 struct aio_ring *ring = (struct aio_ring *)linuxaio_ctx;
276 362
… …
299 { 385 {
300 linuxaio_parse_events (EV_A_ ring->io_events + head, ring->nr - head); 386 linuxaio_parse_events (EV_A_ ring->io_events + head, ring->nr - head);
301 linuxaio_parse_events (EV_A_ ring->io_events, tail); 387 linuxaio_parse_events (EV_A_ ring->io_events, tail);
302 } 388 }
303 389
304 /* TODO: we only need a compiler barrier here, not a read fence */
305 ECB_MEMORY_FENCE_RELEASE; 390 ECB_MEMORY_FENCE_RELEASE;
306 /* as an extension to C, we hope that the volatile will make this atomic and once-only */ 391 /* as an extension to C, we hope that the volatile will make this atomic and once-only */
307 *(volatile unsigned *)&ring->head = tail; 392 *(volatile unsigned *)&ring->head = tail;
308 /* make sure kernel can see our new head value - probably not required */
309 ECB_MEMORY_FENCE_RELEASE;
310 393
311 return 1; 394 return 1;
312} 395}
313 396
314/* read at least one event from kernel, or timeout */ 397/* read at least one event from kernel, or timeout */
… …
347 linuxaio_parse_events (EV_A_ ioev, res); 430 linuxaio_parse_events (EV_A_ ioev, res);
348 linuxaio_get_events_from_ring (EV_A); 431 linuxaio_get_events_from_ring (EV_A);
349 } 432 }
350} 433}
351 434
435static int
436linuxaio_io_setup (EV_P)
437{
438 linuxaio_ctx = 0;
439 return evsys_io_setup (linuxaio_nr_events (EV_A), &linuxaio_ctx);
440}
441
352static void 442static void
353linuxaio_poll (EV_P_ ev_tstamp timeout) 443linuxaio_poll (EV_P_ ev_tstamp timeout)
354{ 444{
355 int submitted; 445 int submitted;
356 446
357 /* first phase: submit new iocbs */ 447 /* first phase: submit new iocbs */
358 448
359 /* io_submit might return less than the requested number of iocbs */ 449 /* io_submit might return less than the requested number of iocbs */
360 /* this is, afaics, only because of errors, but we go by the book and use a loop, */ 450 /* this is, afaics, only because of errors, but we go by the book and use a loop, */
361 /* which allows us to pinpoint the errornous iocb */ 451 /* which allows us to pinpoint the erroneous iocb */
362 for (submitted = 0; submitted < linuxaio_submitcnt; ) 452 for (submitted = 0; submitted < linuxaio_submitcnt; )
363 { 453 {
364#if 0
365 int res;
366 if (linuxaio_submits[submitted]->aio_fildes == backend_fd)
367 res = evsys_io_submit (linuxaio_ctx, 1, linuxaio_submits + submitted);
368 else
369 { res = -1; errno = EINVAL; };
370#else
371 int res = evsys_io_submit (linuxaio_ctx, linuxaio_submitcnt - submitted, linuxaio_submits + submitted); 454 int res = evsys_io_submit (linuxaio_ctx, linuxaio_submitcnt - submitted, linuxaio_submits + submitted);
372#endif
373 455
374 if (expect_false (res < 0)) 456 if (expect_false (res < 0))
375 if (errno == EAGAIN)
376 {
377 /* This happens when the ring buffer is full, at least. I assume this means
378 * that the event was queued synchronously during io_submit, and thus
379 * the buffer overflowed.
380 * In this case, we just try in next loop iteration.
381 * This should not result in a few fds taking priority, as the interface
382 * is one-shot, and we submit iocb's in a round-robin fashion.
383 * TODO: maybe make "submitted" persistent, so we don't have to memmove?
384 */
385 if (ecb_expect_false (submitted))
386 {
387 memmove (linuxaio_submits, linuxaio_submits + submitted, (linuxaio_submitcnt - submitted) * sizeof (*linuxaio_submits));
388 linuxaio_submitcnt -= submitted;
389 }
390
391 timeout = 0;
392 break;
393 }
394#if EPOLL_FALLBACK
395 else if (errno == EINVAL) 457 if (errno == EINVAL)
396 { 458 {
397 /* This happens for unsupported fds, officially, but in my testing, 459 /* This happens for unsupported fds, officially, but in my testing,
398 * also randomly happens for supported fds. We fall back to good old 460 * also randomly happens for supported fds. We fall back to good old
399 * poll() here, under the assumption that this is a very rare case. 461 * poll() here, under the assumption that this is a very rare case.
400 * See https://lore.kernel.org/patchwork/patch/1047453/ to see 462 * See https://lore.kernel.org/patchwork/patch/1047453/ to see
401 * discussion about such a case (ttys) where polling for POLLIN 463 * discussion about such a case (ttys) where polling for POLLIN
402 * fails but POLLIN|POLLOUT works. 464 * fails but POLLIN|POLLOUT works.
403 */ 465 */
404 struct iocb *iocb = linuxaio_submits [submitted]; 466 struct iocb *iocb = linuxaio_submits [submitted];
405 467 epoll_modify (EV_A_ iocb->aio_fildes, 0, anfds [iocb->aio_fildes].events);
406 linuxaio_rearm_epoll (EV_A_ linuxaio_submits [submitted], EPOLL_CTL_ADD);
407 iocb->aio_reqprio = -1; /* mark iocb as epoll */ 468 iocb->aio_reqprio = -1; /* mark iocb as epoll */
408 469
409 res = 1; /* skip this iocb */ 470 res = 1; /* skip this iocb - another iocb, another chance */
410 } 471 }
411#endif 472 else if (errno == EAGAIN)
473 {
474 /* This happens when the ring buffer is full, or some other shit we
475 * don't know and isn't documented. Most likely because we have too
476 * many requests and linux aio can't be assed to handle them.
477 * In this case, we try to allocate a larger ring buffer, freeing
478 * ours first. This might fail, in which case we have to fall back to 100%
479 * epoll.
480 * God, how I hate linux not getting its act together. Ever.
481 */
482 evsys_io_destroy (linuxaio_ctx);
483 linuxaio_submitcnt = 0;
484
485 /* rearm all fds with active iocbs */
486 {
487 int fd;
488 for (fd = 0; fd < linuxaio_iocbpmax; ++fd)
489 if (linuxaio_iocbps [fd]->io.aio_buf)
490 linuxaio_fd_rearm (EV_A_ fd);
491 }
492
493 ++linuxaio_iteration;
494 if (linuxaio_io_setup (EV_A) < 0)
495 {
496 /* to bad, we can't get a new aio context, go 100% epoll */
497 linuxaio_free_iocbp (EV_A);
498 ev_io_stop (EV_A_ &linuxaio_epoll_w);
499 ev_ref (EV_A);
500 linuxaio_ctx = 0;
501 backend_modify = epoll_modify;
502 backend_poll = epoll_poll;
503 }
504
505 timeout = 0;
506 /* it's easiest to handle this mess in another iteration */
507 return;
508 }
412 else if (errno == EBADF) 509 else if (errno == EBADF)
413 { 510 {
414 fd_kill (EV_A_ linuxaio_submits [submitted]->aio_fildes); 511 fd_kill (EV_A_ linuxaio_submits [submitted]->aio_fildes);
415 512
416 res = 1; /* skip this iocb */ 513 res = 1; /* skip this iocb */
… …
432int 529int
433linuxaio_init (EV_P_ int flags) 530linuxaio_init (EV_P_ int flags)
434{ 531{
435 /* would be great to have a nice test for IOCB_CMD_POLL instead */ 532 /* would be great to have a nice test for IOCB_CMD_POLL instead */
436 /* also: test some semi-common fd types, such as files and ttys in recommended_backends */ 533 /* also: test some semi-common fd types, such as files and ttys in recommended_backends */
437#if EPOLL_FALLBACK 534 /* 4.18 introduced IOCB_CMD_POLL, 4.19 made epoll work, and we need that */
438 /* 4.19 made epoll work */
439 if (ev_linux_version () < 0x041300) 535 if (ev_linux_version () < 0x041300)
440 return 0; 536 return 0;
441#else 537
442 /* 4.18 introduced IOCB_CMD_POLL */ 538 if (!epoll_init (EV_A_ 0))
443 if (ev_linux_version () < 0x041200)
444 return 0; 539 return 0;
445#endif
446 540
447 linuxaio_ctx = 0; 541 linuxaio_iteration = 0;
448 if (evsys_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0)
449 return 0;
450 542
451#if EPOLL_FALLBACK 543 if (linuxaio_io_setup (EV_A) < 0)
452 backend_fd = ev_epoll_create ();
453 if (backend_fd < 0)
454 { 544 {
455 evsys_io_destroy (linuxaio_ctx); 545 epoll_destroy (EV_A);
456 return 0; 546 return 0;
457 } 547 }
458 548
459 ev_io_init (EV_A_ &linuxaio_epoll_w, linuxaio_epoll_cb, backend_fd, EV_READ); 549 ev_io_init (EV_A_ &linuxaio_epoll_w, linuxaio_epoll_cb, backend_fd, EV_READ);
460 ev_set_priority (&linuxaio_epoll_w, EV_MAXPRI); 550 ev_set_priority (&linuxaio_epoll_w, EV_MAXPRI);
461 ev_io_start (EV_A_ &linuxaio_epoll_w); 551 ev_io_start (EV_A_ &linuxaio_epoll_w);
462 ev_unref (EV_A); /* watcher should not keep loop alive */ 552 ev_unref (EV_A); /* watcher should not keep loop alive */
463#endif
464 553
465 backend_modify = linuxaio_modify; 554 backend_modify = linuxaio_modify;
466 backend_poll = linuxaio_poll; 555 backend_poll = linuxaio_poll;
467 556
468 linuxaio_iocbpmax = 0; 557 linuxaio_iocbpmax = 0;
… …
477 566
478inline_size 567inline_size
479void 568void
480linuxaio_destroy (EV_P) 569linuxaio_destroy (EV_P)
481{ 570{
482#if EPOLL_FALLBACK 571 epoll_destroy (EV_A);
483 close (backend_fd);
484#endif
485 linuxaio_free_iocbp (EV_A); 572 linuxaio_free_iocbp (EV_A);
486 evsys_io_destroy (linuxaio_ctx); 573 evsys_io_destroy (linuxaio_ctx);
487} 574}
488 575
489inline_size 576inline_size
… …
492{ 579{
493 /* this frees all iocbs, which is very heavy-handed */ 580 /* this frees all iocbs, which is very heavy-handed */
494 linuxaio_destroy (EV_A); 581 linuxaio_destroy (EV_A);
495 linuxaio_submitcnt = 0; /* all pointers were invalidated */ 582 linuxaio_submitcnt = 0; /* all pointers were invalidated */
496 583
497 linuxaio_ctx = 0; 584 linuxaio_iteration = 0; /* we start over in the child */
498 while (evsys_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0) 585
586 while (linuxaio_io_setup (EV_A) < 0)
499 ev_syserr ("(libev) linuxaio io_setup"); 587 ev_syserr ("(libev) linuxaio io_setup");
500 588
501#if EPOLL_FALLBACK 589 epoll_fork (EV_A);
502 while ((backend_fd = ev_epoll_create ()) < 0)
503 ev_syserr ("(libev) linuxaio epoll_create");
504 590
505 ev_io_stop (EV_A_ &linuxaio_epoll_w); 591 ev_io_stop (EV_A_ &linuxaio_epoll_w);
506 ev_io_init (EV_A_ &linuxaio_epoll_w, linuxaio_epoll_cb, backend_fd, EV_READ); 592 ev_io_set (EV_A_ &linuxaio_epoll_w, backend_fd, EV_READ);
507 ev_io_start (EV_A_ &linuxaio_epoll_w); 593 ev_io_start (EV_A_ &linuxaio_epoll_w);
508#endif
509 594
595 /* epoll_fork already did this. hopefully */
510 fd_rearm_all (EV_A); 596 /*fd_rearm_all (EV_A);*/
511} 597}
512 598

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines