diff mbox series

[Eoan] UBUNTU: SAUCE: powerpc/vio: drop bus_type from parent device

Message ID 20190927144011.11017-1-cascardo@canonical.com
State New
Headers show
Series [Eoan] UBUNTU: SAUCE: powerpc/vio: drop bus_type from parent device | expand

Commit Message

Thadeu Lima de Souza Cascardo Sept. 27, 2019, 2:41 p.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1845572

Commit df44b479654f62b478c18ee4d8bc4e9f897a9844 ("kobject: return error code if
writing /sys/.../uevent fails") started returning failure when writing to
/sys/devices/vio/uevent.

This causes an early udevadm trigger to fail. On some installer versions of
Ubuntu, this will cause init to exit, thus panicing the system very early
during boot.

Removing the bus_type from the parent device will remove some of the extra
empty files from /sys/devices/vio/, but will keep the rest of the layout for
vio devices, keeping them under /sys/devices/vio/.

It has been tested that uevents for vio devices don't change after this fix,
they still contain MODALIAS.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
---

This has been submitted upstream just now.

---
 arch/powerpc/platforms/pseries/vio.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Andrea Righi Sept. 27, 2019, 3:06 p.m. UTC | #1
On Fri, Sep 27, 2019 at 11:41:53AM -0300, Thadeu Lima de Souza Cascardo wrote:
> BugLink: https://bugs.launchpad.net/bugs/1845572
> 
> Commit df44b479654f62b478c18ee4d8bc4e9f897a9844 ("kobject: return error code if
> writing /sys/.../uevent fails") started returning failure when writing to
> /sys/devices/vio/uevent.

What's the downside of reverting df44b479654f?

> 
> This causes an early udevadm trigger to fail. On some installer versions of
> Ubuntu, this will cause init to exit, thus panicing the system very early
> during boot.
> 
> Removing the bus_type from the parent device will remove some of the extra
> empty files from /sys/devices/vio/, but will keep the rest of the layout for
> vio devices, keeping them under /sys/devices/vio/.
> 
> It has been tested that uevents for vio devices don't change after this fix,
> they still contain MODALIAS.
> 
> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
> ---
> 
> This has been submitted upstream just now.

Link:?

Thanks,
-Andrea
Thadeu Lima de Souza Cascardo Sept. 27, 2019, 3:11 p.m. UTC | #2
On Fri, Sep 27, 2019 at 05:06:03PM +0200, Andrea Righi wrote:
> On Fri, Sep 27, 2019 at 11:41:53AM -0300, Thadeu Lima de Souza Cascardo wrote:
> > BugLink: https://bugs.launchpad.net/bugs/1845572
> > 
> > Commit df44b479654f62b478c18ee4d8bc4e9f897a9844 ("kobject: return error code if
> > writing /sys/.../uevent fails") started returning failure when writing to
> > /sys/devices/vio/uevent.
> 
> What's the downside of reverting df44b479654f?
> 

We divert from upstream and change core code, instead of changing only powerpc
specific code.

> > 
> > This causes an early udevadm trigger to fail. On some installer versions of
> > Ubuntu, this will cause init to exit, thus panicing the system very early
> > during boot.
> > 
> > Removing the bus_type from the parent device will remove some of the extra
> > empty files from /sys/devices/vio/, but will keep the rest of the layout for
> > vio devices, keeping them under /sys/devices/vio/.
> > 
> > It has been tested that uevents for vio devices don't change after this fix,
> > they still contain MODALIAS.
> > 
> > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
> > ---
> > 
> > This has been submitted upstream just now.
> 
> Link:?
> 

There was no link yet when I sent the sauce patch.  :-)

http://patchwork.ozlabs.org/patch/1168596/

> Thanks,
> -Andrea
Seth Forshee Sept. 27, 2019, 5:33 p.m. UTC | #3
On Fri, Sep 27, 2019 at 11:41:53AM -0300, Thadeu Lima de Souza Cascardo wrote:
> BugLink: https://bugs.launchpad.net/bugs/1845572
> 
> Commit df44b479654f62b478c18ee4d8bc4e9f897a9844 ("kobject: return error code if
> writing /sys/.../uevent fails") started returning failure when writing to
> /sys/devices/vio/uevent.
> 
> This causes an early udevadm trigger to fail. On some installer versions of
> Ubuntu, this will cause init to exit, thus panicing the system very early
> during boot.
> 
> Removing the bus_type from the parent device will remove some of the extra
> empty files from /sys/devices/vio/, but will keep the rest of the layout for
> vio devices, keeping them under /sys/devices/vio/.
> 
> It has been tested that uevents for vio devices don't change after this fix,
> they still contain MODALIAS.
> 
> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

Positive testing, fixes a bug critical for eoan release.

Acked-by: Seth Forshee <seth.forshee@canonical.com>
Marcelo Henrique Cerri Sept. 27, 2019, 7:01 p.m. UTC | #4
Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
diff mbox series

Patch

diff --git a/arch/powerpc/platforms/pseries/vio.c b/arch/powerpc/platforms/pseries/vio.c
index 6601b9d404dc..d570d5494f30 100644
--- a/arch/powerpc/platforms/pseries/vio.c
+++ b/arch/powerpc/platforms/pseries/vio.c
@@ -36,7 +36,6 @@  static struct vio_dev vio_bus_device  = { /* fake "parent" device */
 	.name = "vio",
 	.type = "",
 	.dev.init_name = "vio",
-	.dev.bus = &vio_bus_type,
 };
 
 #ifdef CONFIG_PPC_SMLPAR