Skip to content

Commit

Permalink
fs/aio: simple simple work
Browse files Browse the repository at this point in the history
[ Upstream commit 1a142116f6435ef070ecebb66d2d599507c10601 ]

|BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:768
|in_atomic(): 1, irqs_disabled(): 0, pid: 26, name: rcuos/2
|2 locks held by rcuos/2/26:
| #0:  (rcu_callback){.+.+..}, at: [<ffffffff810b1a12>] rcu_nocb_kthread+0x1e2/0x380
| #1:  (rcu_read_lock_sched){.+.+..}, at: [<ffffffff812acd26>] percpu_ref_kill_rcu+0xa6/0x1c0
|Preemption disabled at:[<ffffffff810b1a93>] rcu_nocb_kthread+0x263/0x380
|Call Trace:
| [<ffffffff81582e9e>] dump_stack+0x4e/0x9c
| [<ffffffff81077aeb>] __might_sleep+0xfb/0x170
| [<ffffffff81589304>] rt_spin_lock+0x24/0x70
| [<ffffffff811c5790>] free_ioctx_users+0x30/0x130
| [<ffffffff812ace34>] percpu_ref_kill_rcu+0x1b4/0x1c0
| [<ffffffff810b1a93>] rcu_nocb_kthread+0x263/0x380
| [<ffffffff8106e046>] kthread+0xd6/0xf0
| [<ffffffff81591eec>] ret_from_fork+0x7c/0xb0

replace this preempt_disable() friendly swork.

Reported-By: Mike Galbraith <umgwanakikbuti@gmail.com>
Suggested-by: Benjamin LaHaise <bcrl@kvack.org>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
  • Loading branch information
Sebastian Andrzej Siewior authored and jianlong.wang committed Oct 26, 2021
1 parent e7cc3a3 commit 940037d
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions fs/aio.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ struct kioctx {
long nr_pages;

struct rcu_work free_rwork; /* see free_ioctx() */
struct kthread_work free_kwork; /* see free_ioctx() */

/*
* signals when all in-flight requests are done
Expand Down Expand Up @@ -607,9 +608,9 @@ static void free_ioctx_reqs(struct percpu_ref *ref)
* and ctx->users has dropped to 0, so we know no more kiocbs can be submitted -
* now it's safe to cancel any that need to be.
*/
static void free_ioctx_users(struct percpu_ref *ref)
static void free_ioctx_users_work(struct kthread_work *work)
{
struct kioctx *ctx = container_of(ref, struct kioctx, users);
struct kioctx *ctx = container_of(work, struct kioctx, free_kwork);
struct aio_kiocb *req;

spin_lock_irq(&ctx->ctx_lock);
Expand All @@ -627,6 +628,14 @@ static void free_ioctx_users(struct percpu_ref *ref)
percpu_ref_put(&ctx->reqs);
}

static void free_ioctx_users(struct percpu_ref *ref)
{
struct kioctx *ctx = container_of(ref, struct kioctx, users);

kthread_init_work(&ctx->free_kwork, free_ioctx_users_work);
kthread_schedule_work(&ctx->free_kwork);
}

static int ioctx_add_table(struct kioctx *ctx, struct mm_struct *mm)
{
unsigned i, new_nr;
Expand Down

0 comments on commit 940037d

Please sign in to comment.