Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix debug object on stack warning 

When running the SPLAT tests on a kernel with CONFIG_DEBUG_OBJECTS=y
enabled the following warning is generated.

  ODEBUG: object is on stack, but not annotated
  WARNING: at lib/debugobjects.c:300 __debug_object_init+0x221/0x480()

This is caused by the test cases placing a debug object on the stack
rather than the heap.  This isn't harmful since they are small objects
but to make CONFIG_DEBUG_OBJECTS=y happy the objects have been relocated
to the heap.  This impacted taskq tests 1, 3, and 7.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #424
This commit is contained in:
Brian Behlendorf 2014-11-19 20:01:20 -05:00
parent a3c1eb7772
commit 03a783534a
1 changed files with 57 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
module/splat/splat-taskq.c
View File

@ -118,9 +118,10 @@ splat_taskq_test1_impl(struct file *file, void *arg, boolean_t prealloc)
taskq_t *tq; taskq_t *tq;
taskqid_t id; taskqid_t id;
splat_taskq_arg_t tq_arg; splat_taskq_arg_t tq_arg;
taskq_ent_t tqe; taskq_ent_t *tqe;
taskq_init_ent(&tqe); tqe = kmem_alloc(sizeof (taskq_ent_t), KM_SLEEP);
taskq_init_ent(tqe);
splat_vprint(file, SPLAT_TASKQ_TEST1_NAME, splat_vprint(file, SPLAT_TASKQ_TEST1_NAME,
"Taskq '%s' creating (%s dispatch)\n", "Taskq '%s' creating (%s dispatch)\n",
@ -131,6 +132,7 @@ splat_taskq_test1_impl(struct file *file, void *arg, boolean_t prealloc)
splat_vprint(file, SPLAT_TASKQ_TEST1_NAME, splat_vprint(file, SPLAT_TASKQ_TEST1_NAME,
"Taskq '%s' create failed\n", "Taskq '%s' create failed\n",
SPLAT_TASKQ_TEST1_NAME); SPLAT_TASKQ_TEST1_NAME);
kmem_free(tqe, sizeof (taskq_ent_t));
return -EINVAL; return -EINVAL;
} }
@ -144,8 +146,8 @@ splat_taskq_test1_impl(struct file *file, void *arg, boolean_t prealloc)
tq_arg.name, sym2str(splat_taskq_test13_func)); tq_arg.name, sym2str(splat_taskq_test13_func));
if (prealloc) { if (prealloc) {
taskq_dispatch_ent(tq, splat_taskq_test13_func, taskq_dispatch_ent(tq, splat_taskq_test13_func,
&tq_arg, TQ_SLEEP, &tqe); &tq_arg, TQ_SLEEP, tqe);
id = tqe.tqent_id; id = tqe->tqent_id;
} else { } else {
id = taskq_dispatch(tq, splat_taskq_test13_func, id = taskq_dispatch(tq, splat_taskq_test13_func,
&tq_arg, TQ_SLEEP); &tq_arg, TQ_SLEEP);
@ -155,6 +157,7 @@ splat_taskq_test1_impl(struct file *file, void *arg, boolean_t prealloc)
splat_vprint(file, SPLAT_TASKQ_TEST1_NAME, splat_vprint(file, SPLAT_TASKQ_TEST1_NAME,
"Taskq '%s' function '%s' dispatch failed\n", "Taskq '%s' function '%s' dispatch failed\n",
tq_arg.name, sym2str(splat_taskq_test13_func)); tq_arg.name, sym2str(splat_taskq_test13_func));
kmem_free(tqe, sizeof (taskq_ent_t));
taskq_destroy(tq); taskq_destroy(tq);
return -EINVAL; return -EINVAL;
} }
@ -165,6 +168,7 @@ splat_taskq_test1_impl(struct file *file, void *arg, boolean_t prealloc)
splat_vprint(file, SPLAT_TASKQ_TEST1_NAME, "Taskq '%s' destroying\n", splat_vprint(file, SPLAT_TASKQ_TEST1_NAME, "Taskq '%s' destroying\n",
tq_arg.name); tq_arg.name);
kmem_free(tqe, sizeof (taskq_ent_t));
taskq_destroy(tq); taskq_destroy(tq);
return (tq_arg.flag) ? 0 : -EINVAL; return (tq_arg.flag) ? 0 : -EINVAL;
@ -372,41 +376,51 @@ static int
splat_taskq_test3_impl(struct file *file, void *arg, boolean_t prealloc) splat_taskq_test3_impl(struct file *file, void *arg, boolean_t prealloc)
{ {
taskqid_t id; taskqid_t id;
splat_taskq_arg_t tq_arg; splat_taskq_arg_t *tq_arg;
taskq_ent_t tqe; taskq_ent_t *tqe;
int error;
taskq_init_ent(&tqe); tq_arg = kmem_alloc(sizeof (splat_taskq_arg_t), KM_SLEEP);
tqe = kmem_alloc(sizeof (taskq_ent_t), KM_SLEEP);
taskq_init_ent(tqe);
tq_arg.flag = 0; tq_arg->flag = 0;
tq_arg.id = 0; tq_arg->id = 0;
tq_arg.file = file; tq_arg->file = file;
tq_arg.name = SPLAT_TASKQ_TEST3_NAME; tq_arg->name = SPLAT_TASKQ_TEST3_NAME;
splat_vprint(file, SPLAT_TASKQ_TEST3_NAME, splat_vprint(file, SPLAT_TASKQ_TEST3_NAME,
"Taskq '%s' function '%s' %s dispatch\n", "Taskq '%s' function '%s' %s dispatch\n",
tq_arg.name, sym2str(splat_taskq_test13_func), tq_arg->name, sym2str(splat_taskq_test13_func),
prealloc ? "prealloc" : "dynamic"); prealloc ? "prealloc" : "dynamic");
if (prealloc) { if (prealloc) {
taskq_dispatch_ent(system_taskq, splat_taskq_test13_func, taskq_dispatch_ent(system_taskq, splat_taskq_test13_func,
&tq_arg, TQ_SLEEP, &tqe); tq_arg, TQ_SLEEP, tqe);
id = tqe.tqent_id; id = tqe->tqent_id;
} else { } else {
id = taskq_dispatch(system_taskq, splat_taskq_test13_func, id = taskq_dispatch(system_taskq, splat_taskq_test13_func,
&tq_arg, TQ_SLEEP); tq_arg, TQ_SLEEP);
} }
if (id == 0) { if (id == 0) {
splat_vprint(file, SPLAT_TASKQ_TEST3_NAME, splat_vprint(file, SPLAT_TASKQ_TEST3_NAME,
"Taskq '%s' function '%s' dispatch failed\n", "Taskq '%s' function '%s' dispatch failed\n",
tq_arg.name, sym2str(splat_taskq_test13_func)); tq_arg->name, sym2str(splat_taskq_test13_func));
kmem_free(tqe, sizeof (taskq_ent_t));
kmem_free(tq_arg, sizeof (splat_taskq_arg_t));
return -EINVAL; return -EINVAL;
} }
splat_vprint(file, SPLAT_TASKQ_TEST3_NAME, "Taskq '%s' waiting\n", splat_vprint(file, SPLAT_TASKQ_TEST3_NAME, "Taskq '%s' waiting\n",
tq_arg.name); tq_arg->name);
taskq_wait(system_taskq); taskq_wait(system_taskq);
return (tq_arg.flag) ? 0 : -EINVAL; error = (tq_arg->flag) ? 0 : -EINVAL;
kmem_free(tqe, sizeof (taskq_ent_t));
kmem_free(tq_arg, sizeof (splat_taskq_arg_t));
return (error);
} }
static int static int
@ -965,8 +979,9 @@ static int
splat_taskq_test7_impl(struct file *file, void *arg, boolean_t prealloc) splat_taskq_test7_impl(struct file *file, void *arg, boolean_t prealloc)
{ {
taskq_t *tq; taskq_t *tq;
taskq_ent_t tqe; splat_taskq_arg_t *tq_arg;
splat_taskq_arg_t tq_arg; taskq_ent_t *tqe;
int error;
splat_vprint(file, SPLAT_TASKQ_TEST7_NAME, splat_vprint(file, SPLAT_TASKQ_TEST7_NAME,
"Taskq '%s' creating (%s dispatch)\n", "Taskq '%s' creating (%s dispatch)\n",
@ -980,33 +995,41 @@ splat_taskq_test7_impl(struct file *file, void *arg, boolean_t prealloc)
return -EINVAL; return -EINVAL;
} }
tq_arg.depth = 0; tq_arg = kmem_alloc(sizeof (splat_taskq_arg_t), KM_SLEEP);
tq_arg.flag = 0; tqe = kmem_alloc(sizeof (taskq_ent_t), KM_SLEEP);
tq_arg.id = 0;
tq_arg.file = file; tq_arg->depth = 0;
tq_arg.name = SPLAT_TASKQ_TEST7_NAME; tq_arg->flag = 0;
tq_arg.tq = tq; tq_arg->id = 0;
tq_arg->file = file;
tq_arg->name = SPLAT_TASKQ_TEST7_NAME;
tq_arg->tq = tq;
if (prealloc) { if (prealloc) {
taskq_init_ent(&tqe); taskq_init_ent(tqe);
tq_arg.tqe = &tqe; tq_arg->tqe = tqe;
} else { } else {
tq_arg.tqe = NULL; tq_arg->tqe = NULL;
} }
splat_taskq_test7_func(&tq_arg); splat_taskq_test7_func(tq_arg);
if (tq_arg.flag == 0) { if (tq_arg->flag == 0) {
splat_vprint(file, SPLAT_TASKQ_TEST7_NAME, splat_vprint(file, SPLAT_TASKQ_TEST7_NAME,
"Taskq '%s' waiting\n", tq_arg.name); "Taskq '%s' waiting\n", tq_arg->name);
taskq_wait_all(tq, SPLAT_TASKQ_DEPTH_MAX); taskq_wait_all(tq, SPLAT_TASKQ_DEPTH_MAX);
} }
error = (tq_arg->depth == SPLAT_TASKQ_DEPTH_MAX ? 0 : -EINVAL);
kmem_free(tqe, sizeof (taskq_ent_t));
kmem_free(tq_arg, sizeof (splat_taskq_arg_t));
splat_vprint(file, SPLAT_TASKQ_TEST7_NAME, splat_vprint(file, SPLAT_TASKQ_TEST7_NAME,
"Taskq '%s' destroying\n", tq_arg.name); "Taskq '%s' destroying\n", tq_arg->name);
taskq_destroy(tq); taskq_destroy(tq);
return tq_arg.depth == SPLAT_TASKQ_DEPTH_MAX ? 0 : -EINVAL; return (error);
} }
static int static int