From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 294B75BAFD; Tue, 23 Jan 2024 01:46:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705974363; cv=none; b=bXhlvI83zUz6hkGedaEXz9lpoz55Wtkz7IuXnEuFauzDikq9bSmKLBT6Abn4DlC09ZlKZnu9l8xAbqLdUsa8hwDswVovbhhJ9pt9KdJlprJ1UR50EsftDXVSVtwy6/npAChIkKolekt+f51+t80c04d+kPnZtnaDkT7NG01p5zc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705974363; c=relaxed/simple; bh=I0nF9wzn4Nb51WINtjz0iYi8eTKxAZjirIjiEJveHk4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GB2xDciZEfgExX9XCGb7hV+ptphZEZ/EL0/moGq3bPH8C8Kw3tBoleLUm1rk+B7mRNBmOQce101ex3TXTeEHdQ+hbwZBGAgcStcwb5J41qMB/F6xFpN1F2kUb1NNo8WaDvWjH2jXc0ZjnOvFQv5WoSyegoJvjMF8m1IZ9kHqwNo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XkwsnuBl; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="XkwsnuBl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90D00C43390; Tue, 23 Jan 2024 01:46:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705974362; bh=I0nF9wzn4Nb51WINtjz0iYi8eTKxAZjirIjiEJveHk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XkwsnuBlyC81SlYWbAsvk69SW44wVScdQZMkBwMEE+3Kp8zEWQUh4ZjxiaAwN8gUl NQnCkQKM3rWqnEW3+PQUaeDNKwn7gRJnljJqnbvHFz6xoOFndKR3BMQQIapny5Whe6 oIyviGHg/pX0UhwmRmgdrw1vQz8vmxVktjGNXcuo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, wangyangxin , Gonglei , Herbert Xu , Sasha Levin Subject: [PATCH 6.6 066/583] crypto: virtio - Wait for tasklet to complete on device remove Date: Mon, 22 Jan 2024 15:51:57 -0800 Message-ID: <20240122235814.164404090@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235812.238724226@linuxfoundation.org> References: <20240122235812.238724226@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: wangyangxin [ Upstream commit 67cc511e8d436456cc98033e6d4ba83ebfc8e672 ] The scheduled tasklet needs to be executed on device remove. Fixes: fed93fb62e05 ("crypto: virtio - Handle dataq logic with tasklet") Signed-off-by: wangyangxin Signed-off-by: Gonglei Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/virtio/virtio_crypto_core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/crypto/virtio/virtio_crypto_core.c b/drivers/crypto/virtio/virtio_crypto_core.c index 428d76562447..b909c6a2bf1c 100644 --- a/drivers/crypto/virtio/virtio_crypto_core.c +++ b/drivers/crypto/virtio/virtio_crypto_core.c @@ -500,12 +500,15 @@ static void virtcrypto_free_unused_reqs(struct virtio_crypto *vcrypto) static void virtcrypto_remove(struct virtio_device *vdev) { struct virtio_crypto *vcrypto = vdev->priv; + int i; dev_info(&vdev->dev, "Start virtcrypto_remove.\n"); flush_work(&vcrypto->config_work); if (virtcrypto_dev_started(vcrypto)) virtcrypto_dev_stop(vcrypto); + for (i = 0; i < vcrypto->max_data_queues; i++) + tasklet_kill(&vcrypto->data_vq[i].done_task); virtio_reset_device(vdev); virtcrypto_free_unused_reqs(vcrypto); virtcrypto_clear_crypto_engines(vcrypto); -- 2.43.0