svn commit: r307567 - head/sys/kern
Sean Bruno
sbruno at FreeBSD.org
Tue Oct 18 14:00:28 UTC 2016
Author: sbruno
Date: Tue Oct 18 14:00:26 2016
New Revision: 307567
URL: https://svnweb.freebsd.org/changeset/base/307567
Log:
Assert that we're assigning a non-null taskqueue.
ref: https://github.com/NextBSD/NextBSD/commit/535865d02c162e415d7436899cd6db5000a0cc7b
Fix cpu assignment by assuring stride is non-zero, assert that all tasks
have a valid taskqueue.
ref: https://github.com/NextBSD/NextBSD/commit/db398176234fe3ce9f8e8b671f56000f8276feba
Start cpu assignment from zero.
ref: https://github.com/NextBSD/NextBSD/commit/d99d39b6b6c5dfac1eb440c41e36ebf4c897198e
Submitted by: mmacy at nextbsd.org
Modified:
head/sys/kern/subr_gtaskqueue.c
Modified: head/sys/kern/subr_gtaskqueue.c
==============================================================================
--- head/sys/kern/subr_gtaskqueue.c Tue Oct 18 13:55:34 2016 (r307566)
+++ head/sys/kern/subr_gtaskqueue.c Tue Oct 18 14:00:26 2016 (r307567)
@@ -665,6 +665,7 @@ taskqgroup_attach_deferred(struct taskqg
LIST_INSERT_HEAD(&qgroup->tqg_queue[qid].tgc_tasks, gtask,
gt_list);
+ MPASS(qgroup->tqg_queue[qid].tgc_taskq != NULL);
gtask->gt_taskqueue = qgroup->tqg_queue[qid].tgc_taskq;
mtx_unlock(&qgroup->tqg_lock);
}
@@ -729,6 +730,7 @@ taskqgroup_attach_cpu_deferred(struct ta
}
qgroup->tqg_queue[qid].tgc_cnt++;
LIST_INSERT_HEAD(&qgroup->tqg_queue[qid].tgc_tasks, gtask, gt_list);
+ MPASS(qgroup->tqg_queue[qid].tgc_taskq != NULL);
gtask->gt_taskqueue = qgroup->tqg_queue[qid].tgc_taskq;
mtx_unlock(&qgroup->tqg_lock);
@@ -834,10 +836,10 @@ _taskqgroup_adjust(struct taskqgroup *qg
*/
cpu = old_cpu;
for (i = old_cnt; i < cnt; i++) {
- for (k = 0; k < qgroup->tqg_stride; k++)
- cpu = CPU_NEXT(cpu);
-
taskqgroup_cpu_create(qgroup, i, cpu);
+
+ for (k = 0; k < stride; k++)
+ cpu = CPU_NEXT(cpu);
}
mtx_lock(&qgroup->tqg_lock);
qgroup->tqg_cnt = cnt;
@@ -864,6 +866,15 @@ _taskqgroup_adjust(struct taskqgroup *qg
taskqgroup_attach_deferred(qgroup, gtask);
}
+#ifdef INVARIANTS
+ mtx_lock(&qgroup->tqg_lock);
+ for (i = 0; i < qgroup->tqg_cnt; i++) {
+ MPASS(qgroup->tqg_queue[i].tgc_taskq != NULL);
+ LIST_FOREACH(gtask, &qgroup->tqg_queue[i].tgc_tasks, gt_list)
+ MPASS(gtask->gt_taskqueue != NULL);
+ }
+ mtx_unlock(&qgroup->tqg_lock);
+#endif
/*
* If taskq thread count has been reduced.
*/
More information about the svn-src-head
mailing list