* [PATCH net-next] netdevsim: Change nsim_devlink_setup to return error to caller
@ 2018-03-30 16:28 David Ahern
2018-03-31 6:15 ` Jakub Kicinski
2018-04-01 2:07 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: David Ahern @ 2018-03-30 16:28 UTC (permalink / raw)
To: netdev, jakub.kicinski; +Cc: David Ahern
Change nsim_devlink_setup to return any error back to the caller and
update nsim_init to handle it.
Requested-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
---
drivers/net/netdevsim/devlink.c | 12 +++++++-----
drivers/net/netdevsim/netdev.c | 6 +++++-
drivers/net/netdevsim/netdevsim.h | 5 +++--
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/drivers/net/netdevsim/devlink.c b/drivers/net/netdevsim/devlink.c
index bbdcf064ba10..27ae05c5fdaf 100644
--- a/drivers/net/netdevsim/devlink.c
+++ b/drivers/net/netdevsim/devlink.c
@@ -218,22 +218,22 @@ void nsim_devlink_teardown(struct netdevsim *ns)
}
}
-void nsim_devlink_setup(struct netdevsim *ns)
+int nsim_devlink_setup(struct netdevsim *ns)
{
struct net *net = nsim_to_net(ns);
bool *reg_devlink = net_generic(net, nsim_devlink_id);
struct devlink *devlink;
- int err = -ENOMEM;
+ int err;
/* only one device per namespace controls devlink */
if (!*reg_devlink) {
ns->devlink = NULL;
- return;
+ return 0;
}
devlink = devlink_alloc(&nsim_devlink_ops, 0);
if (!devlink)
- return;
+ return -ENOMEM;
err = devlink_register(devlink, &ns->dev);
if (err)
@@ -247,12 +247,14 @@ void nsim_devlink_setup(struct netdevsim *ns)
*reg_devlink = false;
- return;
+ return 0;
err_dl_unregister:
devlink_unregister(devlink);
err_devlink_free:
devlink_free(devlink);
+
+ return err;
}
/* Initialize per network namespace state */
diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c
index 8b30ab3ea2c2..ec68f38213d9 100644
--- a/drivers/net/netdevsim/netdev.c
+++ b/drivers/net/netdevsim/netdev.c
@@ -167,10 +167,14 @@ static int nsim_init(struct net_device *dev)
SET_NETDEV_DEV(dev, &ns->dev);
- nsim_devlink_setup(ns);
+ err = nsim_devlink_setup(ns);
+ if (err)
+ goto err_unreg_dev;
return 0;
+err_unreg_dev:
+ device_unregister(&ns->dev);
err_bpf_uninit:
nsim_bpf_uninit(ns);
err_debugfs_destroy:
diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h
index afb8cf90c0fd..3a8581af3b85 100644
--- a/drivers/net/netdevsim/netdevsim.h
+++ b/drivers/net/netdevsim/netdevsim.h
@@ -117,7 +117,7 @@ enum nsim_resource_id {
NSIM_RESOURCE_IPV6_FIB_RULES,
};
-void nsim_devlink_setup(struct netdevsim *ns);
+int nsim_devlink_setup(struct netdevsim *ns);
void nsim_devlink_teardown(struct netdevsim *ns);
int nsim_devlink_init(void);
@@ -128,8 +128,9 @@ void nsim_fib_exit(void);
u64 nsim_fib_get_val(struct net *net, enum nsim_resource_id res_id, bool max);
int nsim_fib_set_max(struct net *net, enum nsim_resource_id res_id, u64 val);
#else
-static inline void nsim_devlink_setup(struct netdevsim *ns)
+static inline int nsim_devlink_setup(struct netdevsim *ns)
{
+ return 0;
}
static inline void nsim_devlink_teardown(struct netdevsim *ns)
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] netdevsim: Change nsim_devlink_setup to return error to caller
2018-03-30 16:28 [PATCH net-next] netdevsim: Change nsim_devlink_setup to return error to caller David Ahern
@ 2018-03-31 6:15 ` Jakub Kicinski
2018-04-01 2:07 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2018-03-31 6:15 UTC (permalink / raw)
To: David Ahern; +Cc: netdev
On Fri, 30 Mar 2018 09:28:51 -0700, David Ahern wrote:
> Change nsim_devlink_setup to return any error back to the caller and
> update nsim_init to handle it.
>
> Requested-by: Jakub Kicinski <jakub.kicinski@netronome.com>
> Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Thank you!
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] netdevsim: Change nsim_devlink_setup to return error to caller
2018-03-30 16:28 [PATCH net-next] netdevsim: Change nsim_devlink_setup to return error to caller David Ahern
2018-03-31 6:15 ` Jakub Kicinski
@ 2018-04-01 2:07 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2018-04-01 2:07 UTC (permalink / raw)
To: dsa; +Cc: netdev, jakub.kicinski
From: David Ahern <dsa@cumulusnetworks.com>
Date: Fri, 30 Mar 2018 09:28:51 -0700
> Change nsim_devlink_setup to return any error back to the caller and
> update nsim_init to handle it.
>
> Requested-by: Jakub Kicinski <jakub.kicinski@netronome.com>
> Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-04-01 2:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-30 16:28 [PATCH net-next] netdevsim: Change nsim_devlink_setup to return error to caller David Ahern
2018-03-31 6:15 ` Jakub Kicinski
2018-04-01 2:07 ` David Miller
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).