Patchwork net: wrong test in inet_ehash_locks_alloc()

login
register
mail settings
Submitter Eric Dumazet
Date Jan. 27, 2009, 2:42 p.m.
Message ID <497F1D46.70103@cosmosbay.com>
Download mbox | patch
Permalink /patch/20456/
State Accepted
Delegated to: David Miller
Headers show

Comments

Eric Dumazet - Jan. 27, 2009, 2:42 p.m.
In commit 9db66bdcc83749affe61c61eb8ff3cf08f42afec
(net: convert TCP/DCCP ehash rwlocks to spinlocks), I forgot to change
 one occurrence of rwlock_t to spinlock_t

I believe sizeof(raw_spinlock_t) might be > 0 on !CONFIG_SMP if CONFIG_DEBUG_SPINLOCK
while sizeof(raw_rwlock_t) should be 0 in this case.

Fortunatly, CONFIG_DEBUG_SPINLOCK adds fields to both spinlock_t and rwlock_t,
but at this might change in the future (being able to debug spinlocks but not rwlocks for
example), better to be safe.

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Jan. 28, 2009, 1:45 a.m.
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Tue, 27 Jan 2009 15:42:14 +0100

> In commit 9db66bdcc83749affe61c61eb8ff3cf08f42afec
> (net: convert TCP/DCCP ehash rwlocks to spinlocks), I forgot to change
>  one occurrence of rwlock_t to spinlock_t
> 
> I believe sizeof(raw_spinlock_t) might be > 0 on !CONFIG_SMP if CONFIG_DEBUG_SPINLOCK
> while sizeof(raw_rwlock_t) should be 0 in this case.
> 
> Fortunatly, CONFIG_DEBUG_SPINLOCK adds fields to both spinlock_t and rwlock_t,
> but at this might change in the future (being able to debug spinlocks but not rwlocks for
> example), better to be safe.
> 
> Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>

Agreed, applied.

Thanks Eric.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index f44bb5c..d0a0431 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -182,7 +182,7 @@  static inline int inet_ehash_locks_alloc(struct inet_hashinfo *hashinfo)
 		size = 2048;
 	if (nr_pcpus >= 32)
 		size = 4096;
-	if (sizeof(rwlock_t) != 0) {
+	if (sizeof(spinlock_t) != 0) {
 #ifdef CONFIG_NUMA
 		if (size * sizeof(spinlock_t) > PAGE_SIZE)
 			hashinfo->ehash_locks = vmalloc(size * sizeof(spinlock_t));