linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Price <price@MIT.EDU>
To: "Theodore Ts'o" <tytso@MIT.EDU>
Cc: linux-kernel@vger.kernel.org, Jiri Kosina <jkosina@suse.cz>
Subject: [PATCH 7/9] random: forget lock in lockless accounting
Date: Wed, 13 Nov 2013 03:08:28 -0500	[thread overview]
Message-ID: <20131113080828.GU16018@ringworld.MIT.EDU> (raw)
In-Reply-To: <cover.1384329436.git.price@mit.edu>

The only mutable data accessed here is ->entropy_count, but since
902c098a3 ("random: use lockless techniques in the interrupt path")
that member isn't protected by the lock anyway.  Since 10b3a32d2
("random: fix accounting race condition") we use cmpxchg to protect
our accesses to ->entropy_count here.  Drop the use of the lock.

Cc: Jiri Kosina <jkosina@suse.cz>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Greg Price <price@mit.edu>
---
 drivers/char/random.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 5dffca8..1f43f9e 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -974,9 +974,6 @@ static size_t account(struct entropy_store *r, size_t nbytes, int min,
 	int entropy_count, orig;
 	size_t ibytes;
 
-	/* Hold lock while accounting */
-	spin_lock_irqsave(&r->lock, flags);
-
 	BUG_ON(r->entropy_count > r->poolinfo->poolfracbits);
 
 	/* Can we pull enough? */
@@ -999,7 +996,6 @@ retry:
 		    < random_write_wakeup_thresh)
 			wakeup_write = 1;
 	}
-	spin_unlock_irqrestore(&r->lock, flags);
 
 	trace_debit_entropy(r->name, 8 * ibytes);
 	if (wakeup_write) {
-- 
1.8.3.2


  parent reply	other threads:[~2013-11-13  8:08 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-13  8:07 [PATCH v2 0/9] random: code cleanups Greg Price
2013-11-13  8:07 ` [PATCH 1/9] random: fix typos / spelling errors in comments Greg Price
2013-11-29 19:56   ` Theodore Ts'o
2013-11-13  8:07 ` [PATCH 2/9] random: fix comment on proc_do_uuid Greg Price
2013-11-29 19:59   ` Theodore Ts'o
2013-11-13  8:07 ` [PATCH 3/9] random: fix description of get_random_bytes Greg Price
2013-11-29 20:00   ` Theodore Ts'o
2013-11-13  8:07 ` [PATCH 4/9] random: simplify loop in random_read Greg Price
2013-11-29 20:09   ` Theodore Ts'o
2013-11-30  5:30     ` Greg Price
2013-11-13  8:08 ` [PATCH 5/9] random: fix comment on "account" Greg Price
2013-11-29 20:53   ` Theodore Ts'o
2013-11-13  8:08 ` [PATCH 6/9] random: simplify accounting logic Greg Price
2013-11-30  1:04   ` Theodore Ts'o
2013-11-13  8:08 ` Greg Price [this message]
2013-11-30  1:10   ` [PATCH 7/9] random: forget lock in lockless accounting Theodore Ts'o
2013-11-13  8:08 ` [PATCH 8/9] random: tighten bound on random_read_wakeup_thresh Greg Price
2013-12-06  0:31   ` Theodore Ts'o
2013-11-13  8:08 ` [PATCH 9/9] random: simplify accounting code Greg Price
2013-12-06  1:13   ` Theodore Ts'o
2013-12-06 18:25     ` Greg Price
2013-12-07 14:48       ` Theodore Ts'o

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=20131113080828.GU16018@ringworld.MIT.EDU \
    --to=price@mit.edu \
    --cc=jkosina@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tytso@MIT.EDU \
    /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).