linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: John Stultz <john.stultz@linaro.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Eric Dumazet <eric.dumazet@gmail.com>,
	Richard Cochran <richardcochran@gmail.com>
Subject: [PATCH 6/7] time: Reduce timekeeper read lock hold time
Date: Mon, 27 Feb 2012 16:29:33 -0800	[thread overview]
Message-ID: <1330388974-27793-7-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1330388974-27793-1-git-send-email-john.stultz@linaro.org>

Now that timekeeper updates are done with a shadow copy,
we can reduce the readlock hold time to only the update.

CC: Thomas Gleixner <tglx@linutronix.de>
CC: Eric Dumazet <eric.dumazet@gmail.com>
CC: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 kernel/time/timekeeping.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index ebfb037..5a444b8 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1062,7 +1062,6 @@ static void update_wall_time(void)
 	s64 remainder;
 
 	spin_lock_irqsave(&timekeeper.wlock, flags);
-	write_seqcount_begin(&timekeeper.rlock);
 
 	/* Make sure we're fully resumed: */
 	if (unlikely(timekeeping_suspended))
@@ -1145,13 +1144,18 @@ static void update_wall_time(void)
 		second_overflow();
 	}
 
-
+	write_seqcount_begin(&timekeeper.rlock);
+	/*
+	 * We have to store rlock back to tk, otherwise we'll
+	 * corrupt the timeekeerp.rlock when we copy over timekeeper
+	 */
+	tk.rlock = timekeeper.rlock;
 	timekeeper = tk;
 	timekeeper.clock->cycle_last = timekeeper.cycle_last;
 	timekeeping_update(&timekeeper, false);
+	write_seqcount_end(&timekeeper.rlock);
 
 out:
-	write_seqcount_end(&timekeeper.rlock);
 	spin_unlock_irqrestore(&timekeeper.wlock, flags);
 
 }
-- 
1.7.3.2.146.gca209


  parent reply	other threads:[~2012-02-28  0:31 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-28  0:29 [GIT PULL][PATCH 0/7] Reduce timekeeping lock hold time John Stultz
2012-02-28  0:29 ` [PATCH 1/7] time: Condense timekeeper.xtime into xtime_sec John Stultz
2012-02-28  8:06   ` Ingo Molnar
2012-02-28  8:17     ` John Stultz
2012-02-28  8:30       ` Ingo Molnar
2012-02-28  0:29 ` [PATCH 2/7] time: Rework timekeeping functions to take timekeeper ptr as argument John Stultz
2012-02-28  0:29 ` [PATCH 3/7] time: Split timekeeper lock into separate reader/writer locks John Stultz
2012-02-28  8:08   ` Ingo Molnar
2012-02-28  0:29 ` [PATCH 4/7] time: Update timekeeper structure using a local shadow John Stultz
2012-02-28  8:12   ` Ingo Molnar
2012-02-28  0:29 ` [PATCH 5/7] time: Shadow cycle_last in timekeeper structure John Stultz
2012-02-28  8:16   ` Ingo Molnar
2012-02-28  0:29 ` John Stultz [this message]
2012-02-28  0:29 ` [PATCH 7/7] time: Convert the timekeeper's wlock to a raw_spin_lock John Stultz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1330388974-27793-7-git-send-email-john.stultz@linaro.org \
    --to=john.stultz@linaro.org \
    --cc=eric.dumazet@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=richardcochran@gmail.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).