diff options
author | Octavian Purdila <opurdila@ixiacom.com> | 2009-12-26 06:51:06 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-26 23:46:28 -0500 |
commit | 8beb9ab6c2df203e8d68cb1f48cf42604a6bed86 (patch) | |
tree | f342d582af0dd5f62016edcd2a50d2873ebcdbf2 /net/llc/llc_core.c | |
parent | 52d58aef5ee460fedd7f250f05e79081019f2c79 (diff) |
llc: convert llc_sap_list to RCU
Signed-off-by: Octavian Purdila <opurdila@ixiacom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/llc/llc_core.c')
-rw-r--r-- | net/llc/llc_core.c | 46 |
1 files changed, 14 insertions, 32 deletions
diff --git a/net/llc/llc_core.c b/net/llc/llc_core.c index 0c9ef8bc765..78167e81dfe 100644 --- a/net/llc/llc_core.c +++ b/net/llc/llc_core.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <net/llc.h> | 23 | #include <net/llc.h> |
24 | 24 | ||
25 | LIST_HEAD(llc_sap_list); | 25 | LIST_HEAD(llc_sap_list); |
26 | DEFINE_RWLOCK(llc_sap_list_lock); | 26 | DEFINE_SPINLOCK(llc_sap_list_lock); |
27 | 27 | ||
28 | /** | 28 | /** |
29 | * llc_sap_alloc - allocates and initializes sap. | 29 | * llc_sap_alloc - allocates and initializes sap. |
@@ -46,30 +46,6 @@ static struct llc_sap *llc_sap_alloc(void) | |||
46 | return sap; | 46 | return sap; |
47 | } | 47 | } |
48 | 48 | ||
49 | /** | ||
50 | * llc_add_sap - add sap to station list | ||
51 | * @sap: Address of the sap | ||
52 | * | ||
53 | * Adds a sap to the LLC's station sap list. | ||
54 | */ | ||
55 | static void llc_add_sap(struct llc_sap *sap) | ||
56 | { | ||
57 | list_add_tail(&sap->node, &llc_sap_list); | ||
58 | } | ||
59 | |||
60 | /** | ||
61 | * llc_del_sap - del sap from station list | ||
62 | * @sap: Address of the sap | ||
63 | * | ||
64 | * Removes a sap to the LLC's station sap list. | ||
65 | */ | ||
66 | static void llc_del_sap(struct llc_sap *sap) | ||
67 | { | ||
68 | write_lock_bh(&llc_sap_list_lock); | ||
69 | list_del(&sap->node); | ||
70 | write_unlock_bh(&llc_sap_list_lock); | ||
71 | } | ||
72 | |||
73 | static struct llc_sap *__llc_sap_find(unsigned char sap_value) | 49 | static struct llc_sap *__llc_sap_find(unsigned char sap_value) |
74 | { | 50 | { |
75 | struct llc_sap* sap; | 51 | struct llc_sap* sap; |
@@ -93,13 +69,13 @@ out: | |||
93 | */ | 69 | */ |
94 | struct llc_sap *llc_sap_find(unsigned char sap_value) | 70 | struct llc_sap *llc_sap_find(unsigned char sap_value) |
95 | { | 71 | { |
96 | struct llc_sap* sap; | 72 | struct llc_sap *sap; |
97 | 73 | ||
98 | read_lock_bh(&llc_sap_list_lock); | 74 | rcu_read_lock_bh(); |
99 | sap = __llc_sap_find(sap_value); | 75 | sap = __llc_sap_find(sap_value); |
100 | if (sap) | 76 | if (sap) |
101 | llc_sap_hold(sap); | 77 | llc_sap_hold(sap); |
102 | read_unlock_bh(&llc_sap_list_lock); | 78 | rcu_read_unlock_bh(); |
103 | return sap; | 79 | return sap; |
104 | } | 80 | } |
105 | 81 | ||
@@ -120,7 +96,7 @@ struct llc_sap *llc_sap_open(unsigned char lsap, | |||
120 | { | 96 | { |
121 | struct llc_sap *sap = NULL; | 97 | struct llc_sap *sap = NULL; |
122 | 98 | ||
123 | write_lock_bh(&llc_sap_list_lock); | 99 | spin_lock_bh(&llc_sap_list_lock); |
124 | if (__llc_sap_find(lsap)) /* SAP already exists */ | 100 | if (__llc_sap_find(lsap)) /* SAP already exists */ |
125 | goto out; | 101 | goto out; |
126 | sap = llc_sap_alloc(); | 102 | sap = llc_sap_alloc(); |
@@ -128,9 +104,9 @@ struct llc_sap *llc_sap_open(unsigned char lsap, | |||
128 | goto out; | 104 | goto out; |
129 | sap->laddr.lsap = lsap; | 105 | sap->laddr.lsap = lsap; |
130 | sap->rcv_func = func; | 106 | sap->rcv_func = func; |
131 | llc_add_sap(sap); | 107 | list_add_tail_rcu(&sap->node, &llc_sap_list); |
132 | out: | 108 | out: |
133 | write_unlock_bh(&llc_sap_list_lock); | 109 | spin_unlock_bh(&llc_sap_list_lock); |
134 | return sap; | 110 | return sap; |
135 | } | 111 | } |
136 | 112 | ||
@@ -146,7 +122,13 @@ out: | |||
146 | void llc_sap_close(struct llc_sap *sap) | 122 | void llc_sap_close(struct llc_sap *sap) |
147 | { | 123 | { |
148 | WARN_ON(sap->sk_count); | 124 | WARN_ON(sap->sk_count); |
149 | llc_del_sap(sap); | 125 | |
126 | spin_lock_bh(&llc_sap_list_lock); | ||
127 | list_del_rcu(&sap->node); | ||
128 | spin_unlock_bh(&llc_sap_list_lock); | ||
129 | |||
130 | synchronize_rcu(); | ||
131 | |||
150 | kfree(sap); | 132 | kfree(sap); |
151 | } | 133 | } |
152 | 134 | ||