1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
|
From 68ad61182dd79be1e67cf191bab28c1e6af610aa Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Tue, 13 May 2014 15:14:53 +0200
Subject: [PATCH 17/27] fatfs: use a seperate lock to protect nodehash
Previously, fatfs used diskfs_node_refcnt_lock to serialize access to
the nodehash.
Use a separate lock to protect nodehash. Adjust the reference
counting accordingly. Every node in the nodehash carries a light
reference. When we are asked to give up that light reference, we
reacquire our lock momentarily to check whether someone else
reacquired a reference through the nodehash.
* fatfs/inode.c (nodehash_lock): New lock.
(diskfs_cached_lookup): Use a separate lock to protect nodehash.
Adjust the reference counting accordingly.
(ifind): Likewise.
(diskfs_node_iterate): Likewise.
(diskfs_node_norefs): Move the code removing the node from nodehash...
(diskfs_try_dropping_softrefs): ... here, where we check whether
someone reacquired a reference, and if so hold on to our light
reference.
---
fatfs/inode.c | 81 +++++++++++++++++++++++++++++++++++++++++------------------
1 file changed, 57 insertions(+), 24 deletions(-)
diff --git a/fatfs/inode.c b/fatfs/inode.c
index ed6f3f0..8b3385b 100644
--- a/fatfs/inode.c
+++ b/fatfs/inode.c
@@ -44,8 +44,18 @@
#define INOHASH(ino) (((unsigned)(ino))%INOHSZ)
#endif
+/* The nodehash is a cache of nodes.
+
+ Access to nodehash and nodehash_nr_items is protected by
+ nodehash_lock.
+
+ Every node in the nodehash carries a light reference. When we are
+ asked to give up that light reference, we reacquire our lock
+ momentarily to check whether someone else reacquired a reference
+ through the nodehash. */
static struct node *nodehash[INOHSZ];
static size_t nodehash_nr_items;
+static pthread_mutex_t nodehash_lock = PTHREAD_MUTEX_INITIALIZER;
static error_t read_node (struct node *np, vm_address_t buf);
@@ -67,12 +77,12 @@ diskfs_cached_lookup (ino64_t inum, struct node **npp)
struct node *np;
struct disknode *dn;
- pthread_spin_lock (&diskfs_node_refcnt_lock);
+ pthread_mutex_lock (&nodehash_lock);
for (np = nodehash[INOHASH(inum)]; np; np = np->dn->hnext)
if (np->cache_id == inum)
{
- np->references++;
- pthread_spin_unlock (&diskfs_node_refcnt_lock);
+ diskfs_nref (np);
+ pthread_mutex_unlock (&nodehash_lock);
pthread_mutex_lock (&np->lock);
*npp = np;
return 0;
@@ -82,7 +92,7 @@ diskfs_cached_lookup (ino64_t inum, struct node **npp)
dn = malloc (sizeof (struct disknode));
if (! dn)
{
- pthread_spin_unlock (&diskfs_node_refcnt_lock);
+ pthread_mutex_unlock (&nodehash_lock);
return ENOMEM;
}
dn->pager = 0;
@@ -107,10 +117,11 @@ diskfs_cached_lookup (ino64_t inum, struct node **npp)
dn->hnext->dn->hprevp = &dn->hnext;
dn->hprevp = &nodehash[INOHASH(inum)];
nodehash[INOHASH(inum)] = np;
+ diskfs_nref_light (np);
nodehash_nr_items += 1;
- pthread_spin_unlock (&diskfs_node_refcnt_lock);
-
+ pthread_mutex_unlock (&nodehash_lock);
+
/* Get the contents of NP off disk. */
err = read_node (np, 0);
@@ -133,12 +144,12 @@ diskfs_cached_lookup_in_dirbuf (int inum, struct node **npp, vm_address_t buf)
struct node *np;
struct disknode *dn;
- pthread_spin_lock (&diskfs_node_refcnt_lock);
+ pthread_mutex_lock (&nodehash_lock);
for (np = nodehash[INOHASH(inum)]; np; np = np->dn->hnext)
if (np->cache_id == inum)
{
- np->references++;
- pthread_spin_unlock (&diskfs_node_refcnt_lock);
+ diskfs_nref (np);
+ pthread_mutex_unlock (&nodehash_lock);
pthread_mutex_lock (&np->lock);
*npp = np;
return 0;
@@ -148,7 +159,7 @@ diskfs_cached_lookup_in_dirbuf (int inum, struct node **npp, vm_address_t buf)
dn = malloc (sizeof (struct disknode));
if (! dn)
{
- pthread_spin_unlock (&diskfs_node_refcnt_lock);
+ pthread_mutex_unlock (&nodehash_lock);
return ENOMEM;
}
dn->pager = 0;
@@ -173,10 +184,11 @@ diskfs_cached_lookup_in_dirbuf (int inum, struct node **npp, vm_address_t buf)
dn->hnext->dn->hprevp = &dn->hnext;
dn->hprevp = &nodehash[INOHASH(inum)];
nodehash[INOHASH(inum)] = np;
+ diskfs_nref_light (np);
nodehash_nr_items += 1;
- pthread_spin_unlock (&diskfs_node_refcnt_lock);
-
+ pthread_mutex_unlock (&nodehash_lock);
+
/* Get the contents of NP off disk. */
err = read_node (np, buf);
@@ -196,14 +208,13 @@ ifind (ino_t inum)
{
struct node *np;
- pthread_spin_lock (&diskfs_node_refcnt_lock);
+ pthread_mutex_lock (&nodehash_lock);
for (np = nodehash[INOHASH(inum)]; np; np = np->dn->hnext)
{
if (np->cache_id != inum)
continue;
- assert (np->references);
- pthread_spin_unlock (&diskfs_node_refcnt_lock);
+ pthread_mutex_unlock (&nodehash_lock);
return np;
}
assert (0);
@@ -216,11 +227,6 @@ diskfs_node_norefs (struct node *np)
{
struct cluster_chain *last = np->dn->first;
- *np->dn->hprevp = np->dn->hnext;
- if (np->dn->hnext)
- np->dn->hnext->dn->hprevp = np->dn->hprevp;
- nodehash_nr_items -= 1;
-
while (last)
{
struct cluster_chain *next = last->next;
@@ -251,6 +257,33 @@ diskfs_node_norefs (struct node *np)
void
diskfs_try_dropping_softrefs (struct node *np)
{
+ pthread_mutex_lock (&nodehash_lock);
+ if (np->dn->hnext != NULL)
+ {
+ /* Check if someone reacquired a reference through the
+ nodehash. */
+ unsigned int references;
+ pthread_spin_lock (&diskfs_node_refcnt_lock);
+ references = np->references;
+ pthread_spin_unlock (&diskfs_node_refcnt_lock);
+
+ if (references > 0)
+ {
+ /* A reference was reacquired through a hash table lookup.
+ It's fine, we didn't touch anything yet. */
+ pthread_mutex_unlock (&nodehash_lock);
+ return;
+ }
+
+ *np->dn->hprevp = np->dn->hnext;
+ if (np->dn->hnext)
+ np->dn->hnext->dn->hprevp = np->dn->hprevp;
+ np->dn->hnext = NULL;
+ nodehash_nr_items -= 1;
+ diskfs_nrele_light (np);
+ }
+ pthread_mutex_unlock (&nodehash_lock);
+
drop_pager_softrefs (np);
}
@@ -554,12 +587,12 @@ diskfs_node_iterate (error_t (*fun)(struct node *))
size_t num_nodes;
struct node *node, **node_list, **p;
- pthread_spin_lock (&diskfs_node_refcnt_lock);
+ pthread_mutex_lock (&nodehash_lock);
/* We must copy everything from the hash table into another data structure
to avoid running into any problems with the hash-table being modified
during processing (normally we delegate access to hash-table with
- diskfs_node_refcnt_lock, but we can't hold this while locking the
+ nodehash_lock, but we can't hold this while locking the
individual node locks). */
num_nodes = nodehash_nr_items;
@@ -570,10 +603,10 @@ diskfs_node_iterate (error_t (*fun)(struct node *))
for (node = nodehash[n]; node; node = node->dn->hnext)
{
*p++ = node;
- node->references++;
+ diskfs_nref (node);
}
- pthread_spin_unlock (&diskfs_node_refcnt_lock);
+ pthread_mutex_unlock (&nodehash_lock);
p = node_list;
while (num_nodes-- > 0)
--
2.0.0.rc2
|
