Skip to contentSkip to conversation

ipmi_si: fix unexpected driver unregister warning

PATCH In review Kefeng Wang 2 participants 5 messages May 17, 2019 – May 18, 2019 IPMI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ipmi_si: fix unexpected driver unregister warning

If ipmi_si_platform_init()->platform_driver_register() fails, platform_driver_unregister() called unconditionally will trigger following warning,

ipmi_platform: Unable to register driver: -12

------------[ cut here ]------------
Unexpected driver unregister!
WARNING: CPU: 1 PID: 7210 at drivers/base/driver.c:193 driver_unregister+0x60/0x70 drivers/base/driver.c:193

Fix it by adding platform_registered variable, only unregister platform driver when it is already successfully registered.

---
 drivers/char/ipmi/ipmi_si_platform.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/char/ipmi/ipmi_si_platform.c +5 -1
index f2a91c4d8cab..0cd849675d99 100644
@@ -19,6 +19,7 @@
 #include "ipmi_si.h"
 #include "ipmi_dmi.h"
 
+static bool platform_registered;
 static bool si_tryplatform = true;
 #ifdef CONFIG_ACPI
 static bool          si_tryacpi = true;
@@ -469,9 +470,12 @@ void ipmi_si_platform_init(void)
 	int rv = platform_driver_register(&ipmi_platform_driver);
 	if (rv)
 		pr_err("Unable to register driver: %d\n", rv);
+	else
+		platform_registered = true;
 }
 
 void ipmi_si_platform_shutdown(void)
 {
-	platform_driver_unregister(&ipmi_platform_driver);
+	if (platform_registered)
+		platform_driver_unregister(&ipmi_platform_driver);
 }
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 ipmi_si: use bool type for initialized variable

Cover 'int' to 'bool' type for initialized variable.

---
 drivers/char/ipmi/ipmi_si_intf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/char/ipmi/ipmi_si_intf.c +2 -2
index f124a2d2bb9f..da5b6723329a 100644
@@ -71,7 +71,7 @@ enum si_intf_state {
 
 static const char * const si_to_str[] = { "invalid", "kcs", "smic", "bt" };
 
-static int initialized;
+static bool initialized;
 
 /*
  * Indexes into stats[] in smi_info below.
@@ -2124,7 +2124,7 @@ static int __init init_ipmi_si(void)
 	}
 
 skip_fallback_noirq:
-	initialized = 1;
+	initialized = true;
 	mutex_unlock(&smi_infos_lock);
 
 	if (type)
Signature · 1 line
2.20.1
#2 lore raw

Re: [PATCH] ipmi_si: use bool type for initialized variable

Quoted 1 line · Kefeng Wang

Cover 'int' to 'bool' type for initialized variable.

A reasonable cleanup, queued for 5.3.

-corey

Quoted 31 lines
---
 drivers/char/ipmi/ipmi_si_intf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/char/ipmi/ipmi_si_intf.c +2 -2
index f124a2d2bb9f..da5b6723329a 100644
@@ -71,7 +71,7 @@ enum si_intf_state {
 
 static const char * const si_to_str[] = { "invalid", "kcs", "smic", "bt" };
 
-static int initialized;
+static bool initialized;
 
 /*
  * Indexes into stats[] in smi_info below.
@@ -2124,7 +2124,7 @@ static int __init init_ipmi_si(void)
 	}
 
 skip_fallback_noirq:
-	initialized = 1;
+	initialized = true;
 	mutex_unlock(&smi_infos_lock);
 
 	if (type)
Signature · 1 line
2.20.1
#3 lore raw
In reply to Kefeng Wang
Quoted 11 lines · Kefeng Wang

If ipmi_si_platform_init()->platform_driver_register() fails, platform_driver_unregister() called unconditionally will trigger following warning,

ipmi_platform: Unable to register driver: -12

------------[ cut here ]------------
Unexpected driver unregister!
WARNING: CPU: 1 PID: 7210 at drivers/base/driver.c:193 driver_unregister+0x60/0x70 drivers/base/driver.c:193

Fix it by adding platform_registered variable, only unregister platform driver when it is already successfully registered.

This is good, but have you found out why the driver was unable to register in the first place? That really shouldn't happen.

This patch is queued for 5.3.

-corey

Quoted 36 lines
---
 drivers/char/ipmi/ipmi_si_platform.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/char/ipmi/ipmi_si_platform.c +5 -1
index f2a91c4d8cab..0cd849675d99 100644
@@ -19,6 +19,7 @@
 #include "ipmi_si.h"
 #include "ipmi_dmi.h"
 
+static bool platform_registered;
 static bool si_tryplatform = true;
 #ifdef CONFIG_ACPI
 static bool          si_tryacpi = true;
@@ -469,9 +470,12 @@ void ipmi_si_platform_init(void)
 	int rv = platform_driver_register(&ipmi_platform_driver);
 	if (rv)
 		pr_err("Unable to register driver: %d\n", rv);
+	else
+		platform_registered = true;
 }
 
 void ipmi_si_platform_shutdown(void)
 {
-	platform_driver_unregister(&ipmi_platform_driver);
+	if (platform_registered)
+		platform_driver_unregister(&ipmi_platform_driver);
 }
Signature · 1 line
2.20.1
#4 lore raw
Quoted 10 lines · Corey Minyard
Quoted 9 lines · Kefeng Wang

If ipmi_si_platform_init()->platform_driver_register() fails, platform_driver_unregister() called unconditionally will trigger following warning,

ipmi_platform: Unable to register driver: -12

------------[ cut here ]------------
Unexpected driver unregister!
WARNING: CPU: 1 PID: 7210 at drivers/base/driver.c:193 driver_unregister+0x60/0x70 drivers/base/driver.c:193
Quoted 4 lines
Quoted 2 lines

Fix it by adding platform_registered variable, only unregister platform driver when it is already successfully registered.

This is good, but have you found out why the driver was unable to register in the first place? That really shouldn't happen.

Yes, it is hard to happen in  real scene, the test robot found this issue

when FAULT_INJECTION enabled.

Quoted 42 lines

This patch is queued for 5.3.

-corey

Quoted 35 lines
---
 drivers/char/ipmi/ipmi_si_platform.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/char/ipmi/ipmi_si_platform.c +5 -1
index f2a91c4d8cab..0cd849675d99 100644
@@ -19,6 +19,7 @@
 #include "ipmi_si.h"
 #include "ipmi_dmi.h"
 
+static bool platform_registered;
 static bool si_tryplatform = true;
 #ifdef CONFIG_ACPI
 static bool          si_tryacpi = true;
@@ -469,9 +470,12 @@ void ipmi_si_platform_init(void)
 	int rv = platform_driver_register(&ipmi_platform_driver);
 	if (rv)
 		pr_err("Unable to register driver: %d\n", rv);
+	else
+		platform_registered = true;
 }
 
 void ipmi_si_platform_shutdown(void)
 {
-	platform_driver_unregister(&ipmi_platform_driver);
+	if (platform_registered)
+		platform_driver_unregister(&ipmi_platform_driver);
 }
Signature · 1 line
2.20.1

.