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 CF7E4C433F5 for ; Wed, 16 Mar 2022 14:16:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355213AbiCPOSE (ORCPT ); Wed, 16 Mar 2022 10:18:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356437AbiCPORP (ORCPT ); Wed, 16 Mar 2022 10:17:15 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D49F27FE1; Wed, 16 Mar 2022 07:16:01 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id DFD97B81B7D; Wed, 16 Mar 2022 14:15:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A877C340E9; Wed, 16 Mar 2022 14:15:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647440158; bh=M91qFEFG0fcfjlffzLFtwrC6VjPvkQUbQGDh5M59zrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hrNrapCz5XyoCegsv7Xm6oYcfSiunvSJBk5C2nuI9jcnH/XyxVODRp/nwvp4j+dSz R2ZyLmy1+WAy0rWdaKeKS+JRo2t5gHAbj/oPNi/+W/klcwI8hV1YKqy+JCLP8+z1MW HYAQ65zNb90uZwCmron5AvR7iNttArvgd8Np6CQHfxjMgIHjy/85zaSj4FROqLRqJj +wg/NyTL7qZHnp3j9p61ZVCqk4ldsCGTxd9pjSyzFq2UFU+qq12KaAnC+IyX4p1GXm dHZEvIhAYsCAi4QbZxhVyOM6zfXPkfTFA/OekUBFDcvVIA3e+uLTej2KOw4Ds/jwdS nxth2WEItUFag== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Michael S. Tsirkin" , Sasha Levin , amit@kernel.org, gregkh@linuxfoundation.org, virtualization@lists.linux-foundation.org Subject: [PATCH AUTOSEL 5.15 06/13] virtio_console: break out of buf poll on remove Date: Wed, 16 Mar 2022 10:15:06 -0400 Message-Id: <20220316141513.247965-6-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220316141513.247965-1-sashal@kernel.org> References: <20220316141513.247965-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Michael S. Tsirkin" [ Upstream commit 0e7174b9d5877130fec41fb4a16e0c2ee4958d44 ] A common pattern for device reset is currently: vdev->config->reset(vdev); .. cleanup .. reset prevents new interrupts from arriving and waits for interrupt handlers to finish. However if - as is common - the handler queues a work request which is flushed during the cleanup stage, we have code adding buffers / trying to get buffers while device is reset. Not good. This was reproduced by running modprobe virtio_console modprobe -r virtio_console in a loop. Fix this up by calling virtio_break_device + flush before reset. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1786239 Signed-off-by: Michael S. Tsirkin Signed-off-by: Sasha Levin --- drivers/char/virtio_console.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 7eaf303a7a86..3adf04766e98 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -1956,6 +1956,13 @@ static void virtcons_remove(struct virtio_device *vdev) list_del(&portdev->list); spin_unlock_irq(&pdrvdata_lock); + /* Device is going away, exit any polling for buffers */ + virtio_break_device(vdev); + if (use_multiport(portdev)) + flush_work(&portdev->control_work); + else + flush_work(&portdev->config_work); + /* Disable interrupts for vqs */ vdev->config->reset(vdev); /* Finish up work that's lined up */ -- 2.34.1