From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5A61C10F14 for ; Sat, 13 Apr 2019 16:21:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7DDE5208E3 for ; Sat, 13 Apr 2019 16:21:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="HPHYUP3o" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727353AbfDMQVg (ORCPT ); Sat, 13 Apr 2019 12:21:36 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:40644 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727334AbfDMQVa (ORCPT ); Sat, 13 Apr 2019 12:21:30 -0400 Received: by mail-wr1-f67.google.com with SMTP id h4so15900501wre.7 for ; Sat, 13 Apr 2019 09:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1lKibjdUvc0OFM6FHiVs3QCACjezLReirRh0w24jqh0=; b=HPHYUP3oSV4DNz0QdZeh4RWZfP+Jp7r1ds/oJ89imIpZdBASWt1rJ1vDQbFuOpqJds KU0rF2iboyk96C1/JvxgO2rRgpziZmgf8fEZM0EFYQpIlH7wc+Q5JlEG0vVd70PGa1/Z F9xq8BKxGEW9TD4HgMmHMy0S1LCvIlED9FMNHUMP11jJ/zapiFl4BvPQL9gb2N6PLhF3 velHCeYjHTFdbf1QzPviDRslsSvTR1JAr4Mfj0aTFeERhQ/e7F6Wy/I9kRFxw04IiTAv /9ZILphQN3/HrGTHianCm4KQKK2X+tvm2WTV1wLo3HwVhX6ItNtPcSPNv4oOykyz39Xj Sozg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1lKibjdUvc0OFM6FHiVs3QCACjezLReirRh0w24jqh0=; b=n5OO3RcLCDG0yKRfZPFohUANgIP7eu0MRS9q/XR8b0NHIuHsVnIm0Vt4pyeq+KGSa6 b087x3DUHTnUD7NitcBW4LWwB/drb/kYgqmrTqmOALRlbsbNcn9zgrOGGhb/X0pQeGpM Zsfr5AsnYt39SFjK7hfNR5QMVUuoQBxBYtTXAgldDdEbBZhXr4z0s99pL0QNJVEjnWI5 6XOP6M6hbv/NMAJ9+lyA6/1yB274O/kGUtD2yiv26MBE5MjDFzyM8SeZbhGXGYeLSFEV ujW9jBlyKtIFEFMVRAQFD5OraQI66lh5mz9i6+QKsz9yYIUogL7rc6KZJmOzVAnrItfZ 6bWg== X-Gm-Message-State: APjAAAW414HmVfqe43Mgc/fCpHels63U4I4TB/wLeOHFRq08tz0LN/xc BlAnYdw7EUVvH5GmU/qXtLsQLCgI98k= X-Google-Smtp-Source: APXvYqw5B/l6CoklYFyMijgV3XF4cMvQ7awdMo626NpEuV+wT+dLuucT85i/fUmF8hqSZ/qoe/6tVA== X-Received: by 2002:adf:ff91:: with SMTP id j17mr42742936wrr.114.1555172487677; Sat, 13 Apr 2019 09:21:27 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id r30sm144880681wrr.46.2019.04.13.09.21.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 13 Apr 2019 09:21:27 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, jakub.kicinski@netronome.com Subject: [patch net-next rfc 13/15] netdevsim: implement dev probe/remove skeleton with port initialization Date: Sat, 13 Apr 2019 18:21:10 +0200 Message-Id: <20190413162112.8203-14-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190413162112.8203-1-jiri@resnulli.us> References: <20190413162112.8203-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Implement netdevsim bus probing of netdevsim devices. For every probed device create a devlink instance. According to the user-passed value, create a number of ports represented by devlink port instances. Signed-off-by: Jiri Pirko --- drivers/net/netdevsim/bus.c | 29 ++++++++ drivers/net/netdevsim/dev.c | 115 ++++++++++++++++++++++++++---- drivers/net/netdevsim/netdev.c | 15 ++-- drivers/net/netdevsim/netdevsim.h | 14 +++- 4 files changed, 144 insertions(+), 29 deletions(-) diff --git a/drivers/net/netdevsim/bus.c b/drivers/net/netdevsim/bus.c index 4471f5db50ee..46108a926890 100644 --- a/drivers/net/netdevsim/bus.c +++ b/drivers/net/netdevsim/bus.c @@ -194,6 +194,21 @@ static struct attribute *nsim_bus_attrs[] = { }; ATTRIBUTE_GROUPS(nsim_bus); +static int nsim_bus_probe(struct device *dev) +{ + struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev); + + return nsim_dev_probe(nsim_bus_dev); +} + +static int nsim_bus_remove(struct device *dev) +{ + struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev); + + nsim_dev_remove(nsim_bus_dev); + return 0; +} + int nsim_num_vf(struct device *dev) { struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev); @@ -205,6 +220,8 @@ static struct bus_type nsim_bus = { .name = DRV_NAME, .dev_name = DRV_NAME, .bus_groups = nsim_bus_groups, + .probe = nsim_bus_probe, + .remove = nsim_bus_remove, .num_vf = nsim_num_vf, }; @@ -238,6 +255,18 @@ struct nsim_bus_dev *nsim_bus_dev_new(unsigned int id, unsigned int port_count) return ERR_PTR(err); } +struct nsim_bus_dev *nsim_bus_dev_new_with_ns(struct netdevsim *ns) +{ + struct nsim_bus_dev *nsim_bus_dev; + + dev_hold(ns->netdev); + rtnl_unlock(); + nsim_bus_dev = nsim_bus_dev_new(~0, 0); + rtnl_lock(); + dev_put(ns->netdev); + return nsim_bus_dev; +} + void nsim_bus_dev_del(struct nsim_bus_dev *nsim_bus_dev) { device_unregister(&nsim_bus_dev->dev); diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c index ef518d59afba..43d87c457ad9 100644 --- a/drivers/net/netdevsim/dev.c +++ b/drivers/net/netdevsim/dev.c @@ -45,6 +45,30 @@ static void nsim_dev_debugfs_exit(struct nsim_dev *nsim_dev) debugfs_remove_recursive(nsim_dev->ddir); } +static int nsim_dev_port_debugfs_init(struct nsim_dev *nsim_dev, + struct nsim_dev_port *nsim_dev_port) +{ + char port_ddir_name[16]; + char dev_link_name[32]; + + sprintf(port_ddir_name, "%u", nsim_dev_port->port_index); + nsim_dev_port->ddir = debugfs_create_dir(port_ddir_name, + nsim_dev->ports_ddir); + if (IS_ERR_OR_NULL(nsim_dev_port->ddir)) + return -ENOMEM; + + sprintf(dev_link_name, "../../../" DRV_NAME "%u", + nsim_dev->nsim_bus_dev->dev.id); + debugfs_create_symlink("dev", nsim_dev_port->ddir, dev_link_name); + + return 0; +} + +static void nsim_dev_port_debugfs_exit(struct nsim_dev_port *nsim_dev_port) +{ + debugfs_remove_recursive(nsim_dev_port->ddir); +} + static u64 nsim_dev_ipv4_fib_resource_occ_get(void *priv) { struct nsim_dev *nsim_dev = priv; @@ -198,13 +222,15 @@ static const struct devlink_ops nsim_dev_devlink_ops = { .reload = nsim_dev_reload, }; -static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev) +static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev, + unsigned int port_count) { struct nsim_dev *nsim_dev; struct devlink *devlink; int err; - devlink = devlink_alloc(&nsim_dev_devlink_ops, sizeof(*nsim_dev)); + devlink = devlink_alloc(&nsim_dev_devlink_ops, + struct_size(nsim_dev, ports, port_count)); if (!devlink) return ERR_PTR(-ENOMEM); nsim_dev = devlink_priv(devlink); @@ -249,19 +275,6 @@ static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev) return ERR_PTR(err); } -struct nsim_dev *nsim_dev_create_with_ns(struct nsim_bus_dev *nsim_bus_dev, - struct netdevsim *ns) -{ - struct nsim_dev *nsim_dev; - - dev_hold(ns->netdev); - rtnl_unlock(); - nsim_dev = nsim_dev_create(nsim_bus_dev); - rtnl_lock(); - dev_put(ns->netdev); - return nsim_dev; -} - void nsim_dev_destroy(struct nsim_dev *nsim_dev) { struct devlink *devlink = priv_to_devlink(nsim_dev); @@ -274,6 +287,78 @@ void nsim_dev_destroy(struct nsim_dev *nsim_dev) devlink_free(devlink); } +static int nsim_dev_port_init(struct nsim_dev *nsim_dev, + unsigned int port_index) +{ + struct nsim_dev_port *nsim_dev_port = &nsim_dev->ports[port_index]; + struct devlink_port *devlink_port = &nsim_dev_port->devlink_port; + int err; + + nsim_dev_port->port_index = port_index; + devlink_port_attrs_set(devlink_port, DEVLINK_PORT_FLAVOUR_PHYSICAL, + port_index + 1, 0, 0, + nsim_dev->switch_id.id, + nsim_dev->switch_id.id_len); + err = devlink_port_register(priv_to_devlink(nsim_dev), devlink_port, + port_index); + if (err) + return err; + + err = nsim_dev_port_debugfs_init(nsim_dev, nsim_dev_port); + if (err) + goto err_dl_port_unregister; + return 0; + +err_dl_port_unregister: + devlink_port_unregister(devlink_port); + return err; +} + +static void nsim_dev_port_exit(struct nsim_dev *nsim_dev, + unsigned int port_index) +{ + struct nsim_dev_port *nsim_dev_port = &nsim_dev->ports[port_index]; + struct devlink_port *devlink_port = &nsim_dev_port->devlink_port; + + nsim_dev_port_debugfs_exit(nsim_dev_port); + devlink_port_unregister(devlink_port); +} + +int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev) +{ + struct nsim_dev *nsim_dev; + int i; + int err; + + nsim_dev = nsim_dev_create(nsim_bus_dev, nsim_bus_dev->port_count); + if (IS_ERR(nsim_dev)) + return PTR_ERR(nsim_dev); + dev_set_drvdata(&nsim_bus_dev->dev, nsim_dev); + + for (i = 0; i < nsim_bus_dev->port_count; i++) { + err = nsim_dev_port_init(nsim_dev, i); + if (err) + goto port_rollback; + } + return 0; + +port_rollback: + for (i--; i >= 0; i--) + nsim_dev_port_exit(nsim_dev, i); + nsim_dev_destroy(nsim_dev); + return err; +} + +void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev) +{ + struct nsim_dev *nsim_dev = dev_get_drvdata(&nsim_bus_dev->dev); + int i; + + for (i = nsim_bus_dev->port_count - 1; i >= 0; i--) + nsim_dev_port_exit(nsim_dev, i); + nsim_dev_destroy(nsim_dev); +} + int nsim_dev_init(void) { nsim_dev_ddir = debugfs_create_dir(DRV_NAME, NULL); diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index eb823bd0dc39..99169fe521f2 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -74,7 +74,6 @@ static void nsim_free(struct net_device *dev) { struct netdevsim *ns = netdev_priv(dev); - nsim_dev_destroy(ns->nsim_dev); nsim_bus_dev_del(ns->nsim_bus_dev); /* netdev and vf state will be freed out of device_release() */ } @@ -364,26 +363,20 @@ static int nsim_newlink(struct net *src_net, struct net_device *dev, struct netdevsim *ns = netdev_priv(dev); int err; - ns->nsim_bus_dev = nsim_bus_dev_new(~0, 0); + ns->netdev = dev; + ns->nsim_bus_dev = nsim_bus_dev_new_with_ns(ns); if (IS_ERR(ns->nsim_bus_dev)) return PTR_ERR(ns->nsim_bus_dev); SET_NETDEV_DEV(dev, &ns->nsim_bus_dev->dev); - ns->netdev = dev; - ns->nsim_dev = nsim_dev_create_with_ns(ns->nsim_bus_dev, ns); - if (IS_ERR(ns->nsim_dev)) { - err = PTR_ERR(ns->nsim_dev); - goto err_dev_del; - } + ns->nsim_dev = dev_get_drvdata(&ns->nsim_bus_dev->dev); err = register_netdevice(dev); if (err) - goto err_dev_destroy; + goto err_dev_del; return 0; -err_dev_destroy: - nsim_dev_destroy(ns->nsim_dev); err_dev_del: nsim_bus_dev_del(ns->nsim_bus_dev); return err; diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h index ec678371865f..c0a08af5e724 100644 --- a/drivers/net/netdevsim/netdevsim.h +++ b/drivers/net/netdevsim/netdevsim.h @@ -18,6 +18,7 @@ #include #include #include +#include #include #define DRV_NAME "netdevsim" @@ -130,6 +131,12 @@ enum nsim_resource_id { NSIM_RESOURCE_IPV6_FIB_RULES, }; +struct nsim_dev_port { + struct devlink_port devlink_port; + unsigned int port_index; + struct dentry *ddir; +}; + struct nsim_dev { struct nsim_bus_dev *nsim_bus_dev; struct nsim_fib_data *fib_data; @@ -143,13 +150,13 @@ struct nsim_dev { struct list_head bpf_bound_progs; struct list_head bpf_bound_maps; struct netdev_phys_item_id switch_id; + struct nsim_dev_port ports[0]; }; -struct nsim_dev *nsim_dev_create_with_ns(struct nsim_bus_dev *nsim_bus_dev, - struct netdevsim *ns); -void nsim_dev_destroy(struct nsim_dev *nsim_dev); int nsim_dev_init(void); void nsim_dev_exit(void); +int nsim_dev_probe(struct nsim_bus_dev *nsim_bus_dev); +void nsim_dev_remove(struct nsim_bus_dev *nsim_bus_dev); struct nsim_fib_data *nsim_fib_create(void); void nsim_fib_destroy(struct nsim_fib_data *fib_data); @@ -200,6 +207,7 @@ struct nsim_bus_dev { }; struct nsim_bus_dev *nsim_bus_dev_new(unsigned int id, unsigned int port_count); +struct nsim_bus_dev *nsim_bus_dev_new_with_ns(struct netdevsim *ns); void nsim_bus_dev_del(struct nsim_bus_dev *nsim_bus_dev); int nsim_bus_init(void); void nsim_bus_exit(void); -- 2.17.2