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=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 A7E14C43219 for ; Thu, 25 Apr 2019 14:00:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A13E206BA for ; Thu, 25 Apr 2019 14:00:14 +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="nHtK+8wE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728961AbfDYOAN (ORCPT ); Thu, 25 Apr 2019 10:00:13 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:45577 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728834AbfDYOAL (ORCPT ); Thu, 25 Apr 2019 10:00:11 -0400 Received: by mail-wr1-f65.google.com with SMTP id s15so30452599wra.12 for ; Thu, 25 Apr 2019 07:00:09 -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=tJ7go7/RCkEGJIsuCmWf49pwbg2hG0zpZrJtlXCYy0Y=; b=nHtK+8wEYL6wO05p5lXCyxBofu0QYst1L5uToJCCpcdgNXrtRtDRI0Hq0BOeZnS++C vvfIxw1QJc2cSQzoCplQ7Kwi4g38PJXeH5ZmwGllzzHNSDyE6tPsPAL6Cf9oIW6lc3i8 hgayIZf0Bu+hbP8QFvPpiMZpLlidABtremSGo4FuMDU5UPiUlq8EKBN9WJRy3aR9ATEn FZlGPSmgqb8QV8BUTpXSTHNs0/sRMZ2MHIbucEp0e+7ZqG2JuXEUA5XJ5kEL5iWiHwQ0 WhW7znHPEaYareeuDP6qTF7guewfeggiDK27YxkfXPJxxabBGAAil+ivs/Cx82NvPTfm 0WEA== 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=tJ7go7/RCkEGJIsuCmWf49pwbg2hG0zpZrJtlXCYy0Y=; b=prCoLIKAObiPDFjpqDTMypUGRKSxwE6Zag6zFqL7GMTJL7ZFgHLy+D11BoIlhkplrK Ftt25PmdhAj86O0AlpW+x8pE1ngmS7GOQ9LQD+gVnWcYzndDnFqfvM/VN6CZrlWsreG2 bbWMJqrs6RANzmCBqoW38KkcpJxiJR/wdzaKreshEtIN+nOFVE+wYhlota+W7gGd+d89 ok0B5V1k/pH94HUN7XI+itcsyEYVyHS5kFfVIPOndt+sPD3oXgC96IXvFYqDFmeGvWyd XH77ygc1pN/zgRCSS7nG4o3l2H6ESOvrzKUCklXaAwGhR9XAplQtPjQWOzr1gQNFqB7l Ru0g== X-Gm-Message-State: APjAAAXyWbNb2HhDVjS95ygCGDel8XS4P46Qvt9fSzlMlI7VSikUSp49 prRJDcGfgOz8q0/8phbkSiA6e87fXXQ= X-Google-Smtp-Source: APXvYqxUyej+mxyA9LvCl4GUJ+va2uox+0aUMZ874VBn4zsNqgYk448zDgYDgO9gMyOJa5umtSUOyQ== X-Received: by 2002:a5d:434c:: with SMTP id u12mr27507264wrr.92.1556200808951; Thu, 25 Apr 2019 07:00:08 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id e16sm28569862wrs.0.2019.04.25.07.00.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2019 07:00:08 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, jakub.kicinski@netronome.com, dsahern@gmail.com Subject: [patch net-next v4 09/16] netdevsim: rename dev_init/exit() functions and make them independent on ns Date: Thu, 25 Apr 2019 15:59:49 +0200 Message-Id: <20190425135956.3970-10-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190425135956.3970-1-jiri@resnulli.us> References: <20190425135956.3970-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko These functions are going to be called from bus probe/release(), therefore make them independent on ns struct and rename accordingly. Signed-off-by: Jiri Pirko --- v3->v4: - fix wrapping of function declararions according to Jakub's rules. --- drivers/net/netdevsim/dev.c | 32 +++++++++++++------------------ drivers/net/netdevsim/netdev.c | 14 ++++++++------ drivers/net/netdevsim/netdevsim.h | 12 +++++++++--- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c index c83c08edf94f..664b9329a65c 100644 --- a/drivers/net/netdevsim/dev.c +++ b/drivers/net/netdevsim/dev.c @@ -21,10 +21,6 @@ #include "netdevsim.h" -struct nsim_dev { - struct nsim_fib_data *fib_data; -}; - static u64 nsim_dev_ipv4_fib_resource_occ_get(void *priv) { struct nsim_dev *nsim_dev = priv; @@ -178,7 +174,7 @@ static const struct devlink_ops nsim_dev_devlink_ops = { .reload = nsim_dev_reload, }; -static int __nsim_dev_init(struct netdevsim *ns) +static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev) { struct nsim_dev *nsim_dev; struct devlink *devlink; @@ -186,7 +182,7 @@ static int __nsim_dev_init(struct netdevsim *ns) devlink = devlink_alloc(&nsim_dev_devlink_ops, sizeof(*nsim_dev)); if (!devlink) - return -ENOMEM; + return ERR_PTR(-ENOMEM); nsim_dev = devlink_priv(devlink); nsim_dev->fib_data = nsim_fib_create(); @@ -199,13 +195,11 @@ static int __nsim_dev_init(struct netdevsim *ns) if (err) goto err_fib_destroy; - err = devlink_register(devlink, &ns->nsim_bus_dev->dev); + err = devlink_register(devlink, &nsim_bus_dev->dev); if (err) goto err_resources_unregister; - ns->devlink = devlink; - - return 0; + return nsim_dev; err_resources_unregister: devlink_resources_unregister(devlink, NULL); @@ -213,26 +207,26 @@ static int __nsim_dev_init(struct netdevsim *ns) nsim_fib_destroy(nsim_dev->fib_data); err_devlink_free: devlink_free(devlink); - - return err; + return ERR_PTR(err); } -int nsim_dev_init(struct netdevsim *ns) +struct nsim_dev * +nsim_dev_create_with_ns(struct nsim_bus_dev *nsim_bus_dev, + struct netdevsim *ns) { - int err; + struct nsim_dev *nsim_dev; dev_hold(ns->netdev); rtnl_unlock(); - err = __nsim_dev_init(ns); + nsim_dev = nsim_dev_create(nsim_bus_dev); rtnl_lock(); dev_put(ns->netdev); - return err; + return nsim_dev; } -void nsim_dev_exit(struct netdevsim *ns) +void nsim_dev_destroy(struct nsim_dev *nsim_dev) { - struct devlink *devlink = ns->devlink; - struct nsim_dev *nsim_dev = devlink_priv(devlink); + struct devlink *devlink = priv_to_devlink(nsim_dev); devlink_unregister(devlink); devlink_resources_unregister(devlink, NULL); diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index 37a442ffcb8b..28231bfbc989 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -77,7 +77,7 @@ static void nsim_free(struct net_device *dev) { struct netdevsim *ns = netdev_priv(dev); - nsim_dev_exit(ns); + 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() */ nsim_sdev_put(ns->sdev); @@ -395,17 +395,19 @@ static int nsim_newlink(struct net *src_net, struct net_device *dev, SET_NETDEV_DEV(dev, &ns->nsim_bus_dev->dev); ns->netdev = dev; - err = nsim_dev_init(ns); - if (err) + 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; + } err = register_netdevice(dev); if (err) - goto err_dev_exit; + goto err_dev_destroy; return 0; -err_dev_exit: - nsim_dev_exit(ns); +err_dev_destroy: + nsim_dev_destroy(ns->nsim_dev); err_dev_del: nsim_bus_dev_del(ns->nsim_bus_dev); err_sdev_put: diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h index 8d61fcb55f39..d6b3668f9afd 100644 --- a/drivers/net/netdevsim/netdevsim.h +++ b/drivers/net/netdevsim/netdevsim.h @@ -80,6 +80,7 @@ struct nsim_ipsec { struct netdevsim { struct net_device *netdev; + struct nsim_dev *nsim_dev; u64 tx_packets; u64 tx_bytes; @@ -102,7 +103,6 @@ struct netdevsim { bool bpf_xdpoffload_accept; bool bpf_map_accept; - struct devlink *devlink; struct nsim_ipsec ipsec; }; @@ -151,8 +151,14 @@ enum nsim_resource_id { NSIM_RESOURCE_IPV6_FIB_RULES, }; -int nsim_dev_init(struct netdevsim *ns); -void nsim_dev_exit(struct netdevsim *ns); +struct nsim_dev { + struct nsim_fib_data *fib_data; +}; + +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); struct nsim_fib_data *nsim_fib_create(void); void nsim_fib_destroy(struct nsim_fib_data *fib_data); -- 2.17.2