d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make robust futexes work on linux32/amd64. Use PTRIN to read

Browse Source 
user-mode pointers. Change types used in the structures definitions to
properly-sized architecture-specific types.

Submitted by:	dchagin
MFC after:	1 week
This commit is contained in:
Konstantin Belousov 2008-10-14 07:59:23 +00:00
parent 84fc65da9f
commit 175c6c319b
4 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/amd64/linux32/linux.h
View File

@ -880,4 +880,15 @@ typedef int l_mqd_t;
(LINUX_CLONE_VM | LINUX_CLONE_FS | LINUX_CLONE_FILES | \
LINUX_CLONE_SIGHAND | LINUX_CLONE_THREAD)
/* robust futexes */
struct linux_robust_list {
l_uintptr_t next;
};
struct linux_robust_list_head {
struct linux_robust_list list;
l_ulong futex_offset;
l_uintptr_t pending_list;
};
#endif /* !_AMD64_LINUX_H_ */

6
sys/compat/linux/linux_futex.c
View File

@ -661,17 +661,17 @@ release_futexes(struct proc *p)
if (head == NULL)
return;
if (fetch_robust_entry(&entry, &head->list.next, &pi))
if (fetch_robust_entry(&entry, PTRIN(&head->list.next), &pi))
return;
if (copyin(&head->futex_offset, &futex_offset, sizeof(l_ulong)))
return;
if (fetch_robust_entry(&pending, &head->pending_list, &pip))
if (fetch_robust_entry(&pending, PTRIN(&head->pending_list), &pip))
return;
while (entry != &head->list) {
rc = fetch_robust_entry(&next_entry, &entry->next, &next_pi);
rc = fetch_robust_entry(&next_entry, PTRIN(&entry->next), &next_pi);
if (entry != pending)
if (handle_futex_death((char *)entry + futex_offset,

12
sys/compat/linux/linux_futex.h
View File

@ -63,18 +63,6 @@
#define FUTEX_OP_CMP_GT 4 /* if (oldval > CMPARG) wake */
#define FUTEX_OP_CMP_GE 5 /* if (oldval >= CMPARG) wake */
/* This is defined by Linux user-space */
struct linux_robust_list {
struct linux_robust_list *next;
};
struct linux_robust_list_head {
struct linux_robust_list list;
l_ulong futex_offset;
struct linux_robust_list *pending_list;
};
#define FUTEX_WAITERS 0x80000000
#define FUTEX_OWNER_DIED 0x40000000
#define FUTEX_TID_MASK 0x3fffffff

11
sys/i386/linux/linux.h
View File

@ -845,4 +845,15 @@ typedef int l_mqd_t;
(LINUX_CLONE_VM | LINUX_CLONE_FS | LINUX_CLONE_FILES | \
LINUX_CLONE_SIGHAND | LINUX_CLONE_THREAD)
/* robust futexes */
struct linux_robust_list {
struct linux_robust_list *next;
};
struct linux_robust_list_head {
struct linux_robust_list list;
l_ulong futex_offset;
struct linux_robust_list *pending_list;
};
#endif /* !_I386_LINUX_H_ */