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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B0B8C46467 for ; Sat, 7 Jan 2023 10:12:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231209AbjAGKMN (ORCPT ); Sat, 7 Jan 2023 05:12:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230135AbjAGKMH (ORCPT ); Sat, 7 Jan 2023 05:12:07 -0500 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AD0C7DE0A for ; Sat, 7 Jan 2023 02:12:05 -0800 (PST) Received: by mail-pj1-x102b.google.com with SMTP id o8-20020a17090a9f8800b00223de0364beso7734285pjp.4 for ; Sat, 07 Jan 2023 02:12:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hFZzyYy3cnyXRONunaM6t3i0ymLdSSoZouxoDeB1fZE=; b=YoOO6WBY0KfItwKJtnCFdn0TEhLfc3k3hQIJcQfsULjthVwvmUzWqszmORxUxJKIYv oX+iUaE92tlPojAR6NM880XrCWNw+rfiPtnZl4xCWFpYwvnGPQlIrOxfjGtE/tq3oYrP 8zYL1WaX6iJi/gCryWGxN1xZTCvA4nFtLAPw6XhzYPOOjHb/LfXcXcr/QijMTEx6gfbg O/Qdr0tW2WYIR9fuKa7cZ66IhH3+2f6YX/cszB7TD+cAZhmAxn9Uet0JkDx/iy8Z8NMT wQX2VtD/X1afnS42VqR/RKqdrJ7MIw/UyY4xHCLAphJ3wFUA8JXFbjK8mGU+DP1INWWd Yz3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hFZzyYy3cnyXRONunaM6t3i0ymLdSSoZouxoDeB1fZE=; b=mI/OVadzyhviPTMz9aszgah/3kUUFeOKkvx7a3/ZkxX0K2zKE2eYi41XzcFPVxFf1Q VN50zXU+xhNjOJqJEnXXVjsDnCqvr9+hMSQ3rBBD0MUdVaP+uCA06N/IbudjVaGZlqUo 7Usyc4J02xa0CzslUlVQHluQH9ui9YEnzJvTmIcw9vv33bwCTuurbAhtDArvoMSlO6Me yfq3Z/4DECD8R2lZEApnkqqmV+RDyHDCR9ZtVxpCm1gHJtRLMwaeaOoPyHcZaXofhoG1 dzcflKgPKBpsEktNzACFrOzhFII7LWqI3+zEt4vaG9PaqCQwB+kVs+KJLaEpb6sBO3V4 iZWg== X-Gm-Message-State: AFqh2kpFlxvNYm5FSyf36PxInJM6XqPJio5wfrLCmUAAOIqoQZ1SFbwx k7uOAKdn0U3H7RL5ez9qQWO7KdVo75zdXhUSa4GckQ== X-Google-Smtp-Source: AMrXdXvnynUZ3t9qiHoiId8fZNiqeqzaSfJTwtO+GJ9DQegWBCLT+JO5veFqzw3T0vOrmfqwvbx6CQ== X-Received: by 2002:a05:6a20:43aa:b0:af:7336:f468 with SMTP id i42-20020a056a2043aa00b000af7336f468mr75155520pzl.20.1673086324938; Sat, 07 Jan 2023 02:12:04 -0800 (PST) Received: from localhost (thunderhill.nvidia.com. [216.228.112.22]) by smtp.gmail.com with ESMTPSA id y6-20020a17090a474600b002139459e121sm4013714pjg.27.2023.01.07.02.12.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Jan 2023 02:12:04 -0800 (PST) From: Jiri Pirko 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 Message-Id: <20230107101151.532611-4-jiri@resnulli.us> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230107101151.532611-1-jiri@resnulli.us> References: <20230107101151.532611-1-jiri@resnulli.us> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko 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 --- 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