aio: Do not return -ERESTARTSYS (and friends) from AIO
Jan Kara
reviewerPATCH 1/1 aio: Do not return -ERESTARTSYS (and friends) from AIO
We must not leak ERESTARTSYS (and similar error codes) to userspace as a return value of IO. Because other AIO could have been already submitted by the same io_submit syscall, there is no easy way to restart the syscall. So we do not have much other options than fail the particular IO with EINTR.
--- fs/aio.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-)
Not sure who should merge it... Andrew?
fs/aio.c +11 -1
@@ -712,8 +712,18 @@ static ssize_t aio_run_iocb(struct kiocb *iocb)*/ ret =retry (iocb); -if (ret != -EIOCBRETRY && ret != -EIOCBQUEUED ) +if (ret != -EIOCBRETRY && ret != -EIOCBQUEUED ) { +/* +* There's no easy way to restart the syscall since other AIO's +* may be already running. Just fail this IO with EINTR. +*/ +if (unlikely (ret == -ERESTARTSYS || + ret == -ERESTARTNOINTR || + ret == -ERESTARTNOHAND || + ret == -ERESTART_RESTARTBLOCK )) + ret = -EINTR ;aio_complete (iocb, ret,0 ); + } out:spin_lock_irq (&ctx->ctx_lock);
Signature · 1 line
1.6.4.2
Quoted 4 lines · Jan Kara
We must not leak ERESTARTSYS (and similar error codes) to userspace as a return value of IO. Because other AIO could have been already submitted by the same
io_submitsyscall, there is no easy way to restart the syscall. So we do not have much other options than fail the particular IO with EINTR.
This is a confusing problem description. First, I'm assuming you actually experienced this, is that right? Care to share the details of that?
Next, assuming we can get ERSTARTSYS and friends, it will be the return code of a single iocb (reaped via io_getevents), not the return code of the io_submit system call. I'm not saying this is right, I'm just saying that your description of the problem is misleading.
Cheers,
Jeff
Quoted 30 lines
Signed-off-by Jan Kara <[email protected]>--- fs/aio.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-)Not sure who should merge it... Andrew?
fs/aio.c +11
-1@@ -712,8 +712,18 @@ static ssize_t aio_run_iocb(struct kiocb *iocb)*/ ret =retry (iocb); -if (ret != -EIOCBRETRY && ret != -EIOCBQUEUED ) +if (ret != -EIOCBRETRY && ret != -EIOCBQUEUED ) { +/* +* There's no easy way to restart the syscall since other AIO's +* may be already running. Just fail this IO with EINTR. +*/ +if (unlikely (ret == -ERESTARTSYS || + ret == -ERESTARTNOINTR || + ret == -ERESTARTNOHAND || + ret == -ERESTART_RESTARTBLOCK )) + ret = -EINTR ;aio_complete (iocb, ret,0 ); + } out:spin_lock_irq (&ctx->ctx_lock);