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=-18.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=unavailable 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 1B0E3C4338F for ; Tue, 3 Aug 2021 08:09:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 00A6D60F11 for ; Tue, 3 Aug 2021 08:09:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234494AbhHCIJz (ORCPT ); Tue, 3 Aug 2021 04:09:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59238 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234284AbhHCIJu (ORCPT ); Tue, 3 Aug 2021 04:09:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627978178; 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=d/r6zvhdFIL6U9mMpelz1ZP/rGx2CiqZiJxW3s2xgLY=; b=LOFwDr1VQuRJSPoCcXU7iZPYXL1N6dXCiShUeot75AojJ2dC082rcTa0pg4nbiIZnhZiGu vndbAIxYvVnaW2xkCSaa7QdgXtCs4WTRILHqt4boUXY4Ij4UhcLWbG4ty8TesmV5roE+DE IfFlnu8x0Bj9bnXUxKzUOMBjBYQeUio= Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-191-Bavu5G4GNh2fIDowbhEOOQ-1; Tue, 03 Aug 2021 04:09:37 -0400 X-MC-Unique: Bavu5G4GNh2fIDowbhEOOQ-1 Received: by mail-pl1-f197.google.com with SMTP id f17-20020a170902ab91b029012c3bac8d81so15970756plr.23 for ; Tue, 03 Aug 2021 01:09:37 -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=d/r6zvhdFIL6U9mMpelz1ZP/rGx2CiqZiJxW3s2xgLY=; b=jvv7IkKRFrmXOeFT4vyCvOn5YIOovodHx9cwlS3hsLyQRDG5TekhhOeVM3e6XRsQr7 AeS9Km2oRavrXpiAiBQJ1M7CGkp9P+OurtLIR06ScW6l5wlNZAd2qiArietLgpwaEMDo irqzlvd37kojz8N8OjEvD5s/XMwUmAqA+hxQ9FZBFqBNNviSUVCbu6/HjZofVYphd+Tx O10TbZqaExfBLZ3+Vw4r11bCUlWkcqDtqEHw93m6KsirHGoQeanb0ResFxV5XAm9o4qw fVlSkh8vbLIQZVoPRoXI72uNozpOJXWvgy5FwrYn58tppR8V4MXWo03eQDmTuKbIUYGI D5qw== X-Gm-Message-State: AOAM532ss5txAh686opQBtaTyytUTgFJ1sfKa/r1Cmhx51skRehZpE2k hccVigXEU5W89dc02k+nP8j5ZDXnDzqRo60RgAndBDth48/eC/EbyjthiDBSZDRsjvJ7k4n0tz9 4ewNDZ9YHXTNLHyJnVxJmY/Eu/w== X-Received: by 2002:aa7:8e51:0:b029:332:920f:1430 with SMTP id d17-20020aa78e510000b0290332920f1430mr21300598pfr.1.1627978176647; Tue, 03 Aug 2021 01:09:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7eB41SimgYU81rcElaZj+nONhqTjmXUgDQCX8JCwgqwPPspHzUgCCQ+CXUVfMnpfJwz3SQw== X-Received: by 2002:aa7:8e51:0:b029:332:920f:1430 with SMTP id d17-20020aa78e510000b0290332920f1430mr21300550pfr.1.1627978176387; Tue, 03 Aug 2021 01:09:36 -0700 (PDT) Received: from wangxiaodeMacBook-Air.local ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id j10sm15534492pfd.200.2021.08.03.01.09.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 03 Aug 2021 01:09:35 -0700 (PDT) Subject: Re: [PATCH v10 10/17] virtio: Handle device reset failure in register_virtio_device() 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 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: <20210729073503.187-1-xieyongji@bytedance.com> <20210729073503.187-11-xieyongji@bytedance.com> From: Jason Wang Message-ID: <6bb6c689-e6dd-cfa2-094b-a0ca4258aded@redhat.com> Date: Tue, 3 Aug 2021 16:09:23 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210729073503.187-11-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: linux-fsdevel@vger.kernel.org ÔÚ 2021/7/29 ÏÂÎç3:34, Xie Yongji дµÀ: > The device reset may fail in virtio-vdpa case now, so add checks to > its return value and fail the register_virtio_device(). So the reset() would be called by the driver during remove as well, or is it sufficient to deal only with the reset during probe? Thanks > > Signed-off-by: Xie Yongji > --- > drivers/virtio/virtio.c | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c > index a15beb6b593b..8df75425fb43 100644 > --- a/drivers/virtio/virtio.c > +++ b/drivers/virtio/virtio.c > @@ -349,7 +349,9 @@ int register_virtio_device(struct virtio_device *dev) > > /* We always start by resetting the device, in case a previous > * driver messed it up. This also tests that code path a little. */ > - dev->config->reset(dev); > + err = dev->config->reset(dev); > + if (err) > + goto err_reset; > > /* Acknowledge that we've seen the device. */ > virtio_add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE); > @@ -362,10 +364,13 @@ int register_virtio_device(struct virtio_device *dev) > */ > err = device_add(&dev->dev); > if (err) > - ida_simple_remove(&virtio_index_ida, dev->index); > -out: > - if (err) > - virtio_add_status(dev, VIRTIO_CONFIG_S_FAILED); > + goto err_add; > + > + return 0; > +err_add: > + virtio_add_status(dev, VIRTIO_CONFIG_S_FAILED); > +err_reset: > + ida_simple_remove(&virtio_index_ida, dev->index); > return err; > } > EXPORT_SYMBOL_GPL(register_virtio_device);