Skip to content

Commit

Permalink
aio: protect reqs_available updates from changes in interrupt handlers
Browse files Browse the repository at this point in the history
As of commit f8567a3 it is now possible to
have put_reqs_available() called from irq context.  While put_reqs_available()
is per cpu, it did not protect itself from interrupts on the same CPU.  This
lead to aio_complete() corrupting the available io requests count when run
under a heavy O_DIRECT workloads as reported by Robert Elliott.  Fix this by
disabling irq updates around the per cpu batch updates of reqs_available.

Many thanks to Robert and folks for testing and tracking this down.

Reported-by: Robert Elliot <[email protected]>
Tested-by: Robert Elliot <[email protected]>
Signed-off-by: Benjamin LaHaise <[email protected]>
Cc: Jens Axboe <[email protected]>, Christoph Hellwig <[email protected]>
Cc: [email protected]
  • Loading branch information
bcrl committed Jul 14, 2014
1 parent 1795cd9 commit 263782c
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions fs/aio.c
Original file line number Diff line number Diff line change
Expand Up @@ -830,27 +830,33 @@ void exit_aio(struct mm_struct *mm)
static void put_reqs_available(struct kioctx *ctx, unsigned nr)
{
struct kioctx_cpu *kcpu;
unsigned long flags;

preempt_disable();
kcpu = this_cpu_ptr(ctx->cpu);

local_irq_save(flags);
kcpu->reqs_available += nr;

while (kcpu->reqs_available >= ctx->req_batch * 2) {
kcpu->reqs_available -= ctx->req_batch;
atomic_add(ctx->req_batch, &ctx->reqs_available);
}

local_irq_restore(flags);
preempt_enable();
}

static bool get_reqs_available(struct kioctx *ctx)
{
struct kioctx_cpu *kcpu;
bool ret = false;
unsigned long flags;

preempt_disable();
kcpu = this_cpu_ptr(ctx->cpu);

local_irq_save(flags);
if (!kcpu->reqs_available) {
int old, avail = atomic_read(&ctx->reqs_available);

Expand All @@ -869,6 +875,7 @@ static bool get_reqs_available(struct kioctx *ctx)
ret = true;
kcpu->reqs_available--;
out:
local_irq_restore(flags);
preempt_enable();
return ret;
}
Expand Down

0 comments on commit 263782c

Please sign in to comment.