Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
Message-ID: <d4aa3f76-3e08-a852-a948-b88226a37fdd@nfschina.com>
Date:   Mon, 23 Oct 2023 10:51:59 +0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.8.0
Subject: Re: [PATCH] virtio_ring: add an error code check in virtqueue_resize
Content-Language: en-US
To:     Xuan Zhuo <xuanzhuo@linux.alibaba.com>,
        "Michael S. Tsirkin" <mst@redhat.com>
Cc:     kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org,
        virtualization@lists.linux-foundation.org
From:   Su Hui <suhui@nfschina.com>
In-Reply-To: <1698028017.8052797-1-xuanzhuo@linux.alibaba.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

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) {
+               vq->broken = true;
+               WARN_ON(err_reset);
+               return err;
+       }
+
+       return err_reset;
  }

Thanks.
Su Hui