diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2020-07-02 15:51:48 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2020-07-02 15:51:48 +0200 |
| commit | 78c2141b654375079e3737f06f19cabfc0fcecd7 (patch) | |
| tree | 5068a6c2904d93b61b37243ea39b728fe621196e /kernel/workqueue.c | |
| parent | perf/x86/intel/uncore: Expose an Uncore unit to IIO PMON mapping (diff) | |
| parent | perf/x86: Keep LBR records unchanged in host context for guest usage (diff) | |
| download | linux-78c2141b654375079e3737f06f19cabfc0fcecd7.tar.gz linux-78c2141b654375079e3737f06f19cabfc0fcecd7.zip | |
Merge branch 'perf/vlbr'
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 9fbe1e237563..c41c3c17b86a 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -4638,11 +4638,11 @@ void print_worker_info(const char *log_lvl, struct task_struct *task) * Carefully copy the associated workqueue's workfn, name and desc. * Keep the original last '\0' in case the original is garbage. */ - probe_kernel_read(&fn, &worker->current_func, sizeof(fn)); - probe_kernel_read(&pwq, &worker->current_pwq, sizeof(pwq)); - probe_kernel_read(&wq, &pwq->wq, sizeof(wq)); - probe_kernel_read(name, wq->name, sizeof(name) - 1); - probe_kernel_read(desc, worker->desc, sizeof(desc) - 1); + copy_from_kernel_nofault(&fn, &worker->current_func, sizeof(fn)); + copy_from_kernel_nofault(&pwq, &worker->current_pwq, sizeof(pwq)); + copy_from_kernel_nofault(&wq, &pwq->wq, sizeof(wq)); + copy_from_kernel_nofault(name, wq->name, sizeof(name) - 1); + copy_from_kernel_nofault(desc, worker->desc, sizeof(desc) - 1); if (fn || name[0] || desc[0]) { printk("%sWorkqueue: %s %ps", log_lvl, name, fn); |