[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CACGkMEtL43VKTjU0D9bCftCCnv7_DwiSMaALPZnPo3E8btBmVQ@mail.gmail.com>
Date: Thu, 30 May 2024 11:52:57 +0800
From: Jason Wang <jasowang@...hat.com>
To: Heng Qi <hengqi@...ux.alibaba.com>
Cc: netdev@...r.kernel.org, virtualization@...ts.linux.dev,
"Michael S. Tsirkin" <mst@...hat.com>, Xuan Zhuo <xuanzhuo@...ux.alibaba.com>,
Eugenio Pérez <eperezma@...hat.com>,
"David S. Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, Jiri Pirko <jiri@...nulli.us>,
Daniel Jurgens <danielj@...dia.com>, Hariprasad Kelam <hkelam@...vell.com>
Subject: Re: [PATCH net v2] virtio_net: fix missing lock protection on
control_buf access
On Thu, May 30, 2024 at 11:41 AM Heng Qi <hengqi@...ux.alibaba.com> wrote:
>
> Refactored the handling of control_buf to be within the cvq_lock
> critical section, mitigating race conditions between reading device
> responses and new command submissions.
>
> Fixes: 6f45ab3e0409 ("virtio_net: Add a lock for the command VQ.")
> Signed-off-by: Heng Qi <hengqi@...ux.alibaba.com>
> Reviewed-by: Hariprasad Kelam <hkelam@...vell.com>
> ---
> v1->v2:
> - Use the ok instead of ret.
>
> drivers/net/virtio_net.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index 4a802c0ea2cb..1ea8e6a24286 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -2686,6 +2686,7 @@ static bool virtnet_send_command_reply(struct virtnet_info *vi, u8 class, u8 cmd
> {
> struct scatterlist *sgs[5], hdr, stat;
> u32 out_num = 0, tmp, in_num = 0;
> + bool ok;
> int ret;
>
> /* Caller should know better */
> @@ -2731,8 +2732,9 @@ static bool virtnet_send_command_reply(struct virtnet_info *vi, u8 class, u8 cmd
> }
>
> unlock:
> + ok = vi->ctrl->status == VIRTIO_NET_OK;
> mutex_unlock(&vi->cvq_lock);
> - return vi->ctrl->status == VIRTIO_NET_OK;
> + return ok;
> }
>
> static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,
> --
> 2.32.0.3.g01195cf9f
Acked-by: Jason Wang <jasowang@...hat.com>
Thanks
Powered by blists - more mailing lists