Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1211278

[PATCH v2 8/8] percpu-rwsem: cleanup the lockdep annotations in percpu_down_read()

Show all headers | View raw

Stolen from Peter's patch.

Change percpu_down_read() to use __down_read(), this way we can
do rwsem_acquire_read() unconditionally at the start to make this
code more symmetric and clean.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
 kernel/locking/percpu-rwsem.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/locking/percpu-rwsem.c b/kernel/locking/percpu-rwsem.c
index 69704eb..5694849 100644
--- a/kernel/locking/percpu-rwsem.c
+++ b/kernel/locking/percpu-rwsem.c
@@ -69,14 +69,14 @@ static bool update_fast_ctr(struct percpu_rw_semaphore *brw, unsigned int val)
 void percpu_down_read(struct percpu_rw_semaphore *brw)
 {
 	might_sleep();
-	if (likely(update_fast_ctr(brw, +1))) {
-		rwsem_acquire_read(&brw->rw_sem.dep_map, 0, 0, _RET_IP_);
+	rwsem_acquire_read(&brw->rw_sem.dep_map, 0, 0, _RET_IP_);
+
+	if (likely(update_fast_ctr(brw, +1)))
 		return;
-	}
 
-	down_read(&brw->rw_sem);
+	/* Avoid rwsem_acquire_read() and rwsem_release() */
+	__down_read(&brw->rw_sem);
 	atomic_inc(&brw->slow_read_ctr);
-	/* avoid up_read()->rwsem_release() */
 	__up_read(&brw->rw_sem);
 }
 
-- 
1.5.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/8] Add rcu_sync infrastructure to avoid _expedited()  in percpu-rwsem Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  [PATCH v2 3/8] rcusync: Add the CONFIG_PROVE_RCU checks Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  [PATCH v2 6/8] percpu-rwsem: change it to rely on rss_sync  infrastructure Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  [PATCH v2 5/8] percpu-rwsem: make percpu_free_rwsem() after  kzalloc() safe Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  [PATCH v2 8/8] percpu-rwsem: cleanup the lockdep annotations in  percpu_down_read() Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  [PATCH v2 4/8] rcusync: Introduce rcu_sync_dtor() Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  [PATCH v2 7/8] percpu-rwsem: fix the comments outdated by rcu_sync Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  [PATCH v2 2/8] rcusync: Introduce struct rcu_sync_ops Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  [PATCH v2 1/8] rcu: Create rcu_sync infrastructure Oleg Nesterov <oleg@redhat.com> - 2015-08-21 19:50 +0200
  Re: [PATCH v2 0/8] Add rcu_sync infrastructure to avoid _expedited()  in percpu-rwsem "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-08-22 18:40 +0200
    Re: [PATCH v2 0/8] Add rcu_sync infrastructure to avoid  _expedited() in percpu-rwsem Oleg Nesterov <oleg@redhat.com> - 2015-08-24 17:40 +0200
      parse_args() is too unforgivable? Oleg Nesterov <oleg@redhat.com> - 2015-08-24 20:40 +0200
        Re: parse_args() is too unforgivable? Rusty Russell <rusty@rustcorp.com.au> - 2015-08-25 03:40 +0200
          [PATCH 0/1] params: don't ignore the rest of cmdline if  parse_one() fails Oleg Nesterov <oleg@redhat.com> - 2015-08-25 17:30 +0200
            [PATCH 1/1] params: don't ignore the rest of cmdline if  parse_one() fails Oleg Nesterov <oleg@redhat.com> - 2015-08-25 17:30 +0200
              Re: [PATCH 1/1] params: don't ignore the rest of cmdline if parse_one() fails Rusty Russell <rusty@rustcorp.com.au> - 2015-08-26 03:20 +0200
      Re: [PATCH v2 0/8] Add rcu_sync infrastructure to avoid  _expedited() in percpu-rwsem "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-08-26 02:30 +0200
        Re: [PATCH v2 0/8] Add rcu_sync infrastructure to avoid  _expedited() in percpu-rwsem Oleg Nesterov <oleg@redhat.com> - 2015-08-26 14:20 +0200
          Re: [PATCH v2 0/8] Add rcu_sync infrastructure to avoid  _expedited() in percpu-rwsem Oleg Nesterov <oleg@redhat.com> - 2015-08-26 15:00 +0200
            Re: [PATCH v2 0/8] Add rcu_sync infrastructure to avoid  _expedited() in percpu-rwsem "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> - 2015-08-26 16:40 +0200

csiph-web