From patchwork Mon Nov 28 02:10:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: lizetao X-Patchwork-Id: 13056932 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 395E2C352A1 for ; Mon, 28 Nov 2022 01:22:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229720AbiK1BWT (ORCPT ); Sun, 27 Nov 2022 20:22:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229518AbiK1BWL (ORCPT ); Sun, 27 Nov 2022 20:22:11 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1515B11174; Sun, 27 Nov 2022 17:22:10 -0800 (PST) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NL73H1X3HzRpSN; Mon, 28 Nov 2022 09:21:31 +0800 (CST) Received: from huawei.com (10.67.175.21) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 28 Nov 2022 09:22:07 +0800 From: Li Zetao To: , , , , , , , , , , , , , , , CC: , , , , , Subject: [PATCH 1/4] 9p: Fix probe failed when modprobe 9pnet_virtio Date: Mon, 28 Nov 2022 10:10:02 +0800 Message-ID: <20221128021005.232105-2-lizetao1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221128021005.232105-1-lizetao1@huawei.com> References: <20221128021005.232105-1-lizetao1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.175.21] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500012.china.huawei.com (7.221.188.12) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org When doing the following test steps, an error was found: step 1: modprobe 9pnet_virtio succeeded # modprobe 9pnet_virtio <-- OK step 2: fault injection in sysfs_create_file() # modprobe -r 9pnet_virtio <-- OK # ... FAULT_INJECTION: forcing a failure. name failslab, interval 1, probability 0, space 0, times 0 CPU: 0 PID: 3790 Comm: modprobe Tainted: G W 6.1.0-rc6-00285-g6a1e40c4b995-dirty #108 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996) Call Trace: ... should_failslab+0xa/0x20 ... sysfs_create_file_ns+0x130/0x1d0 p9_virtio_probe+0x662/0xb30 [9pnet_virtio] virtio_dev_probe+0x608/0xae0 ... 9pnet_virtio: probe of virtio3 failed with error -12 step 3: modprobe virtio_net failed # modprobe 9pnet_virtio <-- failed 9pnet_virtio: probe of virtio3 failed with error -2 The root cause of the problem is that the virtqueues are not stopped on the error handling path when sysfs_create_file() fails in p9_virtio_probe(), resulting in an error "-ENOENT" returned in the next modprobe call in setup_vq(). virtio_pci_modern_device uses virtqueues to send or receive message, and "queue_enable" records whether the queues are available. In vp_modern_find_vqs(), all queues will be selected and activated, but once queues are enabled there is no way to go back except reset. Fix it by reset virtio device on error handling path. After virtio_find_single_vq() succeeded, all virtqueues should be stopped on error handling path. Fixes: 1fcf0512c9c8 ("virtio_pci: modern driver") Signed-off-by: Li Zetao Reviewed-by: Christian Schoenebeck --- net/9p/trans_virtio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index e757f0601304..39933187284b 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -668,6 +668,7 @@ static int p9_virtio_probe(struct virtio_device *vdev) out_free_tag: kfree(tag); out_free_vq: + virtio_reset_device(vdev); vdev->config->del_vqs(vdev); out_free_chan: kfree(chan); From patchwork Mon Nov 28 02:10:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: lizetao X-Patchwork-Id: 13056933 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 E8A01C46467 for ; Mon, 28 Nov 2022 01:22:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229729AbiK1BWV (ORCPT ); Sun, 27 Nov 2022 20:22:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229746AbiK1BWL (ORCPT ); Sun, 27 Nov 2022 20:22:11 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD34C11448; Sun, 27 Nov 2022 17:22:10 -0800 (PST) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NL73H5KMdzRpVW; Mon, 28 Nov 2022 09:21:31 +0800 (CST) Received: from huawei.com (10.67.175.21) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 28 Nov 2022 09:22:07 +0800 From: Li Zetao To: , , , , , , , , , , , , , , , CC: , , , , , Subject: [PATCH 2/4] virtio-mem: Fix probe failed when modprobe virtio_mem Date: Mon, 28 Nov 2022 10:10:03 +0800 Message-ID: <20221128021005.232105-3-lizetao1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221128021005.232105-1-lizetao1@huawei.com> References: <20221128021005.232105-1-lizetao1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.175.21] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500012.china.huawei.com (7.221.188.12) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org When doing the following test steps, an error was found: step 1: modprobe virtio_mem succeeded # modprobe virtio_mem <-- OK step 2: fault injection in virtio_mem_init() # modprobe -r virtio_mem <-- OK # ... CPU: 0 PID: 1837 Comm: modprobe Not tainted 6.1.0-rc6-00285-g6a1e40c4b995-dirty Hardware name: QEMU Standard PC (i440FX + PIIX, 1996) Call Trace: should_fail.cold+0x5/0x1f ... virtio_mem_init_hotplug+0x9ae/0xe57 [virtio_mem] virtio_mem_init.cold+0x327/0x339 [virtio_mem] virtio_mem_probe+0x48e/0x910 [virtio_mem] virtio_dev_probe+0x608/0xae0 ... virtio_mem virtio4: could not reserve device region virtio_mem: probe of virtio4 failed with error -16 step 3: modprobe virtio_net failed # modprobe virtio_mem <-- failed virtio_mem: probe of virtio4 failed with error -16 The root cause of the problem is that the virtqueues are not stopped on the error handling path when virtio_mem_init() fails in virtio_mem_probe(), resulting in an error "-ENOENT" returned in the next modprobe call in setup_vq(). virtio_pci_modern_device uses virtqueues to send or receive message, and "queue_enable" records whether the queues are available. In vp_modern_find_vqs(), all queues will be selected and activated, but once queues are enabled there is no way to go back except reset. Fix it by reset virtio device on error handling path. After virtio_mem_init_vq() succeeded, all virtqueues should be stopped on error handling path. Fixes: 1fcf0512c9c8 ("virtio_pci: modern driver") Signed-off-by: Li Zetao Reviewed-by: David Hildenbrand --- drivers/virtio/virtio_mem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c index 0c2892ec6817..c7f09c2ce982 100644 --- a/drivers/virtio/virtio_mem.c +++ b/drivers/virtio/virtio_mem.c @@ -2793,6 +2793,7 @@ static int virtio_mem_probe(struct virtio_device *vdev) return 0; out_del_vq: + virtio_reset_device(vdev); vdev->config->del_vqs(vdev); out_free_vm: kfree(vm); From patchwork Mon Nov 28 02:10:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: lizetao X-Patchwork-Id: 13056934 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 B8605C4332F for ; Mon, 28 Nov 2022 01:22:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229607AbiK1BWW (ORCPT ); Sun, 27 Nov 2022 20:22:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229704AbiK1BWM (ORCPT ); Sun, 27 Nov 2022 20:22:12 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C44A1144B; Sun, 27 Nov 2022 17:22:11 -0800 (PST) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NL73J3Z1RzRpX4; Mon, 28 Nov 2022 09:21:32 +0800 (CST) Received: from huawei.com (10.67.175.21) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 28 Nov 2022 09:22:08 +0800 From: Li Zetao To: , , , , , , , , , , , , , , , CC: , , , , , Subject: [PATCH 3/4] virtio-input: Fix probe failed when modprobe virtio_input Date: Mon, 28 Nov 2022 10:10:04 +0800 Message-ID: <20221128021005.232105-4-lizetao1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221128021005.232105-1-lizetao1@huawei.com> References: <20221128021005.232105-1-lizetao1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.175.21] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500012.china.huawei.com (7.221.188.12) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org When doing the following test steps, an error was found: step 1: modprobe virtio_input succeeded # modprobe virtio_input <-- OK step 2: fault injection in input_allocate_device() # modprobe -r virtio_input <-- OK # ... CPU: 0 PID: 4260 Comm: modprobe Tainted: G W 6.1.0-rc6-00285-g6a1e40c4b995-dirty #109 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), Call Trace: should_fail.cold+0x5/0x1f ... kmalloc_trace+0x27/0xa0 input_allocate_device+0x43/0x280 virtinput_probe+0x23b/0x1648 [virtio_input] ... virtio_input: probe of virtio5 failed with error -12 step 3: modprobe virtio_net failed # modprobe virtio_input <-- failed virtio_input: probe of virtio1 failed with error -2 The root cause of the problem is that the virtqueues are not stopped on the error handling path when input_allocate_device() fails in virtinput_probe(), resulting in an error "-ENOENT" returned in the next modprobe call in setup_vq(). virtio_pci_modern_device uses virtqueues to send or receive message, and "queue_enable" records whether the queues are available. In vp_modern_find_vqs(), all queues will be selected and activated, but once queues are enabled there is no way to go back except reset. Fix it by reset virtio device on error handling path. After virtinput_init_vqs() succeeded, all virtqueues should be stopped on error handling path. Fixes: 1fcf0512c9c8 ("virtio_pci: modern driver") Signed-off-by: Li Zetao --- drivers/virtio/virtio_input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/virtio/virtio_input.c b/drivers/virtio/virtio_input.c index 3aa46703872d..f638f1cd3531 100644 --- a/drivers/virtio/virtio_input.c +++ b/drivers/virtio/virtio_input.c @@ -330,6 +330,7 @@ static int virtinput_probe(struct virtio_device *vdev) err_mt_init_slots: input_free_device(vi->idev); err_input_alloc: + virtio_reset_device(vdev); vdev->config->del_vqs(vdev); err_init_vq: kfree(vi); From patchwork Mon Nov 28 02:10:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: lizetao X-Patchwork-Id: 13056935 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 4DEE4C433FE for ; Mon, 28 Nov 2022 01:22:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229504AbiK1BW1 (ORCPT ); Sun, 27 Nov 2022 20:22:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229615AbiK1BWN (ORCPT ); Sun, 27 Nov 2022 20:22:13 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09CF31117B; Sun, 27 Nov 2022 17:22:12 -0800 (PST) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NL73F3BWpzHw33; Mon, 28 Nov 2022 09:21:29 +0800 (CST) Received: from huawei.com (10.67.175.21) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 28 Nov 2022 09:22:09 +0800 From: Li Zetao To: , , , , , , , , , , , , , , , CC: , , , , , Subject: [PATCH 4/4] virtio-blk: Fix probe failed when modprobe virtio_blk Date: Mon, 28 Nov 2022 10:10:05 +0800 Message-ID: <20221128021005.232105-5-lizetao1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221128021005.232105-1-lizetao1@huawei.com> References: <20221128021005.232105-1-lizetao1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.175.21] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500012.china.huawei.com (7.221.188.12) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org When doing the following test steps, an error was found: step 1: modprobe virtio_blk succeeded # modprobe virtio_blk <-- OK step 2: fault injection in __blk_mq_alloc_disk() # modprobe -r virtio_blk <-- OK # ... CPU: 0 PID: 4578 Comm: modprobe Tainted: G W 6.1.0-rc6-00308-g644e9524388a-dirty Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), Call Trace: should_failslab+0xa/0x20 ... blk_alloc_queue+0x3a4/0x780 __blk_mq_alloc_disk+0x91/0x1f0 virtblk_probe+0x6ff/0x1f20 [virtio_blk] ... virtio_blk: probe of virtio1 failed with error -12 step 3: modprobe virtio_net failed # modprobe virtio_blk <-- failed virtio_blk: probe of virtio1 failed with error -2 The root cause of the problem is that the virtqueues are not stopped on the error handling path when __blk_mq_alloc_disk() fails in virtblk_probe(), resulting in an error "-ENOENT" returned in the next modprobe call in setup_vq(). virtio_pci_modern_device uses virtqueues to send or receive message, and "queue_enable" records whether the queues are available. In vp_modern_find_vqs(), all queues will be selected and activated, but once queues are enabled there is no way to go back except reset. Fix it by reset virtio device on error handling path. After init_vq() succeeded, all virtqueues should be stopped on error handling path. Fixes: 1fcf0512c9c8 ("virtio_pci: modern driver") Signed-off-by: Li Zetao --- drivers/block/virtio_blk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 19da5defd734..f401546d4e85 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -1157,6 +1157,7 @@ static int virtblk_probe(struct virtio_device *vdev) put_disk(vblk->disk); out_free_tags: blk_mq_free_tag_set(&vblk->tag_set); + virtio_reset_device(vdev); out_free_vq: vdev->config->del_vqs(vdev); kfree(vblk->vqs);