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 0E950C46467 for ; Sat, 7 Jan 2023 10:30:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237235AbjAGK2q (ORCPT ); Sat, 7 Jan 2023 05:28:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237326AbjAGK2C (ORCPT ); Sat, 7 Jan 2023 05:28:02 -0500 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99ABB921ED for ; Sat, 7 Jan 2023 02:26:16 -0800 (PST) Received: by mail-pj1-x1032.google.com with SMTP id q64so3934182pjq.4 for ; Sat, 07 Jan 2023 02:26:16 -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=OyrMFYMpDwJrP4wZGU94xNWhMaXJyPqmR+ydD4RxfFo=; b=QGRxmx9lWf7+7/OG9ZiRE+8UkWbPPjLl+f518c6F6+T4LfVvDID/yjuPNhUXnNdFNX zf4TlVsKyYLbKiZr8QrU3gJqA1M32s/NOdzy4IIi+OAOp5yrdcjDUjGIPnhr3tURrAUZ sJPX2Wbtv8ojSmKMk7a+jRTvVZbhSshHecf7LZ8AO56BT1saK6ME1/vcRnakrZg5KYmx 2mivVq4r0wZcTQMeHDbhaQEx7gJnx4uOQqJIKVR/9HVorMbZH61t+V2tgjMu5y5eSxwc aja5heH0ojTa5glt+dgyajVjpan3zLm+T2b6X62HU3SDRLM7VWtxl9vX4ZudPNGQxjTX gQFw== 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=OyrMFYMpDwJrP4wZGU94xNWhMaXJyPqmR+ydD4RxfFo=; b=Y3pyoMSy6Ao2nNxLtVN8pP8C5bwk9ejPlhS1dGD7hSHtw/JKL4U+gIuq0FQWmNPKaA lOTreTw3UYHXlaDXHby6A2jx3FySuXtuUxlOUPlUZ3Xi4OXE0BgCxisdBthmh0t9+kkA 94vUgd6mjIQ3tPYHN6y6w59bDR3j0UKgvwdLv5I2OuhfQPWefnkAglQ2vEkoBm9wPmF5 DsiTjDOFTvRMuhHE8U506srIJy4QoYr1XRfjfIAxMPklU3LWeZQXdOcJDqOa7pRxKEPJ 9e1zbbiaU9CQbqo5FSbS8s2Bg5/Zve4Q+nI9wAKeRfQCcjcP1UJk6fVVoRgUAGxLtkKC 5MmA== X-Gm-Message-State: AFqh2kpipdmF/+5SVU56522cUsxGT2t76vCdGCCHbxAtB5Uk1e+1Smg4 MWZfyUnxZ5JVxO/iG8WcZ9l2qYbSHLd8BZQUkpYqHg== X-Google-Smtp-Source: AMrXdXuEtmWQwKAkoGZFAf10jvNENYsd5MuoKl/Za0j2UpdqLeVRRSQs6j5AAOWO2mY5MkDttXFF0A== X-Received: by 2002:a17:903:228a:b0:191:271f:4789 with SMTP id b10-20020a170903228a00b00191271f4789mr78945837plh.27.1673087176069; Sat, 07 Jan 2023 02:26:16 -0800 (PST) Received: from localhost (thunderhill.nvidia.com. [216.228.112.22]) by smtp.gmail.com with ESMTPSA id ij30-20020a170902ab5e00b00193198ffeddsm1313229plb.30.2023.01.07.02.26.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Jan 2023 02:26:15 -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 9/9] devlink: add instance lock assertion in devl_is_registered() Date: Sat, 7 Jan 2023 11:26:12 +0100 Message-Id: <20230107102612.533262-1-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 After region and linecard lock removals, this helper is always supposed to be called with instance lock held. So put the assertion here and remove the comment which is no longer accurate. Signed-off-by: Jiri Pirko --- net/devlink/devl_internal.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h index 2b0e119e7b84..09fc4d60fefb 100644 --- a/net/devlink/devl_internal.h +++ b/net/devlink/devl_internal.h @@ -83,9 +83,7 @@ struct devlink *devlinks_xa_find_get(struct net *net, unsigned long *indexp); static inline bool devl_is_registered(struct devlink *devlink) { - /* To prevent races the caller must hold the instance lock - * or another lock taken during unregistration. - */ + devl_assert_locked(devlink); return xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED); } -- 2.39.0