From: Saeed Mahameed <saeed@kernel.org>
To: Geert Uytterhoeven <geert+renesas@glider.be>,
Heiner Kallweit <hkallweit1@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Andrew Lunn <andrew@lunn.ch>,
"David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Gaku Inami <gaku.inami.xh@renesas.com>,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Revert "net: linkwatch: add check for netdevice being present to linkwatch_do_dev"
Date: Fri, 18 Sep 2020 10:58:49 -0700 [thread overview]
Message-ID: <7bfebfdc0d7345c4612124ff00e20eebb0ff6cd9.camel@kernel.org> (raw)
In-Reply-To: <20200901150237.15302-1-geert+renesas@glider.be>
On Tue, 2020-09-01 at 17:02 +0200, Geert Uytterhoeven wrote:
> This reverts commit 124eee3f6955f7aa19b9e6ff5c9b6d37cb3d1e2c.
>
> Inami-san reported that this commit breaks bridge support in a Xen
> environment, and that reverting it fixes this.
>
> During system resume, bridge ports are no longer enabled, as that
> relies
> on the receipt of the NETDEV_CHANGE notification. This notification
> is
> not sent, as netdev_state_change() is no longer called.
>
> Note that the condition this commit intended to fix never existed
> upstream, as the patch triggering it and referenced in the commit was
> never applied upstream. Hence I can confirm s2ram on r8a73a4/ape6evm
> and sh73a0/kzm9g works fine before/after this revert.
>
> Reported-by Gaku Inami <gaku.inami.xh@renesas.com>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> net/core/link_watch.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/core/link_watch.c b/net/core/link_watch.c
> index 75431ca9300fb9c4..c24574493ecf95e6 100644
> --- a/net/core/link_watch.c
> +++ b/net/core/link_watch.c
> @@ -158,7 +158,7 @@ static void linkwatch_do_dev(struct net_device
> *dev)
> clear_bit(__LINK_STATE_LINKWATCH_PENDING, &dev->state);
>
> rfc2863_policy(dev);
> - if (dev->flags & IFF_UP && netif_device_present(dev)) {
> + if (dev->flags & IFF_UP) {
So with your issue the devices is both IFF_UP and !present ? how so ?
I think you should look into that.
I am ok with removing the "dev present" check from here just because we
shouldn't be expecting IFF_UP && !present .. such thing must be a bug
somewhere else.
> if (netif_carrier_ok(dev))
> dev_activate(dev);
> else
next prev parent reply other threads:[~2020-09-18 17:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-01 15:02 [PATCH] Revert "net: linkwatch: add check for netdevice being present to linkwatch_do_dev" Geert Uytterhoeven
2020-09-03 21:58 ` David Miller
2020-09-10 19:20 ` David Miller
2020-09-11 6:32 ` Geert Uytterhoeven
2020-09-12 0:44 ` David Miller
2020-09-12 12:33 ` Geert Uytterhoeven
2020-09-13 1:34 ` David Miller
2020-09-14 7:40 ` Geert Uytterhoeven
2020-09-18 12:35 ` Nikolay Aleksandrov
2020-09-18 21:47 ` David Miller
2020-09-18 17:58 ` Saeed Mahameed [this message]
2020-09-18 22:10 ` David Miller
2020-09-23 11:49 ` Heiner Kallweit
2020-09-23 18:35 ` Saeed Mahameed
2020-09-23 19:58 ` Heiner Kallweit
2020-09-23 20:15 ` David Miller
2020-09-23 20:44 ` Heiner Kallweit
2020-09-23 22:42 ` Saeed Mahameed
2020-09-24 0:21 ` David Miller
2020-09-24 0:23 ` David Miller
2020-09-24 5:49 ` Saeed Mahameed
2020-09-24 16:03 ` Jakub Kicinski
2020-09-24 18:16 ` Saeed Mahameed
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=7bfebfdc0d7345c4612124ff00e20eebb0ff6cd9.camel@kernel.org \
--to=saeed@kernel.org \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=gaku.inami.xh@renesas.com \
--cc=geert+renesas@glider.be \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=yoshihiro.shimoda.uh@renesas.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).