* [PATCH 0/4] staging: dpaa2-ethsw: cleanup notifier block registration
@ 2019-11-11 16:50 Ioana Ciornei
2019-11-11 16:50 ` [PATCH 1/4] staging: dpaa2-ethsw: move port notifier per ethsw Ioana Ciornei
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Ioana Ciornei @ 2019-11-11 16:50 UTC (permalink / raw)
To: gregkh, linux-kernel; +Cc: Ioana Ciornei
This patch set cleans up the notifier block registration by keeping a
private notifier per dpaa2-ethsw instance. Also, convert the global
workqueue to a private one. Without this, multiple probes will lead
to a WARNING dump.
Ioana Ciornei (4):
staging: dpaa2-ethsw: move port notifier per ethsw
staging: dpaa2-ethsw: move port switchdev notifier per ethsw
staging: dpaa2-ethsw: move port switchdev blocking notifier per ethsw
staging: dpaa2-ethsw: ordered workqueue should be per ethsw
drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 50 +++++++++++++++------------------
drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 5 ++++
2 files changed, 27 insertions(+), 28 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/4] staging: dpaa2-ethsw: move port notifier per ethsw
2019-11-11 16:50 [PATCH 0/4] staging: dpaa2-ethsw: cleanup notifier block registration Ioana Ciornei
@ 2019-11-11 16:50 ` Ioana Ciornei
2019-11-11 16:50 ` [PATCH 2/4] staging: dpaa2-ethsw: move port switchdev " Ioana Ciornei
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Ioana Ciornei @ 2019-11-11 16:50 UTC (permalink / raw)
To: gregkh, linux-kernel; +Cc: Ioana Ciornei
Register a different net_device notifier block per ethsw instance.
When probing multiple dpaa2-ethsw instances, without this the register
will fail.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 13 ++++++-------
drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 2 ++
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
index 14a9eebf687e..b25520173fec 100644
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
@@ -1174,10 +1174,6 @@ static int port_netdevice_event(struct notifier_block *unused,
return notifier_from_errno(err);
}
-static struct notifier_block port_nb __read_mostly = {
- .notifier_call = port_netdevice_event,
-};
-
struct ethsw_switchdev_event_work {
struct work_struct work;
struct switchdev_notifier_fdb_info fdb_info;
@@ -1328,9 +1324,11 @@ static int port_switchdev_blocking_event(struct notifier_block *unused,
static int ethsw_register_notifier(struct device *dev)
{
+ struct ethsw_core *ethsw = dev_get_drvdata(dev);
int err;
- err = register_netdevice_notifier(&port_nb);
+ ethsw->port_nb.notifier_call = port_netdevice_event;
+ err = register_netdevice_notifier(ðsw->port_nb);
if (err) {
dev_err(dev, "Failed to register netdev notifier\n");
return err;
@@ -1353,7 +1351,7 @@ static int ethsw_register_notifier(struct device *dev)
err_switchdev_blocking_nb:
unregister_switchdev_notifier(&port_switchdev_nb);
err_switchdev_nb:
- unregister_netdevice_notifier(&port_nb);
+ unregister_netdevice_notifier(ðsw->port_nb);
return err;
}
@@ -1491,6 +1489,7 @@ static int ethsw_port_init(struct ethsw_port_priv *port_priv, u16 port)
static void ethsw_unregister_notifier(struct device *dev)
{
+ struct ethsw_core *ethsw = dev_get_drvdata(dev);
struct notifier_block *nb;
int err;
@@ -1505,7 +1504,7 @@ static void ethsw_unregister_notifier(struct device *dev)
dev_err(dev,
"Failed to unregister switchdev notifier (%d)\n", err);
- err = unregister_netdevice_notifier(&port_nb);
+ err = unregister_netdevice_notifier(ðsw->port_nb);
if (err)
dev_err(dev,
"Failed to unregister netdev notifier (%d)\n", err);
diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
index 3ea8a0ad8c10..39a3f542c8ee 100644
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
@@ -66,6 +66,8 @@ struct ethsw_core {
u8 vlans[VLAN_VID_MASK + 1];
bool learning;
+
+ struct notifier_block port_nb;
};
#endif /* __ETHSW_H */
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/4] staging: dpaa2-ethsw: move port switchdev notifier per ethsw
2019-11-11 16:50 [PATCH 0/4] staging: dpaa2-ethsw: cleanup notifier block registration Ioana Ciornei
2019-11-11 16:50 ` [PATCH 1/4] staging: dpaa2-ethsw: move port notifier per ethsw Ioana Ciornei
@ 2019-11-11 16:50 ` Ioana Ciornei
2019-11-11 16:50 ` [PATCH 3/4] staging: dpaa2-ethsw: move port switchdev blocking " Ioana Ciornei
2019-11-11 16:50 ` [PATCH 4/4] staging: dpaa2-ethsw: ordered workqueue should be " Ioana Ciornei
3 siblings, 0 replies; 5+ messages in thread
From: Ioana Ciornei @ 2019-11-11 16:50 UTC (permalink / raw)
To: gregkh, linux-kernel; +Cc: Ioana Ciornei
Register a different switchdev notifier block per ethsw instance.
When probing multiple dpaa2-ethsw instances, without this the register
will fail.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 11 ++++-------
drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 1 +
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
index b25520173fec..abbfcbf81241 100644
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
@@ -1314,10 +1314,6 @@ static int port_switchdev_blocking_event(struct notifier_block *unused,
return NOTIFY_DONE;
}
-static struct notifier_block port_switchdev_nb = {
- .notifier_call = port_switchdev_event,
-};
-
static struct notifier_block port_switchdev_blocking_nb = {
.notifier_call = port_switchdev_blocking_event,
};
@@ -1334,7 +1330,8 @@ static int ethsw_register_notifier(struct device *dev)
return err;
}
- err = register_switchdev_notifier(&port_switchdev_nb);
+ ethsw->port_switchdev_nb.notifier_call = port_switchdev_event;
+ err = register_switchdev_notifier(ðsw->port_switchdev_nb);
if (err) {
dev_err(dev, "Failed to register switchdev notifier\n");
goto err_switchdev_nb;
@@ -1349,7 +1346,7 @@ static int ethsw_register_notifier(struct device *dev)
return 0;
err_switchdev_blocking_nb:
- unregister_switchdev_notifier(&port_switchdev_nb);
+ unregister_switchdev_notifier(ðsw->port_switchdev_nb);
err_switchdev_nb:
unregister_netdevice_notifier(ðsw->port_nb);
return err;
@@ -1499,7 +1496,7 @@ static void ethsw_unregister_notifier(struct device *dev)
dev_err(dev,
"Failed to unregister switchdev blocking notifier (%d)\n", err);
- err = unregister_switchdev_notifier(&port_switchdev_nb);
+ err = unregister_switchdev_notifier(ðsw->port_switchdev_nb);
if (err)
dev_err(dev,
"Failed to unregister switchdev notifier (%d)\n", err);
diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
index 39a3f542c8ee..e050589758b1 100644
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
@@ -68,6 +68,7 @@ struct ethsw_core {
bool learning;
struct notifier_block port_nb;
+ struct notifier_block port_switchdev_nb;
};
#endif /* __ETHSW_H */
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/4] staging: dpaa2-ethsw: move port switchdev blocking notifier per ethsw
2019-11-11 16:50 [PATCH 0/4] staging: dpaa2-ethsw: cleanup notifier block registration Ioana Ciornei
2019-11-11 16:50 ` [PATCH 1/4] staging: dpaa2-ethsw: move port notifier per ethsw Ioana Ciornei
2019-11-11 16:50 ` [PATCH 2/4] staging: dpaa2-ethsw: move port switchdev " Ioana Ciornei
@ 2019-11-11 16:50 ` Ioana Ciornei
2019-11-11 16:50 ` [PATCH 4/4] staging: dpaa2-ethsw: ordered workqueue should be " Ioana Ciornei
3 siblings, 0 replies; 5+ messages in thread
From: Ioana Ciornei @ 2019-11-11 16:50 UTC (permalink / raw)
To: gregkh, linux-kernel; +Cc: Ioana Ciornei
Register a different switchdev blocking notifier block per ethsw
instance. When probing multiple dpaa2-ethsw instances, without this the
register will fail.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 9 +++------
drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 1 +
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
index abbfcbf81241..37ee9b0aa326 100644
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
@@ -1314,10 +1314,6 @@ static int port_switchdev_blocking_event(struct notifier_block *unused,
return NOTIFY_DONE;
}
-static struct notifier_block port_switchdev_blocking_nb = {
- .notifier_call = port_switchdev_blocking_event,
-};
-
static int ethsw_register_notifier(struct device *dev)
{
struct ethsw_core *ethsw = dev_get_drvdata(dev);
@@ -1337,7 +1333,8 @@ static int ethsw_register_notifier(struct device *dev)
goto err_switchdev_nb;
}
- err = register_switchdev_blocking_notifier(&port_switchdev_blocking_nb);
+ ethsw->port_switchdevb_nb.notifier_call = port_switchdev_blocking_event;
+ err = register_switchdev_blocking_notifier(ðsw->port_switchdevb_nb);
if (err) {
dev_err(dev, "Failed to register switchdev blocking notifier\n");
goto err_switchdev_blocking_nb;
@@ -1490,7 +1487,7 @@ static void ethsw_unregister_notifier(struct device *dev)
struct notifier_block *nb;
int err;
- nb = &port_switchdev_blocking_nb;
+ nb = ðsw->port_switchdevb_nb;
err = unregister_switchdev_blocking_notifier(nb);
if (err)
dev_err(dev,
diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
index e050589758b1..db7eef134230 100644
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
@@ -69,6 +69,7 @@ struct ethsw_core {
struct notifier_block port_nb;
struct notifier_block port_switchdev_nb;
+ struct notifier_block port_switchdevb_nb;
};
#endif /* __ETHSW_H */
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4/4] staging: dpaa2-ethsw: ordered workqueue should be per ethsw
2019-11-11 16:50 [PATCH 0/4] staging: dpaa2-ethsw: cleanup notifier block registration Ioana Ciornei
` (2 preceding siblings ...)
2019-11-11 16:50 ` [PATCH 3/4] staging: dpaa2-ethsw: move port switchdev blocking " Ioana Ciornei
@ 2019-11-11 16:50 ` Ioana Ciornei
3 siblings, 0 replies; 5+ messages in thread
From: Ioana Ciornei @ 2019-11-11 16:50 UTC (permalink / raw)
To: gregkh, linux-kernel; +Cc: Ioana Ciornei
Create a different ordered workqueue per dpaa2-ethsw instance. Without
this change, we overwrite the global queue and leak memory when probing
multiple instances of the driver.
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 17 +++++++++--------
drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 1 +
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
index 37ee9b0aa326..39c0fe347188 100644
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
@@ -18,8 +18,6 @@
#include "ethsw.h"
-static struct workqueue_struct *ethsw_owq;
-
/* Minimal supported DPSW version */
#define DPSW_MIN_VER_MAJOR 8
#define DPSW_MIN_VER_MINOR 1
@@ -1229,8 +1227,10 @@ static int port_switchdev_event(struct notifier_block *unused,
unsigned long event, void *ptr)
{
struct net_device *dev = switchdev_notifier_info_to_dev(ptr);
+ struct ethsw_port_priv *port_priv = netdev_priv(dev);
struct ethsw_switchdev_event_work *switchdev_work;
struct switchdev_notifier_fdb_info *fdb_info = ptr;
+ struct ethsw_core *ethsw = port_priv->ethsw_data;
if (!ethsw_port_dev_check(dev))
return NOTIFY_DONE;
@@ -1266,7 +1266,7 @@ static int port_switchdev_event(struct notifier_block *unused,
return NOTIFY_DONE;
}
- queue_work(ethsw_owq, &switchdev_work->work);
+ queue_work(ethsw->workqueue, &switchdev_work->work);
return NOTIFY_DONE;
@@ -1427,9 +1427,10 @@ static int ethsw_init(struct fsl_mc_device *sw_dev)
}
}
- ethsw_owq = alloc_ordered_workqueue("%s_ordered", WQ_MEM_RECLAIM,
- "ethsw");
- if (!ethsw_owq) {
+ ethsw->workqueue = alloc_ordered_workqueue("%s_%d_ordered",
+ WQ_MEM_RECLAIM, "ethsw",
+ ethsw->sw_attr.id);
+ if (!ethsw->workqueue) {
err = -ENOMEM;
goto err_close;
}
@@ -1441,7 +1442,7 @@ static int ethsw_init(struct fsl_mc_device *sw_dev)
return 0;
err_destroy_ordered_workqueue:
- destroy_workqueue(ethsw_owq);
+ destroy_workqueue(ethsw->workqueue);
err_close:
dpsw_close(ethsw->mc_io, 0, ethsw->dpsw_handle);
@@ -1529,7 +1530,7 @@ static int ethsw_remove(struct fsl_mc_device *sw_dev)
ethsw_teardown_irqs(sw_dev);
- destroy_workqueue(ethsw_owq);
+ destroy_workqueue(ethsw->workqueue);
dpsw_disable(ethsw->mc_io, 0, ethsw->dpsw_handle);
diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
index db7eef134230..a0244f7d5003 100644
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h
@@ -70,6 +70,7 @@ struct ethsw_core {
struct notifier_block port_nb;
struct notifier_block port_switchdev_nb;
struct notifier_block port_switchdevb_nb;
+ struct workqueue_struct *workqueue;
};
#endif /* __ETHSW_H */
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-11-11 16:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-11 16:50 [PATCH 0/4] staging: dpaa2-ethsw: cleanup notifier block registration Ioana Ciornei
2019-11-11 16:50 ` [PATCH 1/4] staging: dpaa2-ethsw: move port notifier per ethsw Ioana Ciornei
2019-11-11 16:50 ` [PATCH 2/4] staging: dpaa2-ethsw: move port switchdev " Ioana Ciornei
2019-11-11 16:50 ` [PATCH 3/4] staging: dpaa2-ethsw: move port switchdev blocking " Ioana Ciornei
2019-11-11 16:50 ` [PATCH 4/4] staging: dpaa2-ethsw: ordered workqueue should be " Ioana Ciornei
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).