From: Breno Leitao <leitao@debian.org>
To: leitao@debian.org, kuba@kernel.org, netdev@vger.kernel.org
Cc: leit@fb.com, davem@davemloft.net, edumazet@google.com,
pabeni@redhat.com, sa+renesas@sang-engineering.com,
linux-kernel@vger.kernel.org,
Michael van der Westhuizen <rmikey@meta.com>
Subject: [RFC PATCH v2] netpoll: Remove 4s sleep during carrier detection
Date: Thu, 19 Jan 2023 10:00:08 -0800 [thread overview]
Message-ID: <20230119180008.2156048-1-leitao@debian.org> (raw)
In-Reply-To: <20230119164448.1348272-1-leitao@debian.org>
This patch proposes to remove the msleep(4s) during netpoll_setup() if
the carrier appears instantly.
Modern NICs do not seem to have this bouncing problem anymore, and this
sleep slows down the machine boot unnecessarily
Reported-by: Michael van der Westhuizen <rmikey@meta.com>
Signed-off-by: Breno Leitao <leitao@debian.org>
---
net/core/netpoll.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 9be762e1d042..a089b704b986 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -682,7 +682,7 @@ int netpoll_setup(struct netpoll *np)
}
if (!netif_running(ndev)) {
- unsigned long atmost, atleast;
+ unsigned long atmost;
np_info(np, "device %s not up yet, forcing it\n", np->dev_name);
@@ -694,7 +694,6 @@ int netpoll_setup(struct netpoll *np)
}
rtnl_unlock();
- atleast = jiffies + HZ/10;
atmost = jiffies + carrier_timeout * HZ;
while (!netif_carrier_ok(ndev)) {
if (time_after(jiffies, atmost)) {
@@ -704,15 +703,6 @@ int netpoll_setup(struct netpoll *np)
msleep(1);
}
- /* If carrier appears to come up instantly, we don't
- * trust it and pause so that we don't pump all our
- * queued console messages into the bitbucket.
- */
-
- if (time_before(jiffies, atleast)) {
- np_notice(np, "carrier detect appears untrustworthy, waiting 4 seconds\n");
- msleep(4000);
- }
rtnl_lock();
}
--
2.30.2
next prev parent reply other threads:[~2023-01-19 18:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 16:44 [PATCH] netpoll: Remove 4s sleep during carrier detection Breno Leitao
2023-01-19 18:00 ` Breno Leitao [this message]
2023-01-19 19:04 ` [RFC PATCH v2] " Jakub Kicinski
2023-01-23 13:56 ` Andrew Lunn
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=20230119180008.2156048-1-leitao@debian.org \
--to=leitao@debian.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=leit@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rmikey@meta.com \
--cc=sa+renesas@sang-engineering.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).