From: Joern Engel <joern@logfs.org>
To: linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Borislav Petkov <bp@alien8.de>, Jeff Moyer <jmoyer@redhat.com>,
Joern Engel <joern@logfs.org>
Subject: [PATCH 6/9] bcon: add a release work struct
Date: Thu, 28 Feb 2013 16:39:59 -0500 [thread overview]
Message-ID: <1362087602-8979-7-git-send-email-joern@logfs.org> (raw)
In-Reply-To: <1362087602-8979-1-git-send-email-joern@logfs.org>
The final bcon_put() can be called from atomic context, by way of
bio_endio(). In that case we would sleep in invalidate_mapping_pages(),
with the usual unhappy results.
In nearly a year of production use, I have only seen a matching
backtrace once. There was a second known issue that could be reproduced
by "yes h > /proc/sysrq-trigger" and concurrently pulling and replugging
the blockconsole device. It took be somewhere around 30 pulls and sore
thumbs to reproduce and I never found the time to get to the bottom of
it. Quite likely the two issues are identical.
Signed-off-by: Joern Engel <joern@logfs.org>
---
drivers/block/blockconsole.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/block/blockconsole.c b/drivers/block/blockconsole.c
index 32f6c62..b4730f8 100644
--- a/drivers/block/blockconsole.c
+++ b/drivers/block/blockconsole.c
@@ -65,6 +65,7 @@ struct blockconsole {
struct block_device *bdev;
struct console console;
struct work_struct unregister_work;
+ struct work_struct release_work;
struct task_struct *writeback_thread;
struct notifier_block panic_block;
};
@@ -74,9 +75,10 @@ static void bcon_get(struct blockconsole *bc)
kref_get(&bc->kref);
}
-static void bcon_release(struct kref *kref)
+static void __bcon_release(struct work_struct *work)
{
- struct blockconsole *bc = container_of(kref, struct blockconsole, kref);
+ struct blockconsole *bc = container_of(work, struct blockconsole,
+ release_work);
__free_pages(bc->zero_page, 0);
__free_pages(bc->pages, 8);
@@ -85,6 +87,14 @@ static void bcon_release(struct kref *kref)
kfree(bc);
}
+static void bcon_release(struct kref *kref)
+{
+ struct blockconsole *bc = container_of(kref, struct blockconsole, kref);
+
+ /* bcon_release can be called from atomic context */
+ schedule_work(&bc->release_work);
+}
+
static void bcon_put(struct blockconsole *bc)
{
kref_put(&bc->kref, bcon_release);
@@ -512,6 +522,7 @@ static int bcon_create(const char *devname)
if (IS_ERR(bc->writeback_thread))
goto out2;
INIT_WORK(&bc->unregister_work, bcon_unregister);
+ INIT_WORK(&bc->release_work, __bcon_release);
register_console(&bc->console);
bc->panic_block.notifier_call = blockconsole_panic;
bc->panic_block.priority = INT_MAX;
--
1.7.10.4
next prev parent reply other threads:[~2013-02-28 23:05 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-28 21:39 [PATCH 0/9] Add blockconsole version 1.1 (try 2) Joern Engel
2013-02-28 21:39 ` [PATCH 1/9] do_mounts: constify name_to_dev_t parameter Joern Engel
2013-02-28 21:39 ` [PATCH 2/9] add blockconsole version 1.1 Joern Engel
2013-02-28 21:39 ` [PATCH 3/9] printk: add CON_ALLDATA console flag Joern Engel
2013-03-01 14:52 ` Jeff Moyer
2013-03-01 14:58 ` Borislav Petkov
2013-03-01 15:08 ` Jeff Moyer
2013-03-01 15:31 ` Borislav Petkov
2013-03-01 15:42 ` Jeff Moyer
2013-03-01 15:58 ` Borislav Petkov
2013-03-01 16:15 ` Jörn Engel
2013-02-28 21:39 ` [PATCH 4/9] netconsole: use CON_ALLDATA Joern Engel
2013-02-28 21:39 ` [PATCH 5/9] blockconsole: " Joern Engel
2013-03-01 16:11 ` Jeff Moyer
2013-03-01 16:20 ` Jörn Engel
2013-03-01 17:52 ` Borislav Petkov
2013-03-01 16:31 ` Jörn Engel
2013-03-01 17:56 ` Borislav Petkov
2013-02-28 21:39 ` Joern Engel [this message]
2013-02-28 21:40 ` [PATCH 7/9] bcon: check for hdparm in bcon_tail Joern Engel
2013-02-28 21:40 ` [PATCH 8/9] blockconsole: Allow to pass a device file path to bcon_tail Joern Engel
2013-02-28 21:40 ` [PATCH 9/9] bcon: remove version 1.0 support Joern Engel
2013-03-01 17:15 ` [PATCH 0/9] Add blockconsole version 1.1 (try 2) Takashi Iwai
2013-03-01 16:22 ` Jörn Engel
2013-03-05 17:36 ` Takashi Iwai
2013-03-06 19:49 ` Jörn Engel
2013-03-07 18:46 ` Takashi Iwai
2013-03-07 18:51 ` [PATCH 0/3] blockconsole: make it a module Takashi Iwai
2013-03-07 18:51 ` [PATCH 1/3] Export sched_setscheduler_nocheck() Takashi Iwai
2013-03-07 18:51 ` [PATCH 2/3] block/partitions: Support dynamic addition of partition checkers Takashi Iwai
2013-03-07 18:51 ` [PATCH 3/3] blockconsole: Allow to be a module Takashi Iwai
2013-03-01 17:17 ` [PATCH 1/3] blockconsole: Fix undefined MAX_RT_PRIO Takashi Iwai
2013-03-01 17:17 ` [PATCH 2/3] blockconsole: Rename device_lock with bc_device_lock Takashi Iwai
2013-03-01 17:17 ` [PATCH 3/3] blockconsole: Mark a local work struct static Takashi Iwai
2013-03-20 22:52 ` [PATCH 0/9] Add blockconsole version 1.1 (try 2) Borislav Petkov
2013-03-21 6:30 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1362087602-8979-7-git-send-email-joern@logfs.org \
--to=joern@logfs.org \
--cc=akpm@linux-foundation.org \
--cc=bp@alien8.de \
--cc=jmoyer@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox