From: Jiri Pirko <jiri@resnulli.us>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com,
edumazet@google.com, michael.chan@broadcom.com,
yisen.zhuang@huawei.com, salil.mehta@huawei.com,
jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com,
tariqt@nvidia.com, saeedm@nvidia.com, leon@kernel.org,
idosch@nvidia.com, petrm@nvidia.com, mailhol.vincent@wanadoo.fr,
jacob.e.keller@intel.com, gal@nvidia.com
Subject: [patch net-next v2 3/9] devlink: remove linecard reference counting
Date: Sat, 7 Jan 2023 11:11:44 +0100 [thread overview]
Message-ID: <20230107101151.532611-4-jiri@resnulli.us> (raw)
In-Reply-To: <20230107101151.532611-1-jiri@resnulli.us>
From: Jiri Pirko <jiri@nvidia.com>
As long as the linecard live time is protected by devlink instance
lock, the reference counting is no longer needed. Remove it.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
net/devlink/leftover.c | 14 ++------------
net/devlink/netlink.c | 5 -----
2 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
index 4b01b15f8659..2208711b4b18 100644
--- a/net/devlink/leftover.c
+++ b/net/devlink/leftover.c
@@ -37,7 +37,6 @@ struct devlink_linecard {
struct list_head list;
struct devlink *devlink;
unsigned int index;
- refcount_t refcount;
const struct devlink_linecard_ops *ops;
void *priv;
enum devlink_linecard_state state;
@@ -285,7 +284,6 @@ devlink_linecard_get_from_attrs(struct devlink *devlink, struct nlattr **attrs)
linecard = devlink_linecard_get_by_index(devlink, linecard_index);
if (!linecard)
return ERR_PTR(-ENODEV);
- refcount_inc(&linecard->refcount);
return linecard;
}
return ERR_PTR(-EINVAL);
@@ -297,14 +295,6 @@ devlink_linecard_get_from_info(struct devlink *devlink, struct genl_info *info)
return devlink_linecard_get_from_attrs(devlink, info->attrs);
}
-void devlink_linecard_put(struct devlink_linecard *linecard)
-{
- if (refcount_dec_and_test(&linecard->refcount)) {
- mutex_destroy(&linecard->state_lock);
- kfree(linecard);
- }
-}
-
struct devlink_sb {
struct list_head list;
unsigned int index;
@@ -10268,7 +10258,6 @@ devl_linecard_create(struct devlink *devlink, unsigned int linecard_index,
}
list_add_tail(&linecard->list, &devlink->linecard_list);
- refcount_set(&linecard->refcount, 1);
devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);
return linecard;
}
@@ -10284,7 +10273,8 @@ void devl_linecard_destroy(struct devlink_linecard *linecard)
devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_DEL);
list_del(&linecard->list);
devlink_linecard_types_fini(linecard);
- devlink_linecard_put(linecard);
+ mutex_destroy(&linecard->state_lock);
+ kfree(linecard);
}
EXPORT_SYMBOL_GPL(devl_linecard_destroy);
diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c
index b5b8ac6db2d1..3f2ab4360f11 100644
--- a/net/devlink/netlink.c
+++ b/net/devlink/netlink.c
@@ -170,14 +170,9 @@ static int devlink_nl_pre_doit(const struct genl_split_ops *ops,
static void devlink_nl_post_doit(const struct genl_split_ops *ops,
struct sk_buff *skb, struct genl_info *info)
{
- struct devlink_linecard *linecard;
struct devlink *devlink;
devlink = info->user_ptr[0];
- if (ops->internal_flags & DEVLINK_NL_FLAG_NEED_LINECARD) {
- linecard = info->user_ptr[1];
- devlink_linecard_put(linecard);
- }
devl_unlock(devlink);
devlink_put(devlink);
}
--
2.39.0
next prev parent reply other threads:[~2023-01-07 10:12 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-07 10:11 [patch net-next v2 0/9] devlink: features, linecard and reporters locking cleanup Jiri Pirko
2023-01-07 10:11 ` [patch net-next v2 1/9] devlink: remove devlink features Jiri Pirko
2023-01-08 15:32 ` Ido Schimmel
2023-01-09 8:41 ` Jiri Pirko
2023-01-07 10:11 ` [patch net-next v2 2/9] devlink: remove linecards lock Jiri Pirko
2023-01-08 15:42 ` Ido Schimmel
2023-01-09 8:42 ` Jiri Pirko
2023-01-07 10:11 ` Jiri Pirko [this message]
2023-01-08 15:50 ` [patch net-next v2 3/9] devlink: remove linecard reference counting Ido Schimmel
2023-01-09 8:42 ` Jiri Pirko
2023-01-07 10:11 ` [patch net-next v2 4/9] devlink: remove reporters_lock Jiri Pirko
2023-01-08 16:28 ` Ido Schimmel
2023-01-09 8:44 ` Jiri Pirko
2023-01-07 10:11 ` [patch net-next v2 5/9] devlink: remove reporter reference counting Jiri Pirko
2023-01-07 10:11 ` [patch net-next v2 6/9] devlink: convert linecards dump to devlink_nl_instance_iter_dump() Jiri Pirko
2023-01-08 17:01 ` Ido Schimmel
2023-01-07 10:11 ` [patch net-next v2 7/9] devlink: convert reporters " Jiri Pirko
2023-01-07 10:11 ` [patch net-next 8/8] devlink: add instance lock assertion in devl_is_registered() Jiri Pirko
2023-01-07 10:11 ` [patch net-next v2 8/9] devlink: remove devlink_dump_for_each_instance_get() helper Jiri Pirko
2023-01-07 10:26 ` [patch net-next v2 9/9] devlink: add instance lock assertion in devl_is_registered() Jiri Pirko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230107101151.532611-4-jiri@resnulli.us \
--to=jiri@resnulli.us \
--cc=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gal@nvidia.com \
--cc=idosch@nvidia.com \
--cc=jacob.e.keller@intel.com \
--cc=jesse.brandeburg@intel.com \
--cc=kuba@kernel.org \
--cc=leon@kernel.org \
--cc=mailhol.vincent@wanadoo.fr \
--cc=michael.chan@broadcom.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=petrm@nvidia.com \
--cc=saeedm@nvidia.com \
--cc=salil.mehta@huawei.com \
--cc=tariqt@nvidia.com \
--cc=yisen.zhuang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).