Blame view
kernel/futex.c
69.7 KB
1da177e4c Linux-2.6.12-rc2 |
1 2 3 4 5 6 7 8 9 10 |
/* * Fast Userspace Mutexes (which I call "Futexes!"). * (C) Rusty Russell, IBM 2002 * * Generalized futexes, futex requeueing, misc fixes by Ingo Molnar * (C) Copyright 2003 Red Hat Inc, All Rights Reserved * * Removed page pinning, fix privately mapped COW pages and other cleanups * (C) Copyright 2003, 2004 Jamie Lokier * |
0771dfefc [PATCH] lightweig... |
11 12 13 14 |
* Robust futex support started by Ingo Molnar * (C) Copyright 2006 Red Hat Inc, All Rights Reserved * Thanks to Thomas Gleixner for suggestions, analysis and fixes. * |
c87e2837b [PATCH] pi-futex:... |
15 16 17 18 |
* PI-futex support started by Ingo Molnar and Thomas Gleixner * Copyright (C) 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com> * Copyright (C) 2006 Timesys Corp., Thomas Gleixner <tglx@timesys.com> * |
34f01cc1f FUTEX: new PRIVAT... |
19 20 21 |
* PRIVATE futexes by Eric Dumazet * Copyright (C) 2007 Eric Dumazet <dada1@cosmosbay.com> * |
52400ba94 futex: add requeu... |
22 23 24 25 |
* Requeue-PI support by Darren Hart <dvhltc@us.ibm.com> * Copyright (C) IBM Corporation, 2009 * Thanks to Thomas Gleixner for conceptual design and careful reviews. * |
1da177e4c Linux-2.6.12-rc2 |
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 |
* Thanks to Ben LaHaise for yelling "hashed waitqueues" loudly * enough at me, Linus for the original (flawed) idea, Matthew * Kirkwood for proof-of-concept implementation. * * "The futexes are also cursed." * "But they come in a choice of three flavours!" * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <linux/slab.h> #include <linux/poll.h> #include <linux/fs.h> #include <linux/file.h> #include <linux/jhash.h> #include <linux/init.h> #include <linux/futex.h> #include <linux/mount.h> #include <linux/pagemap.h> #include <linux/syscalls.h> |
7ed20e1ad [PATCH] convert t... |
57 |
#include <linux/signal.h> |
9adef58b1 futex: get_futex_... |
58 |
#include <linux/module.h> |
fd5eea421 change inotifyfs ... |
59 |
#include <linux/magic.h> |
b488893a3 pid namespaces: c... |
60 61 |
#include <linux/pid.h> #include <linux/nsproxy.h> |
4732efbeb [PATCH] FUTEX_WAK... |
62 |
#include <asm/futex.h> |
1da177e4c Linux-2.6.12-rc2 |
63 |
|
c87e2837b [PATCH] pi-futex:... |
64 |
#include "rtmutex_common.h" |
a0c1e9073 futex: runtime en... |
65 |
int __read_mostly futex_cmpxchg_enabled; |
1da177e4c Linux-2.6.12-rc2 |
66 67 68 |
#define FUTEX_HASHBITS (CONFIG_BASE_SMALL ? 4 : 8) /* |
b41277dc7 futex: Replace fs... |
69 70 71 72 73 74 75 76 |
* Futex flags used to encode options to functions and preserve them across * restarts. */ #define FLAGS_SHARED 0x01 #define FLAGS_CLOCKRT 0x02 #define FLAGS_HAS_TIMEOUT 0x04 /* |
c87e2837b [PATCH] pi-futex:... |
77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 |
* Priority Inheritance state: */ struct futex_pi_state { /* * list of 'owned' pi_state instances - these have to be * cleaned up in do_exit() if the task exits prematurely: */ struct list_head list; /* * The PI object: */ struct rt_mutex pi_mutex; struct task_struct *owner; atomic_t refcount; union futex_key key; }; |
d8d88fbb1 futex: Correct fu... |
96 97 |
/** * struct futex_q - The hashed futex queue entry, one per waiting task |
fb62db2ba futex: Fix kernel... |
98 |
* @list: priority-sorted list of tasks waiting on this futex |
d8d88fbb1 futex: Correct fu... |
99 100 101 102 103 104 105 106 107 |
* @task: the task waiting on the futex * @lock_ptr: the hash bucket lock * @key: the key the futex is hashed on * @pi_state: optional priority inheritance state * @rt_waiter: rt_waiter storage for use with requeue_pi * @requeue_pi_key: the requeue_pi target futex key * @bitset: bitset for the optional bitmasked wakeup * * We use this hashed waitqueue, instead of a normal wait_queue_t, so |
1da177e4c Linux-2.6.12-rc2 |
108 109 110 |
* we can wake only the relevant ones (hashed queues may be shared). * * A futex_q has a woken state, just like tasks have TASK_RUNNING. |
ec92d0829 futex priority ba... |
111 |
* It is considered woken when plist_node_empty(&q->list) || q->lock_ptr == 0. |
fb62db2ba futex: Fix kernel... |
112 |
* The order of wakeup is always to make the first condition true, then |
d8d88fbb1 futex: Correct fu... |
113 114 115 116 |
* the second. * * PI futexes are typically woken before they are removed from the hash list via * the rt_mutex code. See unqueue_me_pi(). |
1da177e4c Linux-2.6.12-rc2 |
117 118 |
*/ struct futex_q { |
ec92d0829 futex priority ba... |
119 |
struct plist_node list; |
1da177e4c Linux-2.6.12-rc2 |
120 |
|
d8d88fbb1 futex: Correct fu... |
121 |
struct task_struct *task; |
1da177e4c Linux-2.6.12-rc2 |
122 |
spinlock_t *lock_ptr; |
1da177e4c Linux-2.6.12-rc2 |
123 |
union futex_key key; |
c87e2837b [PATCH] pi-futex:... |
124 |
struct futex_pi_state *pi_state; |
52400ba94 futex: add requeu... |
125 |
struct rt_mutex_waiter *rt_waiter; |
84bc4af59 futex: Detect mis... |
126 |
union futex_key *requeue_pi_key; |
cd689985c futex: Add bitset... |
127 |
u32 bitset; |
1da177e4c Linux-2.6.12-rc2 |
128 |
}; |
5bdb05f91 futex: Add futex_... |
129 130 131 132 133 |
static const struct futex_q futex_q_init = { /* list gets initialized in queue_me()*/ .key = FUTEX_KEY_INIT, .bitset = FUTEX_BITSET_MATCH_ANY }; |
1da177e4c Linux-2.6.12-rc2 |
134 |
/* |
b2d0994b1 futex: update fut... |
135 136 137 |
* Hash buckets are shared by all the futex_keys that hash to the same * location. Each key may have multiple futex_q structures, one for each task * waiting on a futex. |
1da177e4c Linux-2.6.12-rc2 |
138 139 |
*/ struct futex_hash_bucket { |
ec92d0829 futex priority ba... |
140 141 |
spinlock_t lock; struct plist_head chain; |
1da177e4c Linux-2.6.12-rc2 |
142 143 144 |
}; static struct futex_hash_bucket futex_queues[1<<FUTEX_HASHBITS]; |
1da177e4c Linux-2.6.12-rc2 |
145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 |
/* * We hash on the keys returned from get_futex_key (see below). */ static struct futex_hash_bucket *hash_futex(union futex_key *key) { u32 hash = jhash2((u32*)&key->both.word, (sizeof(key->both.word)+sizeof(key->both.ptr))/4, key->both.offset); return &futex_queues[hash & ((1 << FUTEX_HASHBITS)-1)]; } /* * Return 1 if two futex_keys are equal, 0 otherwise. */ static inline int match_futex(union futex_key *key1, union futex_key *key2) { |
2bc872036 futex: Check for ... |
161 162 |
return (key1 && key2 && key1->both.word == key2->both.word |
1da177e4c Linux-2.6.12-rc2 |
163 164 165 |
&& key1->both.ptr == key2->both.ptr && key1->both.offset == key2->both.offset); } |
38d47c1b7 futex: rely on ge... |
166 167 168 169 170 171 172 173 174 175 176 177 |
/* * Take a reference to the resource addressed by a key. * Can be called while holding spinlocks. * */ static void get_futex_key_refs(union futex_key *key) { if (!key->both.ptr) return; switch (key->both.offset & (FUT_OFF_INODE|FUT_OFF_MMSHARED)) { case FUT_OFF_INODE: |
7de9c6ee3 new helper: ihold() |
178 |
ihold(key->shared.inode); |
38d47c1b7 futex: rely on ge... |
179 180 181 182 183 184 185 186 187 188 189 190 191 |
break; case FUT_OFF_MMSHARED: atomic_inc(&key->private.mm->mm_count); break; } } /* * Drop a reference to the resource addressed by a key. * The hash bucket spinlock must not be held. */ static void drop_futex_key_refs(union futex_key *key) { |
90621c40c futex: catch cert... |
192 193 194 |
if (!key->both.ptr) { /* If we're here then we tried to put a key we failed to get */ WARN_ON_ONCE(1); |
38d47c1b7 futex: rely on ge... |
195 |
return; |
90621c40c futex: catch cert... |
196 |
} |
38d47c1b7 futex: rely on ge... |
197 198 199 200 201 202 203 204 205 206 |
switch (key->both.offset & (FUT_OFF_INODE|FUT_OFF_MMSHARED)) { case FUT_OFF_INODE: iput(key->shared.inode); break; case FUT_OFF_MMSHARED: mmdrop(key->private.mm); break; } } |
34f01cc1f FUTEX: new PRIVAT... |
207 |
/** |
d96ee56ce futex: Make funct... |
208 209 210 211 |
* get_futex_key() - Get parameters which are the keys for a futex * @uaddr: virtual address of the futex * @fshared: 0 for a PROCESS_PRIVATE futex, 1 for PROCESS_SHARED * @key: address where result is stored. |
34f01cc1f FUTEX: new PRIVAT... |
212 213 214 |
* * Returns a negative error code or 0 * The key words are stored in *key on success. |
1da177e4c Linux-2.6.12-rc2 |
215 |
* |
f3a43f3f6 [PATCH] kernel: c... |
216 |
* For shared mappings, it's (page->index, vma->vm_file->f_path.dentry->d_inode, |
1da177e4c Linux-2.6.12-rc2 |
217 218 219 |
* offset_within_page). For private mappings, it's (uaddr, current->mm). * We can usually work out the index without swapping in the page. * |
b2d0994b1 futex: update fut... |
220 |
* lock_page() might sleep, the caller should not hold a spinlock. |
1da177e4c Linux-2.6.12-rc2 |
221 |
*/ |
64d1304a6 futex: setup writ... |
222 |
static int |
7485d0d37 futexes: Remove r... |
223 |
get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key) |
1da177e4c Linux-2.6.12-rc2 |
224 |
{ |
e2970f2fb [PATCH] pi-futex:... |
225 |
unsigned long address = (unsigned long)uaddr; |
1da177e4c Linux-2.6.12-rc2 |
226 |
struct mm_struct *mm = current->mm; |
a5b338f2b thp: update futex... |
227 |
struct page *page, *page_head; |
1da177e4c Linux-2.6.12-rc2 |
228 229 230 231 232 |
int err; /* * The futex address must be "naturally" aligned. */ |
e2970f2fb [PATCH] pi-futex:... |
233 |
key->both.offset = address % PAGE_SIZE; |
34f01cc1f FUTEX: new PRIVAT... |
234 |
if (unlikely((address % sizeof(u32)) != 0)) |
1da177e4c Linux-2.6.12-rc2 |
235 |
return -EINVAL; |
e2970f2fb [PATCH] pi-futex:... |
236 |
address -= key->both.offset; |
1da177e4c Linux-2.6.12-rc2 |
237 238 |
/* |
34f01cc1f FUTEX: new PRIVAT... |
239 240 241 242 243 244 245 |
* PROCESS_PRIVATE futexes are fast. * As the mm cannot disappear under us and the 'key' only needs * virtual address, we dont even have to find the underlying vma. * Note : We do have to check 'uaddr' is a valid user address, * but access_ok() should be faster than find_vma() */ if (!fshared) { |
7485d0d37 futexes: Remove r... |
246 |
if (unlikely(!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))) |
34f01cc1f FUTEX: new PRIVAT... |
247 248 249 |
return -EFAULT; key->private.mm = mm; key->private.address = address; |
42569c399 futex: fixup get_... |
250 |
get_futex_key_refs(key); |
34f01cc1f FUTEX: new PRIVAT... |
251 252 |
return 0; } |
1da177e4c Linux-2.6.12-rc2 |
253 |
|
38d47c1b7 futex: rely on ge... |
254 |
again: |
7485d0d37 futexes: Remove r... |
255 |
err = get_user_pages_fast(address, 1, 1, &page); |
38d47c1b7 futex: rely on ge... |
256 257 |
if (err < 0) return err; |
a5b338f2b thp: update futex... |
258 259 260 |
#ifdef CONFIG_TRANSPARENT_HUGEPAGE page_head = page; if (unlikely(PageTail(page))) { |
38d47c1b7 futex: rely on ge... |
261 |
put_page(page); |
a5b338f2b thp: update futex... |
262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 |
/* serialize against __split_huge_page_splitting() */ local_irq_disable(); if (likely(__get_user_pages_fast(address, 1, 1, &page) == 1)) { page_head = compound_head(page); /* * page_head is valid pointer but we must pin * it before taking the PG_lock and/or * PG_compound_lock. The moment we re-enable * irqs __split_huge_page_splitting() can * return and the head page can be freed from * under us. We can't take the PG_lock and/or * PG_compound_lock on a page that could be * freed from under us. */ if (page != page_head) { get_page(page_head); put_page(page); } local_irq_enable(); } else { local_irq_enable(); goto again; } } #else page_head = compound_head(page); if (page != page_head) { get_page(page_head); put_page(page); } #endif lock_page(page_head); if (!page_head->mapping) { unlock_page(page_head); put_page(page_head); |
38d47c1b7 futex: rely on ge... |
298 299 |
goto again; } |
1da177e4c Linux-2.6.12-rc2 |
300 301 302 303 304 305 |
/* * Private mappings are handled in a simple way. * * NOTE: When userspace waits on a MAP_SHARED mapping, even if * it's a read-only handle, it's expected that futexes attach to |
38d47c1b7 futex: rely on ge... |
306 |
* the object not the particular process. |
1da177e4c Linux-2.6.12-rc2 |
307 |
*/ |
a5b338f2b thp: update futex... |
308 |
if (PageAnon(page_head)) { |
38d47c1b7 futex: rely on ge... |
309 |
key->both.offset |= FUT_OFF_MMSHARED; /* ref taken on mm */ |
1da177e4c Linux-2.6.12-rc2 |
310 |
key->private.mm = mm; |
e2970f2fb [PATCH] pi-futex:... |
311 |
key->private.address = address; |
38d47c1b7 futex: rely on ge... |
312 313 |
} else { key->both.offset |= FUT_OFF_INODE; /* inode-based key */ |
a5b338f2b thp: update futex... |
314 315 |
key->shared.inode = page_head->mapping->host; key->shared.pgoff = page_head->index; |
1da177e4c Linux-2.6.12-rc2 |
316 |
} |
38d47c1b7 futex: rely on ge... |
317 |
get_futex_key_refs(key); |
1da177e4c Linux-2.6.12-rc2 |
318 |
|
a5b338f2b thp: update futex... |
319 320 |
unlock_page(page_head); put_page(page_head); |
38d47c1b7 futex: rely on ge... |
321 |
return 0; |
1da177e4c Linux-2.6.12-rc2 |
322 |
} |
ae791a2d2 futex: Cleanup st... |
323 |
static inline void put_futex_key(union futex_key *key) |
1da177e4c Linux-2.6.12-rc2 |
324 |
{ |
38d47c1b7 futex: rely on ge... |
325 |
drop_futex_key_refs(key); |
1da177e4c Linux-2.6.12-rc2 |
326 |
} |
d96ee56ce futex: Make funct... |
327 328 |
/** * fault_in_user_writeable() - Fault in user address and verify RW access |
d0725992c futex: Fix the wr... |
329 330 331 332 333 |
* @uaddr: pointer to faulting user space address * * Slow path to fixup the fault we just took in the atomic write * access to @uaddr. * |
fb62db2ba futex: Fix kernel... |
334 |
* We have no generic implementation of a non-destructive write to the |
d0725992c futex: Fix the wr... |
335 336 337 338 339 340 |
* user address. We know that we faulted in the atomic pagefault * disabled section so we can as well avoid the #PF overhead by * calling get_user_pages() right away. */ static int fault_in_user_writeable(u32 __user *uaddr) { |
722d01723 futex: Take mmap_... |
341 342 343 344 345 346 347 |
struct mm_struct *mm = current->mm; int ret; down_read(&mm->mmap_sem); ret = get_user_pages(current, mm, (unsigned long)uaddr, 1, 1, 0, NULL, NULL); up_read(&mm->mmap_sem); |
d0725992c futex: Fix the wr... |
348 349 |
return ret < 0 ? ret : 0; } |
4b1c486b3 futex: add helper... |
350 351 |
/** * futex_top_waiter() - Return the highest priority waiter on a futex |
d96ee56ce futex: Make funct... |
352 353 |
* @hb: the hash bucket the futex_q's reside in * @key: the futex key (to distinguish it from other futex futex_q's) |
4b1c486b3 futex: add helper... |
354 355 356 357 358 359 360 361 362 363 364 365 366 367 |
* * Must be called with the hb lock held. */ static struct futex_q *futex_top_waiter(struct futex_hash_bucket *hb, union futex_key *key) { struct futex_q *this; plist_for_each_entry(this, &hb->chain, list) { if (match_futex(&this->key, key)) return this; } return NULL; } |
37a9d912b futex: Sanitize c... |
368 369 |
static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr, u32 uval, u32 newval) |
36cf3b5c3 FUTEX: Tidy up th... |
370 |
{ |
37a9d912b futex: Sanitize c... |
371 |
int ret; |
36cf3b5c3 FUTEX: Tidy up th... |
372 373 |
pagefault_disable(); |
37a9d912b futex: Sanitize c... |
374 |
ret = futex_atomic_cmpxchg_inatomic(curval, uaddr, uval, newval); |
36cf3b5c3 FUTEX: Tidy up th... |
375 |
pagefault_enable(); |
37a9d912b futex: Sanitize c... |
376 |
return ret; |
36cf3b5c3 FUTEX: Tidy up th... |
377 378 379 |
} static int get_futex_value_locked(u32 *dest, u32 __user *from) |
1da177e4c Linux-2.6.12-rc2 |
380 381 |
{ int ret; |
a866374ae [PATCH] mm: pagef... |
382 |
pagefault_disable(); |
e2970f2fb [PATCH] pi-futex:... |
383 |
ret = __copy_from_user_inatomic(dest, from, sizeof(u32)); |
a866374ae [PATCH] mm: pagef... |
384 |
pagefault_enable(); |
1da177e4c Linux-2.6.12-rc2 |
385 386 387 |
return ret ? -EFAULT : 0; } |
c87e2837b [PATCH] pi-futex:... |
388 389 390 391 392 393 394 395 396 397 |
/* * PI code: */ static int refill_pi_state_cache(void) { struct futex_pi_state *pi_state; if (likely(current->pi_state_cache)) return 0; |
4668edc33 [PATCH] kernel co... |
398 |
pi_state = kzalloc(sizeof(*pi_state), GFP_KERNEL); |
c87e2837b [PATCH] pi-futex:... |
399 400 401 |
if (!pi_state) return -ENOMEM; |
c87e2837b [PATCH] pi-futex:... |
402 403 404 405 |
INIT_LIST_HEAD(&pi_state->list); /* pi_mutex gets initialized later */ pi_state->owner = NULL; atomic_set(&pi_state->refcount, 1); |
38d47c1b7 futex: rely on ge... |
406 |
pi_state->key = FUTEX_KEY_INIT; |
c87e2837b [PATCH] pi-futex:... |
407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 |
current->pi_state_cache = pi_state; return 0; } static struct futex_pi_state * alloc_pi_state(void) { struct futex_pi_state *pi_state = current->pi_state_cache; WARN_ON(!pi_state); current->pi_state_cache = NULL; return pi_state; } static void free_pi_state(struct futex_pi_state *pi_state) { if (!atomic_dec_and_test(&pi_state->refcount)) return; /* * If pi_state->owner is NULL, the owner is most probably dying * and has cleaned up the pi_state already */ if (pi_state->owner) { |
1d6154825 sched: Convert pi... |
433 |
raw_spin_lock_irq(&pi_state->owner->pi_lock); |
c87e2837b [PATCH] pi-futex:... |
434 |
list_del_init(&pi_state->list); |
1d6154825 sched: Convert pi... |
435 |
raw_spin_unlock_irq(&pi_state->owner->pi_lock); |
c87e2837b [PATCH] pi-futex:... |
436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 |
rt_mutex_proxy_unlock(&pi_state->pi_mutex, pi_state->owner); } if (current->pi_state_cache) kfree(pi_state); else { /* * pi_state->list is already empty. * clear pi_state->owner. * refcount is at 0 - put it back to 1. */ pi_state->owner = NULL; atomic_set(&pi_state->refcount, 1); current->pi_state_cache = pi_state; } } /* * Look up the task based on what TID userspace gave us. * We dont trust it. */ static struct task_struct * futex_find_get_task(pid_t pid) { struct task_struct *p; |
d359b549b [PATCH] futex_fin... |
461 |
rcu_read_lock(); |
228ebcbe6 Uninline find_tas... |
462 |
p = find_task_by_vpid(pid); |
7a0ea09ad futex: futex_find... |
463 464 |
if (p) get_task_struct(p); |
a06381fec FUTEX: Restore th... |
465 |
|
d359b549b [PATCH] futex_fin... |
466 |
rcu_read_unlock(); |
c87e2837b [PATCH] pi-futex:... |
467 468 469 470 471 472 473 474 475 476 477 |
return p; } /* * This task is holding PI mutexes at exit time => bad. * Kernel cleans up PI-state, but userspace is likely hosed. * (Robust-futex cleanup is separate and might save the day for userspace.) */ void exit_pi_state_list(struct task_struct *curr) { |
c87e2837b [PATCH] pi-futex:... |
478 479 |
struct list_head *next, *head = &curr->pi_state_list; struct futex_pi_state *pi_state; |
627371d73 [PATCH] pi-futex:... |
480 |
struct futex_hash_bucket *hb; |
38d47c1b7 futex: rely on ge... |
481 |
union futex_key key = FUTEX_KEY_INIT; |
c87e2837b [PATCH] pi-futex:... |
482 |
|
a0c1e9073 futex: runtime en... |
483 484 |
if (!futex_cmpxchg_enabled) return; |
c87e2837b [PATCH] pi-futex:... |
485 486 487 |
/* * We are a ZOMBIE and nobody can enqueue itself on * pi_state_list anymore, but we have to be careful |
627371d73 [PATCH] pi-futex:... |
488 |
* versus waiters unqueueing themselves: |
c87e2837b [PATCH] pi-futex:... |
489 |
*/ |
1d6154825 sched: Convert pi... |
490 |
raw_spin_lock_irq(&curr->pi_lock); |
c87e2837b [PATCH] pi-futex:... |
491 492 493 494 495 |
while (!list_empty(head)) { next = head->next; pi_state = list_entry(next, struct futex_pi_state, list); key = pi_state->key; |
627371d73 [PATCH] pi-futex:... |
496 |
hb = hash_futex(&key); |
1d6154825 sched: Convert pi... |
497 |
raw_spin_unlock_irq(&curr->pi_lock); |
c87e2837b [PATCH] pi-futex:... |
498 |
|
c87e2837b [PATCH] pi-futex:... |
499 |
spin_lock(&hb->lock); |
1d6154825 sched: Convert pi... |
500 |
raw_spin_lock_irq(&curr->pi_lock); |
627371d73 [PATCH] pi-futex:... |
501 502 503 504 |
/* * We dropped the pi-lock, so re-check whether this * task still owns the PI-state: */ |
c87e2837b [PATCH] pi-futex:... |
505 506 507 508 |
if (head->next != next) { spin_unlock(&hb->lock); continue; } |
c87e2837b [PATCH] pi-futex:... |
509 |
WARN_ON(pi_state->owner != curr); |
627371d73 [PATCH] pi-futex:... |
510 511 |
WARN_ON(list_empty(&pi_state->list)); list_del_init(&pi_state->list); |
c87e2837b [PATCH] pi-futex:... |
512 |
pi_state->owner = NULL; |
1d6154825 sched: Convert pi... |
513 |
raw_spin_unlock_irq(&curr->pi_lock); |
c87e2837b [PATCH] pi-futex:... |
514 515 516 517 |
rt_mutex_unlock(&pi_state->pi_mutex); spin_unlock(&hb->lock); |
1d6154825 sched: Convert pi... |
518 |
raw_spin_lock_irq(&curr->pi_lock); |
c87e2837b [PATCH] pi-futex:... |
519 |
} |
1d6154825 sched: Convert pi... |
520 |
raw_spin_unlock_irq(&curr->pi_lock); |
c87e2837b [PATCH] pi-futex:... |
521 522 523 |
} static int |
d0aa7a70b futex_requeue_pi ... |
524 525 |
lookup_pi_state(u32 uval, struct futex_hash_bucket *hb, union futex_key *key, struct futex_pi_state **ps) |
c87e2837b [PATCH] pi-futex:... |
526 527 528 |
{ struct futex_pi_state *pi_state = NULL; struct futex_q *this, *next; |
ec92d0829 futex priority ba... |
529 |
struct plist_head *head; |
c87e2837b [PATCH] pi-futex:... |
530 |
struct task_struct *p; |
778e9a9c3 pi-futex: fix exi... |
531 |
pid_t pid = uval & FUTEX_TID_MASK; |
c87e2837b [PATCH] pi-futex:... |
532 533 |
head = &hb->chain; |
ec92d0829 futex priority ba... |
534 |
plist_for_each_entry_safe(this, next, head, list) { |
d0aa7a70b futex_requeue_pi ... |
535 |
if (match_futex(&this->key, key)) { |
c87e2837b [PATCH] pi-futex:... |
536 537 538 539 540 |
/* * Another waiter already exists - bump up * the refcount and return its pi_state: */ pi_state = this->pi_state; |
06a9ec291 [PATCH] pi-futex:... |
541 |
/* |
fb62db2ba futex: Fix kernel... |
542 |
* Userspace might have messed up non-PI and PI futexes |
06a9ec291 [PATCH] pi-futex:... |
543 544 545 |
*/ if (unlikely(!pi_state)) return -EINVAL; |
627371d73 [PATCH] pi-futex:... |
546 |
WARN_ON(!atomic_read(&pi_state->refcount)); |
59647b6ac futex: Handle fut... |
547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 |
/* * When pi_state->owner is NULL then the owner died * and another waiter is on the fly. pi_state->owner * is fixed up by the task which acquires * pi_state->rt_mutex. * * We do not check for pid == 0 which can happen when * the owner died and robust_list_exit() cleared the * TID. */ if (pid && pi_state->owner) { /* * Bail out if user space manipulated the * futex value. */ if (pid != task_pid_vnr(pi_state->owner)) return -EINVAL; } |
627371d73 [PATCH] pi-futex:... |
566 |
|
c87e2837b [PATCH] pi-futex:... |
567 |
atomic_inc(&pi_state->refcount); |
d0aa7a70b futex_requeue_pi ... |
568 |
*ps = pi_state; |
c87e2837b [PATCH] pi-futex:... |
569 570 571 572 573 574 |
return 0; } } /* |
e3f2ddeac [PATCH] pi-futex:... |
575 |
* We are the first waiter - try to look up the real owner and attach |
778e9a9c3 pi-futex: fix exi... |
576 |
* the new pi_state to it, but bail out when TID = 0 |
c87e2837b [PATCH] pi-futex:... |
577 |
*/ |
778e9a9c3 pi-futex: fix exi... |
578 |
if (!pid) |
e3f2ddeac [PATCH] pi-futex:... |
579 |
return -ESRCH; |
c87e2837b [PATCH] pi-futex:... |
580 |
p = futex_find_get_task(pid); |
7a0ea09ad futex: futex_find... |
581 582 |
if (!p) return -ESRCH; |
778e9a9c3 pi-futex: fix exi... |
583 584 585 586 587 588 589 |
/* * We need to look at the task state flags to figure out, * whether the task is exiting. To protect against the do_exit * change of the task flags, we do this protected by * p->pi_lock: */ |
1d6154825 sched: Convert pi... |
590 |
raw_spin_lock_irq(&p->pi_lock); |
778e9a9c3 pi-futex: fix exi... |
591 592 593 594 595 596 597 |
if (unlikely(p->flags & PF_EXITING)) { /* * The task is on the way out. When PF_EXITPIDONE is * set, we know that the task has finished the * cleanup: */ int ret = (p->flags & PF_EXITPIDONE) ? -ESRCH : -EAGAIN; |
1d6154825 sched: Convert pi... |
598 |
raw_spin_unlock_irq(&p->pi_lock); |
778e9a9c3 pi-futex: fix exi... |
599 600 601 |
put_task_struct(p); return ret; } |
c87e2837b [PATCH] pi-futex:... |
602 603 604 605 606 607 608 609 610 611 |
pi_state = alloc_pi_state(); /* * Initialize the pi_mutex in locked state and make 'p' * the owner of it: */ rt_mutex_init_proxy_locked(&pi_state->pi_mutex, p); /* Store the key for possible exit cleanups: */ |
d0aa7a70b futex_requeue_pi ... |
612 |
pi_state->key = *key; |
c87e2837b [PATCH] pi-futex:... |
613 |
|
627371d73 [PATCH] pi-futex:... |
614 |
WARN_ON(!list_empty(&pi_state->list)); |
c87e2837b [PATCH] pi-futex:... |
615 616 |
list_add(&pi_state->list, &p->pi_state_list); pi_state->owner = p; |
1d6154825 sched: Convert pi... |
617 |
raw_spin_unlock_irq(&p->pi_lock); |
c87e2837b [PATCH] pi-futex:... |
618 619 |
put_task_struct(p); |
d0aa7a70b futex_requeue_pi ... |
620 |
*ps = pi_state; |
c87e2837b [PATCH] pi-futex:... |
621 622 623 |
return 0; } |
1a52084d0 futex: split out ... |
624 |
/** |
d96ee56ce futex: Make funct... |
625 |
* futex_lock_pi_atomic() - Atomic work required to acquire a pi aware futex |
bab5bc9e8 futex: fixup unlo... |
626 627 628 629 630 631 632 633 |
* @uaddr: the pi futex user address * @hb: the pi futex hash bucket * @key: the futex key associated with uaddr and hb * @ps: the pi_state pointer where we store the result of the * lookup * @task: the task to perform the atomic lock work for. This will * be "current" except in the case of requeue pi. * @set_waiters: force setting the FUTEX_WAITERS bit (1) or not (0) |
1a52084d0 futex: split out ... |
634 635 636 637 638 639 640 641 642 643 644 |
* * Returns: * 0 - ready to wait * 1 - acquired the lock * <0 - error * * The hb->lock and futex_key refs shall be held by the caller. */ static int futex_lock_pi_atomic(u32 __user *uaddr, struct futex_hash_bucket *hb, union futex_key *key, struct futex_pi_state **ps, |
bab5bc9e8 futex: fixup unlo... |
645 |
struct task_struct *task, int set_waiters) |
1a52084d0 futex: split out ... |
646 647 |
{ int lock_taken, ret, ownerdied = 0; |
c0c9ed150 futex: Avoid redu... |
648 |
u32 uval, newval, curval, vpid = task_pid_vnr(task); |
1a52084d0 futex: split out ... |
649 650 651 652 653 654 655 656 657 |
retry: ret = lock_taken = 0; /* * To avoid races, we attempt to take the lock here again * (by doing a 0 -> TID atomic cmpxchg), while holding all * the locks. It will most likely not succeed. */ |
c0c9ed150 futex: Avoid redu... |
658 |
newval = vpid; |
bab5bc9e8 futex: fixup unlo... |
659 660 |
if (set_waiters) newval |= FUTEX_WAITERS; |
1a52084d0 futex: split out ... |
661 |
|
37a9d912b futex: Sanitize c... |
662 |
if (unlikely(cmpxchg_futex_value_locked(&curval, uaddr, 0, newval))) |
1a52084d0 futex: split out ... |
663 664 665 666 667 |
return -EFAULT; /* * Detect deadlocks. */ |
c0c9ed150 futex: Avoid redu... |
668 |
if ((unlikely((curval & FUTEX_TID_MASK) == vpid))) |
1a52084d0 futex: split out ... |
669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 |
return -EDEADLK; /* * Surprise - we got the lock. Just return to userspace: */ if (unlikely(!curval)) return 1; uval = curval; /* * Set the FUTEX_WAITERS flag, so the owner will know it has someone * to wake at the next unlock. */ newval = curval | FUTEX_WAITERS; /* * There are two cases, where a futex might have no owner (the * owner TID is 0): OWNER_DIED. We take over the futex in this * case. We also do an unconditional take over, when the owner * of the futex died. * * This is safe as we are protected by the hash bucket lock ! */ if (unlikely(ownerdied || !(curval & FUTEX_TID_MASK))) { /* Keep the OWNER_DIED bit */ |
c0c9ed150 futex: Avoid redu... |
695 |
newval = (curval & ~FUTEX_TID_MASK) | vpid; |
1a52084d0 futex: split out ... |
696 697 698 |
ownerdied = 0; lock_taken = 1; } |
37a9d912b futex: Sanitize c... |
699 |
if (unlikely(cmpxchg_futex_value_locked(&curval, uaddr, uval, newval))) |
1a52084d0 futex: split out ... |
700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 |
return -EFAULT; if (unlikely(curval != uval)) goto retry; /* * We took the lock due to owner died take over. */ if (unlikely(lock_taken)) return 1; /* * We dont have the lock. Look up the PI state (or create it if * we are the first waiter): */ ret = lookup_pi_state(uval, hb, key, ps); if (unlikely(ret)) { switch (ret) { case -ESRCH: /* * No owner found for this futex. Check if the * OWNER_DIED bit is set to figure out whether * this is a robust futex or not. */ if (get_futex_value_locked(&curval, uaddr)) return -EFAULT; /* * We simply start over in case of a robust * futex. The code above will take the futex * and return happy. */ if (curval & FUTEX_OWNER_DIED) { ownerdied = 1; goto retry; } default: break; } } return ret; } |
2e12978a9 futex,plist: Pass... |
743 744 745 746 747 748 749 750 751 |
/** * __unqueue_futex() - Remove the futex_q from its futex_hash_bucket * @q: The futex_q to unqueue * * The q->lock_ptr must not be NULL and must be held by the caller. */ static void __unqueue_futex(struct futex_q *q) { struct futex_hash_bucket *hb; |
290962021 futex: Fix WARN_O... |
752 753 |
if (WARN_ON_SMP(!q->lock_ptr || !spin_is_locked(q->lock_ptr)) || WARN_ON(plist_node_empty(&q->list))) |
2e12978a9 futex,plist: Pass... |
754 755 756 757 758 |
return; hb = container_of(q->lock_ptr, struct futex_hash_bucket, lock); plist_del(&q->list, &hb->chain); } |
c87e2837b [PATCH] pi-futex:... |
759 |
/* |
1da177e4c Linux-2.6.12-rc2 |
760 761 762 763 764 |
* The hash bucket lock must be held when this is called. * Afterwards, the futex_q must not be accessed. */ static void wake_futex(struct futex_q *q) { |
f1a11e057 futex: remove the... |
765 |
struct task_struct *p = q->task; |
1da177e4c Linux-2.6.12-rc2 |
766 |
/* |
f1a11e057 futex: remove the... |
767 |
* We set q->lock_ptr = NULL _before_ we wake up the task. If |
fb62db2ba futex: Fix kernel... |
768 769 |
* a non-futex wake up happens on another CPU then the task * might exit and p would dereference a non-existing task |
f1a11e057 futex: remove the... |
770 771 |
* struct. Prevent this by holding a reference on p across the * wake up. |
1da177e4c Linux-2.6.12-rc2 |
772 |
*/ |
f1a11e057 futex: remove the... |
773 |
get_task_struct(p); |
2e12978a9 futex,plist: Pass... |
774 |
__unqueue_futex(q); |
1da177e4c Linux-2.6.12-rc2 |
775 |
/* |
f1a11e057 futex: remove the... |
776 777 778 779 |
* The waiting task can free the futex_q as soon as * q->lock_ptr = NULL is written, without taking any locks. A * memory barrier is required here to prevent the following * store to lock_ptr from getting ahead of the plist_del. |
1da177e4c Linux-2.6.12-rc2 |
780 |
*/ |
ccdea2f88 [PATCH] futex: re... |
781 |
smp_wmb(); |
1da177e4c Linux-2.6.12-rc2 |
782 |
q->lock_ptr = NULL; |
f1a11e057 futex: remove the... |
783 784 785 |
wake_up_state(p, TASK_NORMAL); put_task_struct(p); |
1da177e4c Linux-2.6.12-rc2 |
786 |
} |
c87e2837b [PATCH] pi-futex:... |
787 788 789 790 791 792 793 794 |
static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this) { struct task_struct *new_owner; struct futex_pi_state *pi_state = this->pi_state; u32 curval, newval; if (!pi_state) return -EINVAL; |
51246bfd1 futex: Handle use... |
795 796 797 798 799 800 |
/* * If current does not own the pi_state then the futex is * inconsistent and user space fiddled with the futex value. */ if (pi_state->owner != current) return -EINVAL; |
d209d74d5 rtmutes: Convert ... |
801 |
raw_spin_lock(&pi_state->pi_mutex.wait_lock); |
c87e2837b [PATCH] pi-futex:... |
802 803 804 |
new_owner = rt_mutex_next_owner(&pi_state->pi_mutex); /* |
f123c98e7 rtmutex: Fix comm... |
805 806 807 |
* It is possible that the next waiter (the one that brought * this owner to the kernel) timed out and is no longer * waiting on the lock. |
c87e2837b [PATCH] pi-futex:... |
808 809 810 811 812 813 814 815 816 |
*/ if (!new_owner) new_owner = this->task; /* * We pass it to the next owner. (The WAITERS bit is always * kept enabled while there is PI state around. We must also * preserve the owner died bit.) */ |
e3f2ddeac [PATCH] pi-futex:... |
817 |
if (!(uval & FUTEX_OWNER_DIED)) { |
778e9a9c3 pi-futex: fix exi... |
818 |
int ret = 0; |
b488893a3 pid namespaces: c... |
819 |
newval = FUTEX_WAITERS | task_pid_vnr(new_owner); |
e3f2ddeac [PATCH] pi-futex:... |
820 |
|
37a9d912b futex: Sanitize c... |
821 |
if (cmpxchg_futex_value_locked(&curval, uaddr, uval, newval)) |
778e9a9c3 pi-futex: fix exi... |
822 |
ret = -EFAULT; |
cde898fa8 futex: correctly ... |
823 |
else if (curval != uval) |
778e9a9c3 pi-futex: fix exi... |
824 825 |
ret = -EINVAL; if (ret) { |
d209d74d5 rtmutes: Convert ... |
826 |
raw_spin_unlock(&pi_state->pi_mutex.wait_lock); |
778e9a9c3 pi-futex: fix exi... |
827 828 |
return ret; } |
e3f2ddeac [PATCH] pi-futex:... |
829 |
} |
c87e2837b [PATCH] pi-futex:... |
830 |
|
1d6154825 sched: Convert pi... |
831 |
raw_spin_lock_irq(&pi_state->owner->pi_lock); |
627371d73 [PATCH] pi-futex:... |
832 833 |
WARN_ON(list_empty(&pi_state->list)); list_del_init(&pi_state->list); |
1d6154825 sched: Convert pi... |
834 |
raw_spin_unlock_irq(&pi_state->owner->pi_lock); |
627371d73 [PATCH] pi-futex:... |
835 |
|
1d6154825 sched: Convert pi... |
836 |
raw_spin_lock_irq(&new_owner->pi_lock); |
627371d73 [PATCH] pi-futex:... |
837 |
WARN_ON(!list_empty(&pi_state->list)); |
c87e2837b [PATCH] pi-futex:... |
838 839 |
list_add(&pi_state->list, &new_owner->pi_state_list); pi_state->owner = new_owner; |
1d6154825 sched: Convert pi... |
840 |
raw_spin_unlock_irq(&new_owner->pi_lock); |
627371d73 [PATCH] pi-futex:... |
841 |
|
d209d74d5 rtmutes: Convert ... |
842 |
raw_spin_unlock(&pi_state->pi_mutex.wait_lock); |
c87e2837b [PATCH] pi-futex:... |
843 844 845 846 847 848 849 850 851 852 853 854 855 |
rt_mutex_unlock(&pi_state->pi_mutex); return 0; } static int unlock_futex_pi(u32 __user *uaddr, u32 uval) { u32 oldval; /* * There is no waiter, so we unlock the futex. The owner died * bit has not to be preserved here. We are the owner: */ |
37a9d912b futex: Sanitize c... |
856 857 |
if (cmpxchg_futex_value_locked(&oldval, uaddr, uval, 0)) return -EFAULT; |
c87e2837b [PATCH] pi-futex:... |
858 859 860 861 862 |
if (oldval != uval) return -EAGAIN; return 0; } |
1da177e4c Linux-2.6.12-rc2 |
863 |
/* |
8b8f319fc [PATCH] lockdep: ... |
864 865 866 867 868 869 870 871 872 873 874 875 876 877 |
* Express the locking dependencies for lockdep: */ static inline void double_lock_hb(struct futex_hash_bucket *hb1, struct futex_hash_bucket *hb2) { if (hb1 <= hb2) { spin_lock(&hb1->lock); if (hb1 < hb2) spin_lock_nested(&hb2->lock, SINGLE_DEPTH_NESTING); } else { /* hb1 > hb2 */ spin_lock(&hb2->lock); spin_lock_nested(&hb1->lock, SINGLE_DEPTH_NESTING); } } |
5eb3dc62f futex: add double... |
878 879 880 |
static inline void double_unlock_hb(struct futex_hash_bucket *hb1, struct futex_hash_bucket *hb2) { |
f061d3515 futex: remove the... |
881 |
spin_unlock(&hb1->lock); |
88f502fed futex: remove the... |
882 883 |
if (hb1 != hb2) spin_unlock(&hb2->lock); |
5eb3dc62f futex: add double... |
884 |
} |
8b8f319fc [PATCH] lockdep: ... |
885 |
/* |
b2d0994b1 futex: update fut... |
886 |
* Wake up waiters matching bitset queued on this futex (uaddr). |
1da177e4c Linux-2.6.12-rc2 |
887 |
*/ |
b41277dc7 futex: Replace fs... |
888 889 |
static int futex_wake(u32 __user *uaddr, unsigned int flags, int nr_wake, u32 bitset) |
1da177e4c Linux-2.6.12-rc2 |
890 |
{ |
e2970f2fb [PATCH] pi-futex:... |
891 |
struct futex_hash_bucket *hb; |
1da177e4c Linux-2.6.12-rc2 |
892 |
struct futex_q *this, *next; |
ec92d0829 futex priority ba... |
893 |
struct plist_head *head; |
38d47c1b7 futex: rely on ge... |
894 |
union futex_key key = FUTEX_KEY_INIT; |
1da177e4c Linux-2.6.12-rc2 |
895 |
int ret; |
cd689985c futex: Add bitset... |
896 897 |
if (!bitset) return -EINVAL; |
b41277dc7 futex: Replace fs... |
898 |
ret = get_futex_key(uaddr, flags & FLAGS_SHARED, &key); |
1da177e4c Linux-2.6.12-rc2 |
899 900 |
if (unlikely(ret != 0)) goto out; |
e2970f2fb [PATCH] pi-futex:... |
901 902 903 |
hb = hash_futex(&key); spin_lock(&hb->lock); head = &hb->chain; |
1da177e4c Linux-2.6.12-rc2 |
904 |
|
ec92d0829 futex priority ba... |
905 |
plist_for_each_entry_safe(this, next, head, list) { |
1da177e4c Linux-2.6.12-rc2 |
906 |
if (match_futex (&this->key, &key)) { |
52400ba94 futex: add requeu... |
907 |
if (this->pi_state || this->rt_waiter) { |
ed6f7b10e [PATCH] pi-futex:... |
908 909 910 |
ret = -EINVAL; break; } |
cd689985c futex: Add bitset... |
911 912 913 914 |
/* Check if one of the bits is set in both bitsets */ if (!(this->bitset & bitset)) continue; |
1da177e4c Linux-2.6.12-rc2 |
915 916 917 918 919 |
wake_futex(this); if (++ret >= nr_wake) break; } } |
e2970f2fb [PATCH] pi-futex:... |
920 |
spin_unlock(&hb->lock); |
ae791a2d2 futex: Cleanup st... |
921 |
put_futex_key(&key); |
42d35d48c futex: make futex... |
922 |
out: |
1da177e4c Linux-2.6.12-rc2 |
923 924 925 926 |
return ret; } /* |
4732efbeb [PATCH] FUTEX_WAK... |
927 928 929 |
* Wake up all waiters hashed on the physical page that is mapped * to this virtual address: */ |
e2970f2fb [PATCH] pi-futex:... |
930 |
static int |
b41277dc7 futex: Replace fs... |
931 |
futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, |
e2970f2fb [PATCH] pi-futex:... |
932 |
int nr_wake, int nr_wake2, int op) |
4732efbeb [PATCH] FUTEX_WAK... |
933 |
{ |
38d47c1b7 futex: rely on ge... |
934 |
union futex_key key1 = FUTEX_KEY_INIT, key2 = FUTEX_KEY_INIT; |
e2970f2fb [PATCH] pi-futex:... |
935 |
struct futex_hash_bucket *hb1, *hb2; |
ec92d0829 futex priority ba... |
936 |
struct plist_head *head; |
4732efbeb [PATCH] FUTEX_WAK... |
937 |
struct futex_q *this, *next; |
e4dc5b7a3 futex: clean up f... |
938 |
int ret, op_ret; |
4732efbeb [PATCH] FUTEX_WAK... |
939 |
|
e4dc5b7a3 futex: clean up f... |
940 |
retry: |
b41277dc7 futex: Replace fs... |
941 |
ret = get_futex_key(uaddr1, flags & FLAGS_SHARED, &key1); |
4732efbeb [PATCH] FUTEX_WAK... |
942 943 |
if (unlikely(ret != 0)) goto out; |
b41277dc7 futex: Replace fs... |
944 |
ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2); |
4732efbeb [PATCH] FUTEX_WAK... |
945 |
if (unlikely(ret != 0)) |
42d35d48c futex: make futex... |
946 |
goto out_put_key1; |
4732efbeb [PATCH] FUTEX_WAK... |
947 |
|
e2970f2fb [PATCH] pi-futex:... |
948 949 |
hb1 = hash_futex(&key1); hb2 = hash_futex(&key2); |
4732efbeb [PATCH] FUTEX_WAK... |
950 |
|
e4dc5b7a3 futex: clean up f... |
951 |
retry_private: |
eaaea8036 futex: Fix lockin... |
952 |
double_lock_hb(hb1, hb2); |
e2970f2fb [PATCH] pi-futex:... |
953 |
op_ret = futex_atomic_op_inuser(op, uaddr2); |
4732efbeb [PATCH] FUTEX_WAK... |
954 |
if (unlikely(op_ret < 0)) { |
4732efbeb [PATCH] FUTEX_WAK... |
955 |
|
5eb3dc62f futex: add double... |
956 |
double_unlock_hb(hb1, hb2); |
4732efbeb [PATCH] FUTEX_WAK... |
957 |
|
7ee1dd3fe [PATCH] FRV: Make... |
958 |
#ifndef CONFIG_MMU |
e2970f2fb [PATCH] pi-futex:... |
959 960 961 962 |
/* * we don't get EFAULT from MMU faults if we don't have an MMU, * but we might get them from range checking */ |
7ee1dd3fe [PATCH] FRV: Make... |
963 |
ret = op_ret; |
42d35d48c futex: make futex... |
964 |
goto out_put_keys; |
7ee1dd3fe [PATCH] FRV: Make... |
965 |
#endif |
796f8d9b9 [PATCH] FUTEX_WAK... |
966 967 |
if (unlikely(op_ret != -EFAULT)) { ret = op_ret; |
42d35d48c futex: make futex... |
968 |
goto out_put_keys; |
796f8d9b9 [PATCH] FUTEX_WAK... |
969 |
} |
d0725992c futex: Fix the wr... |
970 |
ret = fault_in_user_writeable(uaddr2); |
4732efbeb [PATCH] FUTEX_WAK... |
971 |
if (ret) |
de87fcc12 futex: additional... |
972 |
goto out_put_keys; |
4732efbeb [PATCH] FUTEX_WAK... |
973 |
|
b41277dc7 futex: Replace fs... |
974 |
if (!(flags & FLAGS_SHARED)) |
e4dc5b7a3 futex: clean up f... |
975 |
goto retry_private; |
ae791a2d2 futex: Cleanup st... |
976 977 |
put_futex_key(&key2); put_futex_key(&key1); |
e4dc5b7a3 futex: clean up f... |
978 |
goto retry; |
4732efbeb [PATCH] FUTEX_WAK... |
979 |
} |
e2970f2fb [PATCH] pi-futex:... |
980 |
head = &hb1->chain; |
4732efbeb [PATCH] FUTEX_WAK... |
981 |
|
ec92d0829 futex priority ba... |
982 |
plist_for_each_entry_safe(this, next, head, list) { |
4732efbeb [PATCH] FUTEX_WAK... |
983 984 985 986 987 988 989 990 |
if (match_futex (&this->key, &key1)) { wake_futex(this); if (++ret >= nr_wake) break; } } if (op_ret > 0) { |
e2970f2fb [PATCH] pi-futex:... |
991 |
head = &hb2->chain; |
4732efbeb [PATCH] FUTEX_WAK... |
992 993 |
op_ret = 0; |
ec92d0829 futex priority ba... |
994 |
plist_for_each_entry_safe(this, next, head, list) { |
4732efbeb [PATCH] FUTEX_WAK... |
995 996 997 998 999 1000 1001 1002 |
if (match_futex (&this->key, &key2)) { wake_futex(this); if (++op_ret >= nr_wake2) break; } } ret += op_ret; } |
5eb3dc62f futex: add double... |
1003 |
double_unlock_hb(hb1, hb2); |
42d35d48c futex: make futex... |
1004 |
out_put_keys: |
ae791a2d2 futex: Cleanup st... |
1005 |
put_futex_key(&key2); |
42d35d48c futex: make futex... |
1006 |
out_put_key1: |
ae791a2d2 futex: Cleanup st... |
1007 |
put_futex_key(&key1); |
42d35d48c futex: make futex... |
1008 |
out: |
4732efbeb [PATCH] FUTEX_WAK... |
1009 1010 |
return ret; } |
9121e4783 futex: distangle ... |
1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 |
/** * requeue_futex() - Requeue a futex_q from one hb to another * @q: the futex_q to requeue * @hb1: the source hash_bucket * @hb2: the target hash_bucket * @key2: the new key for the requeued futex_q */ static inline void requeue_futex(struct futex_q *q, struct futex_hash_bucket *hb1, struct futex_hash_bucket *hb2, union futex_key *key2) { /* * If key1 and key2 hash to the same bucket, no need to * requeue. */ if (likely(&hb1->chain != &hb2->chain)) { plist_del(&q->list, &hb1->chain); plist_add(&q->list, &hb2->chain); q->lock_ptr = &hb2->lock; |
9121e4783 futex: distangle ... |
1031 1032 1033 1034 |
} get_futex_key_refs(key2); q->key = *key2; } |
52400ba94 futex: add requeu... |
1035 1036 |
/** * requeue_pi_wake_futex() - Wake a task that acquired the lock during requeue |
d96ee56ce futex: Make funct... |
1037 1038 1039 |
* @q: the futex_q * @key: the key of the requeue target futex * @hb: the hash_bucket of the requeue target futex |
52400ba94 futex: add requeu... |
1040 1041 1042 1043 1044 |
* * During futex_requeue, with requeue_pi=1, it is possible to acquire the * target futex if it is uncontended or via a lock steal. Set the futex_q key * to the requeue target futex so the waiter can detect the wakeup on the right * futex, but remove it from the hb and NULL the rt_waiter so it can detect |
beda2c7ea futex: Update fut... |
1045 1046 1047 |
* atomic lock acquisition. Set the q->lock_ptr to the requeue target hb->lock * to protect access to the pi_state to fixup the owner later. Must be called * with both q->lock_ptr and hb->lock held. |
52400ba94 futex: add requeu... |
1048 1049 |
*/ static inline |
beda2c7ea futex: Update fut... |
1050 1051 |
void requeue_pi_wake_futex(struct futex_q *q, union futex_key *key, struct futex_hash_bucket *hb) |
52400ba94 futex: add requeu... |
1052 |
{ |
52400ba94 futex: add requeu... |
1053 1054 |
get_futex_key_refs(key); q->key = *key; |
2e12978a9 futex,plist: Pass... |
1055 |
__unqueue_futex(q); |
52400ba94 futex: add requeu... |
1056 1057 1058 |
WARN_ON(!q->rt_waiter); q->rt_waiter = NULL; |
beda2c7ea futex: Update fut... |
1059 |
q->lock_ptr = &hb->lock; |
beda2c7ea futex: Update fut... |
1060 |
|
f1a11e057 futex: remove the... |
1061 |
wake_up_state(q->task, TASK_NORMAL); |
52400ba94 futex: add requeu... |
1062 1063 1064 1065 |
} /** * futex_proxy_trylock_atomic() - Attempt an atomic lock for the top waiter |
bab5bc9e8 futex: fixup unlo... |
1066 1067 1068 1069 1070 1071 1072 |
* @pifutex: the user address of the to futex * @hb1: the from futex hash bucket, must be locked by the caller * @hb2: the to futex hash bucket, must be locked by the caller * @key1: the from futex key * @key2: the to futex key * @ps: address to store the pi_state pointer * @set_waiters: force setting the FUTEX_WAITERS bit (1) or not (0) |
52400ba94 futex: add requeu... |
1073 1074 |
* * Try and get the lock on behalf of the top waiter if we can do it atomically. |
bab5bc9e8 futex: fixup unlo... |
1075 1076 1077 |
* Wake the top waiter if we succeed. If the caller specified set_waiters, * then direct futex_lock_pi_atomic() to force setting the FUTEX_WAITERS bit. * hb1 and hb2 must be held by the caller. |
52400ba94 futex: add requeu... |
1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 |
* * Returns: * 0 - failed to acquire the lock atomicly * 1 - acquired the lock * <0 - error */ static int futex_proxy_trylock_atomic(u32 __user *pifutex, struct futex_hash_bucket *hb1, struct futex_hash_bucket *hb2, union futex_key *key1, union futex_key *key2, |
bab5bc9e8 futex: fixup unlo... |
1088 |
struct futex_pi_state **ps, int set_waiters) |
52400ba94 futex: add requeu... |
1089 |
{ |
bab5bc9e8 futex: fixup unlo... |
1090 |
struct futex_q *top_waiter = NULL; |
52400ba94 futex: add requeu... |
1091 1092 1093 1094 1095 |
u32 curval; int ret; if (get_futex_value_locked(&curval, pifutex)) return -EFAULT; |
bab5bc9e8 futex: fixup unlo... |
1096 1097 1098 1099 1100 1101 1102 1103 |
/* * Find the top_waiter and determine if there are additional waiters. * If the caller intends to requeue more than 1 waiter to pifutex, * force futex_lock_pi_atomic() to set the FUTEX_WAITERS bit now, * as we have means to handle the possible fault. If not, don't set * the bit unecessarily as it will force the subsequent unlock to enter * the kernel. */ |
52400ba94 futex: add requeu... |
1104 1105 1106 1107 1108 |
top_waiter = futex_top_waiter(hb1, key1); /* There are no waiters, nothing for us to do. */ if (!top_waiter) return 0; |
84bc4af59 futex: Detect mis... |
1109 1110 1111 |
/* Ensure we requeue to the expected futex. */ if (!match_futex(top_waiter->requeue_pi_key, key2)) return -EINVAL; |
52400ba94 futex: add requeu... |
1112 |
/* |
bab5bc9e8 futex: fixup unlo... |
1113 1114 1115 |
* Try to take the lock for top_waiter. Set the FUTEX_WAITERS bit in * the contended case or if set_waiters is 1. The pi_state is returned * in ps in contended cases. |
52400ba94 futex: add requeu... |
1116 |
*/ |
bab5bc9e8 futex: fixup unlo... |
1117 1118 |
ret = futex_lock_pi_atomic(pifutex, hb2, key2, ps, top_waiter->task, set_waiters); |
52400ba94 futex: add requeu... |
1119 |
if (ret == 1) |
beda2c7ea futex: Update fut... |
1120 |
requeue_pi_wake_futex(top_waiter, key2, hb2); |
52400ba94 futex: add requeu... |
1121 1122 1123 1124 1125 1126 |
return ret; } /** * futex_requeue() - Requeue waiters from uaddr1 to uaddr2 |
fb62db2ba futex: Fix kernel... |
1127 |
* @uaddr1: source futex user address |
b41277dc7 futex: Replace fs... |
1128 |
* @flags: futex flags (FLAGS_SHARED, etc.) |
fb62db2ba futex: Fix kernel... |
1129 1130 1131 1132 1133 |
* @uaddr2: target futex user address * @nr_wake: number of waiters to wake (must be 1 for requeue_pi) * @nr_requeue: number of waiters to requeue (0-INT_MAX) * @cmpval: @uaddr1 expected value (or %NULL) * @requeue_pi: if we are attempting to requeue from a non-pi futex to a |
b41277dc7 futex: Replace fs... |
1134 |
* pi futex (pi to pi requeue is not supported) |
52400ba94 futex: add requeu... |
1135 1136 1137 1138 1139 1140 1141 |
* * Requeue waiters on uaddr1 to uaddr2. In the requeue_pi case, try to acquire * uaddr2 atomically on behalf of the top waiter. * * Returns: * >=0 - on success, the number of tasks requeued or woken * <0 - on error |
1da177e4c Linux-2.6.12-rc2 |
1142 |
*/ |
b41277dc7 futex: Replace fs... |
1143 1144 1145 |
static int futex_requeue(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, int nr_wake, int nr_requeue, u32 *cmpval, int requeue_pi) |
1da177e4c Linux-2.6.12-rc2 |
1146 |
{ |
38d47c1b7 futex: rely on ge... |
1147 |
union futex_key key1 = FUTEX_KEY_INIT, key2 = FUTEX_KEY_INIT; |
52400ba94 futex: add requeu... |
1148 1149 |
int drop_count = 0, task_count = 0, ret; struct futex_pi_state *pi_state = NULL; |
e2970f2fb [PATCH] pi-futex:... |
1150 |
struct futex_hash_bucket *hb1, *hb2; |
ec92d0829 futex priority ba... |
1151 |
struct plist_head *head1; |
1da177e4c Linux-2.6.12-rc2 |
1152 |
struct futex_q *this, *next; |
52400ba94 futex: add requeu... |
1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 |
u32 curval2; if (requeue_pi) { /* * requeue_pi requires a pi_state, try to allocate it now * without any locks in case it fails. */ if (refill_pi_state_cache()) return -ENOMEM; /* * requeue_pi must wake as many tasks as it can, up to nr_wake * + nr_requeue, since it acquires the rt_mutex prior to * returning to userspace, so as to not leave the rt_mutex with * waiters and no owner. However, second and third wake-ups * cannot be predicted as they involve race conditions with the * first wake and a fault while looking up the pi_state. Both * pthread_cond_signal() and pthread_cond_broadcast() should * use nr_wake=1. */ if (nr_wake != 1) return -EINVAL; } |
1da177e4c Linux-2.6.12-rc2 |
1175 |
|
42d35d48c futex: make futex... |
1176 |
retry: |
52400ba94 futex: add requeu... |
1177 1178 1179 1180 1181 1182 1183 1184 |
if (pi_state != NULL) { /* * We will have to lookup the pi_state again, so free this one * to keep the accounting correct. */ free_pi_state(pi_state); pi_state = NULL; } |
b41277dc7 futex: Replace fs... |
1185 |
ret = get_futex_key(uaddr1, flags & FLAGS_SHARED, &key1); |
1da177e4c Linux-2.6.12-rc2 |
1186 1187 |
if (unlikely(ret != 0)) goto out; |
b41277dc7 futex: Replace fs... |
1188 |
ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2); |
1da177e4c Linux-2.6.12-rc2 |
1189 |
if (unlikely(ret != 0)) |
42d35d48c futex: make futex... |
1190 |
goto out_put_key1; |
1da177e4c Linux-2.6.12-rc2 |
1191 |
|
e2970f2fb [PATCH] pi-futex:... |
1192 1193 |
hb1 = hash_futex(&key1); hb2 = hash_futex(&key2); |
1da177e4c Linux-2.6.12-rc2 |
1194 |
|
e4dc5b7a3 futex: clean up f... |
1195 |
retry_private: |
8b8f319fc [PATCH] lockdep: ... |
1196 |
double_lock_hb(hb1, hb2); |
1da177e4c Linux-2.6.12-rc2 |
1197 |
|
e2970f2fb [PATCH] pi-futex:... |
1198 1199 |
if (likely(cmpval != NULL)) { u32 curval; |
1da177e4c Linux-2.6.12-rc2 |
1200 |
|
e2970f2fb [PATCH] pi-futex:... |
1201 |
ret = get_futex_value_locked(&curval, uaddr1); |
1da177e4c Linux-2.6.12-rc2 |
1202 1203 |
if (unlikely(ret)) { |
5eb3dc62f futex: add double... |
1204 |
double_unlock_hb(hb1, hb2); |
1da177e4c Linux-2.6.12-rc2 |
1205 |
|
e2970f2fb [PATCH] pi-futex:... |
1206 |
ret = get_user(curval, uaddr1); |
e4dc5b7a3 futex: clean up f... |
1207 1208 |
if (ret) goto out_put_keys; |
1da177e4c Linux-2.6.12-rc2 |
1209 |
|
b41277dc7 futex: Replace fs... |
1210 |
if (!(flags & FLAGS_SHARED)) |
e4dc5b7a3 futex: clean up f... |
1211 |
goto retry_private; |
1da177e4c Linux-2.6.12-rc2 |
1212 |
|
ae791a2d2 futex: Cleanup st... |
1213 1214 |
put_futex_key(&key2); put_futex_key(&key1); |
e4dc5b7a3 futex: clean up f... |
1215 |
goto retry; |
1da177e4c Linux-2.6.12-rc2 |
1216 |
} |
e2970f2fb [PATCH] pi-futex:... |
1217 |
if (curval != *cmpval) { |
1da177e4c Linux-2.6.12-rc2 |
1218 1219 1220 1221 |
ret = -EAGAIN; goto out_unlock; } } |
52400ba94 futex: add requeu... |
1222 |
if (requeue_pi && (task_count - nr_wake < nr_requeue)) { |
bab5bc9e8 futex: fixup unlo... |
1223 1224 1225 1226 1227 1228 |
/* * Attempt to acquire uaddr2 and wake the top waiter. If we * intend to requeue waiters, force setting the FUTEX_WAITERS * bit. We force this here where we are able to easily handle * faults rather in the requeue loop below. */ |
52400ba94 futex: add requeu... |
1229 |
ret = futex_proxy_trylock_atomic(uaddr2, hb1, hb2, &key1, |
bab5bc9e8 futex: fixup unlo... |
1230 |
&key2, &pi_state, nr_requeue); |
52400ba94 futex: add requeu... |
1231 1232 1233 1234 1235 1236 1237 1238 1239 |
/* * At this point the top_waiter has either taken uaddr2 or is * waiting on it. If the former, then the pi_state will not * exist yet, look it up one more time to ensure we have a * reference to it. */ if (ret == 1) { WARN_ON(pi_state); |
89061d3d5 futex: Move drop_... |
1240 |
drop_count++; |
52400ba94 futex: add requeu... |
1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 |
task_count++; ret = get_futex_value_locked(&curval2, uaddr2); if (!ret) ret = lookup_pi_state(curval2, hb2, &key2, &pi_state); } switch (ret) { case 0: break; case -EFAULT: double_unlock_hb(hb1, hb2); |
ae791a2d2 futex: Cleanup st... |
1253 1254 |
put_futex_key(&key2); put_futex_key(&key1); |
d0725992c futex: Fix the wr... |
1255 |
ret = fault_in_user_writeable(uaddr2); |
52400ba94 futex: add requeu... |
1256 1257 1258 1259 1260 1261 |
if (!ret) goto retry; goto out; case -EAGAIN: /* The owner was exiting, try again. */ double_unlock_hb(hb1, hb2); |
ae791a2d2 futex: Cleanup st... |
1262 1263 |
put_futex_key(&key2); put_futex_key(&key1); |
52400ba94 futex: add requeu... |
1264 1265 1266 1267 1268 1269 |
cond_resched(); goto retry; default: goto out_unlock; } } |
e2970f2fb [PATCH] pi-futex:... |
1270 |
head1 = &hb1->chain; |
ec92d0829 futex priority ba... |
1271 |
plist_for_each_entry_safe(this, next, head1, list) { |
52400ba94 futex: add requeu... |
1272 1273 1274 1275 |
if (task_count - nr_wake >= nr_requeue) break; if (!match_futex(&this->key, &key1)) |
1da177e4c Linux-2.6.12-rc2 |
1276 |
continue; |
52400ba94 futex: add requeu... |
1277 |
|
392741e0a futex: Fix handli... |
1278 1279 1280 1281 1282 1283 1284 1285 1286 |
/* * FUTEX_WAIT_REQEUE_PI and FUTEX_CMP_REQUEUE_PI should always * be paired with each other and no other futex ops. */ if ((requeue_pi && !this->rt_waiter) || (!requeue_pi && this->rt_waiter)) { ret = -EINVAL; break; } |
52400ba94 futex: add requeu... |
1287 1288 1289 1290 1291 1292 1293 |
/* * Wake nr_wake waiters. For requeue_pi, if we acquired the * lock, we already woke the top_waiter. If not, it will be * woken by futex_unlock_pi(). */ if (++task_count <= nr_wake && !requeue_pi) { |
1da177e4c Linux-2.6.12-rc2 |
1294 |
wake_futex(this); |
52400ba94 futex: add requeu... |
1295 1296 |
continue; } |
1da177e4c Linux-2.6.12-rc2 |
1297 |
|
84bc4af59 futex: Detect mis... |
1298 1299 1300 1301 1302 |
/* Ensure we requeue to the expected futex for requeue_pi. */ if (requeue_pi && !match_futex(this->requeue_pi_key, &key2)) { ret = -EINVAL; break; } |
52400ba94 futex: add requeu... |
1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 |
/* * Requeue nr_requeue waiters and possibly one more in the case * of requeue_pi if we couldn't acquire the lock atomically. */ if (requeue_pi) { /* Prepare the waiter to take the rt_mutex. */ atomic_inc(&pi_state->refcount); this->pi_state = pi_state; ret = rt_mutex_start_proxy_lock(&pi_state->pi_mutex, this->rt_waiter, this->task, 1); if (ret == 1) { /* We got the lock. */ |
beda2c7ea futex: Update fut... |
1316 |
requeue_pi_wake_futex(this, &key2, hb2); |
89061d3d5 futex: Move drop_... |
1317 |
drop_count++; |
52400ba94 futex: add requeu... |
1318 1319 1320 1321 1322 1323 1324 |
continue; } else if (ret) { /* -EDEADLK */ this->pi_state = NULL; free_pi_state(pi_state); goto out_unlock; } |
1da177e4c Linux-2.6.12-rc2 |
1325 |
} |
52400ba94 futex: add requeu... |
1326 1327 |
requeue_futex(this, hb1, hb2, &key2); drop_count++; |
1da177e4c Linux-2.6.12-rc2 |
1328 1329 1330 |
} out_unlock: |
5eb3dc62f futex: add double... |
1331 |
double_unlock_hb(hb1, hb2); |
1da177e4c Linux-2.6.12-rc2 |
1332 |
|
cd84a42f3 futex: comment re... |
1333 1334 1335 1336 1337 1338 |
/* * drop_futex_key_refs() must be called outside the spinlocks. During * the requeue we moved futex_q's from the hash bucket at key1 to the * one at key2 and updated their key pointer. We no longer need to * hold the references to key1. */ |
1da177e4c Linux-2.6.12-rc2 |
1339 |
while (--drop_count >= 0) |
9adef58b1 futex: get_futex_... |
1340 |
drop_futex_key_refs(&key1); |
1da177e4c Linux-2.6.12-rc2 |
1341 |
|
42d35d48c futex: make futex... |
1342 |
out_put_keys: |
ae791a2d2 futex: Cleanup st... |
1343 |
put_futex_key(&key2); |
42d35d48c futex: make futex... |
1344 |
out_put_key1: |
ae791a2d2 futex: Cleanup st... |
1345 |
put_futex_key(&key1); |
42d35d48c futex: make futex... |
1346 |
out: |
52400ba94 futex: add requeu... |
1347 1348 1349 |
if (pi_state != NULL) free_pi_state(pi_state); return ret ? ret : task_count; |
1da177e4c Linux-2.6.12-rc2 |
1350 1351 1352 |
} /* The key must be already stored in q->key. */ |
82af7aca5 Removal of FUTEX_FD |
1353 |
static inline struct futex_hash_bucket *queue_lock(struct futex_q *q) |
15e408cd6 futex: Add lock c... |
1354 |
__acquires(&hb->lock) |
1da177e4c Linux-2.6.12-rc2 |
1355 |
{ |
e2970f2fb [PATCH] pi-futex:... |
1356 |
struct futex_hash_bucket *hb; |
1da177e4c Linux-2.6.12-rc2 |
1357 |
|
e2970f2fb [PATCH] pi-futex:... |
1358 1359 |
hb = hash_futex(&q->key); q->lock_ptr = &hb->lock; |
1da177e4c Linux-2.6.12-rc2 |
1360 |
|
e2970f2fb [PATCH] pi-futex:... |
1361 1362 |
spin_lock(&hb->lock); return hb; |
1da177e4c Linux-2.6.12-rc2 |
1363 |
} |
d40d65c8d futex: Correct qu... |
1364 1365 |
static inline void queue_unlock(struct futex_q *q, struct futex_hash_bucket *hb) |
15e408cd6 futex: Add lock c... |
1366 |
__releases(&hb->lock) |
d40d65c8d futex: Correct qu... |
1367 1368 |
{ spin_unlock(&hb->lock); |
d40d65c8d futex: Correct qu... |
1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 |
} /** * queue_me() - Enqueue the futex_q on the futex_hash_bucket * @q: The futex_q to enqueue * @hb: The destination hash bucket * * The hb->lock must be held by the caller, and is released here. A call to * queue_me() is typically paired with exactly one call to unqueue_me(). The * exceptions involve the PI related operations, which may use unqueue_me_pi() * or nothing if the unqueue is done as part of the wake process and the unqueue * state is implicit in the state of woken task (see futex_wait_requeue_pi() for * an example). */ |
82af7aca5 Removal of FUTEX_FD |
1383 |
static inline void queue_me(struct futex_q *q, struct futex_hash_bucket *hb) |
15e408cd6 futex: Add lock c... |
1384 |
__releases(&hb->lock) |
1da177e4c Linux-2.6.12-rc2 |
1385 |
{ |
ec92d0829 futex priority ba... |
1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 |
int prio; /* * The priority used to register this element is * - either the real thread-priority for the real-time threads * (i.e. threads with a priority lower than MAX_RT_PRIO) * - or MAX_RT_PRIO for non-RT threads. * Thus, all RT-threads are woken first in priority order, and * the others are woken last, in FIFO order. */ prio = min(current->normal_prio, MAX_RT_PRIO); plist_node_init(&q->list, prio); |
ec92d0829 futex priority ba... |
1399 |
plist_add(&q->list, &hb->chain); |
c87e2837b [PATCH] pi-futex:... |
1400 |
q->task = current; |
e2970f2fb [PATCH] pi-futex:... |
1401 |
spin_unlock(&hb->lock); |
1da177e4c Linux-2.6.12-rc2 |
1402 |
} |
d40d65c8d futex: Correct qu... |
1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 |
/** * unqueue_me() - Remove the futex_q from its futex_hash_bucket * @q: The futex_q to unqueue * * The q->lock_ptr must not be held by the caller. A call to unqueue_me() must * be paired with exactly one earlier call to queue_me(). * * Returns: * 1 - if the futex_q was still queued (and we removed unqueued it) * 0 - if the futex_q was already removed by the waking thread |
1da177e4c Linux-2.6.12-rc2 |
1413 |
*/ |
1da177e4c Linux-2.6.12-rc2 |
1414 1415 |
static int unqueue_me(struct futex_q *q) { |
1da177e4c Linux-2.6.12-rc2 |
1416 |
spinlock_t *lock_ptr; |
e2970f2fb [PATCH] pi-futex:... |
1417 |
int ret = 0; |
1da177e4c Linux-2.6.12-rc2 |
1418 1419 |
/* In the common case we don't take the spinlock, which is nice. */ |
42d35d48c futex: make futex... |
1420 |
retry: |
1da177e4c Linux-2.6.12-rc2 |
1421 |
lock_ptr = q->lock_ptr; |
e91467ecd [PATCH] bug in fu... |
1422 |
barrier(); |
c80544dc0 sparse pointer us... |
1423 |
if (lock_ptr != NULL) { |
1da177e4c Linux-2.6.12-rc2 |
1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 |
spin_lock(lock_ptr); /* * q->lock_ptr can change between reading it and * spin_lock(), causing us to take the wrong lock. This * corrects the race condition. * * Reasoning goes like this: if we have the wrong lock, * q->lock_ptr must have changed (maybe several times) * between reading it and the spin_lock(). It can * change again after the spin_lock() but only if it was * already changed before the spin_lock(). It cannot, * however, change back to the original value. Therefore * we can detect whether we acquired the correct lock. */ if (unlikely(lock_ptr != q->lock_ptr)) { spin_unlock(lock_ptr); goto retry; } |
2e12978a9 futex,plist: Pass... |
1442 |
__unqueue_futex(q); |
c87e2837b [PATCH] pi-futex:... |
1443 1444 |
BUG_ON(q->pi_state); |
1da177e4c Linux-2.6.12-rc2 |
1445 1446 1447 |
spin_unlock(lock_ptr); ret = 1; } |
9adef58b1 futex: get_futex_... |
1448 |
drop_futex_key_refs(&q->key); |
1da177e4c Linux-2.6.12-rc2 |
1449 1450 |
return ret; } |
c87e2837b [PATCH] pi-futex:... |
1451 1452 |
/* * PI futexes can not be requeued and must remove themself from the |
d0aa7a70b futex_requeue_pi ... |
1453 1454 |
* hash bucket. The hash bucket lock (i.e. lock_ptr) is held on entry * and dropped here. |
c87e2837b [PATCH] pi-futex:... |
1455 |
*/ |
d0aa7a70b futex_requeue_pi ... |
1456 |
static void unqueue_me_pi(struct futex_q *q) |
15e408cd6 futex: Add lock c... |
1457 |
__releases(q->lock_ptr) |
c87e2837b [PATCH] pi-futex:... |
1458 |
{ |
2e12978a9 futex,plist: Pass... |
1459 |
__unqueue_futex(q); |
c87e2837b [PATCH] pi-futex:... |
1460 1461 1462 1463 |
BUG_ON(!q->pi_state); free_pi_state(q->pi_state); q->pi_state = NULL; |
d0aa7a70b futex_requeue_pi ... |
1464 |
spin_unlock(q->lock_ptr); |
c87e2837b [PATCH] pi-futex:... |
1465 |
} |
d0aa7a70b futex_requeue_pi ... |
1466 |
/* |
cdf71a10c futex: Prevent st... |
1467 |
* Fixup the pi_state owner with the new owner. |
d0aa7a70b futex_requeue_pi ... |
1468 |
* |
778e9a9c3 pi-futex: fix exi... |
1469 1470 |
* Must be called with hash bucket lock held and mm->sem held for non * private futexes. |
d0aa7a70b futex_requeue_pi ... |
1471 |
*/ |
778e9a9c3 pi-futex: fix exi... |
1472 |
static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q, |
ae791a2d2 futex: Cleanup st... |
1473 |
struct task_struct *newowner) |
d0aa7a70b futex_requeue_pi ... |
1474 |
{ |
cdf71a10c futex: Prevent st... |
1475 |
u32 newtid = task_pid_vnr(newowner) | FUTEX_WAITERS; |
d0aa7a70b futex_requeue_pi ... |
1476 |
struct futex_pi_state *pi_state = q->pi_state; |
1b7558e45 futexes: fix faul... |
1477 |
struct task_struct *oldowner = pi_state->owner; |
d0aa7a70b futex_requeue_pi ... |
1478 |
u32 uval, curval, newval; |
e4dc5b7a3 futex: clean up f... |
1479 |
int ret; |
d0aa7a70b futex_requeue_pi ... |
1480 1481 |
/* Owner died? */ |
1b7558e45 futexes: fix faul... |
1482 1483 1484 1485 1486 |
if (!pi_state->owner) newtid |= FUTEX_OWNER_DIED; /* * We are here either because we stole the rtmutex from the |
8161239a8 rtmutex: Simplify... |
1487 1488 1489 1490 |
* previous highest priority waiter or we are the highest priority * waiter but failed to get the rtmutex the first time. * We have to replace the newowner TID in the user space variable. * This must be atomic as we have to preserve the owner died bit here. |
1b7558e45 futexes: fix faul... |
1491 |
* |
b2d0994b1 futex: update fut... |
1492 1493 1494 |
* Note: We write the user space value _before_ changing the pi_state * because we can fault here. Imagine swapped out pages or a fork * that marked all the anonymous memory readonly for cow. |
1b7558e45 futexes: fix faul... |
1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 |
* * Modifying pi_state _before_ the user space value would * leave the pi_state in an inconsistent state when we fault * here, because we need to drop the hash bucket lock to * handle the fault. This might be observed in the PID check * in lookup_pi_state. */ retry: if (get_futex_value_locked(&uval, uaddr)) goto handle_fault; while (1) { newval = (uval & FUTEX_OWNER_DIED) | newtid; |
37a9d912b futex: Sanitize c... |
1508 |
if (cmpxchg_futex_value_locked(&curval, uaddr, uval, newval)) |
1b7558e45 futexes: fix faul... |
1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 |
goto handle_fault; if (curval == uval) break; uval = curval; } /* * We fixed up user space. Now we need to fix the pi_state * itself. */ |
d0aa7a70b futex_requeue_pi ... |
1519 |
if (pi_state->owner != NULL) { |
1d6154825 sched: Convert pi... |
1520 |
raw_spin_lock_irq(&pi_state->owner->pi_lock); |
d0aa7a70b futex_requeue_pi ... |
1521 1522 |
WARN_ON(list_empty(&pi_state->list)); list_del_init(&pi_state->list); |
1d6154825 sched: Convert pi... |
1523 |
raw_spin_unlock_irq(&pi_state->owner->pi_lock); |
1b7558e45 futexes: fix faul... |
1524 |
} |
d0aa7a70b futex_requeue_pi ... |
1525 |
|
cdf71a10c futex: Prevent st... |
1526 |
pi_state->owner = newowner; |
d0aa7a70b futex_requeue_pi ... |
1527 |
|
1d6154825 sched: Convert pi... |
1528 |
raw_spin_lock_irq(&newowner->pi_lock); |
d0aa7a70b futex_requeue_pi ... |
1529 |
WARN_ON(!list_empty(&pi_state->list)); |
cdf71a10c futex: Prevent st... |
1530 |
list_add(&pi_state->list, &newowner->pi_state_list); |
1d6154825 sched: Convert pi... |
1531 |
raw_spin_unlock_irq(&newowner->pi_lock); |
1b7558e45 futexes: fix faul... |
1532 |
return 0; |
d0aa7a70b futex_requeue_pi ... |
1533 |
|
d0aa7a70b futex_requeue_pi ... |
1534 |
/* |
1b7558e45 futexes: fix faul... |
1535 |
* To handle the page fault we need to drop the hash bucket |
8161239a8 rtmutex: Simplify... |
1536 1537 |
* lock here. That gives the other task (either the highest priority * waiter itself or the task which stole the rtmutex) the |
1b7558e45 futexes: fix faul... |
1538 1539 1540 1541 1542 |
* chance to try the fixup of the pi_state. So once we are * back from handling the fault we need to check the pi_state * after reacquiring the hash bucket lock and before trying to * do another fixup. When the fixup has been done already we * simply return. |
d0aa7a70b futex_requeue_pi ... |
1543 |
*/ |
1b7558e45 futexes: fix faul... |
1544 1545 |
handle_fault: spin_unlock(q->lock_ptr); |
778e9a9c3 pi-futex: fix exi... |
1546 |
|
d0725992c futex: Fix the wr... |
1547 |
ret = fault_in_user_writeable(uaddr); |
778e9a9c3 pi-futex: fix exi... |
1548 |
|
1b7558e45 futexes: fix faul... |
1549 |
spin_lock(q->lock_ptr); |
778e9a9c3 pi-futex: fix exi... |
1550 |
|
1b7558e45 futexes: fix faul... |
1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 |
/* * Check if someone else fixed it for us: */ if (pi_state->owner != oldowner) return 0; if (ret) return ret; goto retry; |
d0aa7a70b futex_requeue_pi ... |
1561 |
} |
72c1bbf30 futex: restartabl... |
1562 |
static long futex_wait_restart(struct restart_block *restart); |
36cf3b5c3 FUTEX: Tidy up th... |
1563 |
|
ca5f9524d futex: separate f... |
1564 |
/** |
dd9739980 futex: split out ... |
1565 1566 |
* fixup_owner() - Post lock pi_state and corner case management * @uaddr: user address of the futex |
dd9739980 futex: split out ... |
1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 |
* @q: futex_q (contains pi_state and access to the rt_mutex) * @locked: if the attempt to take the rt_mutex succeeded (1) or not (0) * * After attempting to lock an rt_mutex, this function is called to cleanup * the pi_state owner as well as handle race conditions that may allow us to * acquire the lock. Must be called with the hb lock held. * * Returns: * 1 - success, lock taken * 0 - success, lock not taken * <0 - on error (-EFAULT) */ |
ae791a2d2 futex: Cleanup st... |
1579 |
static int fixup_owner(u32 __user *uaddr, struct futex_q *q, int locked) |
dd9739980 futex: split out ... |
1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 |
{ struct task_struct *owner; int ret = 0; if (locked) { /* * Got the lock. We might not be the anticipated owner if we * did a lock-steal - fix up the PI-state in that case: */ if (q->pi_state->owner != current) |
ae791a2d2 futex: Cleanup st... |
1590 |
ret = fixup_pi_state_owner(uaddr, q, current); |
dd9739980 futex: split out ... |
1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 |
goto out; } /* * Catch the rare case, where the lock was released when we were on the * way back before we locked the hash bucket. */ if (q->pi_state->owner == current) { /* * Try to get the rt_mutex now. This might fail as some other * task acquired the rt_mutex after we removed ourself from the * rt_mutex waiters list. */ if (rt_mutex_trylock(&q->pi_state->pi_mutex)) { locked = 1; goto out; } /* * pi_state is incorrect, some other task did a lock steal and * we returned due to timeout or signal without taking the |
8161239a8 rtmutex: Simplify... |
1612 |
* rt_mutex. Too late. |
dd9739980 futex: split out ... |
1613 |
*/ |
8161239a8 rtmutex: Simplify... |
1614 |
raw_spin_lock(&q->pi_state->pi_mutex.wait_lock); |
dd9739980 futex: split out ... |
1615 |
owner = rt_mutex_owner(&q->pi_state->pi_mutex); |
8161239a8 rtmutex: Simplify... |
1616 1617 1618 |
if (!owner) owner = rt_mutex_next_owner(&q->pi_state->pi_mutex); raw_spin_unlock(&q->pi_state->pi_mutex.wait_lock); |
ae791a2d2 futex: Cleanup st... |
1619 |
ret = fixup_pi_state_owner(uaddr, q, owner); |
dd9739980 futex: split out ... |
1620 1621 1622 1623 1624 |
goto out; } /* * Paranoia check. If we did not take the lock, then we should not be |
8161239a8 rtmutex: Simplify... |
1625 |
* the owner of the rt_mutex. |
dd9739980 futex: split out ... |
1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 |
*/ if (rt_mutex_owner(&q->pi_state->pi_mutex) == current) printk(KERN_ERR "fixup_owner: ret = %d pi-mutex: %p " "pi-state %p ", ret, q->pi_state->pi_mutex.owner, q->pi_state->owner); out: return ret ? ret : locked; } /** |
ca5f9524d futex: separate f... |
1639 1640 1641 1642 |
* futex_wait_queue_me() - queue_me() and wait for wakeup, timeout, or signal * @hb: the futex hash bucket, must be locked by the caller * @q: the futex_q to queue up on * @timeout: the prepared hrtimer_sleeper, or null for no timeout |
ca5f9524d futex: separate f... |
1643 1644 |
*/ static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q, |
f1a11e057 futex: remove the... |
1645 |
struct hrtimer_sleeper *timeout) |
ca5f9524d futex: separate f... |
1646 |
{ |
9beba3c54 futex: Add memory... |
1647 1648 1649 1650 1651 1652 |
/* * The task state is guaranteed to be set before another task can * wake it. set_current_state() is implemented using set_mb() and * queue_me() calls spin_unlock() upon completion, both serializing * access to the hash list and forcing another memory barrier. */ |
f1a11e057 futex: remove the... |
1653 |
set_current_state(TASK_INTERRUPTIBLE); |
0729e1961 futex: Fix wakeup... |
1654 |
queue_me(q, hb); |
ca5f9524d futex: separate f... |
1655 1656 1657 1658 1659 1660 1661 1662 1663 |
/* Arm the timer */ if (timeout) { hrtimer_start_expires(&timeout->timer, HRTIMER_MODE_ABS); if (!hrtimer_active(&timeout->timer)) timeout->task = NULL; } /* |
0729e1961 futex: Fix wakeup... |
1664 1665 |
* If we have been removed from the hash list, then another task * has tried to wake us, and we can skip the call to schedule(). |
ca5f9524d futex: separate f... |
1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 |
*/ if (likely(!plist_node_empty(&q->list))) { /* * If the timer has already expired, current will already be * flagged for rescheduling. Only call schedule if there * is no timeout, or if it has yet to expire. */ if (!timeout || timeout->task) schedule(); } __set_current_state(TASK_RUNNING); } |
f801073f8 futex: split out ... |
1678 1679 1680 1681 |
/** * futex_wait_setup() - Prepare to wait on a futex * @uaddr: the futex userspace address * @val: the expected value |
b41277dc7 futex: Replace fs... |
1682 |
* @flags: futex flags (FLAGS_SHARED, etc.) |
f801073f8 futex: split out ... |
1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 |
* @q: the associated futex_q * @hb: storage for hash_bucket pointer to be returned to caller * * Setup the futex_q and locate the hash_bucket. Get the futex value and * compare it with the expected value. Handle atomic faults internally. * Return with the hb lock held and a q.key reference on success, and unlocked * with no q.key reference on failure. * * Returns: * 0 - uaddr contains val and hb has been locked * <1 - -EFAULT or -EWOULDBLOCK (uaddr does not contain val) and hb is unlcoked */ |
b41277dc7 futex: Replace fs... |
1695 |
static int futex_wait_setup(u32 __user *uaddr, u32 val, unsigned int flags, |
f801073f8 futex: split out ... |
1696 |
struct futex_q *q, struct futex_hash_bucket **hb) |
1da177e4c Linux-2.6.12-rc2 |
1697 |
{ |
e2970f2fb [PATCH] pi-futex:... |
1698 1699 |
u32 uval; int ret; |
1da177e4c Linux-2.6.12-rc2 |
1700 |
|
1da177e4c Linux-2.6.12-rc2 |
1701 |
/* |
b2d0994b1 futex: update fut... |
1702 |
* Access the page AFTER the hash-bucket is locked. |
1da177e4c Linux-2.6.12-rc2 |
1703 1704 1705 1706 1707 1708 1709 |
* Order is important: * * Userspace waiter: val = var; if (cond(val)) futex_wait(&var, val); * Userspace waker: if (cond(var)) { var = new; futex_wake(&var); } * * The basic logical guarantee of a futex is that it blocks ONLY * if cond(var) is known to be true at the time of blocking, for |
8fe8f545c futex: Update fut... |
1710 1711 |
* any cond. If we locked the hash-bucket after testing *uaddr, that * would open a race condition where we could block indefinitely with |
1da177e4c Linux-2.6.12-rc2 |
1712 1713 |
* cond(var) false, which would violate the guarantee. * |
8fe8f545c futex: Update fut... |
1714 1715 1716 1717 |
* On the other hand, we insert q and release the hash-bucket only * after testing *uaddr. This guarantees that futex_wait() will NOT * absorb a wakeup if *uaddr does not match the desired values * while the syscall executes. |
1da177e4c Linux-2.6.12-rc2 |
1718 |
*/ |
f801073f8 futex: split out ... |
1719 |
retry: |
b41277dc7 futex: Replace fs... |
1720 |
ret = get_futex_key(uaddr, flags & FLAGS_SHARED, &q->key); |
f801073f8 futex: split out ... |
1721 |
if (unlikely(ret != 0)) |
a5a2a0c7f futex: fix futex_... |
1722 |
return ret; |
f801073f8 futex: split out ... |
1723 1724 1725 |
retry_private: *hb = queue_lock(q); |
e2970f2fb [PATCH] pi-futex:... |
1726 |
ret = get_futex_value_locked(&uval, uaddr); |
1da177e4c Linux-2.6.12-rc2 |
1727 |
|
f801073f8 futex: split out ... |
1728 1729 |
if (ret) { queue_unlock(q, *hb); |
1da177e4c Linux-2.6.12-rc2 |
1730 |
|
e2970f2fb [PATCH] pi-futex:... |
1731 |
ret = get_user(uval, uaddr); |
e4dc5b7a3 futex: clean up f... |
1732 |
if (ret) |
f801073f8 futex: split out ... |
1733 |
goto out; |
1da177e4c Linux-2.6.12-rc2 |
1734 |
|
b41277dc7 futex: Replace fs... |
1735 |
if (!(flags & FLAGS_SHARED)) |
e4dc5b7a3 futex: clean up f... |
1736 |
goto retry_private; |
ae791a2d2 futex: Cleanup st... |
1737 |
put_futex_key(&q->key); |
e4dc5b7a3 futex: clean up f... |
1738 |
goto retry; |
1da177e4c Linux-2.6.12-rc2 |
1739 |
} |
ca5f9524d futex: separate f... |
1740 |
|
f801073f8 futex: split out ... |
1741 1742 1743 |
if (uval != val) { queue_unlock(q, *hb); ret = -EWOULDBLOCK; |
2fff78c78 futex: fix refere... |
1744 |
} |
1da177e4c Linux-2.6.12-rc2 |
1745 |
|
f801073f8 futex: split out ... |
1746 1747 |
out: if (ret) |
ae791a2d2 futex: Cleanup st... |
1748 |
put_futex_key(&q->key); |
f801073f8 futex: split out ... |
1749 1750 |
return ret; } |
b41277dc7 futex: Replace fs... |
1751 1752 |
static int futex_wait(u32 __user *uaddr, unsigned int flags, u32 val, ktime_t *abs_time, u32 bitset) |
f801073f8 futex: split out ... |
1753 1754 |
{ struct hrtimer_sleeper timeout, *to = NULL; |
f801073f8 futex: split out ... |
1755 1756 |
struct restart_block *restart; struct futex_hash_bucket *hb; |
5bdb05f91 futex: Add futex_... |
1757 |
struct futex_q q = futex_q_init; |
f801073f8 futex: split out ... |
1758 1759 1760 1761 |
int ret; if (!bitset) return -EINVAL; |
f801073f8 futex: split out ... |
1762 1763 1764 1765 |
q.bitset = bitset; if (abs_time) { to = &timeout; |
b41277dc7 futex: Replace fs... |
1766 1767 1768 |
hrtimer_init_on_stack(&to->timer, (flags & FLAGS_CLOCKRT) ? CLOCK_REALTIME : CLOCK_MONOTONIC, HRTIMER_MODE_ABS); |
f801073f8 futex: split out ... |
1769 1770 1771 1772 |
hrtimer_init_sleeper(to, current); hrtimer_set_expires_range_ns(&to->timer, *abs_time, current->timer_slack_ns); } |
d58e6576b futex: Handle spu... |
1773 |
retry: |
7ada876a8 futex: Fix errors... |
1774 1775 1776 1777 |
/* * Prepare to wait on uaddr. On success, holds hb lock and increments * q.key refs. */ |
b41277dc7 futex: Replace fs... |
1778 |
ret = futex_wait_setup(uaddr, val, flags, &q, &hb); |
f801073f8 futex: split out ... |
1779 1780 |
if (ret) goto out; |
ca5f9524d futex: separate f... |
1781 |
/* queue_me and wait for wakeup, timeout, or a signal. */ |
f1a11e057 futex: remove the... |
1782 |
futex_wait_queue_me(hb, &q, to); |
1da177e4c Linux-2.6.12-rc2 |
1783 1784 |
/* If we were woken (and unqueued), we succeeded, whatever. */ |
2fff78c78 futex: fix refere... |
1785 |
ret = 0; |
7ada876a8 futex: Fix errors... |
1786 |
/* unqueue_me() drops q.key ref */ |
1da177e4c Linux-2.6.12-rc2 |
1787 |
if (!unqueue_me(&q)) |
7ada876a8 futex: Fix errors... |
1788 |
goto out; |
2fff78c78 futex: fix refere... |
1789 |
ret = -ETIMEDOUT; |
ca5f9524d futex: separate f... |
1790 |
if (to && !to->task) |
7ada876a8 futex: Fix errors... |
1791 |
goto out; |
72c1bbf30 futex: restartabl... |
1792 |
|
e2970f2fb [PATCH] pi-futex:... |
1793 |
/* |
d58e6576b futex: Handle spu... |
1794 1795 |
* We expect signal_pending(current), but we might be the * victim of a spurious wakeup as well. |
e2970f2fb [PATCH] pi-futex:... |
1796 |
*/ |
7ada876a8 futex: Fix errors... |
1797 |
if (!signal_pending(current)) |
d58e6576b futex: Handle spu... |
1798 |
goto retry; |
d58e6576b futex: Handle spu... |
1799 |
|
2fff78c78 futex: fix refere... |
1800 |
ret = -ERESTARTSYS; |
c19384b5b Make futex_wait()... |
1801 |
if (!abs_time) |
7ada876a8 futex: Fix errors... |
1802 |
goto out; |
1da177e4c Linux-2.6.12-rc2 |
1803 |
|
2fff78c78 futex: fix refere... |
1804 1805 |
restart = ¤t_thread_info()->restart_block; restart->fn = futex_wait_restart; |
a3c74c525 futex: Mark resta... |
1806 |
restart->futex.uaddr = uaddr; |
2fff78c78 futex: fix refere... |
1807 1808 1809 |
restart->futex.val = val; restart->futex.time = abs_time->tv64; restart->futex.bitset = bitset; |
0cd9c6494 futex: Set FLAGS_... |
1810 |
restart->futex.flags = flags | FLAGS_HAS_TIMEOUT; |
42d35d48c futex: make futex... |
1811 |
|
2fff78c78 futex: fix refere... |
1812 |
ret = -ERESTART_RESTARTBLOCK; |
42d35d48c futex: make futex... |
1813 |
out: |
ca5f9524d futex: separate f... |
1814 1815 1816 1817 |
if (to) { hrtimer_cancel(&to->timer); destroy_hrtimer_on_stack(&to->timer); } |
c87e2837b [PATCH] pi-futex:... |
1818 1819 |
return ret; } |
72c1bbf30 futex: restartabl... |
1820 1821 1822 |
static long futex_wait_restart(struct restart_block *restart) { |
a3c74c525 futex: Mark resta... |
1823 |
u32 __user *uaddr = restart->futex.uaddr; |
a72188d8a futex: add FUTEX_... |
1824 |
ktime_t t, *tp = NULL; |
72c1bbf30 futex: restartabl... |
1825 |
|
a72188d8a futex: add FUTEX_... |
1826 1827 1828 1829 |
if (restart->futex.flags & FLAGS_HAS_TIMEOUT) { t.tv64 = restart->futex.time; tp = &t; } |
72c1bbf30 futex: restartabl... |
1830 |
restart->fn = do_no_restart_syscall; |
b41277dc7 futex: Replace fs... |
1831 1832 1833 |
return (long)futex_wait(uaddr, restart->futex.flags, restart->futex.val, tp, restart->futex.bitset); |
72c1bbf30 futex: restartabl... |
1834 |
} |
c87e2837b [PATCH] pi-futex:... |
1835 1836 1837 1838 1839 1840 |
/* * Userspace tried a 0 -> TID atomic transition of the futex value * and failed. The kernel side here does the whole locking operation: * if there are waiters then it will block, it does PI, etc. (Due to * races the kernel might see a 0 value of the futex too.) */ |
b41277dc7 futex: Replace fs... |
1841 1842 |
static int futex_lock_pi(u32 __user *uaddr, unsigned int flags, int detect, ktime_t *time, int trylock) |
c87e2837b [PATCH] pi-futex:... |
1843 |
{ |
c5780e976 [PATCH] Use the c... |
1844 |
struct hrtimer_sleeper timeout, *to = NULL; |
c87e2837b [PATCH] pi-futex:... |
1845 |
struct futex_hash_bucket *hb; |
5bdb05f91 futex: Add futex_... |
1846 |
struct futex_q q = futex_q_init; |
dd9739980 futex: split out ... |
1847 |
int res, ret; |
c87e2837b [PATCH] pi-futex:... |
1848 1849 1850 |
if (refill_pi_state_cache()) return -ENOMEM; |
c19384b5b Make futex_wait()... |
1851 |
if (time) { |
c5780e976 [PATCH] Use the c... |
1852 |
to = &timeout; |
237fc6e7a add hrtimer speci... |
1853 1854 |
hrtimer_init_on_stack(&to->timer, CLOCK_REALTIME, HRTIMER_MODE_ABS); |
c5780e976 [PATCH] Use the c... |
1855 |
hrtimer_init_sleeper(to, current); |
cc584b213 hrtimer: convert ... |
1856 |
hrtimer_set_expires(&to->timer, *time); |
c5780e976 [PATCH] Use the c... |
1857 |
} |
42d35d48c futex: make futex... |
1858 |
retry: |
b41277dc7 futex: Replace fs... |
1859 |
ret = get_futex_key(uaddr, flags & FLAGS_SHARED, &q.key); |
c87e2837b [PATCH] pi-futex:... |
1860 |
if (unlikely(ret != 0)) |
42d35d48c futex: make futex... |
1861 |
goto out; |
c87e2837b [PATCH] pi-futex:... |
1862 |
|
e4dc5b7a3 futex: clean up f... |
1863 |
retry_private: |
82af7aca5 Removal of FUTEX_FD |
1864 |
hb = queue_lock(&q); |
c87e2837b [PATCH] pi-futex:... |
1865 |
|
bab5bc9e8 futex: fixup unlo... |
1866 |
ret = futex_lock_pi_atomic(uaddr, hb, &q.key, &q.pi_state, current, 0); |
c87e2837b [PATCH] pi-futex:... |
1867 |
if (unlikely(ret)) { |
778e9a9c3 pi-futex: fix exi... |
1868 |
switch (ret) { |
1a52084d0 futex: split out ... |
1869 1870 1871 1872 1873 1874 |
case 1: /* We got the lock. */ ret = 0; goto out_unlock_put_key; case -EFAULT: goto uaddr_faulted; |
778e9a9c3 pi-futex: fix exi... |
1875 1876 1877 1878 1879 1880 |
case -EAGAIN: /* * Task is exiting and we just wait for the * exit to complete. */ queue_unlock(&q, hb); |
ae791a2d2 futex: Cleanup st... |
1881 |
put_futex_key(&q.key); |
778e9a9c3 pi-futex: fix exi... |
1882 1883 |
cond_resched(); goto retry; |
778e9a9c3 pi-futex: fix exi... |
1884 |
default: |
42d35d48c futex: make futex... |
1885 |
goto out_unlock_put_key; |
c87e2837b [PATCH] pi-futex:... |
1886 |
} |
c87e2837b [PATCH] pi-futex:... |
1887 1888 1889 1890 1891 |
} /* * Only actually queue now that the atomic ops are done: */ |
82af7aca5 Removal of FUTEX_FD |
1892 |
queue_me(&q, hb); |
c87e2837b [PATCH] pi-futex:... |
1893 |
|
c87e2837b [PATCH] pi-futex:... |
1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 |
WARN_ON(!q.pi_state); /* * Block on the PI mutex: */ if (!trylock) ret = rt_mutex_timed_lock(&q.pi_state->pi_mutex, to, 1); else { ret = rt_mutex_trylock(&q.pi_state->pi_mutex); /* Fixup the trylock return value: */ ret = ret ? 0 : -EWOULDBLOCK; } |
a99e4e413 [PATCH] pi-futex:... |
1905 |
spin_lock(q.lock_ptr); |
dd9739980 futex: split out ... |
1906 1907 1908 1909 |
/* * Fixup the pi_state owner and possibly acquire the lock if we * haven't already. */ |
ae791a2d2 futex: Cleanup st... |
1910 |
res = fixup_owner(uaddr, &q, !ret); |
dd9739980 futex: split out ... |
1911 1912 1913 1914 1915 1916 |
/* * If fixup_owner() returned an error, proprogate that. If it acquired * the lock, clear our -ETIMEDOUT or -EINTR. */ if (res) ret = (res < 0) ? res : 0; |
c87e2837b [PATCH] pi-futex:... |
1917 |
|
e8f6386c0 futex: unlock bef... |
1918 |
/* |
dd9739980 futex: split out ... |
1919 1920 |
* If fixup_owner() faulted and was unable to handle the fault, unlock * it and return the fault to userspace. |
e8f6386c0 futex: unlock bef... |
1921 1922 1923 |
*/ if (ret && (rt_mutex_owner(&q.pi_state->pi_mutex) == current)) rt_mutex_unlock(&q.pi_state->pi_mutex); |
778e9a9c3 pi-futex: fix exi... |
1924 1925 |
/* Unqueue and drop the lock */ unqueue_me_pi(&q); |
c87e2837b [PATCH] pi-futex:... |
1926 |
|
5ecb01cfd futex_lock_pi() k... |
1927 |
goto out_put_key; |
c87e2837b [PATCH] pi-futex:... |
1928 |
|
42d35d48c futex: make futex... |
1929 |
out_unlock_put_key: |
c87e2837b [PATCH] pi-futex:... |
1930 |
queue_unlock(&q, hb); |
42d35d48c futex: make futex... |
1931 |
out_put_key: |
ae791a2d2 futex: Cleanup st... |
1932 |
put_futex_key(&q.key); |
42d35d48c futex: make futex... |
1933 |
out: |
237fc6e7a add hrtimer speci... |
1934 1935 |
if (to) destroy_hrtimer_on_stack(&to->timer); |
dd9739980 futex: split out ... |
1936 |
return ret != -EINTR ? ret : -ERESTARTNOINTR; |
c87e2837b [PATCH] pi-futex:... |
1937 |
|
42d35d48c futex: make futex... |
1938 |
uaddr_faulted: |
778e9a9c3 pi-futex: fix exi... |
1939 |
queue_unlock(&q, hb); |
d0725992c futex: Fix the wr... |
1940 |
ret = fault_in_user_writeable(uaddr); |
e4dc5b7a3 futex: clean up f... |
1941 1942 |
if (ret) goto out_put_key; |
c87e2837b [PATCH] pi-futex:... |
1943 |
|
b41277dc7 futex: Replace fs... |
1944 |
if (!(flags & FLAGS_SHARED)) |
e4dc5b7a3 futex: clean up f... |
1945 |
goto retry_private; |
ae791a2d2 futex: Cleanup st... |
1946 |
put_futex_key(&q.key); |
e4dc5b7a3 futex: clean up f... |
1947 |
goto retry; |
c87e2837b [PATCH] pi-futex:... |
1948 1949 1950 |
} /* |
c87e2837b [PATCH] pi-futex:... |
1951 1952 1953 1954 |
* Userspace attempted a TID -> 0 atomic transition, and failed. * This is the in-kernel slowpath: we look up the PI state (if any), * and do the rt-mutex unlock. */ |
b41277dc7 futex: Replace fs... |
1955 |
static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags) |
c87e2837b [PATCH] pi-futex:... |
1956 1957 1958 |
{ struct futex_hash_bucket *hb; struct futex_q *this, *next; |
ec92d0829 futex priority ba... |
1959 |
struct plist_head *head; |
38d47c1b7 futex: rely on ge... |
1960 |
union futex_key key = FUTEX_KEY_INIT; |
c0c9ed150 futex: Avoid redu... |
1961 |
u32 uval, vpid = task_pid_vnr(current); |
e4dc5b7a3 futex: clean up f... |
1962 |
int ret; |
c87e2837b [PATCH] pi-futex:... |
1963 1964 1965 1966 1967 1968 1969 |
retry: if (get_user(uval, uaddr)) return -EFAULT; /* * We release only a lock we actually own: */ |
c0c9ed150 futex: Avoid redu... |
1970 |
if ((uval & FUTEX_TID_MASK) != vpid) |
c87e2837b [PATCH] pi-futex:... |
1971 |
return -EPERM; |
c87e2837b [PATCH] pi-futex:... |
1972 |
|
b41277dc7 futex: Replace fs... |
1973 |
ret = get_futex_key(uaddr, flags & FLAGS_SHARED, &key); |
c87e2837b [PATCH] pi-futex:... |
1974 1975 1976 1977 1978 |
if (unlikely(ret != 0)) goto out; hb = hash_futex(&key); spin_lock(&hb->lock); |
c87e2837b [PATCH] pi-futex:... |
1979 1980 1981 1982 1983 |
/* * To avoid races, try to do the TID -> 0 atomic transition * again. If it succeeds then we can return without waking * anyone else up: */ |
37a9d912b futex: Sanitize c... |
1984 1985 |
if (!(uval & FUTEX_OWNER_DIED) && cmpxchg_futex_value_locked(&uval, uaddr, vpid, 0)) |
c87e2837b [PATCH] pi-futex:... |
1986 1987 1988 1989 1990 |
goto pi_faulted; /* * Rare case: we managed to release the lock atomically, * no need to wake anyone else up: */ |
c0c9ed150 futex: Avoid redu... |
1991 |
if (unlikely(uval == vpid)) |
c87e2837b [PATCH] pi-futex:... |
1992 1993 1994 1995 1996 1997 1998 |
goto out_unlock; /* * Ok, other tasks may need to be woken up - check waiters * and do the wakeup if necessary: */ head = &hb->chain; |
ec92d0829 futex priority ba... |
1999 |
plist_for_each_entry_safe(this, next, head, list) { |
c87e2837b [PATCH] pi-futex:... |
2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 |
if (!match_futex (&this->key, &key)) continue; ret = wake_futex_pi(uaddr, uval, this); /* * The atomic access to the futex value * generated a pagefault, so retry the * user-access and the wakeup: */ if (ret == -EFAULT) goto pi_faulted; goto out_unlock; } /* * No waiters - kernel unlocks the futex: */ |
e3f2ddeac [PATCH] pi-futex:... |
2015 2016 2017 2018 2019 |
if (!(uval & FUTEX_OWNER_DIED)) { ret = unlock_futex_pi(uaddr, uval); if (ret == -EFAULT) goto pi_faulted; } |
c87e2837b [PATCH] pi-futex:... |
2020 2021 2022 |
out_unlock: spin_unlock(&hb->lock); |
ae791a2d2 futex: Cleanup st... |
2023 |
put_futex_key(&key); |
c87e2837b [PATCH] pi-futex:... |
2024 |
|
42d35d48c futex: make futex... |
2025 |
out: |
c87e2837b [PATCH] pi-futex:... |
2026 2027 2028 |
return ret; pi_faulted: |
778e9a9c3 pi-futex: fix exi... |
2029 |
spin_unlock(&hb->lock); |
ae791a2d2 futex: Cleanup st... |
2030 |
put_futex_key(&key); |
c87e2837b [PATCH] pi-futex:... |
2031 |
|
d0725992c futex: Fix the wr... |
2032 |
ret = fault_in_user_writeable(uaddr); |
b56863630 futex: clean up f... |
2033 |
if (!ret) |
c87e2837b [PATCH] pi-futex:... |
2034 |
goto retry; |
1da177e4c Linux-2.6.12-rc2 |
2035 2036 |
return ret; } |
52400ba94 futex: add requeu... |
2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 |
/** * handle_early_requeue_pi_wakeup() - Detect early wakeup on the initial futex * @hb: the hash_bucket futex_q was original enqueued on * @q: the futex_q woken while waiting to be requeued * @key2: the futex_key of the requeue target futex * @timeout: the timeout associated with the wait (NULL if none) * * Detect if the task was woken on the initial futex as opposed to the requeue * target futex. If so, determine if it was a timeout or a signal that caused * the wakeup and return the appropriate error code to the caller. Must be * called with the hb lock held. * * Returns * 0 - no early wakeup detected |
1c840c149 futex: fix restar... |
2051 |
* <0 - -ETIMEDOUT or -ERESTARTNOINTR |
52400ba94 futex: add requeu... |
2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 |
*/ static inline int handle_early_requeue_pi_wakeup(struct futex_hash_bucket *hb, struct futex_q *q, union futex_key *key2, struct hrtimer_sleeper *timeout) { int ret = 0; /* * With the hb lock held, we avoid races while we process the wakeup. * We only need to hold hb (and not hb2) to ensure atomicity as the * wakeup code can't change q.key from uaddr to uaddr2 if we hold hb. * It can't be requeued from uaddr2 to something else since we don't * support a PI aware source futex for requeue. */ if (!match_futex(&q->key, key2)) { WARN_ON(q->lock_ptr && (&hb->lock != q->lock_ptr)); /* * We were woken prior to requeue by a timeout or a signal. * Unqueue the futex_q and determine which it was. */ |
2e12978a9 futex,plist: Pass... |
2073 |
plist_del(&q->list, &hb->chain); |
52400ba94 futex: add requeu... |
2074 |
|
d58e6576b futex: Handle spu... |
2075 |
/* Handle spurious wakeups gracefully */ |
11df6dddc futex: Fix spurio... |
2076 |
ret = -EWOULDBLOCK; |
52400ba94 futex: add requeu... |
2077 2078 |
if (timeout && !timeout->task) ret = -ETIMEDOUT; |
d58e6576b futex: Handle spu... |
2079 |
else if (signal_pending(current)) |
1c840c149 futex: fix restar... |
2080 |
ret = -ERESTARTNOINTR; |
52400ba94 futex: add requeu... |
2081 2082 2083 2084 2085 2086 |
} return ret; } /** * futex_wait_requeue_pi() - Wait on uaddr and take uaddr2 |
56ec1607b futex: Correct fu... |
2087 |
* @uaddr: the futex we initially wait on (non-pi) |
b41277dc7 futex: Replace fs... |
2088 |
* @flags: futex flags (FLAGS_SHARED, FLAGS_CLOCKRT, etc.), they must be |
52400ba94 futex: add requeu... |
2089 2090 2091 |
* the same type, no requeueing from private to shared, etc. * @val: the expected value of uaddr * @abs_time: absolute timeout |
56ec1607b futex: Correct fu... |
2092 |
* @bitset: 32 bit wakeup bitset set by userspace, defaults to all |
52400ba94 futex: add requeu... |
2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 |
* @clockrt: whether to use CLOCK_REALTIME (1) or CLOCK_MONOTONIC (0) * @uaddr2: the pi futex we will take prior to returning to user-space * * The caller will wait on uaddr and will be requeued by futex_requeue() to * uaddr2 which must be PI aware. Normal wakeup will wake on uaddr2 and * complete the acquisition of the rt_mutex prior to returning to userspace. * This ensures the rt_mutex maintains an owner when it has waiters; without * one, the pi logic wouldn't know which task to boost/deboost, if there was a * need to. * * We call schedule in futex_wait_queue_me() when we enqueue and return there * via the following: * 1) wakeup on uaddr2 after an atomic lock acquisition by futex_requeue() |
cc6db4e60 futex: Correct fu... |
2106 2107 2108 |
* 2) wakeup on uaddr2 after a requeue * 3) signal * 4) timeout |
52400ba94 futex: add requeu... |
2109 |
* |
cc6db4e60 futex: Correct fu... |
2110 |
* If 3, cleanup and return -ERESTARTNOINTR. |
52400ba94 futex: add requeu... |
2111 2112 2113 2114 2115 2116 2117 |
* * If 2, we may then block on trying to take the rt_mutex and return via: * 5) successful lock * 6) signal * 7) timeout * 8) other lock acquisition failure * |
cc6db4e60 futex: Correct fu... |
2118 |
* If 6, return -EWOULDBLOCK (restarting the syscall would do the same). |
52400ba94 futex: add requeu... |
2119 2120 2121 2122 2123 2124 2125 |
* * If 4 or 7, we cleanup and return with -ETIMEDOUT. * * Returns: * 0 - On success * <0 - On error */ |
b41277dc7 futex: Replace fs... |
2126 |
static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, |
52400ba94 futex: add requeu... |
2127 |
u32 val, ktime_t *abs_time, u32 bitset, |
b41277dc7 futex: Replace fs... |
2128 |
u32 __user *uaddr2) |
52400ba94 futex: add requeu... |
2129 2130 2131 2132 |
{ struct hrtimer_sleeper timeout, *to = NULL; struct rt_mutex_waiter rt_waiter; struct rt_mutex *pi_mutex = NULL; |
52400ba94 futex: add requeu... |
2133 |
struct futex_hash_bucket *hb; |
5bdb05f91 futex: Add futex_... |
2134 2135 |
union futex_key key2 = FUTEX_KEY_INIT; struct futex_q q = futex_q_init; |
52400ba94 futex: add requeu... |
2136 |
int res, ret; |
52400ba94 futex: add requeu... |
2137 2138 2139 2140 2141 2142 |
if (!bitset) return -EINVAL; if (abs_time) { to = &timeout; |
b41277dc7 futex: Replace fs... |
2143 2144 2145 |
hrtimer_init_on_stack(&to->timer, (flags & FLAGS_CLOCKRT) ? CLOCK_REALTIME : CLOCK_MONOTONIC, HRTIMER_MODE_ABS); |
52400ba94 futex: add requeu... |
2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 |
hrtimer_init_sleeper(to, current); hrtimer_set_expires_range_ns(&to->timer, *abs_time, current->timer_slack_ns); } /* * The waiter is allocated on our stack, manipulated by the requeue * code while we sleep on uaddr. */ debug_rt_mutex_init_waiter(&rt_waiter); rt_waiter.task = NULL; |
b41277dc7 futex: Replace fs... |
2157 |
ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2); |
52400ba94 futex: add requeu... |
2158 2159 |
if (unlikely(ret != 0)) goto out; |
84bc4af59 futex: Detect mis... |
2160 2161 2162 |
q.bitset = bitset; q.rt_waiter = &rt_waiter; q.requeue_pi_key = &key2; |
7ada876a8 futex: Fix errors... |
2163 2164 2165 2166 |
/* * Prepare to wait on uaddr. On success, increments q.key (key1) ref * count. */ |
b41277dc7 futex: Replace fs... |
2167 |
ret = futex_wait_setup(uaddr, val, flags, &q, &hb); |
c8b15a706 futex: cleanup er... |
2168 2169 |
if (ret) goto out_key2; |
52400ba94 futex: add requeu... |
2170 2171 |
/* Queue the futex_q, drop the hb lock, wait for wakeup. */ |
f1a11e057 futex: remove the... |
2172 |
futex_wait_queue_me(hb, &q, to); |
52400ba94 futex: add requeu... |
2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 |
spin_lock(&hb->lock); ret = handle_early_requeue_pi_wakeup(hb, &q, &key2, to); spin_unlock(&hb->lock); if (ret) goto out_put_keys; /* * In order for us to be here, we know our q.key == key2, and since * we took the hb->lock above, we also know that futex_requeue() has * completed and we no longer have to concern ourselves with a wakeup |
7ada876a8 futex: Fix errors... |
2184 2185 2186 |
* race with the atomic proxy lock acquisition by the requeue code. The * futex_requeue dropped our key1 reference and incremented our key2 * reference count. |
52400ba94 futex: add requeu... |
2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 |
*/ /* Check if the requeue code acquired the second futex for us. */ if (!q.rt_waiter) { /* * Got the lock. We might not be the anticipated owner if we * did a lock-steal - fix up the PI-state in that case. */ if (q.pi_state && (q.pi_state->owner != current)) { spin_lock(q.lock_ptr); |
ae791a2d2 futex: Cleanup st... |
2197 |
ret = fixup_pi_state_owner(uaddr2, &q, current); |
52400ba94 futex: add requeu... |
2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 |
spin_unlock(q.lock_ptr); } } else { /* * We have been woken up by futex_unlock_pi(), a timeout, or a * signal. futex_unlock_pi() will not destroy the lock_ptr nor * the pi_state. */ WARN_ON(!&q.pi_state); pi_mutex = &q.pi_state->pi_mutex; ret = rt_mutex_finish_proxy_lock(pi_mutex, to, &rt_waiter, 1); debug_rt_mutex_free_waiter(&rt_waiter); spin_lock(q.lock_ptr); /* * Fixup the pi_state owner and possibly acquire the lock if we * haven't already. */ |
ae791a2d2 futex: Cleanup st... |
2216 |
res = fixup_owner(uaddr2, &q, !ret); |
52400ba94 futex: add requeu... |
2217 2218 |
/* * If fixup_owner() returned an error, proprogate that. If it |
56ec1607b futex: Correct fu... |
2219 |
* acquired the lock, clear -ETIMEDOUT or -EINTR. |
52400ba94 futex: add requeu... |
2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 |
*/ if (res) ret = (res < 0) ? res : 0; /* Unqueue and drop the lock. */ unqueue_me_pi(&q); } /* * If fixup_pi_state_owner() faulted and was unable to handle the * fault, unlock the rt_mutex and return the fault to userspace. */ if (ret == -EFAULT) { if (rt_mutex_owner(pi_mutex) == current) rt_mutex_unlock(pi_mutex); } else if (ret == -EINTR) { |
52400ba94 futex: add requeu... |
2236 |
/* |
cc6db4e60 futex: Correct fu... |
2237 2238 2239 2240 2241 |
* We've already been requeued, but cannot restart by calling * futex_lock_pi() directly. We could restart this syscall, but * it would detect that the user space "val" changed and return * -EWOULDBLOCK. Save the overhead of the restart and return * -EWOULDBLOCK directly. |
52400ba94 futex: add requeu... |
2242 |
*/ |
2070887fd futex: fix restar... |
2243 |
ret = -EWOULDBLOCK; |
52400ba94 futex: add requeu... |
2244 2245 2246 |
} out_put_keys: |
ae791a2d2 futex: Cleanup st... |
2247 |
put_futex_key(&q.key); |
c8b15a706 futex: cleanup er... |
2248 |
out_key2: |
ae791a2d2 futex: Cleanup st... |
2249 |
put_futex_key(&key2); |
52400ba94 futex: add requeu... |
2250 2251 2252 2253 2254 2255 2256 2257 |
out: if (to) { hrtimer_cancel(&to->timer); destroy_hrtimer_on_stack(&to->timer); } return ret; } |
0771dfefc [PATCH] lightweig... |
2258 2259 2260 2261 2262 2263 2264 |
/* * Support for robust futexes: the kernel cleans up held futexes at * thread exit time. * * Implementation: user-space maintains a per-thread list of locks it * is holding. Upon do_exit(), the kernel carefully walks this list, * and marks all locks that are owned by this thread with the |
c87e2837b [PATCH] pi-futex:... |
2265 |
* FUTEX_OWNER_DIED bit, and wakes up a waiter (if any). The list is |
0771dfefc [PATCH] lightweig... |
2266 2267 2268 2269 2270 2271 2272 2273 |
* always manipulated with the lock held, so the list is private and * per-thread. Userspace also maintains a per-thread 'list_op_pending' * field, to allow the kernel to clean up if the thread dies after * acquiring the lock, but just before it could have added itself to * the list. There can only be one such pending lock. */ /** |
d96ee56ce futex: Make funct... |
2274 2275 2276 |
* sys_set_robust_list() - Set the robust-futex list head of a task * @head: pointer to the list-head * @len: length of the list-head, as userspace expects |
0771dfefc [PATCH] lightweig... |
2277 |
*/ |
836f92adf [CVE-2009-0029] S... |
2278 2279 |
SYSCALL_DEFINE2(set_robust_list, struct robust_list_head __user *, head, size_t, len) |
0771dfefc [PATCH] lightweig... |
2280 |
{ |
a0c1e9073 futex: runtime en... |
2281 2282 |
if (!futex_cmpxchg_enabled) return -ENOSYS; |
0771dfefc [PATCH] lightweig... |
2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 |
/* * The kernel knows only one size for now: */ if (unlikely(len != sizeof(*head))) return -EINVAL; current->robust_list = head; return 0; } /** |
d96ee56ce futex: Make funct... |
2295 2296 2297 2298 |
* sys_get_robust_list() - Get the robust-futex list head of a task * @pid: pid of the process [zero for current task] * @head_ptr: pointer to a list-head pointer, the kernel fills it in * @len_ptr: pointer to a length field, the kernel fills in the header size |
0771dfefc [PATCH] lightweig... |
2299 |
*/ |
836f92adf [CVE-2009-0029] S... |
2300 2301 2302 |
SYSCALL_DEFINE3(get_robust_list, int, pid, struct robust_list_head __user * __user *, head_ptr, size_t __user *, len_ptr) |
0771dfefc [PATCH] lightweig... |
2303 |
{ |
ba46df984 [PATCH] __user an... |
2304 |
struct robust_list_head __user *head; |
0771dfefc [PATCH] lightweig... |
2305 |
unsigned long ret; |
c69e8d9c0 CRED: Use RCU to ... |
2306 |
const struct cred *cred = current_cred(), *pcred; |
0771dfefc [PATCH] lightweig... |
2307 |
|
a0c1e9073 futex: runtime en... |
2308 2309 |
if (!futex_cmpxchg_enabled) return -ENOSYS; |
0771dfefc [PATCH] lightweig... |
2310 2311 2312 2313 2314 2315 |
if (!pid) head = current->robust_list; else { struct task_struct *p; ret = -ESRCH; |
aaa2a97eb [PATCH] sys_get_r... |
2316 |
rcu_read_lock(); |
228ebcbe6 Uninline find_tas... |
2317 |
p = find_task_by_vpid(pid); |
0771dfefc [PATCH] lightweig... |
2318 2319 2320 |
if (!p) goto err_unlock; ret = -EPERM; |
c69e8d9c0 CRED: Use RCU to ... |
2321 |
pcred = __task_cred(p); |
b0e77598f userns: user name... |
2322 2323 2324 2325 2326 2327 2328 2329 |
/* If victim is in different user_ns, then uids are not comparable, so we must have CAP_SYS_PTRACE */ if (cred->user->user_ns != pcred->user->user_ns) { if (!ns_capable(pcred->user->user_ns, CAP_SYS_PTRACE)) goto err_unlock; goto ok; } /* If victim is in same user_ns, then uids are comparable */ |
c69e8d9c0 CRED: Use RCU to ... |
2330 2331 |
if (cred->euid != pcred->euid && cred->euid != pcred->uid && |
b0e77598f userns: user name... |
2332 |
!ns_capable(pcred->user->user_ns, CAP_SYS_PTRACE)) |
0771dfefc [PATCH] lightweig... |
2333 |
goto err_unlock; |
b0e77598f userns: user name... |
2334 |
ok: |
0771dfefc [PATCH] lightweig... |
2335 |
head = p->robust_list; |
aaa2a97eb [PATCH] sys_get_r... |
2336 |
rcu_read_unlock(); |
0771dfefc [PATCH] lightweig... |
2337 2338 2339 2340 2341 2342 2343 |
} if (put_user(sizeof(*head), len_ptr)) return -EFAULT; return put_user(head, head_ptr); err_unlock: |
aaa2a97eb [PATCH] sys_get_r... |
2344 |
rcu_read_unlock(); |
0771dfefc [PATCH] lightweig... |
2345 2346 2347 2348 2349 2350 2351 2352 |
return ret; } /* * Process a futex-list entry, check whether it's owned by the * dying task, and do notification if so: */ |
e3f2ddeac [PATCH] pi-futex:... |
2353 |
int handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int pi) |
0771dfefc [PATCH] lightweig... |
2354 |
{ |
e3f2ddeac [PATCH] pi-futex:... |
2355 |
u32 uval, nval, mval; |
0771dfefc [PATCH] lightweig... |
2356 |
|
8f17d3a50 [PATCH] lightweig... |
2357 2358 |
retry: if (get_user(uval, uaddr)) |
0771dfefc [PATCH] lightweig... |
2359 |
return -1; |
b488893a3 pid namespaces: c... |
2360 |
if ((uval & FUTEX_TID_MASK) == task_pid_vnr(curr)) { |
0771dfefc [PATCH] lightweig... |
2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 |
/* * Ok, this dying thread is truly holding a futex * of interest. Set the OWNER_DIED bit atomically * via cmpxchg, and if the value had FUTEX_WAITERS * set, wake up a waiter (if any). (We have to do a * futex_wake() even if OWNER_DIED is already set - * to handle the rare but possible case of recursive * thread-death.) The rest of the cleanup is done in * userspace. */ |
e3f2ddeac [PATCH] pi-futex:... |
2371 |
mval = (uval & FUTEX_WAITERS) | FUTEX_OWNER_DIED; |
6e0aa9f8a futex: Deobfuscat... |
2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 |
/* * We are not holding a lock here, but we want to have * the pagefault_disable/enable() protection because * we want to handle the fault gracefully. If the * access fails we try to fault in the futex with R/W * verification via get_user_pages. get_user() above * does not guarantee R/W access. If that fails we * give up and leave the futex locked. */ if (cmpxchg_futex_value_locked(&nval, uaddr, uval, mval)) { if (fault_in_user_writeable(uaddr)) return -1; goto retry; } |
c87e2837b [PATCH] pi-futex:... |
2386 |
if (nval != uval) |
8f17d3a50 [PATCH] lightweig... |
2387 |
goto retry; |
0771dfefc [PATCH] lightweig... |
2388 |
|
e3f2ddeac [PATCH] pi-futex:... |
2389 2390 2391 2392 |
/* * Wake robust non-PI futexes here. The wakeup of * PI futexes happens in exit_pi_state(): */ |
36cf3b5c3 FUTEX: Tidy up th... |
2393 |
if (!pi && (uval & FUTEX_WAITERS)) |
c2f9f2015 futex: cleanup fs... |
2394 |
futex_wake(uaddr, 1, 1, FUTEX_BITSET_MATCH_ANY); |
0771dfefc [PATCH] lightweig... |
2395 2396 2397 2398 2399 |
} return 0; } /* |
e3f2ddeac [PATCH] pi-futex:... |
2400 2401 2402 |
* Fetch a robust-list pointer. Bit 0 signals PI futexes: */ static inline int fetch_robust_entry(struct robust_list __user **entry, |
ba46df984 [PATCH] __user an... |
2403 |
struct robust_list __user * __user *head, |
1dcc41bb0 futex: Change 3rd... |
2404 |
unsigned int *pi) |
e3f2ddeac [PATCH] pi-futex:... |
2405 2406 |
{ unsigned long uentry; |
ba46df984 [PATCH] __user an... |
2407 |
if (get_user(uentry, (unsigned long __user *)head)) |
e3f2ddeac [PATCH] pi-futex:... |
2408 |
return -EFAULT; |
ba46df984 [PATCH] __user an... |
2409 |
*entry = (void __user *)(uentry & ~1UL); |
e3f2ddeac [PATCH] pi-futex:... |
2410 2411 2412 2413 2414 2415 |
*pi = uentry & 1; return 0; } /* |
0771dfefc [PATCH] lightweig... |
2416 2417 2418 2419 2420 2421 2422 2423 |
* Walk curr->robust_list (very carefully, it's a userspace list!) * and mark any locks found there dead, and notify any waiters. * * We silently return on any sign of list-walking problem. */ void exit_robust_list(struct task_struct *curr) { struct robust_list_head __user *head = curr->robust_list; |
9f96cb1e8 robust futex thre... |
2424 |
struct robust_list __user *entry, *next_entry, *pending; |
4c115e951 futex: Address co... |
2425 2426 |
unsigned int limit = ROBUST_LIST_LIMIT, pi, pip; unsigned int uninitialized_var(next_pi); |
0771dfefc [PATCH] lightweig... |
2427 |
unsigned long futex_offset; |
9f96cb1e8 robust futex thre... |
2428 |
int rc; |
0771dfefc [PATCH] lightweig... |
2429 |
|
a0c1e9073 futex: runtime en... |
2430 2431 |
if (!futex_cmpxchg_enabled) return; |
0771dfefc [PATCH] lightweig... |
2432 2433 2434 2435 |
/* * Fetch the list head (which was registered earlier, via * sys_set_robust_list()): */ |
e3f2ddeac [PATCH] pi-futex:... |
2436 |
if (fetch_robust_entry(&entry, &head->list.next, &pi)) |
0771dfefc [PATCH] lightweig... |
2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 |
return; /* * Fetch the relative futex offset: */ if (get_user(futex_offset, &head->futex_offset)) return; /* * Fetch any possibly pending lock-add first, and handle it * if it exists: */ |
e3f2ddeac [PATCH] pi-futex:... |
2447 |
if (fetch_robust_entry(&pending, &head->list_op_pending, &pip)) |
0771dfefc [PATCH] lightweig... |
2448 |
return; |
e3f2ddeac [PATCH] pi-futex:... |
2449 |
|
9f96cb1e8 robust futex thre... |
2450 |
next_entry = NULL; /* avoid warning with gcc */ |
0771dfefc [PATCH] lightweig... |
2451 2452 |
while (entry != &head->list) { /* |
9f96cb1e8 robust futex thre... |
2453 2454 2455 2456 2457 |
* Fetch the next entry in the list before calling * handle_futex_death: */ rc = fetch_robust_entry(&next_entry, &entry->next, &next_pi); /* |
0771dfefc [PATCH] lightweig... |
2458 |
* A pending lock might already be on the list, so |
c87e2837b [PATCH] pi-futex:... |
2459 |
* don't process it twice: |
0771dfefc [PATCH] lightweig... |
2460 2461 |
*/ if (entry != pending) |
ba46df984 [PATCH] __user an... |
2462 |
if (handle_futex_death((void __user *)entry + futex_offset, |
e3f2ddeac [PATCH] pi-futex:... |
2463 |
curr, pi)) |
0771dfefc [PATCH] lightweig... |
2464 |
return; |
9f96cb1e8 robust futex thre... |
2465 |
if (rc) |
0771dfefc [PATCH] lightweig... |
2466 |
return; |
9f96cb1e8 robust futex thre... |
2467 2468 |
entry = next_entry; pi = next_pi; |
0771dfefc [PATCH] lightweig... |
2469 2470 2471 2472 2473 2474 2475 2476 |
/* * Avoid excessively long or circular lists: */ if (!--limit) break; cond_resched(); } |
9f96cb1e8 robust futex thre... |
2477 2478 2479 2480 |
if (pending) handle_futex_death((void __user *)pending + futex_offset, curr, pip); |
0771dfefc [PATCH] lightweig... |
2481 |
} |
c19384b5b Make futex_wait()... |
2482 |
long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout, |
e2970f2fb [PATCH] pi-futex:... |
2483 |
u32 __user *uaddr2, u32 val2, u32 val3) |
1da177e4c Linux-2.6.12-rc2 |
2484 |
{ |
b41277dc7 futex: Replace fs... |
2485 2486 |
int ret = -ENOSYS, cmd = op & FUTEX_CMD_MASK; unsigned int flags = 0; |
34f01cc1f FUTEX: new PRIVAT... |
2487 2488 |
if (!(op & FUTEX_PRIVATE_FLAG)) |
b41277dc7 futex: Replace fs... |
2489 |
flags |= FLAGS_SHARED; |
1da177e4c Linux-2.6.12-rc2 |
2490 |
|
b41277dc7 futex: Replace fs... |
2491 2492 2493 2494 2495 |
if (op & FUTEX_CLOCK_REALTIME) { flags |= FLAGS_CLOCKRT; if (cmd != FUTEX_WAIT_BITSET && cmd != FUTEX_WAIT_REQUEUE_PI) return -ENOSYS; } |
1da177e4c Linux-2.6.12-rc2 |
2496 |
|
34f01cc1f FUTEX: new PRIVAT... |
2497 |
switch (cmd) { |
1da177e4c Linux-2.6.12-rc2 |
2498 |
case FUTEX_WAIT: |
cd689985c futex: Add bitset... |
2499 2500 |
val3 = FUTEX_BITSET_MATCH_ANY; case FUTEX_WAIT_BITSET: |
b41277dc7 futex: Replace fs... |
2501 |
ret = futex_wait(uaddr, flags, val, timeout, val3); |
1da177e4c Linux-2.6.12-rc2 |
2502 2503 |
break; case FUTEX_WAKE: |
cd689985c futex: Add bitset... |
2504 2505 |
val3 = FUTEX_BITSET_MATCH_ANY; case FUTEX_WAKE_BITSET: |
b41277dc7 futex: Replace fs... |
2506 |
ret = futex_wake(uaddr, flags, val, val3); |
1da177e4c Linux-2.6.12-rc2 |
2507 |
break; |
1da177e4c Linux-2.6.12-rc2 |
2508 |
case FUTEX_REQUEUE: |
b41277dc7 futex: Replace fs... |
2509 |
ret = futex_requeue(uaddr, flags, uaddr2, val, val2, NULL, 0); |
1da177e4c Linux-2.6.12-rc2 |
2510 2511 |
break; case FUTEX_CMP_REQUEUE: |
b41277dc7 futex: Replace fs... |
2512 |
ret = futex_requeue(uaddr, flags, uaddr2, val, val2, &val3, 0); |
1da177e4c Linux-2.6.12-rc2 |
2513 |
break; |
4732efbeb [PATCH] FUTEX_WAK... |
2514 |
case FUTEX_WAKE_OP: |
b41277dc7 futex: Replace fs... |
2515 |
ret = futex_wake_op(uaddr, flags, uaddr2, val, val2, val3); |
4732efbeb [PATCH] FUTEX_WAK... |
2516 |
break; |
c87e2837b [PATCH] pi-futex:... |
2517 |
case FUTEX_LOCK_PI: |
a0c1e9073 futex: runtime en... |
2518 |
if (futex_cmpxchg_enabled) |
b41277dc7 futex: Replace fs... |
2519 |
ret = futex_lock_pi(uaddr, flags, val, timeout, 0); |
c87e2837b [PATCH] pi-futex:... |
2520 2521 |
break; case FUTEX_UNLOCK_PI: |
a0c1e9073 futex: runtime en... |
2522 |
if (futex_cmpxchg_enabled) |
b41277dc7 futex: Replace fs... |
2523 |
ret = futex_unlock_pi(uaddr, flags); |
c87e2837b [PATCH] pi-futex:... |
2524 2525 |
break; case FUTEX_TRYLOCK_PI: |
a0c1e9073 futex: runtime en... |
2526 |
if (futex_cmpxchg_enabled) |
b41277dc7 futex: Replace fs... |
2527 |
ret = futex_lock_pi(uaddr, flags, 0, timeout, 1); |
c87e2837b [PATCH] pi-futex:... |
2528 |
break; |
52400ba94 futex: add requeu... |
2529 2530 |
case FUTEX_WAIT_REQUEUE_PI: val3 = FUTEX_BITSET_MATCH_ANY; |
b41277dc7 futex: Replace fs... |
2531 2532 |
ret = futex_wait_requeue_pi(uaddr, flags, val, timeout, val3, uaddr2); |
52400ba94 futex: add requeu... |
2533 |
break; |
52400ba94 futex: add requeu... |
2534 |
case FUTEX_CMP_REQUEUE_PI: |
b41277dc7 futex: Replace fs... |
2535 |
ret = futex_requeue(uaddr, flags, uaddr2, val, val2, &val3, 1); |
52400ba94 futex: add requeu... |
2536 |
break; |
1da177e4c Linux-2.6.12-rc2 |
2537 2538 2539 2540 2541 |
default: ret = -ENOSYS; } return ret; } |
17da2bd90 [CVE-2009-0029] S... |
2542 2543 2544 |
SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val, struct timespec __user *, utime, u32 __user *, uaddr2, u32, val3) |
1da177e4c Linux-2.6.12-rc2 |
2545 |
{ |
c19384b5b Make futex_wait()... |
2546 2547 |
struct timespec ts; ktime_t t, *tp = NULL; |
e2970f2fb [PATCH] pi-futex:... |
2548 |
u32 val2 = 0; |
34f01cc1f FUTEX: new PRIVAT... |
2549 |
int cmd = op & FUTEX_CMD_MASK; |
1da177e4c Linux-2.6.12-rc2 |
2550 |
|
cd689985c futex: Add bitset... |
2551 |
if (utime && (cmd == FUTEX_WAIT || cmd == FUTEX_LOCK_PI || |
52400ba94 futex: add requeu... |
2552 2553 |
cmd == FUTEX_WAIT_BITSET || cmd == FUTEX_WAIT_REQUEUE_PI)) { |
c19384b5b Make futex_wait()... |
2554 |
if (copy_from_user(&ts, utime, sizeof(ts)) != 0) |
1da177e4c Linux-2.6.12-rc2 |
2555 |
return -EFAULT; |
c19384b5b Make futex_wait()... |
2556 |
if (!timespec_valid(&ts)) |
9741ef964 [PATCH] futex: ch... |
2557 |
return -EINVAL; |
c19384b5b Make futex_wait()... |
2558 2559 |
t = timespec_to_ktime(ts); |
34f01cc1f FUTEX: new PRIVAT... |
2560 |
if (cmd == FUTEX_WAIT) |
5a7780e72 hrtimer: check re... |
2561 |
t = ktime_add_safe(ktime_get(), t); |
c19384b5b Make futex_wait()... |
2562 |
tp = &t; |
1da177e4c Linux-2.6.12-rc2 |
2563 2564 |
} /* |
52400ba94 futex: add requeu... |
2565 |
* requeue parameter in 'utime' if cmd == FUTEX_*_REQUEUE_*. |
f54f09861 futex: pass nr_wa... |
2566 |
* number of waiters to wake in 'utime' if cmd == FUTEX_WAKE_OP. |
1da177e4c Linux-2.6.12-rc2 |
2567 |
*/ |
f54f09861 futex: pass nr_wa... |
2568 |
if (cmd == FUTEX_REQUEUE || cmd == FUTEX_CMP_REQUEUE || |
ba9c22f2c futex: remove FUT... |
2569 |
cmd == FUTEX_CMP_REQUEUE_PI || cmd == FUTEX_WAKE_OP) |
e2970f2fb [PATCH] pi-futex:... |
2570 |
val2 = (u32) (unsigned long) utime; |
1da177e4c Linux-2.6.12-rc2 |
2571 |
|
c19384b5b Make futex_wait()... |
2572 |
return do_futex(uaddr, op, val, tp, uaddr2, val2, val3); |
1da177e4c Linux-2.6.12-rc2 |
2573 |
} |
f6d107fb1 Give futex init a... |
2574 |
static int __init futex_init(void) |
1da177e4c Linux-2.6.12-rc2 |
2575 |
{ |
a0c1e9073 futex: runtime en... |
2576 |
u32 curval; |
3e4ab747e futex: fix init o... |
2577 |
int i; |
95362fa90 [PATCH] futex: in... |
2578 |
|
a0c1e9073 futex: runtime en... |
2579 2580 2581 2582 2583 2584 2585 |
/* * This will fail and we want it. Some arch implementations do * runtime detection of the futex_atomic_cmpxchg_inatomic() * functionality. We want to know that before we call in any * of the complex code paths. Also we want to prevent * registration of robust lists in that case. NULL is * guaranteed to fault and we get -EFAULT on functional |
fb62db2ba futex: Fix kernel... |
2586 |
* implementation, the non-functional ones will return |
a0c1e9073 futex: runtime en... |
2587 2588 |
* -ENOSYS. */ |
37a9d912b futex: Sanitize c... |
2589 |
if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT) |
a0c1e9073 futex: runtime en... |
2590 |
futex_cmpxchg_enabled = 1; |
3e4ab747e futex: fix init o... |
2591 2592 2593 2594 |
for (i = 0; i < ARRAY_SIZE(futex_queues); i++) { plist_head_init(&futex_queues[i].chain, &futex_queues[i].lock); spin_lock_init(&futex_queues[i].lock); } |
1da177e4c Linux-2.6.12-rc2 |
2595 2596 |
return 0; } |
f6d107fb1 Give futex init a... |
2597 |
__initcall(futex_init); |