net: dsa: move port_setup/teardown to be called outside devlink port registered area
Subsystems (5)
Jiri Pirko
maintainerRFC PATCH 1/1 net: dsa: move port_setup/teardown to be called outside devlink port registered area
From: Jiri Pirko <[email protected]>
Move port_setup() op to be called before devlink_port_register() and port_teardown() after devlink_port_unregister().
RFC note: I don't see why this would not work, but I have no way to test this does not break things. But I think it makes sense to move this alongside the rest of the devlink port code, the reinit() function also gets much nicer, as clearly the fact that port_setup()->devlink_port_region_create() was called in dsa_port_setup did not fit the flow.
--- net/dsa/dsa2.c | 64 +++++++++++++++++--------------------------------- 1 file changed, 21 insertions(+), 43 deletions(-)
net/dsa/dsa2.c +21 -43
@@ -451,19 +451,12 @@ static int dsa_port_setup(struct dsa_port *dp) {struct devlink_port *dlp = &dp->devlink_port;bool dsa_port_link_registered = false; -struct dsa_switch *ds = dp->ds;bool dsa_port_enabled = false;int err =0 ;if (dp->setup)return 0 ; -if (ds->ops->port_setup) { - err = ds->ops->port_setup (ds, dp->index); -if (err) -return err; - } -switch (dp->type) {case DSA_PORT_TYPE_UNUSED :dsa_port_disable (dp);
@@ -506,11 +499,6 @@ static int dsa_port_setup(struct dsa_port *dp)dsa_port_disable (dp);if (err && dsa_port_link_registered)dsa_port_link_unregister_of (dp); -if (err) { -if (ds->ops->port_teardown) - ds->ops->port_teardown (ds, dp->index); -return err; - } dp->setup = true;
@@ -523,10 +511,17 @@ static int dsa_port_devlink_setup(struct dsa_port *dp)struct dsa_switch_tree *dst = dp->ds->dst;struct devlink_port_attrs attrs = {};struct devlink *dl = dp->ds->devlink; +struct dsa_switch *ds = dp->ds;const unsigned char *id;unsigned char len;int err; +if (ds->ops->port_setup) { + err = ds->ops->port_setup (ds, dp->index); +if (err) +return err; + } + id = (const unsigned char *)&dst->index; len =sizeof (dst->index);
@@ -552,24 +547,23 @@ static int dsa_port_devlink_setup(struct dsa_port *dp)devlink_port_attrs_set (dlp, &attrs); err =devlink_port_register (dl, dlp, dp->index); +if (err) { +if (ds->ops->port_teardown) + ds->ops->port_teardown (ds, dp->index); +return err; + } + dp->devlink_port_setup = true; -if (!err) - dp->devlink_port_setup = true; - -return err; +return 0 ; }static void dsa_port_teardown (struct dsa_port *dp) {struct devlink_port *dlp = &dp->devlink_port; -struct dsa_switch *ds = dp->ds;if (!dp->setup)return ; -if (ds->ops->port_teardown) - ds->ops->port_teardown (ds, dp->index); -devlink_port_type_clear (dlp);switch (dp->type) {
@@ -597,40 +591,24 @@ static void dsa_port_teardown(struct dsa_port *dp)static void dsa_port_devlink_teardown (struct dsa_port *dp) {struct devlink_port *dlp = &dp->devlink_port; +struct dsa_switch *ds = dp->ds; -if (dp->devlink_port_setup) +if (dp->devlink_port_setup) {devlink_port_unregister (dlp); +if (ds->ops->port_teardown) + ds->ops->port_teardown (ds, dp->index); + } dp->devlink_port_setup = false; }/* Destroy the current devlink port, and create a new one which has the UNUSED -* flavour. At this point, any call to ds->ops->port_setup has been already -* balanced out by a call to ds->ops->port_teardown, so we know that any -* devlink port regions the driver had are now unregistered. We then call its -* ds->ops->port_setup again, in order for the driver to re-create them on the -* new devlink port. +* flavour. */ static int dsa_port_reinit_as_unused (struct dsa_port *dp) { -struct dsa_switch *ds = dp->ds; -int err; -dsa_port_devlink_teardown (dp); dp->type =DSA_PORT_TYPE_UNUSED ; - err =dsa_port_devlink_setup (dp); -if (err) -return err; - -if (ds->ops->port_setup) { -/* On error, leave the devlink port registered, -* dsa_switch_teardown will clean it up later. -*/ - err = ds->ops->port_setup (ds, dp->index); -if (err) -return err; - } - -return 0 ; +return dsa_port_devlink_setup (dp); } static int dsa_devlink_info_get(struct devlink *dl,
Signature · 1 line
2.35.3
Vladimir Oltean
maintainerHi Jiri,
Quoted 12 lines · Jiri Pirko
From: Jiri Pirko <[email protected]>
Move
port_setup()op to be called beforedevlink_port_register()andport_teardown()afterdevlink_port_unregister().RFC note: I don't see why this would not work, but I have no way to test this does not break things. But I think it makes sense to move this alongside the rest of the devlink port code, the
reinit()function also gets much nicer, as clearly the fact that port_setup()->devlink_port_region_create() was called indsa_port_setupdid not fit the flow.
Quoted 2 lines
Signed-off-by Jiri Pirko <[email protected]>---
devlink_port->devlink isn't set (it's set in devl_port_register), so when devlink_port_region_create() calls devl_lock(devlink), it blasts right through that NULL pointer:
[ 4.966960] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000320 [ 5.009201] [0000000000000320] user address but active_mm is swapper [ 5.015616] Internal error: Oops: 96000004 [#1] PREEMPT SMP [ 5.024244] CPU: 1 PID: 8 Comm: kworker/u4:0 Not tainted 5.19.0-rc7-07010-ga9b9500ffaac-dirty #3395 [ 5.033281] Hardware name: CZ.NIC Turris Mox Board (DT) [ 5.038499] Workqueue: events_unbound deferred_probe_work_func [ 5.044342] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 5.051297] pc : __mutex_lock+0x5c/0x460 [ 5.055220] lr : __mutex_lock+0x50/0x460 [ 5.133818] Call trace: [ 5.136258] __mutex_lock+0x5c/0x460 [ 5.139831] mutex_lock_nested+0x40/0x50 [ 5.143750] devlink_port_region_create+0x54/0x15c [ 5.148542] dsa_devlink_port_region_create+0x64/0x90 [ 5.153592] mv88e6xxx_setup_devlink_regions_port+0x30/0x60 [ 5.159165] mv88e6xxx_port_setup+0x10/0x20 [ 5.163345] dsa_port_devlink_setup+0x60/0x150 [ 5.167786] dsa_register_switch+0x938/0x119c [ 5.172138] mv88e6xxx_probe+0x714/0x770 [ 5.176058] mdio_probe+0x34/0x70 [ 5.179370] really_probe.part.0+0x9c/0x2ac [ 5.183550] __driver_probe_device+0x98/0x144 [ 5.187902] driver_probe_device+0xac/0x14c
Jiri Pirko
maintainerQuoted 37 lines · Tue, Jul 26, 2022 at 03:43:09PM CEST, [email protected] wrote:
Hi Jiri,
Quoted 12 lines · Jiri Pirko
From: Jiri Pirko <[email protected]>
Move
port_setup()op to be called beforedevlink_port_register()andport_teardown()afterdevlink_port_unregister().RFC note: I don't see why this would not work, but I have no way to test this does not break things. But I think it makes sense to move this alongside the rest of the devlink port code, the
reinit()function also gets much nicer, as clearly the fact that port_setup()->devlink_port_region_create() was called indsa_port_setupdid not fit the flow.Quoted 2 lines
Signed-off-by Jiri Pirko <[email protected]>---
devlink_port->devlinkisn't set (it's set indevl_port_register), so whendevlink_port_region_create()callsdevl_lock(devlink), it blasts right through that NULL pointer:[ 4.966960] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000320 [ 5.009201] [0000000000000320] user address but active_mm is swapper [ 5.015616] Internal error: Oops: 96000004 [#1] PREEMPT SMP [ 5.024244] CPU: 1 PID: 8 Comm: kworker/u4:0 Not tainted 5.19.0-rc7-07010-ga9b9500ffaac-dirty #3395 [ 5.033281] Hardware name: CZ.NIC Turris Mox Board (DT) [ 5.038499] Workqueue: events_unbound deferred_probe_work_func [ 5.044342] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 5.051297] pc : __mutex_lock+0x5c/0x460 [ 5.055220] lr : __mutex_lock+0x50/0x460 [ 5.133818] Call trace: [ 5.136258] __mutex_lock+0x5c/0x460 [ 5.139831] mutex_lock_nested+0x40/0x50 [ 5.143750] devlink_port_region_create+0x54/0x15c [ 5.148542] dsa_devlink_port_region_create+0x64/0x90 [ 5.153592] mv88e6xxx_setup_devlink_regions_port+0x30/0x60
Quoted 8 lines
[ 5.159165] mv88e6xxx_port_setup+0x10/0x20 [ 5.163345] dsa_port_devlink_setup+0x60/0x150 [ 5.167786] dsa_register_switch+0x938/0x119c [ 5.172138] mv88e6xxx_probe+0x714/0x770 [ 5.176058] mdio_probe+0x34/0x70 [ 5.179370] really_probe.part.0+0x9c/0x2ac [ 5.183550] __driver_probe_device+0x98/0x144 [ 5.187902] driver_probe_device+0xac/0x14c
Oh yes, could you please try together with following patch? (nevermind chicken-egg problem you may spot now)
Subject: [patch net-next RFC] net: devlink: convert region creation/destroy()
to be forbidden on registered devlink/port
No need to create or destroy region when devlink or devlink ports are registered. Limit the possibility to call the region create/destroy() only for non-registered devlink or devlink port. Benefit from that and avoid need to take devl_lock.
--- drivers/net/netdevsim/dev.c | 8 ++-- include/net/devlink.h | 5 --- net/core/devlink.c | 78 ++++++++----------------------------- 3 files changed, 20 insertions(+), 71 deletions(-)
drivers/net/netdevsim/dev.c +4 -4
@@ -557,15 +557,15 @@ static int nsim_dev_dummy_region_init(struct nsim_dev *nsim_dev, struct devlink *devlink) { nsim_dev->dummy_region = -devl_region_create (devlink, &dummy_region_ops, -NSIM_DEV_DUMMY_REGION_SNAPSHOT_MAX , -NSIM_DEV_DUMMY_REGION_SIZE ); +devlink_region_create (devlink, &dummy_region_ops, +NSIM_DEV_DUMMY_REGION_SNAPSHOT_MAX , +NSIM_DEV_DUMMY_REGION_SIZE );return PTR_ERR_OR_ZERO (nsim_dev->dummy_region); }static void nsim_dev_dummy_region_exit (struct nsim_dev *nsim_dev) { -devl_region_destroy (nsim_dev->dummy_region); +devlink_region_destroy (nsim_dev->dummy_region); } static int
include/net/devlink.h +0 -5
@@ -1666,10 +1666,6 @@ int devlink_param_driverinit_value_get(struct devlink *devlink, u32 param_id,int devlink_param_driverinit_value_set (struct devlink *devlink,u32 param_id,union devlink_param_value init_val);void devlink_param_value_changed (struct devlink *devlink,u32 param_id); -struct devlink_region *devl_region_create (struct devlink *devlink, -const struct devlink_region_ops *ops, -u32 region_max_snapshots, -u64 region_size);struct devlink_region * devlink_region_create(struct devlink *devlink, const struct devlink_region_ops *ops,
@@ -1678,7 +1674,6 @@ struct devlink_region * devlink_port_region_create(struct devlink_port *port, const struct devlink_port_region_ops *ops, u32 region_max_snapshots, u64 region_size); -void devl_region_destroy (struct devlink_region *region);void devlink_region_destroy (struct devlink_region *region);void devlink_port_region_destroy (struct devlink_region *region);
net/core/devlink.c +16 -62
150 lines not on this page · raw message
Signature · 1 line
2.35.3
Vladimir Oltean
maintainerQuoted 2 lines · Jiri Pirko
Oh yes, could you please try together with following patch? (nevermind chicken-egg problem you may spot now)
Duly ignoring ;)
Quoted 131 lines
Subject: [patch net-next RFC] net: devlink: convert region creation/destroy()
to be forbidden on registered devlink/portNo need to create or destroy region when devlink or devlink ports are registered. Limit the possibility to call the region create/destroy() only for non-registered devlink or devlink port. Benefit from that and avoid need to take
devl_lock.Signed-off-by Jiri Pirko <[email protected]>--- drivers/net/netdevsim/dev.c | 8 ++-- include/net/devlink.h | 5 --- net/core/devlink.c | 78 ++++++++----------------------------- 3 files changed, 20 insertions(+), 71 deletions(-)drivers/net/netdevsim/dev.c +4
-4@@ -557,15 +557,15 @@ static int nsim_dev_dummy_region_init(struct nsim_dev *nsim_dev, struct devlink *devlink) { nsim_dev->dummy_region = -devl_region_create (devlink, &dummy_region_ops, -NSIM_DEV_DUMMY_REGION_SNAPSHOT_MAX , -NSIM_DEV_DUMMY_REGION_SIZE ); +devlink_region_create (devlink, &dummy_region_ops, +NSIM_DEV_DUMMY_REGION_SNAPSHOT_MAX , +NSIM_DEV_DUMMY_REGION_SIZE );return PTR_ERR_OR_ZERO (nsim_dev->dummy_region); }static void nsim_dev_dummy_region_exit (struct nsim_dev *nsim_dev) { -devl_region_destroy (nsim_dev->dummy_region); +devlink_region_destroy (nsim_dev->dummy_region); } static intinclude/net/devlink.h +0
-5@@ -1666,10 +1666,6 @@ int devlink_param_driverinit_value_get(struct devlink *devlink, u32 param_id,int devlink_param_driverinit_value_set (struct devlink *devlink,u32 param_id,union devlink_param_value init_val);void devlink_param_value_changed (struct devlink *devlink,u32 param_id); -struct devlink_region *devl_region_create (struct devlink *devlink, -const struct devlink_region_ops *ops, -u32 region_max_snapshots, -u64 region_size);struct devlink_region * devlink_region_create(struct devlink *devlink, const struct devlink_region_ops *ops,@@ -1678,7 +1674,6 @@ struct devlink_region * devlink_port_region_create(struct devlink_port *port, const struct devlink_port_region_ops *ops, u32 region_max_snapshots, u64 region_size); -void devl_region_destroy (struct devlink_region *region);void devlink_region_destroy (struct devlink_region *region);void devlink_port_region_destroy (struct devlink_region *region);net/core/devlink.c +8
-27@@ -5701,8 +5701,7 @@ static void devlink_nl_region_notify(struct devlink_region *region,struct sk_buff *msg;WARN_ON (cmd !=DEVLINK_CMD_REGION_NEW && cmd !=DEVLINK_CMD_REGION_DEL ); -if (!xa_get_mark (&devlinks, devlink->index,DEVLINK_REGISTERED )) -return ; +ASSERT_DEVLINK_REGISTERED (devlink); msg =devlink_nl_region_notify_build (region, snapshot, cmd,0 ,0 );if (IS_ERR (msg))@@ -11131,21 +11130,22 @@ void devlink_param_value_changed(struct devlink *devlink, u32 param_id)EXPORT_SYMBOL_GPL (devlink_param_value_changed);/** -* devl_region_create - create a new address region +* devlink_region_create - create a new address region * * @devlink: devlink * @ops: region operations and name * @region_max_snapshots: Maximum supported number of snapshots for region * @region_size: size of region */ -struct devlink_region *devl_region_create (struct devlink *devlink, -const struct devlink_region_ops *ops, -u32 region_max_snapshots, -u64 region_size) +struct devlink_region * +devlink_region_create (struct devlink *devlink, +const struct devlink_region_ops *ops, +u32 region_max_snapshots, +u64 region_size) {struct devlink_region *region; -devl_assert_locked (devlink); +ASSERT_DEVLINK_NOT_REGISTERED (devlink);if (WARN_ON (!ops) ||WARN_ON (!ops->destructor))return ERR_PTR (-EINVAL );@@ -11164,35 +11164,9 @@ struct devlink_region *devl_region_create(struct devlink *devlink,INIT_LIST_HEAD (®ion->snapshot_list);mutex_init (®ion->snapshot_lock);list_add_tail (®ion->list, &devlink->region_list); -devlink_nl_region_notify (region,NULL ,DEVLINK_CMD_REGION_NEW );return region; } -EXPORT_SYMBOL_GPL (devl_region_create); - -/** -* devlink_region_create - create a new address region -* -* @devlink: devlink -* @ops: region operations and name -* @region_max_snapshots: Maximum supported number of snapshots for region -* @region_size: size of region -* -* Context: Takes and release devlink->lock <mutex>. -*/ -struct devlink_region * -devlink_region_create (struct devlink *devlink, -const struct devlink_region_ops *ops, -u32 region_max_snapshots,u64 region_size) -{ -struct devlink_region *region;
net/core/devlink.c struct devlink_region *devl_region_create(struct devlink *devlink, · line 11172
Quoted 10 lines
net/core/devlink.c +0
-7- -devl_lock (devlink); - region =devl_region_create (devlink, ops, region_max_snapshots, - region_size); -devl_unlock (devlink); -return region; -}EXPORT_SYMBOL_GPL (devlink_region_create);/**
Were you on net-next when you generated this patch? Here's what I have at 11164:
devlink_port_region_create:
if (devlink_port_region_get_by_name(port, ops->name)) {
err = -EEXIST;
goto unlock;
}
region = kzalloc(sizeof(*region), GFP_KERNEL);
if (!region) {My end of devl_region_create() and start of devlink_region_create() are at 11106, but notice how I lack the mutex_init(®ion->snapshot_lock) that you have in your context:
INIT_LIST_HEAD(®ion->snapshot_list); list_add_tail(®ion->list, &devlink->region_list); devlink_nl_region_notify(region, NULL, DEVLINK_CMD_REGION_NEW); return region; }
EXPORT_SYMBOL_GPL(devl_region_create);
Would you mind regenerating this patch rather than letting me bodge it?
Jiri Pirko
maintainerQuoted 170 lines · Tue, Jul 26, 2022 at 05:20:59PM CEST, [email protected] wrote:
Quoted 2 lines · Jiri Pirko
Oh yes, could you please try together with following patch? (nevermind chicken-egg problem you may spot now)
Duly ignoring ;)
Quoted 131 lines
Subject: [patch net-next RFC] net: devlink: convert region creation/destroy()
to be forbidden on registered devlink/portNo need to create or destroy region when devlink or devlink ports are registered. Limit the possibility to call the region create/destroy() only for non-registered devlink or devlink port. Benefit from that and avoid need to take
devl_lock.Signed-off-by Jiri Pirko <[email protected]>--- drivers/net/netdevsim/dev.c | 8 ++-- include/net/devlink.h | 5 --- net/core/devlink.c | 78 ++++++++----------------------------- 3 files changed, 20 insertions(+), 71 deletions(-)drivers/net/netdevsim/dev.c +4
-4@@ -557,15 +557,15 @@ static int nsim_dev_dummy_region_init(struct nsim_dev *nsim_dev, struct devlink *devlink) { nsim_dev->dummy_region = -devl_region_create (devlink, &dummy_region_ops, -NSIM_DEV_DUMMY_REGION_SNAPSHOT_MAX , -NSIM_DEV_DUMMY_REGION_SIZE ); +devlink_region_create (devlink, &dummy_region_ops, +NSIM_DEV_DUMMY_REGION_SNAPSHOT_MAX , +NSIM_DEV_DUMMY_REGION_SIZE );return PTR_ERR_OR_ZERO (nsim_dev->dummy_region); }static void nsim_dev_dummy_region_exit (struct nsim_dev *nsim_dev) { -devl_region_destroy (nsim_dev->dummy_region); +devlink_region_destroy (nsim_dev->dummy_region); } static intinclude/net/devlink.h +0
-5@@ -1666,10 +1666,6 @@ int devlink_param_driverinit_value_get(struct devlink *devlink, u32 param_id,int devlink_param_driverinit_value_set (struct devlink *devlink,u32 param_id,union devlink_param_value init_val);void devlink_param_value_changed (struct devlink *devlink,u32 param_id); -struct devlink_region *devl_region_create (struct devlink *devlink, -const struct devlink_region_ops *ops, -u32 region_max_snapshots, -u64 region_size);struct devlink_region * devlink_region_create(struct devlink *devlink, const struct devlink_region_ops *ops,@@ -1678,7 +1674,6 @@ struct devlink_region * devlink_port_region_create(struct devlink_port *port, const struct devlink_port_region_ops *ops, u32 region_max_snapshots, u64 region_size); -void devl_region_destroy (struct devlink_region *region);void devlink_region_destroy (struct devlink_region *region);void devlink_port_region_destroy (struct devlink_region *region);net/core/devlink.c +8
-27@@ -5701,8 +5701,7 @@ static void devlink_nl_region_notify(struct devlink_region *region,struct sk_buff *msg;WARN_ON (cmd !=DEVLINK_CMD_REGION_NEW && cmd !=DEVLINK_CMD_REGION_DEL ); -if (!xa_get_mark (&devlinks, devlink->index,DEVLINK_REGISTERED )) -return ; +ASSERT_DEVLINK_REGISTERED (devlink); msg =devlink_nl_region_notify_build (region, snapshot, cmd,0 ,0 );if (IS_ERR (msg))@@ -11131,21 +11130,22 @@ void devlink_param_value_changed(struct devlink *devlink, u32 param_id)EXPORT_SYMBOL_GPL (devlink_param_value_changed);/** -* devl_region_create - create a new address region +* devlink_region_create - create a new address region * * @devlink: devlink * @ops: region operations and name * @region_max_snapshots: Maximum supported number of snapshots for region * @region_size: size of region */ -struct devlink_region *devl_region_create (struct devlink *devlink, -const struct devlink_region_ops *ops, -u32 region_max_snapshots, -u64 region_size) +struct devlink_region * +devlink_region_create (struct devlink *devlink, +const struct devlink_region_ops *ops, +u32 region_max_snapshots, +u64 region_size) {struct devlink_region *region; -devl_assert_locked (devlink); +ASSERT_DEVLINK_NOT_REGISTERED (devlink);if (WARN_ON (!ops) ||WARN_ON (!ops->destructor))return ERR_PTR (-EINVAL );@@ -11164,35 +11164,9 @@ struct devlink_region *devl_region_create(struct devlink *devlink,INIT_LIST_HEAD (®ion->snapshot_list);mutex_init (®ion->snapshot_lock);list_add_tail (®ion->list, &devlink->region_list); -devlink_nl_region_notify (region,NULL ,DEVLINK_CMD_REGION_NEW );return region; } -EXPORT_SYMBOL_GPL (devl_region_create); - -/** -* devlink_region_create - create a new address region -* -* @devlink: devlink -* @ops: region operations and name -* @region_max_snapshots: Maximum supported number of snapshots for region -* @region_size: size of region -* -* Context: Takes and release devlink->lock <mutex>. -*/ -struct devlink_region * -devlink_region_create (struct devlink *devlink, -const struct devlink_region_ops *ops, -u32 region_max_snapshots,u64 region_size) -{ -struct devlink_region *region;net/core/devlink.c struct devlink_region *devl_region_create(struct devlink *devlink, · line 11172
Quoted 10 lines
net/core/devlink.c +0
-7- -devl_lock (devlink); - region =devl_region_create (devlink, ops, region_max_snapshots, - region_size); -devl_unlock (devlink); -return region; -}EXPORT_SYMBOL_GPL (devlink_region_create);/** Were you on net-next when you generated this patch? Here's what I have at 11164:
devlink_port_region_create:if (devlink_port_region_get_by_name(port, ops->name)) { err = -EEXIST; goto unlock; } region = kzalloc(sizeof(*region), GFP_KERNEL); if (!region) {My end of
devl_region_create()and start ofdevlink_region_create()are at 11106, but notice how I lack themutex_init(®ion->snapshot_lock)that you have in your context:INIT_LIST_HEAD(®ion->snapshot_list); list_add_tail(®ion->list, &devlink->region_list); devlink_nl_region_notify(region, NULL, DEVLINK_CMD_REGION_NEW); return region; }
Quoted 3 lines
EXPORT_SYMBOL_GPL(devl_region_create);Would you mind regenerating this patch rather than letting me bodge it?
Darn, wait. I will fixup a squash for you. Sorry.
Jiri Pirko
maintainerQuoted 2 lines · Tue, Jul 26, 2022 at 05:57:59PM CEST, [email protected] wrote:
Quoted 1 line · Tue, Jul 26, 2022 at 05:20:59PM CEST, [email protected] wrote:
On Tue, Jul 26, 2022 at 04:45:44PM +0200, Jiri Pirko wrote:
[..]
Quoted 2 lines
Darn, wait. I will fixup a squash for you. Sorry.
Here it is:
drivers/net/netdevsim/dev.c +4 -4
@@ -557,15 +557,15 @@ static int nsim_dev_dummy_region_init(struct nsim_dev *nsim_dev, struct devlink *devlink) { nsim_dev->dummy_region = -devl_region_create (devlink, &dummy_region_ops, -NSIM_DEV_DUMMY_REGION_SNAPSHOT_MAX , -NSIM_DEV_DUMMY_REGION_SIZE ); +devlink_region_create (devlink, &dummy_region_ops, +NSIM_DEV_DUMMY_REGION_SNAPSHOT_MAX , +NSIM_DEV_DUMMY_REGION_SIZE );return PTR_ERR_OR_ZERO (nsim_dev->dummy_region); }static void nsim_dev_dummy_region_exit (struct nsim_dev *nsim_dev) { -devl_region_destroy (nsim_dev->dummy_region); +devlink_region_destroy (nsim_dev->dummy_region); } static int
include/net/devlink.h +0 -5
@@ -1665,10 +1665,6 @@ int devlink_param_driverinit_value_get(struct devlink *devlink, u32 param_id,int devlink_param_driverinit_value_set (struct devlink *devlink,u32 param_id,union devlink_param_value init_val);void devlink_param_value_changed (struct devlink *devlink,u32 param_id); -struct devlink_region *devl_region_create (struct devlink *devlink, -const struct devlink_region_ops *ops, -u32 region_max_snapshots, -u64 region_size);struct devlink_region * devlink_region_create(struct devlink *devlink, const struct devlink_region_ops *ops,
@@ -1677,7 +1673,6 @@ struct devlink_region * devlink_port_region_create(struct devlink_port *port, const struct devlink_port_region_ops *ops, u32 region_max_snapshots, u64 region_size); -void devl_region_destroy (struct devlink_region *region);void devlink_region_destroy (struct devlink_region *region);void devlink_port_region_destroy (struct devlink_region *region);
net/core/devlink.c +35 -75
230 lines not on this page · raw message
net/dsa/dsa2.c +21 -43
125 lines not on this page · raw message
Vladimir Oltean
maintainerQuoted 1 line · Jiri Pirko
Here it is:
Thanks, this one does apply.
We have the same problem, except now it's with port->region_list (region_create does list_add_tail, port_register does INIT_LIST_HEAD).
I don't think you need to see this anymore, but anyway, here it is.
[ 4.949727] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000010 [ 5.020395] CPU: 1 PID: 8 Comm: kworker/u4:0 Not tainted 5.19.0-rc7-07010-ga9b9500ffaac-dirty #3397 [ 5.047447] pc : devlink_port_region_create+0x6c/0x150 [ 5.052587] lr : dsa_devlink_port_region_create+0x64/0x90 [ 5.057983] sp : ffff80000c17b8b0 [ 5.132669] Call trace: [ 5.135109] devlink_port_region_create+0x6c/0x150 [ 5.139899] dsa_devlink_port_region_create+0x64/0x90 [ 5.144946] mv88e6xxx_setup_devlink_regions_port+0x30/0x60 [ 5.150520] mv88e6xxx_port_setup+0x10/0x20 [ 5.154700] dsa_port_devlink_setup+0x60/0x150 [ 5.159141] dsa_register_switch+0x938/0x119c [ 5.163496] mv88e6xxx_probe+0x714/0x770 [ 5.167416] mdio_probe+0x34/0x70
Jiri Pirko
maintainerQuoted 9 lines · Tue, Jul 26, 2022 at 06:55:20PM CEST, [email protected] wrote:
Quoted 1 line · Jiri Pirko
Here it is:
Thanks, this one does apply.
We have the same problem, except now it's with
port->region_list(region_createdoeslist_add_tail,port_registerdoesINIT_LIST_HEAD).I don't think you need to see this anymore, but anyway, here it is.
Thanks, will fix this and send it to you off-list, to avoid spamming people, sorry.
Thanks!
Quoted 15 lines
[ 4.949727] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000010 [ 5.020395] CPU: 1 PID: 8 Comm: kworker/u4:0 Not tainted 5.19.0-rc7-07010-ga9b9500ffaac-dirty #3397 [ 5.047447] pc : devlink_port_region_create+0x6c/0x150 [ 5.052587] lr : dsa_devlink_port_region_create+0x64/0x90 [ 5.057983] sp : ffff80000c17b8b0 [ 5.132669] Call trace: [ 5.135109] devlink_port_region_create+0x6c/0x150 [ 5.139899] dsa_devlink_port_region_create+0x64/0x90 [ 5.144946] mv88e6xxx_setup_devlink_regions_port+0x30/0x60 [ 5.150520] mv88e6xxx_port_setup+0x10/0x20 [ 5.154700] dsa_port_devlink_setup+0x60/0x150 [ 5.159141] dsa_register_switch+0x938/0x119c [ 5.163496] mv88e6xxx_probe+0x714/0x770 [ 5.167416] mdio_probe+0x34/0x70