kevin/linux
1
Fork 0
Code

task_work: s/task_work_cancel()/task_work_cancel_func()/

Browse Source 
A proper task_work_cancel() API that actually cancels a callback and not
*any* callback pointing to a given function is going to be needed for
perf events event freeing. Do the appropriate rename to prepare for
that.

Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20240621091601.18227-2-frederic@kernel.org
This commit is contained in:
Frederic Weisbecker 2024-06-21 11:15:58 +02:00 committed by Peter Zijlstra
parent 57e11990f4
commit 68cbd415dd
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/task_work.h
View File

@ -30,7 +30,7 @@ int task_work_add(struct task_struct *task, struct callback_head *twork,
struct callback_head *task_work_cancel_match(struct task_struct *task, struct callback_head *task_work_cancel_match(struct task_struct *task,
bool (*match)(struct callback_head *, void *data), void *data); bool (*match)(struct callback_head *, void *data), void *data);
struct callback_head *task_work_cancel(struct task_struct *, task_work_func_t); struct callback_head *task_work_cancel_func(struct task_struct *, task_work_func_t);
void task_work_run(void); void task_work_run(void);
static inline void exit_task_work(struct task_struct *task) static inline void exit_task_work(struct task_struct *task)

2
kernel/irq/manage.c
View File

@ -1337,7 +1337,7 @@ static int irq_thread(void *data)
* synchronize_hardirq(). So neither IRQTF_RUNTHREAD nor the * synchronize_hardirq(). So neither IRQTF_RUNTHREAD nor the
* oneshot mask bit can be set. * oneshot mask bit can be set.
*/ */
task_work_cancel(current, irq_thread_dtor); task_work_cancel_func(current, irq_thread_dtor);
return 0; return 0;
} }

10
kernel/task_work.c
View File

@ -120,9 +120,9 @@ static bool task_work_func_match(struct callback_head *cb, void *data)
} }
/** /**
* task_work_cancel - cancel a pending work added by task_work_add() * task_work_cancel_func - cancel a pending work matching a function added by task_work_add()
* @task: the task which should execute the work * @task: the task which should execute the func's work
* @func: identifies the work to remove * @func: identifies the func to match with a work to remove
* *
* Find the last queued pending work with ->func == @func and remove * Find the last queued pending work with ->func == @func and remove
* it from queue. * it from queue.
@ -131,7 +131,7 @@ static bool task_work_func_match(struct callback_head *cb, void *data)
* The found work or NULL if not found. * The found work or NULL if not found.
*/ */
struct callback_head * struct callback_head *
task_work_cancel(struct task_struct *task, task_work_func_t func) task_work_cancel_func(struct task_struct *task, task_work_func_t func)
{ {
return task_work_cancel_match(task, task_work_func_match, func); return task_work_cancel_match(task, task_work_func_match, func);
} }
@ -168,7 +168,7 @@ void task_work_run(void)
if (!work) if (!work)
break; break;
/* /*
* Synchronize with task_work_cancel(). It can not remove * Synchronize with task_work_cancel_match(). It can not remove
* the first entry == work, cmpxchg(task_works) must fail. * the first entry == work, cmpxchg(task_works) must fail.
* But it can remove another entry from the ->next list. * But it can remove another entry from the ->next list.
*/ */

2
security/keys/keyctl.c
View File

@ -1694,7 +1694,7 @@ long keyctl_session_to_parent(void)
goto unlock; goto unlock;
/* cancel an already pending keyring replacement */ /* cancel an already pending keyring replacement */
oldwork = task_work_cancel(parent, key_change_session_keyring); oldwork = task_work_cancel_func(parent, key_change_session_keyring);
/* the replacement session keyring is applied just prior to userspace /* the replacement session keyring is applied just prior to userspace
* restarting */ * restarting */