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 17DA5C43381 for ; Thu, 21 Mar 2019 13:20:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D90AF21874 for ; Thu, 21 Mar 2019 13:20:35 +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="TgTCobFZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728473AbfCUNUf (ORCPT ); Thu, 21 Mar 2019 09:20:35 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:42882 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728461AbfCUNUb (ORCPT ); Thu, 21 Mar 2019 09:20:31 -0400 Received: by mail-wr1-f65.google.com with SMTP id g3so1166158wrx.9 for ; Thu, 21 Mar 2019 06:20:30 -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=TgTCobFZaP7OmBK+Uw5UdzI9mwHBkKoKuDmIKiEMMOcAsBdEzpMfgg2N23Km9bxzlV ZjNpRwiN7QWYU7esqTQttU/UIaiRRpSrqGfuyYgkOwPK7GIy7/WBUtEjzU4cnEp3NKdU s14v9SOltwyITTAZVB+GObVyqFlhVS3ygsLY0lfHmIxB5QndEcy37awBCDLBDzV8Dtzg vYLeYvKDu7f0FPq0pvAMPkx8axqbRrC4gADHUv0g+foaq/vwe51d/VB1IA+FD3OquOWa RnxFV97r1feGmgC86zn7cqJhT3hauKwEcu3qQnf+XR3wDFANz5Jd2I8a2+Tet/YSQVgB qErQ== 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=ZwMhA6lvT2b8qA+ildomTv2jVCtud6Voh/EZrOmF/GY5SAdtwWKLCmVY/wXGK7BFJ9 0OvT7lBPsPZxYjd7BBjByG9F0hOBz6FtOfJXcps4oH+MK3xid4BxYaxQV8KW0fIHznFs 9xcrYDGdCRKfhRyJxDeeXfStzqqewxQKggwfDKKv4CufmzgjYhFwalIBqpB94aOgb0RH v9g6kii3UegBDTUhwmcy+lg4Jc+oFUGDY6hIlv1Psn6WQ0PJ11sz05XhnQIKfn4cy0ol MLVPfjfbQAIZ37y0jbVGYAUaM3bE0pktKgThBVQ+LeTZFYW21zOGZTFKqDYKnFmOOrqD g1AQ== X-Gm-Message-State: APjAAAWF3GuoMeuakJral6GDuWERqW331aGtOlyeMqX8xGPCJ5ggOvrt yqL74IIRjoU/DR81++UUwUr/wMe7hY8= X-Google-Smtp-Source: APXvYqzV6rn4P6ib8x/w+WIDtusgW0RnDy3Yt5tncstBruW6EdclhpE9SHTZOv7/dUbuC8LBPXHsLA== X-Received: by 2002:adf:f04e:: with SMTP id t14mr2625835wro.263.1553174429629; Thu, 21 Mar 2019 06:20:29 -0700 (PDT) Received: from localhost ([195.39.71.253]) by smtp.gmail.com with ESMTPSA id 132sm9656885wmd.27.2019.03.21.06.20.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Mar 2019 06:20:29 -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 06/11] net: devlink: don't take devlink_mutex for devlink_compat_* Date: Thu, 21 Mar 2019 14:20:14 +0100 Message-Id: <20190321132019.1426-7-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190321132019.1426-1-jiri@resnulli.us> References: <20190321132019.1426-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