Skip to content

Commit

Permalink
smp: Allow smp_call_function_single_async() to insert locked csd
Browse files Browse the repository at this point in the history
Previously we will raise an warning if we want to insert a csd object
which is with the LOCK flag set, and if it happens we'll also wait for
the lock to be released.  However, this operation does not match
perfectly with how the function is named - the name with "_async"
suffix hints that this function should not block, while we will.

This patch changed this behavior by simply return -EBUSY instead of
waiting, at the meantime we allow this operation to happen without
warning the user to change this into a feature when the caller wants
to "insert a csd object, if it's there, just wait for that one".

This is pretty safe because in flush_smp_call_function_queue() for
async csd objects (where csd->flags&SYNC is zero) we'll first do the
unlock then we call the csd->func().  So if we see the csd->flags&LOCK
is true in smp_call_function_single_async(), then it's guaranteed that
csd->func() will be called after this smp_call_function_single_async()
returns -EBUSY.

Update the comment of the function too to refect this.

Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lkml.kernel.org/r/20191216213125.9536-2-peterx@redhat.com
  • Loading branch information
Peter Xu authored and Ingo Molnar committed Mar 6, 2020
1 parent 8b614cb commit 5a18cec
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,11 @@ EXPORT_SYMBOL(smp_call_function_single);
* (ie: embedded in an object) and is responsible for synchronizing it
* such that the IPIs performed on the @csd are strictly serialized.
*
* If the function is called with one csd which has not yet been
* processed by previous call to smp_call_function_single_async(), the
* function will return immediately with -EBUSY showing that the csd
* object is still in progress.
*
* NOTE: Be careful, there is unfortunately no current debugging facility to
* validate the correctness of this serialization.
*/
Expand All @@ -338,14 +343,17 @@ int smp_call_function_single_async(int cpu, call_single_data_t *csd)

preempt_disable();

/* We could deadlock if we have to wait here with interrupts disabled! */
if (WARN_ON_ONCE(csd->flags & CSD_FLAG_LOCK))
csd_lock_wait(csd);
if (csd->flags & CSD_FLAG_LOCK) {
err = -EBUSY;
goto out;
}

csd->flags = CSD_FLAG_LOCK;
smp_wmb();

err = generic_exec_single(cpu, csd, csd->func, csd->info);

out:
preempt_enable();

return err;
Expand Down

0 comments on commit 5a18cec

Please sign in to comment.