From: Jesper Dangaard Brouer <jbrouer@redhat.com>
To: Stephan Gerhold <stephan.gerhold@kernkonzept.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Jesper Dangaard Brouer <hawk@kernel.org>,
John Fastabend <john.fastabend@gmail.com>
Cc: brouer@redhat.com, virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
bpf@vger.kernel.org
Subject: Re: [PATCH net] virtio_net: fix xdp_rxq_info bug after suspend/resume
Date: Tue, 21 Jun 2022 18:55:14 +0200 [thread overview]
Message-ID: <0a45e625-22c4-23d7-bb45-964cb9993b71@redhat.com> (raw)
In-Reply-To: <20220621114845.3650258-1-stephan.gerhold@kernkonzept.com>
On 21/06/2022 13.48, Stephan Gerhold wrote:
> The following sequence currently causes a driver bug warning
> when using virtio_net:
>
> # ip link set eth0 up
> # echo mem > /sys/power/state (or e.g. # rtcwake -s 10 -m mem)
> <resume>
> # ip link set eth0 down
>
> Missing register, driver bug
> WARNING: CPU: 0 PID: 375 at net/core/xdp.c:138 xdp_rxq_info_unreg+0x58/0x60
I love seeing that the sanity check we added are actually catching bugs
in drives like this :-)))
> Call trace:
> xdp_rxq_info_unreg+0x58/0x60
> virtnet_close+0x58/0xac
> __dev_close_many+0xac/0x140
> __dev_change_flags+0xd8/0x210
> dev_change_flags+0x24/0x64
> do_setlink+0x230/0xdd0
> ...
>
> This happens because virtnet_freeze() frees the receive_queue
> completely (including struct xdp_rxq_info) but does not call
> xdp_rxq_info_unreg(). Similarly, virtnet_restore() sets up the
> receive_queue again but does not call xdp_rxq_info_reg().
>
> Actually, parts of virtnet_freeze_down() and virtnet_restore_up()
> are almost identical to virtnet_close() and virtnet_open(): only
> the calls to xdp_rxq_info_(un)reg() are missing. This means that
> we can fix this easily and avoid such problems in the future by
> just calling virtnet_close()/open() from the freeze/restore handlers.
>
> Aside from adding the missing xdp_rxq_info calls the only difference
> is that the refill work is only cancelled if netif_running(). However,
> this should not make any functional difference since the refill work
> should only be active if the network interface is actually up.
>
> Fixes: 754b8a21a96d ("virtio_net: setup xdp_rxq_info")
> Signed-off-by: Stephan Gerhold<stephan.gerhold@kernkonzept.com>
> ---
> drivers/net/virtio_net.c | 25 ++++++-------------------
> 1 file changed, 6 insertions(+), 19 deletions(-)
LGTM
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
next prev parent reply other threads:[~2022-06-21 16:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 11:48 Stephan Gerhold
2022-06-21 16:55 ` Jesper Dangaard Brouer [this message]
2022-06-22 8:06 ` Jason Wang
2022-06-23 2:20 ` 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=0a45e625-22c4-23d7-bb45-964cb9993b71@redhat.com \
--to=jbrouer@redhat.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hawk@kernel.org \
--cc=jasowang@redhat.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=stephan.gerhold@kernkonzept.com \
--cc=virtualization@lists.linux-foundation.org \
/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
all inboxes | Powered by JetHome®