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 X-Spam-Level: X-Spam-Status: No, score=-20.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADE5EC4338F for ; Mon, 23 Aug 2021 06:32:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9066F61250 for ; Mon, 23 Aug 2021 06:32:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231749AbhHWGdA (ORCPT ); Mon, 23 Aug 2021 02:33:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:48516 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231997AbhHWGc7 (ORCPT ); Mon, 23 Aug 2021 02:32:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629700337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F427DPlADbCH/M2u7fz/h7ndiMrb6AVw4qTHSvYRC+w=; b=DCzM5i35ExJMLNvv7UguV+GarRVqJ2FxcZh4qwMW8Eg8Sj/CeSAuoAUKWCLjq8ccDIRm9K g21Aj2IPQEdGm5sk8DT4dwsVpqWp+C0tmkWJJuw5WSKnquBemqwVLcgP6TF1T+8kwNGbRa u/ryfb+7i9IOS0oJyT5//OkA6p9sU2o= Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-114-Q-Z9Dju6NCasWRm07JogAw-1; Mon, 23 Aug 2021 02:32:15 -0400 X-MC-Unique: Q-Z9Dju6NCasWRm07JogAw-1 Received: by mail-pf1-f198.google.com with SMTP id 71-20020a62144a0000b02903cde387cf77so8147664pfu.2 for ; Sun, 22 Aug 2021 23:32:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=F427DPlADbCH/M2u7fz/h7ndiMrb6AVw4qTHSvYRC+w=; b=J955/NFWkIqygaGGXkS5Kpp+W0E85Spr3iInl+lyvNT4kgHJZ2ZKEu4wAujXcShSwu f3Rthh7DPusJYMKinQ7bOzJpXmlrSvv0W0faqmCXEiYhd1ciqFa/+WqrRZLdicVWx/w1 f6xk4ZRzm7Q9ks8GMTHMHcr0Ns9fvjLG+L9hKgh6Ldhp7AvfF/vjfIo2mC3yRQcNYo9f VFPVQB64GwzCJK6mlD3/bYd8qjHRRK813lZVIMMT3OwKVCy1JfXAIXl3I7gF5AR7NPbX zDb8c7P95JeYm5p+DG3tZBqhJnN1NE7MVaJSC8/abSd7KyUcXAgKjhGNJZebIfKQWVVW PWXA== X-Gm-Message-State: AOAM532jpaJSrNJHknstlZic+NWsmKksBD9vlGeMpBZF3Lc1wV8s6GBt 2QChJQinAutkpTObxisJ2Y4Ti/qXUcoiSeBNEAsRL7I2orkaqGIbn2AnTTRpgd9mulENk38VNwK vuSmZtlTqAimu X-Received: by 2002:a65:40c4:: with SMTP id u4mr30729283pgp.186.1629700333935; Sun, 22 Aug 2021 23:32:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyMdGRZ8bEDFR6mhq5hnskFTgOQcLb0mODJnisTe/klfXgBImg93E0Jn9mD7e+X41rM+h1P3A== X-Received: by 2002:a65:40c4:: with SMTP id u4mr30729265pgp.186.1629700333764; Sun, 22 Aug 2021 23:32:13 -0700 (PDT) Received: from wangxiaodeMacBook-Air.local ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id d7sm17831032pgu.78.2021.08.22.23.32.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 22 Aug 2021 23:32:13 -0700 (PDT) Subject: Re: [PATCH v11 05/12] vhost-vdpa: Handle the failure of vdpa_reset() To: Xie Yongji , mst@redhat.com, stefanha@redhat.com, sgarzare@redhat.com, parav@nvidia.com, hch@infradead.org, christian.brauner@canonical.com, rdunlap@infradead.org, willy@infradead.org, viro@zeniv.linux.org.uk, axboe@kernel.dk, bcrl@kvack.org, corbet@lwn.net, mika.penttila@nextfour.com, dan.carpenter@oracle.com, joro@8bytes.org, gregkh@linuxfoundation.org, zhe.he@windriver.com, xiaodong.liu@intel.com, joe@perches.com, robin.murphy@arm.com Cc: songmuchun@bytedance.com, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, kvm@vger.kernel.org, linux-fsdevel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org References: <20210818120642.165-1-xieyongji@bytedance.com> <20210818120642.165-6-xieyongji@bytedance.com> From: Jason Wang Message-ID: Date: Mon, 23 Aug 2021 14:32:04 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <20210818120642.165-6-xieyongji@bytedance.com> Content-Type: text/plain; charset=gbk; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org ÔÚ 2021/8/18 ÏÂÎç8:06, Xie Yongji дµÀ: > The vdpa_reset() may fail now. This adds check to its return > value and fail the vhost_vdpa_open(). > > Signed-off-by: Xie Yongji Acked-by: Jason Wang > --- > drivers/vhost/vdpa.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > index b1c91b4db0ba..d99d75ad30cc 100644 > --- a/drivers/vhost/vdpa.c > +++ b/drivers/vhost/vdpa.c > @@ -116,12 +116,13 @@ static void vhost_vdpa_unsetup_vq_irq(struct vhost_vdpa *v, u16 qid) > irq_bypass_unregister_producer(&vq->call_ctx.producer); > } > > -static void vhost_vdpa_reset(struct vhost_vdpa *v) > +static int vhost_vdpa_reset(struct vhost_vdpa *v) > { > struct vdpa_device *vdpa = v->vdpa; > > - vdpa_reset(vdpa); > v->in_batch = 0; > + > + return vdpa_reset(vdpa); > } > > static long vhost_vdpa_get_device_id(struct vhost_vdpa *v, u8 __user *argp) > @@ -868,7 +869,9 @@ static int vhost_vdpa_open(struct inode *inode, struct file *filep) > return -EBUSY; > > nvqs = v->nvqs; > - vhost_vdpa_reset(v); > + r = vhost_vdpa_reset(v); > + if (r) > + goto err; > > vqs = kmalloc_array(nvqs, sizeof(*vqs), GFP_KERNEL); > if (!vqs) {