Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Heiner Kallweit <hkallweit1@gmail.com>
To: Jakub Kicinski <kuba@kernel.org>, David Miller <davem@davemloft.net>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [PATCH net-next 3/4] ethtool: move netif_device_present check from ethnl_parse_header_dev_get to ethnl_ops_begin
Date: Sun, 1 Aug 2021 12:40:05 +0200	[thread overview]
Message-ID: <82cd410f-8e0e-86d1-031c-bbb43c315574@gmail.com> (raw)
In-Reply-To: <106547ef-7a61-2064-33f5-3cc8d12adb34@gmail.com>

If device is runtime-suspended and not accessible then it may be
flagged as not present. If checking whether device is present is
done too early then we may bail out before we have the chance to
runtime-resume the device. Therefore move this check to
ethnl_ops_begin(). This is in preparation of a follow-up patch
that tries to runtime-resume the device before executing ethtool
ops.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 net/ethtool/netlink.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c
index ac720d684..e628d17f5 100644
--- a/net/ethtool/netlink.c
+++ b/net/ethtool/netlink.c
@@ -31,7 +31,13 @@ const struct nla_policy ethnl_header_policy_stats[] = {
 
 int ethnl_ops_begin(struct net_device *dev)
 {
-	if (dev && dev->ethtool_ops->begin)
+	if (!dev)
+		return 0;
+
+	if (!netif_device_present(dev))
+		return -ENODEV;
+
+	if (dev->ethtool_ops->begin)
 		return dev->ethtool_ops->begin(dev);
 	else
 		return 0;
@@ -115,12 +121,6 @@ int ethnl_parse_header_dev_get(struct ethnl_req_info *req_info,
 		return -EINVAL;
 	}
 
-	if (dev && !netif_device_present(dev)) {
-		dev_put(dev);
-		NL_SET_ERR_MSG(extack, "device not present");
-		return -ENODEV;
-	}
-
 	req_info->dev = dev;
 	req_info->flags = flags;
 	return 0;
-- 
2.32.0



  parent reply	other threads:[~2021-08-01 10:41 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-01 10:35 [PATCH net-next 0/4] ethtool: runtime-resume netdev parent before ethtool ops Heiner Kallweit
2021-08-01 10:36 ` [PATCH net-next 1/4] ethtool: runtime-resume netdev parent before ethtool ioctl ops Heiner Kallweit
2021-08-03 20:41   ` Grygorii Strashko
2021-08-03 21:32     ` Heiner Kallweit
2021-08-04  8:43       ` Grygorii Strashko
2021-08-04 19:33         ` Heiner Kallweit
2021-08-05  8:20           ` Grygorii Strashko
2021-08-05 11:11             ` Joakim Zhang
2021-08-05 11:58               ` Grygorii Strashko
2021-08-05 19:24             ` Heiner Kallweit
2021-08-05 20:00               ` Grygorii Strashko
2021-08-01 10:37 ` [PATCH net-next 2/4] ethtool: move implementation of ethnl_ops_begin/complete to netlink.c Heiner Kallweit
2021-08-01 10:40 ` Heiner Kallweit [this message]
2021-08-01 10:41 ` [PATCH net-next 4/4] ethtool: runtime-resume netdev parent in ethnl_ops_begin Heiner Kallweit
2021-08-05 11:51   ` Julian Wiedmann
2021-08-05 18:48     ` Heiner Kallweit
2021-08-01 16:25 ` [PATCH net-next 0/4] ethtool: runtime-resume netdev parent before ethtool ops Heiner Kallweit
2021-08-02 14:15   ` Jakub Kicinski
2021-08-02 16:42     ` Heiner Kallweit
2021-08-02 16:54       ` Jakub Kicinski
2021-08-02 19:00         ` Heiner Kallweit
2021-08-03 12:00 ` patchwork-bot+netdevbpf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=82cd410f-8e0e-86d1-031c-bbb43c315574@gmail.com \
    --to=hkallweit1@gmail.com \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --subject='Re: [PATCH net-next 3/4] ethtool: move netif_device_present check from ethnl_parse_header_dev_get to ethnl_ops_begin' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).