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,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 1CD7AC43381 for ; Tue, 26 Feb 2019 03:34:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E04EC206B8 for ; Tue, 26 Feb 2019 03:34:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="eGbFipPs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726494AbfBZDe1 (ORCPT ); Mon, 25 Feb 2019 22:34:27 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:38410 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726428AbfBZDeX (ORCPT ); Mon, 25 Feb 2019 22:34:23 -0500 Received: by mail-qt1-f194.google.com with SMTP id s1so13355930qte.5 for ; Mon, 25 Feb 2019 19:34:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VPv4pkEb9Uxe+F82O4f89BTskeVy4tCT2437AsZqMrw=; b=eGbFipPsnvb7in0n8aCxyGNyMtzCilaOBVu7CW43Gg4pBy1CNvPqmmVNiR80EoALkl ehXVRLpEwEa3PzwuEMmOKFud22gA1ldRdploWJI2C1uSBckWBU75CfZeMsHUgFSwNneF vT4EAChgJ4GeAivKxfMhFmBW+sr/lnSEwqVtflddG3h1Utj/2L8Spj9hL7WbbfVPC3Tp kLJLKeVyIZMvLIK8ABhxX/iyIfAvqTST58PmsxLklCIA/xqvIKmr5Kb69DPcmFyydbAs fu7BZ0iGP961cn1ePKKsV5zNPTcsKDdgHiTNXrs5Yqg2E48aZvEt0D7F3or9eE42DV8s iSjQ== 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:mime-version:content-transfer-encoding; bh=VPv4pkEb9Uxe+F82O4f89BTskeVy4tCT2437AsZqMrw=; b=WJOqZMBBlGZ1L06RNIQdnm3VgZABT9oGrvMGN+mGauW3VC+SjaDvAN85krGu3K0xNY MYDixSj1ERo3j14c5E4Iq9eb6HICvO8JYIBVhG1SQA7MmmmV0wDoXpId0gRbY6Ft0mZH XFJsuPLzx0Ou9GwWT5g3R1tedqJdVt0zEJ+Uz2Sq0oj7syLQA9Hpj7zA1aXflkpbdkSS lx52IMQdOdNrhKi2qM01MP/LNF3T0DzKPQpGYGFq8XOLw7ssQlUWV4r2qUuC9wSyphJS as+Ojv062Pzn2yO70kWhyNuNNx6UQ3N7f9f0jrqzvdFW/zLweYe/TGLmSNplq35KjweN vq6A== X-Gm-Message-State: AHQUAuY+sXLqJzdvA29WqUVV5jsMwhM1g1Ny6B+VfRYqm6q0kTYcTswg R36Dh0YXLhN3FtqXxqBV+THHBQ== X-Google-Smtp-Source: AHgI3IadjDGnKEKLy862pQELEDo11ETWRouFFZ1UxgJWzEOVGPc5zPCD67ddlBSAhQRjHuIN5nTe+g== X-Received: by 2002:ac8:3932:: with SMTP id s47mr15861193qtb.337.1551152062734; Mon, 25 Feb 2019 19:34:22 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id i20sm8120317qta.19.2019.02.25.19.34.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Feb 2019 19:34:22 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net, jiri@resnulli.us Cc: mkubecek@suse.cz, andrew@lunn.ch, f.fainelli@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next v4 5/6] devlink: hold a reference to the netdevice around ethtool compat Date: Mon, 25 Feb 2019 19:34:06 -0800 Message-Id: <20190226033407.32625-6-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190226033407.32625-1-jakub.kicinski@netronome.com> References: <20190226033407.32625-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When ethtool is calling into devlink compat code make sure we have a reference on the netdevice on which the operation was invoked. v3: move the hold/lock logic into devlink_compat_* functions (Florian) Signed-off-by: Jakub Kicinski --- net/core/devlink.c | 13 +++++++++++++ net/core/ethtool.c | 13 ++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/net/core/devlink.c b/net/core/devlink.c index 24bfbd2d71e7..ecff6e63bc4d 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -6430,6 +6430,9 @@ void devlink_compat_running_version(struct net_device *dev, { struct devlink *devlink; + dev_hold(dev); + rtnl_unlock(); + mutex_lock(&devlink_mutex); devlink = netdev_to_devlink(dev); if (!devlink || !devlink->ops || !devlink->ops->info_get) @@ -6440,6 +6443,9 @@ void devlink_compat_running_version(struct net_device *dev, mutex_unlock(&devlink->lock); unlock_list: mutex_unlock(&devlink_mutex); + + rtnl_lock(); + dev_put(dev); } int devlink_compat_flash_update(struct net_device *dev, const char *file_name) @@ -6447,6 +6453,9 @@ int devlink_compat_flash_update(struct net_device *dev, const char *file_name) struct devlink *devlink; int ret = -EOPNOTSUPP; + dev_hold(dev); + rtnl_unlock(); + mutex_lock(&devlink_mutex); devlink = netdev_to_devlink(dev); if (!devlink || !devlink->ops || !devlink->ops->flash_update) @@ -6457,6 +6466,10 @@ int devlink_compat_flash_update(struct net_device *dev, const char *file_name) mutex_unlock(&devlink->lock); unlock_list: mutex_unlock(&devlink_mutex); + + rtnl_lock(); + dev_put(dev); + return ret; } diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 1320e8dce559..47558ffae423 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -805,11 +805,9 @@ static noinline_for_stack int ethtool_get_drvinfo(struct net_device *dev, if (ops->get_eeprom_len) info.eedump_len = ops->get_eeprom_len(dev); - rtnl_unlock(); if (!info.fw_version[0]) devlink_compat_running_version(dev, info.fw_version, sizeof(info.fw_version)); - rtnl_lock(); if (copy_to_user(useraddr, &info, sizeof(info))) return -EFAULT; @@ -2040,15 +2038,8 @@ static noinline_for_stack int ethtool_flash_device(struct net_device *dev, return -EFAULT; efl.data[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0; - if (!dev->ethtool_ops->flash_device) { - int ret; - - rtnl_unlock(); - ret = devlink_compat_flash_update(dev, efl.data); - rtnl_lock(); - - return ret; - } + if (!dev->ethtool_ops->flash_device) + return devlink_compat_flash_update(dev, efl.data); return dev->ethtool_ops->flash_device(dev, &efl); } -- 2.19.2