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.1 by root, Thu Jun 20 22:44:59 2019 UTC vs.
Revision 1.11 by root, Sun Jun 23 22:57:25 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
41
40#include <sys/time.h> /* actually linux/time.h, but we must assume they are compatible */ 42#include <sys/time.h> /* actually linux/time.h, but we must assume they are compatible */
43#include <poll.h>
41#include <linux/aio_abi.h> 44#include <linux/aio_abi.h>
42 45
46#if EPOLL_FALLBACK
47# include <sys/epoll.h>
48#endif
49
43/* we try to fill 4kn pages exactly. 50/* we try to fill 4kB pages exactly.
44 * the ring buffer header is 32 bytes, every io event is 32 bytes. 51 * the ring buffer header is 32 bytes, every io event is 32 bytes.
45 * the kernel takes the io event number, doubles it, adds 2, adds the ring buffer 52 * the kernel takes the io event number, doubles it, adds 2, adds the ring buffer.
46 * so the calculation below will use "exactly" 8kB for the ring buffer 53 * therefore the calculation below will use "exactly" 4kB for the ring buffer
47 */ 54 */
48#define EV_LINUXAIO_DEPTH (256 / 2 - 2 - 1) /* max. number of io events per batch */ 55#define EV_LINUXAIO_DEPTH (128 / 2 - 2 - 1) /* max. number of io events per batch */
49 56
50/*****************************************************************************/ 57/*****************************************************************************/
51/* syscall wrapdadoop */ 58/* syscall wrapdadoop */
52 59
53#include <sys/syscall.h> /* no glibc wrappers */ 60#include <sys/syscall.h> /* no glibc wrappers */
54 61
55/* aio_abi.h is not verioned in any way, so we cannot test for its existance */ 62/* aio_abi.h is not versioned in any way, so we cannot test for its existance */
56#define IOCB_CMD_POLL 5 63#define IOCB_CMD_POLL 5
57 64
58/* taken from linux/fs/aio.c */ 65/* taken from linux/fs/aio.c */
59#define AIO_RING_MAGIC 0xa10a10a1 66#define AIO_RING_MAGIC 0xa10a10a1
60#define AIO_RING_INCOMPAT_FEATURES 0 67#define AIO_RING_INCOMPAT_FEATURES 0
… …
71 unsigned header_length; /* size of aio_ring */ 78 unsigned header_length; /* size of aio_ring */
72 79
73 struct io_event io_events[0]; 80 struct io_event io_events[0];
74}; 81};
75 82
76static int 83inline_size
84int
77ev_io_setup (unsigned nr_events, aio_context_t *ctx_idp) 85ev_io_setup (unsigned nr_events, aio_context_t *ctx_idp)
78{ 86{
79 return syscall (SYS_io_setup, nr_events, ctx_idp); 87 return syscall (SYS_io_setup, nr_events, ctx_idp);
80} 88}
81 89
82static int 90inline_size
91int
83ev_io_destroy (aio_context_t ctx_id) 92ev_io_destroy (aio_context_t ctx_id)
84{ 93{
85 return syscall (SYS_io_destroy, ctx_id); 94 return syscall (SYS_io_destroy, ctx_id);
86} 95}
87 96
88static int 97inline_size
98int
89ev_io_submit (aio_context_t ctx_id, long nr, struct iocb *cbp[]) 99ev_io_submit (aio_context_t ctx_id, long nr, struct iocb *cbp[])
90{ 100{
91 return syscall (SYS_io_submit, ctx_id, nr, cbp); 101 return syscall (SYS_io_submit, ctx_id, nr, cbp);
92} 102}
93 103
94static int 104inline_size
105int
95ev_io_cancel (aio_context_t ctx_id, struct iocb *cbp, struct io_event *result) 106ev_io_cancel (aio_context_t ctx_id, struct iocb *cbp, struct io_event *result)
96{ 107{
97 return syscall (SYS_io_cancel, ctx_id, cbp, result); 108 return syscall (SYS_io_cancel, ctx_id, cbp, result);
98} 109}
99 110
100static int 111inline_size
112int
101ev_io_getevents (aio_context_t ctx_id, long min_nr, long nr, struct io_event *events, struct timespec *timeout) 113ev_io_getevents (aio_context_t ctx_id, long min_nr, long nr, struct io_event *events, struct timespec *timeout)
102{ 114{
103 return syscall (SYS_io_getevents, ctx_id, min_nr, nr, events, timeout); 115 return syscall (SYS_io_getevents, ctx_id, min_nr, nr, events, timeout);
104} 116}
105
106typedef void (*ev_io_cb) (long nr, struct io_event *events);
107 117
108/*****************************************************************************/ 118/*****************************************************************************/
109/* actual backed implementation */ 119/* actual backed implementation */
110 120
111/* two iocbs for every fd, one for read, one for write */ 121/* we use out own wrapper structure in acse we ever want to do something "clever" */
112typedef struct aniocb 122typedef struct aniocb
113{ 123{
114 struct iocb io; 124 struct iocb io;
115 /*int inuse;*/ 125 /*int inuse;*/
116} *ANIOCBP; 126} *ANIOCBP;
117 127
118inline_size 128inline_size
119void 129void
120linuxaio_array_needsize_iocbp (ANIOCBP *base, int count) 130linuxaio_array_needsize_iocbp (ANIOCBP *base, int count)
121{ 131{
122 /* TODO: quite the overhead to allocate every iocb separately */ 132 /* TODO: quite the overhead to allocate every iocb separately, maybe use our own alocator? */
123 while (count--) 133 while (count--)
124 { 134 {
125 *base = (ANIOCBP)ev_malloc (sizeof (**base)); 135 *base = (ANIOCBP)ev_malloc (sizeof (**base));
136 /* TODO: full zero initialize required? */
126 memset (*base, 0, sizeof (**base)); 137 memset (*base, 0, sizeof (**base));
127 /* would be nice to initialize fd/data as well */ 138 /* would be nice to initialize fd/data as well, but array_needsize API doesn't support that */
128 (*base)->io.aio_lio_opcode = IOCB_CMD_POLL; 139 (*base)->io.aio_lio_opcode = IOCB_CMD_POLL;
129 ++base; 140 ++base;
130 } 141 }
131} 142}
132 143
144ecb_cold
133static void 145static void
134linuxaio_free_iocbp (EV_P) 146linuxaio_free_iocbp (EV_P)
135{ 147{
136 while (linuxaio_iocbpmax--) 148 while (linuxaio_iocbpmax--)
137 ev_free (linuxaio_iocbps [linuxaio_iocbpmax]); 149 ev_free (linuxaio_iocbps [linuxaio_iocbpmax]);
138 150
139 linuxaio_iocbpmax = 0; 151 linuxaio_iocbpmax = 0; /* next resize will completely reallocate the array, at some overhead */
140} 152}
141 153
142static void 154static void
143linuxaio_modify (EV_P_ int fd, int oev, int nev) 155linuxaio_modify (EV_P_ int fd, int oev, int nev)
144{ 156{
145 /* TODO: full zero initialize required? */
146 array_needsize (ANIOCBP, linuxaio_iocbps, linuxaio_iocbpmax, fd + 1, linuxaio_array_needsize_iocbp); 157 array_needsize (ANIOCBP, linuxaio_iocbps, linuxaio_iocbpmax, fd + 1, linuxaio_array_needsize_iocbp);
147 struct aniocb *iocb = linuxaio_iocbps [fd]; 158 struct aniocb *iocb = linuxaio_iocbps [fd];
148 159
160#if EPOLL_FALLBACK
161 if (iocb->io.aio_reqprio < 0)
162 {
163 epoll_ctl (backend_fd, EPOLL_CTL_DEL, fd, 0);
164 iocb->io.aio_reqprio = 0;
165 }
166#endif
167
149 if (iocb->io.aio_buf) 168 if (iocb->io.aio_buf)
150 ev_io_cancel (linuxaio_ctx, &iocb->io, (void *)0); 169 ev_io_cancel (linuxaio_ctx, &iocb->io, (struct io_event *)0); /* always returns an error relevant kernels */
151 170
152 if (nev) 171 if (nev)
153 { 172 {
154 iocb->io.aio_data = fd; 173 iocb->io.aio_data = fd;
155 iocb->io.aio_fildes = fd; 174 iocb->io.aio_fildes = fd;
… …
171 while (nr) 190 while (nr)
172 { 191 {
173 int fd = ev->data; 192 int fd = ev->data;
174 int res = ev->res; 193 int res = ev->res;
175 194
176 assert (("libev: iocb fd must be in-bounds", fd >= 0 && fd < anfdxmax)); 195 assert (("libev: iocb fd must be in-bounds", fd >= 0 && fd < anfdmax));
177 196
178 /* linux aio is oneshot: rearm fd */ 197 /* linux aio is oneshot: rearm fd */
179 linuxaio_iocbps [fd]->io.aio_buf = 0; 198 linuxaio_iocbps [fd]->io.aio_buf = 0;
180 anfds [fd].events = 0; 199 anfds [fd].events = 0;
181 fd_change (EV_A_ fd, 0); 200 fd_change (EV_A_ fd, 0);
… …
200static int 219static int
201linuxaio_get_events_from_ring (EV_P) 220linuxaio_get_events_from_ring (EV_P)
202{ 221{
203 struct aio_ring *ring = (struct aio_ring *)linuxaio_ctx; 222 struct aio_ring *ring = (struct aio_ring *)linuxaio_ctx;
204 223
205 ECB_MEMORY_FENCE_ACQUIRE;
206
207 unsigned head = ring->head; 224 unsigned head = ring->head;
208 unsigned tail = *(volatile unsigned *)&ring->tail; 225 unsigned tail = *(volatile unsigned *)&ring->tail;
209 226
210 if (ring->magic != AIO_RING_MAGIC 227 if (head == tail)
211 || ring->incompat_features != AIO_RING_INCOMPAT_FEATURES
212 || ring->header_length != sizeof (struct aio_ring) /* TODO: or use it to find io_event[0]? */
213 || head == tail)
214 return 0; 228 return 0;
229
230 /* bail out if the ring buffer doesn't match the expected layout */
231 if (ecb_expect_false (ring->magic != AIO_RING_MAGIC)
232 || ring->incompat_features != AIO_RING_INCOMPAT_FEATURES
233 || ring->header_length != sizeof (struct aio_ring)) /* TODO: or use it to find io_event[0]? */
234 return 0;
235
236 ECB_MEMORY_FENCE_ACQUIRE;
215 237
216 /* parse all available events, but only once, to avoid starvation */ 238 /* parse all available events, but only once, to avoid starvation */
217 if (tail > head) /* normal case around */ 239 if (tail > head) /* normal case around */
218 linuxaio_parse_events (EV_A_ ring->io_events + head, tail - head); 240 linuxaio_parse_events (EV_A_ ring->io_events + head, tail - head);
219 else
220 {
221 /* wrapped around */ 241 else /* wrapped around */
242 {
222 linuxaio_parse_events (EV_A_ ring->io_events + head, ring->nr - head); 243 linuxaio_parse_events (EV_A_ ring->io_events + head, ring->nr - head);
223 linuxaio_parse_events (EV_A_ ring->io_events, tail); 244 linuxaio_parse_events (EV_A_ ring->io_events, tail);
224 } 245 }
225 246
226 ring->head = tail; 247 *(volatile unsigned *)&ring->head = tail;
248
249 /* again, other implementations don't do this, but I think it's required for the kernel to see free slots */
250 ECB_MEMORY_FENCE_RELEASE;
227 251
228 return 1; 252 return 1;
229} 253}
230 254
231/* read at least one event from kernel, or timeout */ 255/* read at least one event from kernel, or timeout */
… …
239 263
240 if (linuxaio_get_events_from_ring (EV_A)) 264 if (linuxaio_get_events_from_ring (EV_A))
241 return; 265 return;
242 266
243 /* no events, so wait for at least one, then poll ring buffer again */ 267 /* no events, so wait for at least one, then poll ring buffer again */
244 /* this degraded to one event per loop iteration */ 268 /* this degrades to one event per loop iteration */
245 /* if the ring buffer changes layout, but so be it */ 269 /* if the ring buffer changes layout, but so be it */
246 270
247 ts.tv_sec = (long)timeout; 271 ts.tv_sec = (long)timeout;
248 ts.tv_nsec = (long)((timeout - ts.tv_sec) * 1e9); 272 ts.tv_nsec = (long)((timeout - ts.tv_sec) * 1e9);
249 273
250 res = ev_io_getevents (linuxaio_ctx, 1, 1, &ioev, &ts); 274 res = ev_io_getevents (linuxaio_ctx, 1, 1, &ioev, &ts);
251 275
252 if (res < 0) 276 if (res < 0)
277 if (errno == EINTR)
278 /* ignored */;
279 else
253 ev_syserr ("(libev) io_getevents"); 280 ev_syserr ("(libev) linuxaio io_getevents");
254 else if (res) 281 else if (res)
255 { 282 {
256 /* at least one event received, handle it and any remaining ones in the ring buffer */ 283 /* at least one event received, handle it and any remaining ones in the ring buffer */
257 linuxaio_parse_events (EV_A_ &ioev, 1); 284 linuxaio_parse_events (EV_A_ &ioev, 1);
258 linuxaio_get_events_from_ring (EV_A); 285 linuxaio_get_events_from_ring (EV_A);
259 } 286 }
260} 287}
288
289#if EPOLL_FALLBACK
290static void
291linuxaio_rearm_epoll (EV_P_ struct iocb *iocb, int op)
292{
293 struct epoll_event eev;
294
295 eev.events = EPOLLONESHOT;
296 if (iocb->aio_buf & POLLIN ) eev.events |= EPOLLIN ;
297 if (iocb->aio_buf & POLLOUT) eev.events |= EPOLLOUT;
298 eev.data.fd = iocb->aio_fildes;
299
300 if (epoll_ctl (backend_fd, op, iocb->aio_fildes, &eev) < 0)
301 ev_syserr ("(libeio) linuxaio epoll_ctl");
302}
303#endif
261 304
262static void 305static void
263linuxaio_poll (EV_P_ ev_tstamp timeout) 306linuxaio_poll (EV_P_ ev_tstamp timeout)
264{ 307{
265 int submitted; 308 int submitted;
… …
271 /* which allows us to pinpoint the errornous iocb */ 314 /* which allows us to pinpoint the errornous iocb */
272 for (submitted = 0; submitted < linuxaio_submitcnt; ) 315 for (submitted = 0; submitted < linuxaio_submitcnt; )
273 { 316 {
274 int res = ev_io_submit (linuxaio_ctx, linuxaio_submitcnt - submitted, linuxaio_submits + submitted); 317 int res = ev_io_submit (linuxaio_ctx, linuxaio_submitcnt - submitted, linuxaio_submits + submitted);
275 318
276 if (res < 0) 319 if (ecb_expect_false (res < 0))
277 if (errno == EAGAIN) 320 if (errno == EAGAIN)
278 { 321 {
279 /* This happens when the ring buffer is full, at least. I assume this means 322 /* This happens when the ring buffer is full, at least. I assume this means
280 * that the event was queued synchronously during io_submit, and thus 323 * that the event was queued synchronously during io_submit, and thus
281 * the buffer overflowd. 324 * the buffer overflowed.
282 * In this case, we just try next loop iteration. 325 * In this case, we just try in next loop iteration.
326 * This should not result in a few fds taking priority, as the interface
327 * is one-shot, and we submit iocb's in a round-robin fashion.
283 */ 328 */
284 memcpy (linuxaio_submits, linuxaio_submits + submitted, (linuxaio_submitcnt - submitted) * sizeof (*linuxaio_submits)); 329 memmove (linuxaio_submits, linuxaio_submits + submitted, (linuxaio_submitcnt - submitted) * sizeof (*linuxaio_submits));
285 linuxaio_submitcnt -= submitted; 330 linuxaio_submitcnt -= submitted;
286 timeout = 0; 331 timeout = 0;
287 break; 332 break;
288 } 333 }
334#if EPOLL_FALLBACK
335 else if (errno == EINVAL)
336 {
337 /* This hapüpens for unsupported fds, officially, but in my testing,
338 * also randomly happens for supported fds. We fall back to good old
339 * poll() here, under the assumption that this is a very rare case.
340 */
341 struct iocb *iocb = linuxaio_submits [submitted];
342 res = 1; /* skip this iocb */
343
344 linuxaio_rearm_epoll (EV_A_ iocb, EPOLL_CTL_ADD);
345 iocb->aio_reqprio = -1; /* mark iocb as epoll */
346 }
347#endif
289 else 348 else
290 /* TODO: we get EAGAIN when the ring buffer is full for some reason */
291 /* TODO: should we always just try next time? */
292 ev_syserr ("(libev) io_submit"); 349 ev_syserr ("(libev) linuxaio io_submit");
293 350
294 submitted += res; 351 submitted += res;
295 } 352 }
296 353
297 linuxaio_submitcnt = 0; 354 linuxaio_submitcnt = 0;
… …
299 /* second phase: fetch and parse events */ 356 /* second phase: fetch and parse events */
300 357
301 linuxaio_get_events (EV_A_ timeout); 358 linuxaio_get_events (EV_A_ timeout);
302} 359}
303 360
361#if EPOLL_FALLBACK
362
363static void
364linuxaio_epoll_cb (EV_P_ struct ev_io *w, int revents)
365{
366 struct epoll_event events[16];
367
368 for (;;)
369 {
370 int idx;
371 int res = epoll_wait (backend_fd, events, sizeof (events) / sizeof (events [0]), 0);
372
373 if (ecb_expect_false (res < 0))
374 ev_syserr ("(libev) linuxaio epoll_wait");
375 else if (!res)
376 break;
377
378 for (idx = res; idx--; )
379 {
380 int fd = events [idx].data.fd;
381 uint32_t ev = events [idx].events;
382
383 assert (("libev: iocb fd must be in-bounds", fd >= 0 && fd < anfdmax));
384
385 linuxaio_rearm_epoll (EV_A_ &linuxaio_iocbps [fd]->io, EPOLL_CTL_MOD);
386
387 fd_event (EV_A_ fd,
388 (ev & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
389 | (ev & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0));
390 }
391
392 if (res < sizeof (events) / sizeof (events [0]))
393 break;
394 }
395}
396
397#endif
398
304inline_size 399inline_size
305int 400int
306linuxaio_init (EV_P_ int flags) 401linuxaio_init (EV_P_ int flags)
307{ 402{
308 /* would be great to have a nice test for IOCB_CMD_POLL instead */ 403 /* would be great to have a nice test for IOCB_CMD_POLL instead */
404 /* also: test some semi-common fd types, such as files and ttys in recommended_backends */
309 if (ev_linux_version () < 0x041200) /* 4.18 introduced IOCB_CMD_POLL */ 405 if (ev_linux_version () < 0x041200) /* 4.18 introduced IOCB_CMD_POLL */
310 return 0; 406 return 0;
311 407
408 linuxaio_ctx = 0;
312 if (ev_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0) 409 if (ev_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0)
313 return 0; 410 return 0;
411
412#if EPOLL_FALLBACK
413 backend_fd = ev_epoll_create ();
414 if (backend_fd < 0)
415 {
416 ev_io_destroy (linuxaio_ctx);
417 return 0;
418 }
419
420 ev_io_init (EV_A_ &linuxaio_epoll_w, linuxaio_epoll_cb, backend_fd, EV_READ);
421 ev_io_start (EV_A_ &linuxaio_epoll_w);
422#endif
314 423
315 backend_modify = linuxaio_modify; 424 backend_modify = linuxaio_modify;
316 backend_poll = linuxaio_poll; 425 backend_poll = linuxaio_poll;
317 426
318 linuxaio_iocbpmax = 0; 427 linuxaio_iocbpmax = 0;
… …
327 436
328inline_size 437inline_size
329void 438void
330linuxaio_destroy (EV_P) 439linuxaio_destroy (EV_P)
331{ 440{
441#if EPOLL_FALLBACK
442 close (backend_fd);
443#endif
332 linuxaio_free_iocbp (EV_A); 444 linuxaio_free_iocbp (EV_A);
333 ev_io_destroy (linuxaio_ctx); 445 ev_io_destroy (linuxaio_ctx);
334} 446}
335 447
336inline_size 448inline_size
337void 449void
338linuxaio_fork (EV_P) 450linuxaio_fork (EV_P)
339{ 451{
340 abort ();//D 452 /* this frees all iocbs, which is very heavy-handed */
341} 453 linuxaio_destroy (EV_A);
454 linuxaio_submitcnt = 0; /* all pointers were invalidated */
342 455
456 linuxaio_ctx = 0;
457 while (ev_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0)
458 ev_syserr ("(libev) linuxaio io_setup");
459
460#if EPOLL_FALLBACK
461 while ((backend_fd = ev_epoll_create ()) < 0)
462 ev_syserr ("(libev) linuxaio epoll_create");
463
464 ev_io_stop (EV_A_ &linuxaio_epoll_w);
465 ev_io_init (EV_A_ &linuxaio_epoll_w, linuxaio_epoll_cb, backend_fd, EV_READ);
466 ev_io_start (EV_A_ &linuxaio_epoll_w);
467 ev_unref (EV_A); /* watcher should not keep loop alive */
468#endif
469
470 fd_rearm_all (EV_A);
471}
472

Diff Legend

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