Skip to content

dma: detect stuck and dead streams #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zack-vii wants to merge 1 commit into
base: main2
Choose a base branch
from
Open

dma: detect stuck and dead streams #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions acq400_drv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,9 +875,10 @@ ssize_t acq400_continuous_read(struct file *file, char __user *buf, size_t count
void _acq420_continuous_dma_stop(struct acq400_dev *adev)
{
unsigned long work_task_wait = 0;
unsigned long last_alive, alive;

while(mutex_lock_interruptible(&adev->mutex)) {
;
continue;
}
if (adev->task_active && !IS_ERR_OR_NULL(adev->w_task)){
kthread_stop(adev->w_task);
Expand All @@ -891,7 +892,7 @@ void _acq420_continuous_dma_stop(struct acq400_dev *adev)

wake_up_interruptible(&adev->DMA_READY);
wake_up_interruptible(&adev->w_waitq);

last_alive = adev->task_alive;
while(adev->task_active){
work_task_wait = jiffies + msecs_to_jiffies(1000);
while (adev->task_active){
Expand All @@ -901,6 +902,12 @@ void _acq420_continuous_dma_stop(struct acq400_dev *adev)
break;
}
}
alive = adev->task_alive;
if (alive == last_alive){
adev->task_active = 0;
break;
}
last_alive = alive;
}
mutex_lock(&adev->mutex);
adev->w_task = 0;
Expand Down Expand Up @@ -1688,6 +1695,7 @@ void null_put_empty(struct acq400_dev *adev, struct HBM* hbm) {}
int axi64_data_loop(void* data)
{
struct acq400_dev *adev = (struct acq400_dev *)data;
adev->task_alive = 0;
/* wait for event from OTHER channel */
int nloop = 0;
struct HBM* hbm;
Expand Down Expand Up @@ -1720,6 +1728,10 @@ int axi64_data_loop(void* data)

for(; !kthread_should_stop(); ++nloop){
int ddone = 0;
if (adev->task_active == 0){
goto quit;
}
adev->task_alive += 1;
dev_dbg(DEVP(adev), "axi64_data_loop() 10");

if (wait_event_interruptible_timeout(
Expand Down
1 change: 1 addition & 0 deletions acq400_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ struct acq400_dev {
struct task_struct* h_task; /* creates fifo histogram */
wait_queue_head_t w_waitq;
int task_active;
unsigned long task_alive;

wait_queue_head_t event_waitq;

Expand Down