From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (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 2FE2D18EB8 for ; Wed, 3 Jul 2024 13:11:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720012274; cv=none; b=F946okoMbR56THsTSSPKwNJG21EY77WYUIBpTtrLgTsoFOZh0d8WI5L6QYGvedJ3CUb5VvZY6PORPn7a1psuc5uV/jN/8YLUWVinaPTuukuFHKByXYbFAu93kVAFpVHVgMgq4MMd5K1PGSfpsaqWGzbiy/ti/7soz/tkltfNPzQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720012274; c=relaxed/simple; bh=Ep7Wkp05xeb0gwBIeNK2C+jf+wt0nx5HxrZBcyf+FTc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UPwLHbXE1MWzyUKzq7LajFzzwG05z84G95TUytF/itf6to6EThUDjSWFRWnUlKOhwHAPAwRSWgzU5vFtcXH1qOR1K9Mivz9rGpLsen4ZHiIRPNnJbYhxnpM1P4oURSTF9MasYqUiJ4iWw0DQHhsI44gikgaFo581iMjxGxINOKs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=K7XmDWQY; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="K7XmDWQY" Received: from localhost.localdomain (unknown [IPv6:2405:201:2015:f873:55f8:639e:8e9f:12ec]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4A5EA8A9; Wed, 3 Jul 2024 15:10:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1720012243; bh=Ep7Wkp05xeb0gwBIeNK2C+jf+wt0nx5HxrZBcyf+FTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K7XmDWQYVpjh31cwJ9HbbRbizEG9Zs93LUwYlq/ST7zbxXMI3ecaj268EYthqKrPn sqrPZjjrzFe8XW4TEQnF2tdh84tji6mjS5Q8OvDhWxItv+TjOeXiDIjJnSFKeeXmkd sDRa4R8sSAWYQ90SHh+igIVjq+NUIexeITgD7rDI= From: Umang Jain To: linux-staging@lists.linux.dev Cc: Dan Carpenter , Kieran Bingham , Laurent Pinchart , Dave Stevenson , Phil Elwell , Greg Kroah-Hartman , Stefan Wahren , Umang Jain Subject: [PATCH v2 2/2] staging: vc04_services: vchiq_core: Stop kthreads on vchiq module unload Date: Wed, 3 Jul 2024 18:40:52 +0530 Message-ID: <20240703131052.597443-3-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240703131052.597443-1-umang.jain@ideasonboard.com> References: <20240703131052.597443-1-umang.jain@ideasonboard.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The various kthreads thread functions (slot_handler_func, sync_func, recycle_func) in vchiq_core and vchiq_keepalive_thread_func in vchiq_arm should be stopped when the module is unloaded. Previous attempt were made to address this but later reverted [1] due to VC04 firmware corruption. The issue around wait_event_interruptible() handling on stopping a kthread has been handled in the previous commit. Hence, it is now safe to stop kthreads on module unload, without any firmware corruption. This also completes the "Fix kernel module support" TODO item, hence drop it from the list. [1] commit ebee9ca2f59e ("Revert "staging: vc04_services: vchiq_core: Stop kthreads on shutdown"") Signed-off-by: Umang Jain --- drivers/staging/vc04_services/interface/TODO | 7 ------- .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 10 +++++++++- .../vc04_services/interface/vchiq_arm/vchiq_core.c | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/staging/vc04_services/interface/TODO b/drivers/staging/vc04_services/interface/TODO index 05f129c0c254..dfb1ee49633f 100644 --- a/drivers/staging/vc04_services/interface/TODO +++ b/drivers/staging/vc04_services/interface/TODO @@ -16,13 +16,6 @@ some of the ones we want: to manage these buffers as dmabufs so that we can zero-copy import camera images into vc4 for rendering/display. -* Fix kernel module support - -Even the VPU firmware doesn't support a VCHI re-connect, the driver -should properly handle a module unload. This also includes that all -resources must be freed (kthreads, debugfs entries, ...) and global -variables avoided. - * Documentation A short top-down description of this driver's architecture (function of diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index 9e6102c43e00..c4d97dbf6ba8 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -1315,7 +1315,7 @@ vchiq_keepalive_thread_func(void *v) goto shutdown; } - while (1) { + while (!kthread_should_stop()) { long rc = 0, uc = 0; if (wait_for_completion_interruptible(&arm_state->ka_evt)) { @@ -1776,12 +1776,20 @@ static int vchiq_probe(struct platform_device *pdev) static void vchiq_remove(struct platform_device *pdev) { struct vchiq_drv_mgmt *mgmt = dev_get_drvdata(&pdev->dev); + struct vchiq_arm_state *arm_state; vchiq_device_unregister(bcm2835_audio); vchiq_device_unregister(bcm2835_camera); vchiq_debugfs_deinit(); vchiq_deregister_chrdev(); + kthread_stop(mgmt->state.sync_thread); + kthread_stop(mgmt->state.recycle_thread); + kthread_stop(mgmt->state.slot_handler_thread); + + arm_state = vchiq_platform_get_arm_state(&mgmt->state); + kthread_stop(arm_state->ka_thread); + kfree(mgmt); } diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c index dd70f2881eca..50af04b217f4 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -1941,7 +1941,7 @@ slot_handler_func(void *v) DEBUG_INITIALISE(local); - while (1) { + while (!kthread_should_stop()) { DEBUG_COUNT(SLOT_HANDLER_COUNT); DEBUG_TRACE(SLOT_HANDLER_LINE); ret = remote_event_wait(&state->trigger_event, &local->trigger); @@ -1986,7 +1986,7 @@ recycle_func(void *v) if (!found) return -ENOMEM; - while (1) { + while (!kthread_should_stop()) { ret = remote_event_wait(&state->recycle_event, &local->recycle); if (ret) return ret; @@ -2008,7 +2008,7 @@ sync_func(void *v) int svc_fourcc; int ret; - while (1) { + while (!kthread_should_stop()) { struct vchiq_service *service; int msgid, size; int type; -- 2.43.0