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 8DC11C433FE for ; Wed, 16 Mar 2022 14:20:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356769AbiCPOVL (ORCPT ); Wed, 16 Mar 2022 10:21:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356522AbiCPOUY (ORCPT ); Wed, 16 Mar 2022 10:20:24 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AEDFA25C64; Wed, 16 Mar 2022 07:18:32 -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 2E3C7B81B7C; Wed, 16 Mar 2022 14:18:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECC4DC36AE3; Wed, 16 Mar 2022 14:18:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647440310; bh=ZSpuhZ0FNDIHPGNjHzbp9ow81UzHOJQp4HiqAQy0f4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cN0M6QihcH2y+tJ0urYKQHrgLI5SNH95mS7eJVWFDuCLzJ3MLdlfC4cWrHZ26MZ3o FpYiysWdA0vuo20FiLboxMFp12/qCUdx8D3Q68rmHDjOuf3z2AK+UkUwxpPG3nuY+r g3+BX6UTYOa335zd+CUFEdIXt4n7Zw+FF57MX+IJp+rcYBzP6ixPX4BxjHAJ87tssv JVag4Oj4nvEOJhcIE7Kfs6b80pJFpKB0+wLH5DcGNVsb0GhmVlS8JOya5t9I6GaTCj qD1Bd5e9ykejPlJOXUmahyMOik3vqXLuQdDVrzWpFuLGhtqQi6xkFsVnvy3zD2QHtI 8ZQ9U/NM6b37Q== 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 4.19 2/6] virtio_console: break out of buf poll on remove Date: Wed, 16 Mar 2022 10:18:13 -0400 Message-Id: <20220316141817.248621-2-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220316141817.248621-1-sashal@kernel.org> References: <20220316141817.248621-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 cdf441942bae..ac0b84afabe7 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -1985,6 +1985,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