Re: Regression with a0747a859ef6 ("bdi: add error handle for bdi_debug_register")
From: weiping zhang
Date: Fri Dec 29 2017 - 11:36:40 EST
On Fri, Dec 22, 2017 at 08:04:23AM -0600, Bruno Wolff III wrote:
> On Fri, Dec 22, 2017 at 21:20:10 +0800,
> weiping zhang <zwp10758@xxxxxxxxx> wrote:
> >2017-12-22 12:53 GMT+08:00 Bruno Wolff III <bruno@xxxxxxxx>:
> >>On Thu, Dec 21, 2017 at 17:16:03 -0600,
> >> Bruno Wolff III <bruno@xxxxxxxx> wrote:
> >>>
> >>>
> >>>Enforcing mode alone isn't enough as I tested that one one machine at home
> >>>and it didn't trigger the problem. I'll try another machine late tonight.
> >>
> >>
> >>I got the problem to occur on my i686 machine when booting in enforcing
> >>mode. This machine uses raid 1 vua mdraid which may or may not be a factor
> >>in this problem. The boot log has a trace at the end and might be helpful,
> >>so I'm attaching it here.
> >Hi Bruno,
> >I can reproduce this issue in my QEMU test VM easily, just add an soft
> >RAID1, always trigger
> >that warning, I'll debug it later.
>
> Great. When you have a fix, I can test it.
This issue can trigger easily in Centos7.3, if meet two factors:
1. SELINUX in enforceing mode
2. mdadm try to create new gendisk.
if disable SELINUX or let it in permissive mode, issue disappear.
As Jens has revert that commit, it seems boot normally, actually
this is no diretor created under /sys/kernel/debug/bdi/, though
has no effect on disk workflow.
As james said before, "debugfs files should be treated as optional",
so kernel give warning here is enough.
So there are 2 ways to fix this issue:
1. Add proper SELINUX policy allow mdadm create dir at debugfs
2. mdadm don't create gendisk directly, first mdadm trigger a kwork and
wait it done, let kwork create gendisk.
A possible change for MD like following:
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 4e4dee0..86ead5a 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -90,6 +90,7 @@
EXPORT_SYMBOL(md_cluster_mod);
static DECLARE_WAIT_QUEUE_HEAD(resync_wait);
+static struct workqueue_struct *md_probe_wq;
static struct workqueue_struct *md_wq;
static struct workqueue_struct *md_misc_wq;
@@ -5367,10 +5368,27 @@ static int md_alloc(dev_t dev, char *name)
return error;
}
+static void md_probe_work_fn(struct work_struct *ws)
+{
+ struct md_probe_work *mpw = container_of(ws, struct md_probe_work,
+ work);
+ md_alloc(mpw->dev, NULL);
+ mpw->done = 1;
+ wake_up(&mpw->wait);
+}
+
static struct kobject *md_probe(dev_t dev, int *part, void *data)
{
- if (create_on_open)
- md_alloc(dev, NULL);
+ struct md_probe_work mpw;
+
+ if (create_on_open) {
+ init_waitqueue_head(&mpw.wait);
+ mpw.dev = dev;
+ mpw.done = 0;
+ INIT_WORK(&mpw.work, md_probe_work_fn);
+ queue_work(md_probe_wq, &mpw.work);
+ wait_event(mpw.wait, mpw.done);
+ }
return NULL;
}
@@ -9023,9 +9041,13 @@ static int __init md_init(void)
{
int ret = -ENOMEM;
+ md_probe_wq = alloc_workqueue("md_probe", 0, 0);
+ if (!md_probe_wq)
+ goto err_wq;
+
md_wq = alloc_workqueue("md", WQ_MEM_RECLAIM, 0);
if (!md_wq)
- goto err_wq;
+ goto err_probe_wq;
md_misc_wq = alloc_workqueue("md_misc", 0, 0);
if (!md_misc_wq)
@@ -9055,6 +9077,8 @@ static int __init md_init(void)
destroy_workqueue(md_misc_wq);
err_misc_wq:
destroy_workqueue(md_wq);
+err_probe_wq:
+ destroy_workqueue(md_probe_wq);
err_wq:
return ret;
}
@@ -9311,6 +9335,7 @@ static __exit void md_exit(void)
}
destroy_workqueue(md_misc_wq);
destroy_workqueue(md_wq);
+ destroy_workqueue(md_probe_wq);
}
subsys_initcall(md_init);
diff --git a/drivers/md/md.h b/drivers/md/md.h
index 7d6bcf0..3953896 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -487,6 +487,13 @@ enum recovery_flags {
MD_RECOVERY_ERROR, /* sync-action interrupted because io-error */
};
+struct md_probe_work {
+ struct work_struct work;
+ wait_queue_head_t wait;
+ dev_t dev;
+ int done;
+};
+
static inline int __must_check mddev_lock(struct mddev *mddev)
{
return mutex_lock_interruptible(&mddev->reconfig_mutex);