From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DB01CDB47E for ; Fri, 20 Oct 2023 09:38:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376700AbjJTJiW (ORCPT ); Fri, 20 Oct 2023 05:38:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376629AbjJTJiU (ORCPT ); Fri, 20 Oct 2023 05:38:20 -0400 Received: from out30-98.freemail.mail.aliyun.com (out30-98.freemail.mail.aliyun.com [115.124.30.98]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3531D51; Fri, 20 Oct 2023 02:38:17 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R771e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046050;MF=xuanzhuo@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0VuWqBIR_1697794692; Received: from localhost(mailfrom:xuanzhuo@linux.alibaba.com fp:SMTPD_---0VuWqBIR_1697794692) by smtp.aliyun-inc.com; Fri, 20 Oct 2023 17:38:13 +0800 Message-ID: <1697794601.5857713-2-xuanzhuo@linux.alibaba.com> Subject: Re: [PATCH] virtio_ring: add an error code check in virtqueue_resize Date: Fri, 20 Oct 2023 17:36:41 +0800 From: Xuan Zhuo To: "Michael S. Tsirkin" Cc: jasowang@redhat.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Su Hui References: <20231020092320.209234-1-suhui@nfschina.com> <20231020053047-mutt-send-email-mst@kernel.org> In-Reply-To: <20231020053047-mutt-send-email-mst@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 20 Oct 2023 05:34:32 -0400, "Michael S. Tsirkin" wrote: > On Fri, Oct 20, 2023 at 05:23:21PM +0800, Su Hui wrote: > > virtqueue_resize_packed() or virtqueue_resize_split() can return > > error code if failed, so add a check for this. > > > > Signed-off-by: Su Hui > > --- > > > > I'm not sure that return directly is right or not, > > maybe there are some process should do before return. > > yes - presizely what virtqueue_enable_after_reset does. > > Error handling in virtqueue_enable_after_reset is really weird BTW. > For some reason it overrides the error code returned. > > > > > > > drivers/virtio/virtio_ring.c | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > > index 51d8f3299c10..cf662c3a755b 100644 > > --- a/drivers/virtio/virtio_ring.c > > +++ b/drivers/virtio/virtio_ring.c > > @@ -2759,6 +2759,9 @@ int virtqueue_resize(struct virtqueue *_vq, u32 num, > > else > > err = virtqueue_resize_split(_vq, num); > > > > + if (err) > > + return err; > > + > > return virtqueue_enable_after_reset(_vq); > > So I think it should be something like: > > int err_reset = virtqueue_enable_after_reset(_vq); > BUG_ON(err_reset); > > return err; > How about WARN and vq->broken? Thanks. > > > > } > > EXPORT_SYMBOL_GPL(virtqueue_resize); > > -- > > 2.30.2 >