Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5;
Message-ID: <1698040004.5365264-4-xuanzhuo@linux.alibaba.com>
Subject: Re: [PATCH] virtio_ring: add an error code check in virtqueue_resize
Date:   Mon, 23 Oct 2023 13:46:44 +0800
From:   Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To:     Su Hui <suhui@nfschina.com>
Cc:     kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org,
        virtualization@lists.linux-foundation.org,
        "Michael S. Tsirkin" <mst@redhat.com>
References: <20231020092320.209234-1-suhui@nfschina.com>
 <20231020053047-mutt-send-email-mst@kernel.org>
 <1697794601.5857713-2-xuanzhuo@linux.alibaba.com>
 <20231020054140-mutt-send-email-mst@kernel.org>
 <1697795422.0986886-1-xuanzhuo@linux.alibaba.com>
 <20231020055943-mutt-send-email-mst@kernel.org>
 <1698028017.8052797-1-xuanzhuo@linux.alibaba.com>
 <d4aa3f76-3e08-a852-a948-b88226a37fdd@nfschina.com>
 <1698029596.5404413-3-xuanzhuo@linux.alibaba.com>
 <46aee820-6c01-ed8a-613b-5c57258d749e@nfschina.com>
In-Reply-To: <46aee820-6c01-ed8a-613b-5c57258d749e@nfschina.com>
Precedence: bulk

On Mon, 23 Oct 2023 11:06:48 +0800, Su Hui <suhui@nfschina.com> wrote:
>
> On 2023/10/23 10:53, Xuan Zhuo wrote:
> > On Mon, 23 Oct 2023 10:51:59 +0800, Su Hui <suhui@nfschina.com> wrote:
> >> On 2023/10/23 10:26, Xuan Zhuo wrote:
> >>>>>> Well, what are the cases where it can happen practically?
> >>>>> Device error. Such as vp_active_vq()
> >>>>>
> >>>>> Thanks.
> >>>> Hmm interesting. OK. But do callers know to recover?
> >>> No.
> >>>
> >>> So I think WARN + broken is suitable.
> >>>
> >>> Thanks.
> >> Sorry for the late, is the following code okay?
> >>
> >> @@ -2739,7 +2739,7 @@ int virtqueue_resize(struct virtqueue *_vq, u32 num,
> >>                        void (*recycle)(struct virtqueue *vq, void *buf))
> >>    {
> >>           struct vring_virtqueue *vq = to_vvq(_vq);
> >> -       int err;
> >> +       int err, err_reset;
> >>
> >>           if (num > vq->vq.num_max)
> >>                   return -E2BIG;
> >> @@ -2759,7 +2759,15 @@ int virtqueue_resize(struct virtqueue *_vq, u32 num,
> >>           else
> >>                   err = virtqueue_resize_split(_vq, num);
> >>
> >> -       return virtqueue_enable_after_reset(_vq);
> >> +       err_reset = virtqueue_enable_after_reset(_vq);
> >> +
> >> +       if (err) {
> > No err.
> >
> > err is not important.
> > You can remove that.
>
> Emm, I'm a little confused that which code should I remove ?


like this:
	if (vq->packed_ring)
		virtqueue_resize_packed(_vq, num);
	else
		virtqueue_resize_split(_vq, num);

And we should set broken and warn inside virtqueue_enable_after_reset()?

Thanks.


>
> > Thanks.
> >
> >
> >> +               vq->broken = true;
> >> +               WARN_ON(err_reset);
> >> +               return err;
> >> +       }
> >> +
> >> +       return err_reset;
> >>    }
> >>
> >> Thanks.
> >> Su Hui
> >>