After following Gregory's stacktrace (also reproduced here):
[<c02451f8>] (iommu_bus_notifier) from [<c00512e8>] (notifier_call_chain+0x64/0x9c)
[<c00512e8>] (notifier_call_chain) from [<c00514cc>] (__blocking_notifier_call_chain+0x40/0x58)
[<c00514cc>] (__blocking_notifier_call_chain) from [<c00514f8>] (blocking_notifier_call_chain+0x14/0x1c)
[<c00514f8>] (blocking_notifier_call_chain) from [<c01d225c>] (device_add+0x424/0x524)
[<c01d225c>] (device_add) from [<c0186d90>] (pci_device_add+0xec/0x110)
[<c0186d90>] (pci_device_add) from [<c0186e54>] (pci_scan_single_device+0xa0/0xac)
I added a few printks and found that the problem is that the iommu_bus_notifier is
called for the 'pci' bus type, which has a null iommu_ops.
On 04 Jul 10:47 AM, Laurent Pinchart wrote:
[..]
>
> We need a quick fix for v3.16, ...
Therefore, a quick fix would be to simply check for that:
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index e5555fc..b712cb2 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -536,6 +536,9 @@ static int iommu_bus_notifier(struct notifier_block *nb,
struct iommu_group *group;
unsigned long group_action = 0;
+ if (!ops)
+ return 0;
+
/*
* ADD/DEL call into iommu driver ops if provided, which may
* result in ADD/DEL notifiers to group->notifier
This (nasty workaround?) patch makes the problem go away.
[..]
> > So it also boot well in 3.15 and then failed in 3.16-rc3. I hope it will
> > help the developers of the OMAP IOMMU driver to fix it.
>
> Thank you. I've had a look at the OMAP IOMMU driver changes between v3.15 and
> v3.16-rc3, and didn't find at first sight any change that could explain the
> crash.
>
> 286f600 iommu/omap: Fix map protection value handling
> 67b779d iommu/omap: Remove comment about supporting single page mappings only
> f7129a0 iommu/omap: Fix 'no page for' debug message in flush_iotlb_page()
> 5acc97d iommu/omap: Move to_iommu definition from omap-iopgtable.h
> 2ac6133 iommu/omap: Remove omap_iommu_domain_has_cap() function
> d760e3e iommu/omap: Correct init value of iotlb_entry valid field
>
> Could you try reverting those changes and retest ? If the problem doesn't
> disappear, we'll need to look somewhere else.
>
I reverted the above commits but nothing changed. I'm far from being an expert,
but it sounds odd to have this bus notifier (that got registered for the
platform bus type) called by a pci bus type.
This doesn't look like a mvebu-specific problem, other platforms should be
affected as well. I'm Ccing GregKH, in case he has an idea what's going on.
--
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
On Sat, Jul 05, 2014 at 12:03:08PM -0300, Ezequiel Garcia wrote:
> After following Gregory's stacktrace (also reproduced here):
>
> [<c02451f8>] (iommu_bus_notifier) from [<c00512e8>] (notifier_call_chain+0x64/0x9c)
> [<c00512e8>] (notifier_call_chain) from [<c00514cc>] (__blocking_notifier_call_chain+0x40/0x58)
> [<c00514cc>] (__blocking_notifier_call_chain) from [<c00514f8>] (blocking_notifier_call_chain+0x14/0x1c)
> [<c00514f8>] (blocking_notifier_call_chain) from [<c01d225c>] (device_add+0x424/0x524)
> [<c01d225c>] (device_add) from [<c0186d90>] (pci_device_add+0xec/0x110)
> [<c0186d90>] (pci_device_add) from [<c0186e54>] (pci_scan_single_device+0xa0/0xac)
>
> I added a few printks and found that the problem is that the iommu_bus_notifier is
> called for the 'pci' bus type, which has a null iommu_ops.
>
> On 04 Jul 10:47 AM, Laurent Pinchart wrote:
> [..]
> >
> > We need a quick fix for v3.16, ...
>
> Therefore, a quick fix would be to simply check for that:
>
> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
> index e5555fc..b712cb2 100644
> --- a/drivers/iommu/iommu.c
> +++ b/drivers/iommu/iommu.c
> @@ -536,6 +536,9 @@ static int iommu_bus_notifier(struct notifier_block *nb,
> struct iommu_group *group;
> unsigned long group_action = 0;
>
> + if (!ops)
> + return 0;
> +
> /*
> * ADD/DEL call into iommu driver ops if provided, which may
> * result in ADD/DEL notifiers to group->notifier
>
> This (nasty workaround?) patch makes the problem go away.
>
> [..]
> > > So it also boot well in 3.15 and then failed in 3.16-rc3. I hope it will
> > > help the developers of the OMAP IOMMU driver to fix it.
> >
> > Thank you. I've had a look at the OMAP IOMMU driver changes between v3.15 and
> > v3.16-rc3, and didn't find at first sight any change that could explain the
> > crash.
> >
> > 286f600 iommu/omap: Fix map protection value handling
> > 67b779d iommu/omap: Remove comment about supporting single page mappings only
> > f7129a0 iommu/omap: Fix 'no page for' debug message in flush_iotlb_page()
> > 5acc97d iommu/omap: Move to_iommu definition from omap-iopgtable.h
> > 2ac6133 iommu/omap: Remove omap_iommu_domain_has_cap() function
> > d760e3e iommu/omap: Correct init value of iotlb_entry valid field
> >
> > Could you try reverting those changes and retest ? If the problem doesn't
> > disappear, we'll need to look somewhere else.
> >
>
> I reverted the above commits but nothing changed. I'm far from being an expert,
> but it sounds odd to have this bus notifier (that got registered for the
> platform bus type) called by a pci bus type.
Why wouldn't the PCI bus set this up for its devices? Are you
"assuming" you know the bus type and that's the issue?
I see the a number of different places this is being initialized for the
pci bus.
Ah, look at drivers/iommu/fsl_pamu_domain.c, odds are, it shouldn't be
doing that logic in the pamu_domain_init() code, using the same bus ops
for different bus types, that's ripe for major problems...
thanks,
greg k-h
On 05 Jul 01:59 PM, Greg Kroah-Hartman wrote:
> On Sat, Jul 05, 2014 at 12:03:08PM -0300, Ezequiel Garcia wrote:
> > After following Gregory's stacktrace (also reproduced here):
> >
> > [<c02451f8>] (iommu_bus_notifier) from [<c00512e8>] (notifier_call_chain+0x64/0x9c)
> > [<c00512e8>] (notifier_call_chain) from [<c00514cc>] (__blocking_notifier_call_chain+0x40/0x58)
> > [<c00514cc>] (__blocking_notifier_call_chain) from [<c00514f8>] (blocking_notifier_call_chain+0x14/0x1c)
> > [<c00514f8>] (blocking_notifier_call_chain) from [<c01d225c>] (device_add+0x424/0x524)
> > [<c01d225c>] (device_add) from [<c0186d90>] (pci_device_add+0xec/0x110)
> > [<c0186d90>] (pci_device_add) from [<c0186e54>] (pci_scan_single_device+0xa0/0xac)
> >
> > I added a few printks and found that the problem is that the iommu_bus_notifier is
> > called for the 'pci' bus type, which has a null iommu_ops.
> >
> > On 04 Jul 10:47 AM, Laurent Pinchart wrote:
> > [..]
> > >
> > > We need a quick fix for v3.16, ...
> >
> > Therefore, a quick fix would be to simply check for that:
> >
> > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
> > index e5555fc..b712cb2 100644
> > --- a/drivers/iommu/iommu.c
> > +++ b/drivers/iommu/iommu.c
> > @@ -536,6 +536,9 @@ static int iommu_bus_notifier(struct notifier_block *nb,
> > struct iommu_group *group;
> > unsigned long group_action = 0;
> >
> > + if (!ops)
> > + return 0;
> > +
> > /*
> > * ADD/DEL call into iommu driver ops if provided, which may
> > * result in ADD/DEL notifiers to group->notifier
> >
> > This (nasty workaround?) patch makes the problem go away.
> >
> > [..]
> > > > So it also boot well in 3.15 and then failed in 3.16-rc3. I hope it will
> > > > help the developers of the OMAP IOMMU driver to fix it.
> > >
> > > Thank you. I've had a look at the OMAP IOMMU driver changes between v3.15 and
> > > v3.16-rc3, and didn't find at first sight any change that could explain the
> > > crash.
> > >
> > > 286f600 iommu/omap: Fix map protection value handling
> > > 67b779d iommu/omap: Remove comment about supporting single page mappings only
> > > f7129a0 iommu/omap: Fix 'no page for' debug message in flush_iotlb_page()
> > > 5acc97d iommu/omap: Move to_iommu definition from omap-iopgtable.h
> > > 2ac6133 iommu/omap: Remove omap_iommu_domain_has_cap() function
> > > d760e3e iommu/omap: Correct init value of iotlb_entry valid field
> > >
> > > Could you try reverting those changes and retest ? If the problem doesn't
> > > disappear, we'll need to look somewhere else.
> > >
> >
> > I reverted the above commits but nothing changed. I'm far from being an expert,
> > but it sounds odd to have this bus notifier (that got registered for the
> > platform bus type) called by a pci bus type.
>
> Why wouldn't the PCI bus set this up for its devices? Are you
> "assuming" you know the bus type and that's the issue?
>
Thanks for looking at this.
I guess I snipped the thread and lost most of the information about the panic.
Here's the original bug report:
http://www.spinics.net/lists/arm-kernel/msg344059.html
The problem reported involves enabling OMAP IOMMU driver and not any other IOMMU
driver. Doing some tracing and adding a few prints, we found that
omap_iommu_init() sets a bus notifier for the platform bus type:
omap_iommu_init -> bus_set_iommu -> iommu_bus_init:
static void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops)
{
bus_register_notifier(bus, &iommu_bus_nb);
bus_for_each_dev(bus, NULL, ops, add_iommu_group);
}
But the iommu bus notifier gets called for the 'pci' bus type, which
has the iommu_ops field NULL (since it hasn't been set for iommu).
The panic is here when the NULL field is dereferenced:
static int iommu_bus_notifier(struct notifier_block *nb,
unsigned long action, void *data)
{
struct device *dev = data;
struct iommu_ops *ops = dev->bus->iommu_ops;
> I see the a number of different places this is being initialized for the
> pci bus.
>
> Ah, look at drivers/iommu/fsl_pamu_domain.c, odds are, it shouldn't be
> doing that logic in the pamu_domain_init() code, using the same bus ops
> for different bus types, that's ripe for major problems...
>
Maybe I'm missing something, but since the fsl driver is not enabled it has
nothing to do. And since the OMAP IOMMU doesn't set the iommu bus notifier
for the 'pci' bus type, I was wondering if there's a problem with the bus
notifier itself.
I hope the above makes sense.
Thanks again for helping out,
--
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
On Mon, Jul 07, 2014 at 07:58:18AM -0300, Ezequiel Garcia wrote:
> On 05 Jul 01:59 PM, Greg Kroah-Hartman wrote:
> > On Sat, Jul 05, 2014 at 12:03:08PM -0300, Ezequiel Garcia wrote:
> > > After following Gregory's stacktrace (also reproduced here):
> > >
> > > [<c02451f8>] (iommu_bus_notifier) from [<c00512e8>] (notifier_call_chain+0x64/0x9c)
> > > [<c00512e8>] (notifier_call_chain) from [<c00514cc>] (__blocking_notifier_call_chain+0x40/0x58)
> > > [<c00514cc>] (__blocking_notifier_call_chain) from [<c00514f8>] (blocking_notifier_call_chain+0x14/0x1c)
> > > [<c00514f8>] (blocking_notifier_call_chain) from [<c01d225c>] (device_add+0x424/0x524)
> > > [<c01d225c>] (device_add) from [<c0186d90>] (pci_device_add+0xec/0x110)
> > > [<c0186d90>] (pci_device_add) from [<c0186e54>] (pci_scan_single_device+0xa0/0xac)
> > >
> > > I added a few printks and found that the problem is that the iommu_bus_notifier is
> > > called for the 'pci' bus type, which has a null iommu_ops.
> > >
> > > On 04 Jul 10:47 AM, Laurent Pinchart wrote:
> > > [..]
> > > >
> > > > We need a quick fix for v3.16, ...
> > >
> > > Therefore, a quick fix would be to simply check for that:
> > >
> > > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
> > > index e5555fc..b712cb2 100644
> > > --- a/drivers/iommu/iommu.c
> > > +++ b/drivers/iommu/iommu.c
> > > @@ -536,6 +536,9 @@ static int iommu_bus_notifier(struct notifier_block *nb,
> > > struct iommu_group *group;
> > > unsigned long group_action = 0;
> > >
> > > + if (!ops)
> > > + return 0;
> > > +
> > > /*
> > > * ADD/DEL call into iommu driver ops if provided, which may
> > > * result in ADD/DEL notifiers to group->notifier
> > >
> > > This (nasty workaround?) patch makes the problem go away.
> > >
> > > [..]
> > > > > So it also boot well in 3.15 and then failed in 3.16-rc3. I hope it will
> > > > > help the developers of the OMAP IOMMU driver to fix it.
> > > >
> > > > Thank you. I've had a look at the OMAP IOMMU driver changes between v3.15 and
> > > > v3.16-rc3, and didn't find at first sight any change that could explain the
> > > > crash.
> > > >
> > > > 286f600 iommu/omap: Fix map protection value handling
> > > > 67b779d iommu/omap: Remove comment about supporting single page mappings only
> > > > f7129a0 iommu/omap: Fix 'no page for' debug message in flush_iotlb_page()
> > > > 5acc97d iommu/omap: Move to_iommu definition from omap-iopgtable.h
> > > > 2ac6133 iommu/omap: Remove omap_iommu_domain_has_cap() function
> > > > d760e3e iommu/omap: Correct init value of iotlb_entry valid field
> > > >
> > > > Could you try reverting those changes and retest ? If the problem doesn't
> > > > disappear, we'll need to look somewhere else.
> > > >
> > >
> > > I reverted the above commits but nothing changed. I'm far from being an expert,
> > > but it sounds odd to have this bus notifier (that got registered for the
> > > platform bus type) called by a pci bus type.
> >
> > Why wouldn't the PCI bus set this up for its devices? Are you
> > "assuming" you know the bus type and that's the issue?
> >
>
> Thanks for looking at this.
>
> I guess I snipped the thread and lost most of the information about the panic.
> Here's the original bug report:
>
> http://www.spinics.net/lists/arm-kernel/msg344059.html
>
> The problem reported involves enabling OMAP IOMMU driver and not any other IOMMU
> driver. Doing some tracing and adding a few prints, we found that
> omap_iommu_init() sets a bus notifier for the platform bus type:
>
> omap_iommu_init -> bus_set_iommu -> iommu_bus_init:
>
> static void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops)
> {
> bus_register_notifier(bus, &iommu_bus_nb);
> bus_for_each_dev(bus, NULL, ops, add_iommu_group);
> }
>
> But the iommu bus notifier gets called for the 'pci' bus type, which
> has the iommu_ops field NULL (since it hasn't been set for iommu).
So this is what needs to be figured out, how is the notifier being
called with a PCI device? Who else called iommu_bus_init() for the PCI
bus?
thanks,
greg k-h
On 07 Jul 11:30 AM, Greg Kroah-Hartman wrote:
> On Mon, Jul 07, 2014 at 07:58:18AM -0300, Ezequiel Garcia wrote:
[..]
> >
> > I guess I snipped the thread and lost most of the information about the panic.
> > Here's the original bug report:
> >
> > http://www.spinics.net/lists/arm-kernel/msg344059.html
> >
> > The problem reported involves enabling OMAP IOMMU driver and not any other IOMMU
> > driver. Doing some tracing and adding a few prints, we found that
> > omap_iommu_init() sets a bus notifier for the platform bus type:
> >
> > omap_iommu_init -> bus_set_iommu -> iommu_bus_init:
> >
> > static void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops)
> > {
> > bus_register_notifier(bus, &iommu_bus_nb);
> > bus_for_each_dev(bus, NULL, ops, add_iommu_group);
> > }
> >
> > But the iommu bus notifier gets called for the 'pci' bus type, which
> > has the iommu_ops field NULL (since it hasn't been set for iommu).
>
> So this is what needs to be figured out, how is the notifier being
> called with a PCI device? Who else called iommu_bus_init() for the PCI
> bus?
>
Nobody. The only caller of iommu_bus_init() the above OMAP IOMMU.
However, I found something interesting. Tried to bisect this without much
luck; I did two bisects and ended up in the same merge commit:
# good: [0f16aa3c24a216d14d7f0587e1cbd2c1b51a38f3] Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
# first bad commit: [755a9ba7bf24a45b6dbf8bb15a5a56c8ed12461a] Merge tag 'dt-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next
So, after doing a few diff's between that good and bad and searching for
"bus_notifier" changes, saw something strange in arch/arm/mach-mvebu/coherency.c.
It seems bus_register_notifier() is been called for platform and pci devices
with the *same* notifier block. Haven't looked close enough, but you mentioned
that could cause trouble?
This patch fixes the issue here:
diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
index 477202f..2bdc323 100644
--- a/arch/arm/mach-mvebu/coherency.c
+++ b/arch/arm/mach-mvebu/coherency.c
@@ -292,6 +292,10 @@ static struct notifier_block mvebu_hwcc_nb = {
.notifier_call = mvebu_hwcc_notifier,
};
+static struct notifier_block mvebu_hwcc_pci_nb = {
+ .notifier_call = mvebu_hwcc_notifier,
+};
+
static void __init armada_370_coherency_init(struct device_node *np)
{
struct resource res;
@@ -427,7 +431,7 @@ static int __init coherency_pci_init(void)
{
if (coherency_available())
bus_register_notifier(&pci_bus_type,
- &mvebu_hwcc_nb);
+ &mvebu_hwcc_pci_nb);
return 0;
}
Paolo, can you apply it and confirm it fixes the problem?
Greg, can you confirm using the same notifier block pointer
for two different bus types makes the bus notifier go nuts?
Thanks for the help,
--
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com
On Mon, Jul 07, 2014 at 08:37:58PM -0300, Ezequiel Garcia wrote:
> On 07 Jul 11:30 AM, Greg Kroah-Hartman wrote:
> > On Mon, Jul 07, 2014 at 07:58:18AM -0300, Ezequiel Garcia wrote:
> [..]
> > >
> > > I guess I snipped the thread and lost most of the information about the panic.
> > > Here's the original bug report:
> > >
> > > http://www.spinics.net/lists/arm-kernel/msg344059.html
> > >
> > > The problem reported involves enabling OMAP IOMMU driver and not any other IOMMU
> > > driver. Doing some tracing and adding a few prints, we found that
> > > omap_iommu_init() sets a bus notifier for the platform bus type:
> > >
> > > omap_iommu_init -> bus_set_iommu -> iommu_bus_init:
> > >
> > > static void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops)
> > > {
> > > bus_register_notifier(bus, &iommu_bus_nb);
> > > bus_for_each_dev(bus, NULL, ops, add_iommu_group);
> > > }
> > >
> > > But the iommu bus notifier gets called for the 'pci' bus type, which
> > > has the iommu_ops field NULL (since it hasn't been set for iommu).
> >
> > So this is what needs to be figured out, how is the notifier being
> > called with a PCI device? Who else called iommu_bus_init() for the PCI
> > bus?
> >
>
> Nobody. The only caller of iommu_bus_init() the above OMAP IOMMU.
>
> However, I found something interesting. Tried to bisect this without much
> luck; I did two bisects and ended up in the same merge commit:
>
> # good: [0f16aa3c24a216d14d7f0587e1cbd2c1b51a38f3] Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
> # first bad commit: [755a9ba7bf24a45b6dbf8bb15a5a56c8ed12461a] Merge tag 'dt-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next
>
> So, after doing a few diff's between that good and bad and searching for
> "bus_notifier" changes, saw something strange in arch/arm/mach-mvebu/coherency.c.
>
> It seems bus_register_notifier() is been called for platform and pci devices
> with the *same* notifier block. Haven't looked close enough, but you mentioned
> that could cause trouble?
>
> This patch fixes the issue here:
>
> diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
> index 477202f..2bdc323 100644
> --- a/arch/arm/mach-mvebu/coherency.c
> +++ b/arch/arm/mach-mvebu/coherency.c
> @@ -292,6 +292,10 @@ static struct notifier_block mvebu_hwcc_nb = {
> .notifier_call = mvebu_hwcc_notifier,
> };
>
> +static struct notifier_block mvebu_hwcc_pci_nb = {
> + .notifier_call = mvebu_hwcc_notifier,
> +};
> +
> static void __init armada_370_coherency_init(struct device_node *np)
> {
> struct resource res;
> @@ -427,7 +431,7 @@ static int __init coherency_pci_init(void)
> {
> if (coherency_available())
> bus_register_notifier(&pci_bus_type,
> - &mvebu_hwcc_nb);
> + &mvebu_hwcc_pci_nb);
> return 0;
> }
>
> Paolo, can you apply it and confirm it fixes the problem?
>
> Greg, can you confirm using the same notifier block pointer
> for two different bus types makes the bus notifier go nuts?
The bus notifier doesn't "go nuts", but the call back functions must be
able to handle the devices for that specific bus being passed to the
function for it.
Again, you shouldn't ever mix bus types with the same notifier unless
you _really_ know what you are doing, and even then, I wouldn't
recommend it.
greg k-h
Dear Ezequiel Garcia,
On Mon, 7 Jul 2014 20:37:58 -0300, Ezequiel Garcia wrote:
> It seems bus_register_notifier() is been called for platform and pci devices
> with the *same* notifier block. Haven't looked close enough, but you mentioned
> that could cause trouble?
>
> This patch fixes the issue here:
>
> diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
> index 477202f..2bdc323 100644
> --- a/arch/arm/mach-mvebu/coherency.c
> +++ b/arch/arm/mach-mvebu/coherency.c
> @@ -292,6 +292,10 @@ static struct notifier_block mvebu_hwcc_nb = {
> .notifier_call = mvebu_hwcc_notifier,
> };
>
> +static struct notifier_block mvebu_hwcc_pci_nb = {
> + .notifier_call = mvebu_hwcc_notifier,
> +};
> +
> static void __init armada_370_coherency_init(struct device_node *np)
> {
> struct resource res;
> @@ -427,7 +431,7 @@ static int __init coherency_pci_init(void)
> {
> if (coherency_available())
> bus_register_notifier(&pci_bus_type,
> - &mvebu_hwcc_nb);
> + &mvebu_hwcc_pci_nb);
> return 0;
> }
>
> Paolo, can you apply it and confirm it fixes the problem?
>
> Greg, can you confirm using the same notifier block pointer
> for two different bus types makes the bus notifier go nuts?
Looking at how notifier_chain_register() is implemented (which gets
called by bus_register_notifier() ->
blocking_notifier_chain_register()), I indeed don't see how a single
'struct notifier_block' can be registered on multiple notifier chains,
so I believe your patch is correct.
Thanks for the investigation!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
On Tue, Jul 8, 2014 at 9:41 AM, Thomas Petazzoni
<[email protected]> wrote:
> Dear Ezequiel Garcia,
>
> On Mon, 7 Jul 2014 20:37:58 -0300, Ezequiel Garcia wrote:
>
>> It seems bus_register_notifier() is been called for platform and pci devices
>> with the *same* notifier block. Haven't looked close enough, but you mentioned
>> that could cause trouble?
>>
>> This patch fixes the issue here:
>>
>> diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
>> index 477202f..2bdc323 100644
>> --- a/arch/arm/mach-mvebu/coherency.c
>> +++ b/arch/arm/mach-mvebu/coherency.c
>> @@ -292,6 +292,10 @@ static struct notifier_block mvebu_hwcc_nb = {
>> .notifier_call = mvebu_hwcc_notifier,
>> };
>>
>> +static struct notifier_block mvebu_hwcc_pci_nb = {
>> + .notifier_call = mvebu_hwcc_notifier,
>> +};
>> +
>> static void __init armada_370_coherency_init(struct device_node *np)
>> {
>> struct resource res;
>> @@ -427,7 +431,7 @@ static int __init coherency_pci_init(void)
>> {
>> if (coherency_available())
>> bus_register_notifier(&pci_bus_type,
>> - &mvebu_hwcc_nb);
>> + &mvebu_hwcc_pci_nb);
>> return 0;
>> }
>>
>> Paolo, can you apply it and confirm it fixes the problem?
>>
>> Greg, can you confirm using the same notifier block pointer
>> for two different bus types makes the bus notifier go nuts?
>
> Looking at how notifier_chain_register() is implemented (which gets
> called by bus_register_notifier() ->
> blocking_notifier_chain_register()), I indeed don't see how a single
> 'struct notifier_block' can be registered on multiple notifier chains,
> so I believe your patch is correct.
>
yes, i confim this patch fixes my issue, thanks!
--
bye,
p.
Ezequiel,
On Mon, Jul 07, 2014 at 08:37:58PM -0300, Ezequiel Garcia wrote:
> On 07 Jul 11:30 AM, Greg Kroah-Hartman wrote:
> > On Mon, Jul 07, 2014 at 07:58:18AM -0300, Ezequiel Garcia wrote:
> [..]
> > >
> > > I guess I snipped the thread and lost most of the information about the panic.
> > > Here's the original bug report:
> > >
> > > http://www.spinics.net/lists/arm-kernel/msg344059.html
> > >
> > > The problem reported involves enabling OMAP IOMMU driver and not any other IOMMU
> > > driver. Doing some tracing and adding a few prints, we found that
> > > omap_iommu_init() sets a bus notifier for the platform bus type:
> > >
> > > omap_iommu_init -> bus_set_iommu -> iommu_bus_init:
> > >
> > > static void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops)
> > > {
> > > bus_register_notifier(bus, &iommu_bus_nb);
> > > bus_for_each_dev(bus, NULL, ops, add_iommu_group);
> > > }
> > >
> > > But the iommu bus notifier gets called for the 'pci' bus type, which
> > > has the iommu_ops field NULL (since it hasn't been set for iommu).
> >
> > So this is what needs to be figured out, how is the notifier being
> > called with a PCI device? Who else called iommu_bus_init() for the PCI
> > bus?
> >
>
> Nobody. The only caller of iommu_bus_init() the above OMAP IOMMU.
>
> However, I found something interesting. Tried to bisect this without much
> luck; I did two bisects and ended up in the same merge commit:
>
> # good: [0f16aa3c24a216d14d7f0587e1cbd2c1b51a38f3] Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
> # first bad commit: [755a9ba7bf24a45b6dbf8bb15a5a56c8ed12461a] Merge tag 'dt-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next
>
> So, after doing a few diff's between that good and bad and searching for
> "bus_notifier" changes, saw something strange in arch/arm/mach-mvebu/coherency.c.
>
> It seems bus_register_notifier() is been called for platform and pci devices
> with the *same* notifier block. Haven't looked close enough, but you mentioned
> that could cause trouble?
>
> This patch fixes the issue here:
Thanks for digging in to this! Please submit this as patch on it's own
and I'll merge it in.
thx,
Jason.