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,URIBL_BLOCKED,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 7573BC43381 for ; Sun, 24 Mar 2019 10:15:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 41B80222A7 for ; Sun, 24 Mar 2019 10:15:10 +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="lQ8Nbbd6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728807AbfCXKPI (ORCPT ); Sun, 24 Mar 2019 06:15:08 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:40628 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728642AbfCXKOr (ORCPT ); Sun, 24 Mar 2019 06:14:47 -0400 Received: by mail-wm1-f68.google.com with SMTP id z24so2777000wmi.5 for ; Sun, 24 Mar 2019 03:14:46 -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=wlg+4IsHmv8Oi3wcZLBkgrkv9gbbQN8nIeLN+CwMblM=; b=lQ8Nbbd6HRecUnxtMSkF4ZoGPfeNA/oKXBBOn2VaztGbPAxxoeHcrWM+91kufvlGZe mFmZnceizcft8ky9Jxz08y74WvD+GuHYpxEyh6OT0MhALid52e2jkOgb8Z1Bsnn/KiR/ S0EA04i0SFBiJmd4EFmfmRqjosDcX+pBOjGvejefWchVz6yoTPKzO0Fhx3xld6f5bxNI EHSniDVtZ9lLhgY3vsKv09l3XcEPbXqIncF+hk2H/rk8+AZm3/Uft/AVK50KD1beDiwp mAV7fd+zo4z7Ig5aIjFuGri4WgJb24hK1NaRNAPxaZfg9Y9b6pjBe1N4LJcf5e81xrYv dWYA== 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=wlg+4IsHmv8Oi3wcZLBkgrkv9gbbQN8nIeLN+CwMblM=; b=ISLxZKGg/Lmqe9tK6xYS8WvgqMrvsSKJgPPeB9q05vqJoFzqviNyPR3xNWwtjUOsrZ Bi0a+Ms46hMvEC7H4+PUMQjnzOcejhfyKuRxsnckeX9nBiTbwP3/tXwr+ubxcyETJAtC vSALBBeicReFxQ4k2inAAH846OrfbXN+ZapbDhelum1bluebCtkkz1yVjlqKtisho2XA 0NXOpwKeX1+HzNoBxM6augZApxuilJFwDUNqzwO6hEbnIApD/JpSpmFp/V9sle8pjutu /wkHRfTb1xkDaSJuEUV2dueoozhu57IGsiJ4lhB5yJqB//Qm8t7CbRwNR61HWdI48B9n f2Ow== X-Gm-Message-State: APjAAAUmAkxMoA4v+dN3P3Nenwv/bjqxwp5zrnYm30ZQ3+MRnnCpqudk zrtEZDA/zRxRTrbMCdklcqhb0axwxvg= X-Google-Smtp-Source: APXvYqwZjS1oS22fbLDJVBLk0L8/l6Vcpywpg1ojp2UNARl2h3pPDcawS6Mcng9UDSrYMvvZg2bLPw== X-Received: by 2002:a1c:700a:: with SMTP id l10mr2385643wmc.13.1553422485499; Sun, 24 Mar 2019 03:14:45 -0700 (PDT) Received: from localhost (ip-94-113-125-71.net.upcbroadband.cz. [94.113.125.71]) by smtp.gmail.com with ESMTPSA id d6sm13839747wrx.62.2019.03.24.03.14.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 24 Mar 2019 03:14:45 -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 v3 06/15] net: devlink: don't take devlink_mutex for devlink_compat_* Date: Sun, 24 Mar 2019 11:14:29 +0100 Message-Id: <20190324101438.6376-7-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190324101438.6376-1-jiri@resnulli.us> References: <20190324101438.6376-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 1fe772eb18af..b40fd1addf14 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -6449,17 +6449,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); } @@ -6467,22 +6465,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