Commit b4547402 authored by Jan Glauber's avatar Jan Glauber Committed by Martin Schwidefsky

[S390] qdio: add missing tiq_list locking

Add a mutex to protect the tiq_list. Although reading the list is done
using RCU adding and removing elements from the list must still
happen locked since multiple qdio devices may change the list in parallel
otherwise.
Signed-off-by: default avatarJan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent feed9b62
...@@ -1112,6 +1112,7 @@ int qdio_shutdown(struct ccw_device *cdev, int how) ...@@ -1112,6 +1112,7 @@ int qdio_shutdown(struct ccw_device *cdev, int how)
if (!irq_ptr) if (!irq_ptr)
return -ENODEV; return -ENODEV;
BUG_ON(irqs_disabled());
DBF_EVENT("qshutdown:%4x", cdev->private->schid.sch_no); DBF_EVENT("qshutdown:%4x", cdev->private->schid.sch_no);
mutex_lock(&irq_ptr->setup_mutex); mutex_lock(&irq_ptr->setup_mutex);
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
/* list of thin interrupt input queues */ /* list of thin interrupt input queues */
static LIST_HEAD(tiq_list); static LIST_HEAD(tiq_list);
DEFINE_MUTEX(tiq_list_lock);
/* adapter local summary indicator */ /* adapter local summary indicator */
static unsigned char *tiqdio_alsi; static unsigned char *tiqdio_alsi;
...@@ -95,10 +96,10 @@ void tiqdio_add_input_queues(struct qdio_irq *irq_ptr) ...@@ -95,10 +96,10 @@ void tiqdio_add_input_queues(struct qdio_irq *irq_ptr)
if (!css_qdio_omit_svs && irq_ptr->siga_flag.sync) if (!css_qdio_omit_svs && irq_ptr->siga_flag.sync)
css_qdio_omit_svs = 1; css_qdio_omit_svs = 1;
for_each_input_queue(irq_ptr, q, i) { mutex_lock(&tiq_list_lock);
for_each_input_queue(irq_ptr, q, i)
list_add_rcu(&q->entry, &tiq_list); list_add_rcu(&q->entry, &tiq_list);
synchronize_rcu(); mutex_unlock(&tiq_list_lock);
}
xchg(irq_ptr->dsci, 1); xchg(irq_ptr->dsci, 1);
tasklet_schedule(&tiqdio_tasklet); tasklet_schedule(&tiqdio_tasklet);
} }
...@@ -118,7 +119,10 @@ void tiqdio_remove_input_queues(struct qdio_irq *irq_ptr) ...@@ -118,7 +119,10 @@ void tiqdio_remove_input_queues(struct qdio_irq *irq_ptr)
/* if establish triggered an error */ /* if establish triggered an error */
if (!q || !q->entry.prev || !q->entry.next) if (!q || !q->entry.prev || !q->entry.next)
continue; continue;
mutex_lock(&tiq_list_lock);
list_del_rcu(&q->entry); list_del_rcu(&q->entry);
mutex_unlock(&tiq_list_lock);
synchronize_rcu(); synchronize_rcu();
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment