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,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 F09D8C43381 for ; Fri, 22 Mar 2019 16:56:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BFE0921916 for ; Fri, 22 Mar 2019 16:56:53 +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="mK5mSozH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728603AbfCVQ4w (ORCPT ); Fri, 22 Mar 2019 12:56:52 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:45866 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728515AbfCVQ4v (ORCPT ); Fri, 22 Mar 2019 12:56:51 -0400 Received: by mail-wr1-f67.google.com with SMTP id s15so3095492wra.12 for ; Fri, 22 Mar 2019 09:56:49 -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=eKI4CmZcG8/TqlcpWiQUHV0l9hPTn8XJ5qCDiWKXvDY=; b=mK5mSozHSW5LzLrOYBE+migq8kbMkHKI2rk3GxtZBQggddwgJxCfWpCikKkQLj9U2q tcBmJ9n76pX69xt7FJ2inforQ+DauPeo3KnpPn1fZ0nJmKGb1GAxvWNg8waJBnkvmKP8 5/ZfO5SyC5EDaolM+UPgDUmMFGZ+VPBoMQv6R/3qJcZrn3Ctiink7KzPIxrjCYGVbCWF Jr6v5UFwfzRk/EpAag9/dj/x8tUSG84e/Gv92rVOMGHtmBlE4FslLrpeNML8C5WJc9aV n8jCuccWYrcNM16d5UewbJBIfiuniGIQFErExUnDnaiGSfeYedlrcMvdBHvO1j0y4d24 0oNQ== 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=eKI4CmZcG8/TqlcpWiQUHV0l9hPTn8XJ5qCDiWKXvDY=; b=fFytweLoi956+W9CdfRMe2NM8ZSvreHN1/t+3esbeUeIeTn6sCDf6WkednPOXYkeE7 gcovyaBZw0Htwbjy/zqGNxDmcGi52OfGUwfrRASmi0xptXBz9XQCm2lm8YKyh1G/aYJ4 FN/gUmVgysFwdI0LTHXf8I2lAAlYH9Ouf+cOwdGDVi4NIkFt5uxNGxWdhPd162k1CCQV 6ZSA0WGaEMBFNd4f1MxR8nSDfO74hrh+G+EvUQhqKS23WFQNlHFtIOA6G/z6JCnuVlis bubJ+eELNv6HqlUVqMPsDlowC2YMsb0OwgR1akHsj/tcn7eY0zUn4ItigtTTcM2SKBwf vJZg== X-Gm-Message-State: APjAAAVG0aaSI5TaGpaa+3IklU6Ltm0SeW+aRVjV7vmDIVcB8uOE8TqZ rxZh6SMSpCPJ1JUZmPTbCkFW3aXTOik= X-Google-Smtp-Source: APXvYqzxZcnLarC2mb7aRnDHdcRNqPIP8j5YThVSsxxU9WNiFpPTbBqgRZvYTSIXPXrkFVgwFTxXuA== X-Received: by 2002:adf:e40b:: with SMTP id g11mr7028011wrm.207.1553273808562; Fri, 22 Mar 2019 09:56:48 -0700 (PDT) Received: from localhost ([195.39.71.253]) by smtp.gmail.com with ESMTPSA id y8sm7433799wrm.8.2019.03.22.09.56.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Mar 2019 09:56:47 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, f.fainelli@gmail.com, andrew@lunn.ch, vivien.didelot@gmail.com Subject: [patch net-next v2 06/15] net: devlink: don't take devlink_mutex for devlink_compat_* Date: Fri, 22 Mar 2019 17:56:27 +0100 Message-Id: <20190322165636.1725-7-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190322165636.1725-1-jiri@resnulli.us> References: <20190322165636.1725-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko The netdevice is guaranteed to not disappear so we can rely that devlink_port and devlink won't disappear as well. No need to take devlink_mutex so don't take it here. Signed-off-by: Jiri Pirko --- net/core/devlink.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/net/core/devlink.c b/net/core/devlink.c index 3dc51ddf7451..1e125c3b890c 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -6444,17 +6444,15 @@ void devlink_compat_running_version(struct net_device *dev, dev_hold(dev); rtnl_unlock(); - mutex_lock(&devlink_mutex); devlink = netdev_to_devlink(dev); if (!devlink || !devlink->ops->info_get) - goto unlock_list; + goto out; mutex_lock(&devlink->lock); __devlink_compat_running_version(devlink, buf, len); mutex_unlock(&devlink->lock); -unlock_list: - mutex_unlock(&devlink_mutex); +out: rtnl_lock(); dev_put(dev); } @@ -6462,22 +6460,22 @@ void devlink_compat_running_version(struct net_device *dev, int devlink_compat_flash_update(struct net_device *dev, const char *file_name) { struct devlink *devlink; - int ret = -EOPNOTSUPP; + int ret; dev_hold(dev); rtnl_unlock(); - mutex_lock(&devlink_mutex); devlink = netdev_to_devlink(dev); - if (!devlink || !devlink->ops->flash_update) - goto unlock_list; + if (!devlink || !devlink->ops->flash_update) { + ret = -EOPNOTSUPP; + goto out; + } mutex_lock(&devlink->lock); ret = devlink->ops->flash_update(devlink, file_name, NULL, NULL); mutex_unlock(&devlink->lock); -unlock_list: - mutex_unlock(&devlink_mutex); +out: rtnl_lock(); dev_put(dev); -- 2.17.2