| Message ID | 20130218123913.26245.7713.stgit@srivatsabhat.in.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Feb 18, 2013 at 8:39 PM, Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> wrote: > @@ -200,6 +217,16 @@ void percpu_write_lock_irqsave(struct percpu_rwlock *pcpu_rwlock, > > smp_mb(); /* Complete the wait-for-readers, before taking the lock */ > write_lock_irqsave(&pcpu_rwlock->global_rwlock, *flags); > + > + /* > + * It is desirable to allow the writer to acquire the percpu-rwlock > + * for read (if necessary), without deadlocking or getting complaints > + * from lockdep. To achieve that, just increment the reader_refcnt of > + * this CPU - that way, any attempt by the writer to acquire the > + * percpu-rwlock for read, will get treated as a case of nested percpu > + * reader, which is safe, from a locking perspective. > + */ > + this_cpu_inc(pcpu_rwlock->rw_state->reader_refcnt); I find this quite disgusting, but once again this may be because I don't like unfair recursive rwlocks. In my opinion, the alternative of explicitly not taking the read lock when one already has the write lock sounds *much* nicer.
On 02/18/2013 09:21 PM, Michel Lespinasse wrote: > On Mon, Feb 18, 2013 at 8:39 PM, Srivatsa S. Bhat > <srivatsa.bhat@linux.vnet.ibm.com> wrote: >> @@ -200,6 +217,16 @@ void percpu_write_lock_irqsave(struct percpu_rwlock *pcpu_rwlock, >> >> smp_mb(); /* Complete the wait-for-readers, before taking the lock */ >> write_lock_irqsave(&pcpu_rwlock->global_rwlock, *flags); >> + >> + /* >> + * It is desirable to allow the writer to acquire the percpu-rwlock >> + * for read (if necessary), without deadlocking or getting complaints >> + * from lockdep. To achieve that, just increment the reader_refcnt of >> + * this CPU - that way, any attempt by the writer to acquire the >> + * percpu-rwlock for read, will get treated as a case of nested percpu >> + * reader, which is safe, from a locking perspective. >> + */ >> + this_cpu_inc(pcpu_rwlock->rw_state->reader_refcnt); > > I find this quite disgusting, but once again this may be because I > don't like unfair recursive rwlocks. > :-) > In my opinion, the alternative of explicitly not taking the read lock > when one already has the write lock sounds *much* nicer. I don't seem to recall any strong reasons to do it this way, so I don't have any strong opinions on doing it this way. But one of the things to note is that, in the CPU Hotplug case, the readers are *way* more hotter than the writer. So avoiding extra checks/'if' conditions/memory barriers in the reader-side is very welcome. (If we slow down the read-side, we get a performance hit even when *not* doing hotplug!). Considering this, the logic used in this patchset seems better, IMHO. Regards, Srivatsa S. Bhat
diff --git a/lib/percpu-rwlock.c b/lib/percpu-rwlock.c index ed36531..bf95e40 100644 --- a/lib/percpu-rwlock.c +++ b/lib/percpu-rwlock.c @@ -102,6 +102,10 @@ void percpu_read_lock_irqsafe(struct percpu_rwlock *pcpu_rwlock) if (likely(!writer_active(pcpu_rwlock))) { this_cpu_inc(pcpu_rwlock->rw_state->reader_refcnt); + + /* Pretend that we take global_rwlock for lockdep */ + rwlock_acquire_read(&pcpu_rwlock->global_rwlock.dep_map, + 0, 0, _RET_IP_); } else { /* Writer is active, so switch to global rwlock. */ @@ -126,6 +130,12 @@ void percpu_read_lock_irqsafe(struct percpu_rwlock *pcpu_rwlock) if (!writer_active(pcpu_rwlock)) { this_cpu_inc(pcpu_rwlock->rw_state->reader_refcnt); read_unlock(&pcpu_rwlock->global_rwlock); + + /* + * Pretend that we take global_rwlock for lockdep + */ + rwlock_acquire_read(&pcpu_rwlock->global_rwlock.dep_map, + 0, 0, _RET_IP_); } } @@ -162,6 +172,13 @@ void percpu_read_unlock_irqsafe(struct percpu_rwlock *pcpu_rwlock) */ smp_mb(); this_cpu_dec(pcpu_rwlock->rw_state->reader_refcnt); + + /* + * Since this is the last decrement, it is time to pretend + * to lockdep that we are releasing the read lock. + */ + rwlock_release(&pcpu_rwlock->global_rwlock.dep_map, + 1, _RET_IP_); } else { read_unlock(&pcpu_rwlock->global_rwlock); } @@ -200,6 +217,16 @@ void percpu_write_lock_irqsave(struct percpu_rwlock *pcpu_rwlock, smp_mb(); /* Complete the wait-for-readers, before taking the lock */ write_lock_irqsave(&pcpu_rwlock->global_rwlock, *flags); + + /* + * It is desirable to allow the writer to acquire the percpu-rwlock + * for read (if necessary), without deadlocking or getting complaints + * from lockdep. To achieve that, just increment the reader_refcnt of + * this CPU - that way, any attempt by the writer to acquire the + * percpu-rwlock for read, will get treated as a case of nested percpu + * reader, which is safe, from a locking perspective. + */ + this_cpu_inc(pcpu_rwlock->rw_state->reader_refcnt); } void percpu_write_unlock_irqrestore(struct percpu_rwlock *pcpu_rwlock, @@ -207,6 +234,12 @@ void percpu_write_unlock_irqrestore(struct percpu_rwlock *pcpu_rwlock, { unsigned int cpu; + /* + * Undo the special increment that we had done in the write-lock path + * in order to allow writers to be readers. + */ + this_cpu_dec(pcpu_rwlock->rw_state->reader_refcnt); + /* Complete the critical section before clearing ->writer_signal */ smp_mb();
CPU hotplug (which will be the first user of per-CPU rwlocks) has a special requirement with respect to locking: the writer, after acquiring the per-CPU rwlock for write, must be allowed to take the same lock for read, without deadlocking and without getting complaints from lockdep. In comparison, this is similar to what get_online_cpus()/put_online_cpus() does today: it allows a hotplug writer (who holds the cpu_hotplug.lock mutex) to invoke it without locking issues, because it silently returns if the caller is the hotplug writer itself. This can be easily achieved with per-CPU rwlocks as well (even without a "is this a writer?" check) by incrementing the per-CPU refcount of the writer immediately after taking the global rwlock for write, and then decrementing the per-CPU refcount before releasing the global rwlock. This ensures that any reader that comes along on that CPU while the writer is active (on that same CPU), notices the non-zero value of the nested counter and assumes that it is a nested read-side critical section and proceeds by just incrementing the refcount. Thus we prevent the reader from taking the global rwlock for read, which prevents the writer from deadlocking itself. Add that support and teach lockdep about this special locking scheme so that it knows that this sort of usage is valid. Also add the required lockdep annotations to enable it to detect common locking problems with per-CPU rwlocks. Cc: David Howells <dhowells@redhat.com> Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> --- lib/percpu-rwlock.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)