Commit fce8ad15 authored Feb 24, 2014 by Frederic Weisbecker Committed by Jens Axboe Feb 24, 2014

smp: Remove wait argument from __smp_call_function_single()



The main point of calling __smp_call_function_single() is to send
an IPI in a pure asynchronous way. By embedding a csd in an object,
a caller can send the IPI without waiting for a previous one to complete
as is required by smp_call_function_single() for example. As such,
sending this kind of IPI can be safe even when irqs are disabled.

This flexibility comes at the expense of the caller who then needs to
synchronize the csd lifecycle by himself and make sure that IPIs on a
single csd are serialized.

This is how __smp_call_function_single() works when wait = 0 and this
usecase is relevant.

Now there don't seem to be any usecase with wait = 1 that can't be
covered by smp_call_function_single() instead, which is safer. Lets look
at the two possible scenario:

1) The user calls __smp_call_function_single(wait = 1) on a csd embedded
   in an object. It looks like a nice and convenient pattern at the first
   sight because we can then retrieve the object from the IPI handler easily.

   But actually it is a waste of memory space in the object since the csd
   can be allocated from the stack by smp_call_function_single(wait = 1)
   and the object can be passed an the IPI argument.

   Besides that, embedding the csd in an object is more error prone
   because the caller must take care of the serialization of the IPIs
   for this csd.

2) The user calls __smp_call_function_single(wait = 1) on a csd that
   is allocated on the stack. It's ok but smp_call_function_single()
   can do it as well and it already takes care of the allocation on the
   stack. Again it's more simple and less error prone.

Therefore, using the underscore prepend API version with wait = 1
is a bad pattern and a sign that the caller can do safer and more
simple.

There was a single user of that which has just been converted.
So lets remove this option to discourage further users.

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jan Kara <jack@suse.cz>
Cc: Jens Axboe <axboe@fb.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent e0a23b06

block/blk-mq.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -353,7 +353,7 @@ void __blk_mq_complete_request(struct request *rq)
		rq->csd.func = __blk_mq_complete_request_remote;
		rq->csd.info = rq;
		rq->csd.flags = 0;
		__smp_call_function_single(ctx->cpu, &rq->csd, 0);
		__smp_call_function_single(ctx->cpu, &rq->csd);
		} else {
		rq->q->softirq_done_fn(rq);
		}

block/blk-softirq.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ static int raise_blk_irq(int cpu, struct request *rq)
		data->info = rq;
		data->flags = 0;

		__smp_call_function_single(cpu, data, 0);
		__smp_call_function_single(cpu, data);
		return 0;
		}

drivers/cpuidle/coupled.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -323,7 +323,7 @@ static void cpuidle_coupled_poke(int cpu)
		struct call_single_data *csd = &per_cpu(cpuidle_coupled_poke_cb, cpu);

		if (!cpumask_test_and_set_cpu(cpu, &cpuidle_coupled_poke_pending))
		__smp_call_function_single(cpu, csd, 0);
		__smp_call_function_single(cpu, csd);
		}

		/**

include/linux/smp.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ void on_each_cpu_cond(bool (cond_func)(int cpu, void info),
		smp_call_func_t func, void *info, bool wait,
		gfp_t gfp_flags);

		int __smp_call_function_single(int cpu, struct call_single_data *csd, int wait);
		int __smp_call_function_single(int cpu, struct call_single_data *csd);

		#ifdef CONFIG_SMP

kernel/sched/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -432,7 +432,7 @@ void hrtick_start(struct rq *rq, u64 delay)
		if (rq == this_rq()) {
		__hrtick_restart(rq);
		} else if (!rq->hrtick_csd_pending) {
		__smp_call_function_single(cpu_of(rq), &rq->hrtick_csd, 0);
		__smp_call_function_single(cpu_of(rq), &rq->hrtick_csd);
		rq->hrtick_csd_pending = 1;
		}
		}

Admin message