svn commit: r183871 - in head/sys: amd64/linux32 compat/linux
i386/linux
Konstantin Belousov
kib at FreeBSD.org
Tue Oct 14 07:59:23 UTC 2008
Author: kib
Date: Tue Oct 14 07:59:23 2008
New Revision: 183871
URL: http://svn.freebsd.org/changeset/base/183871
Log:
Make robust futexes work on linux32/amd64. Use PTRIN to read
user-mode pointers. Change types used in the structures definitions to
properly-sized architecture-specific types.
Submitted by: dchagin
MFC after: 1 week
Modified:
head/sys/amd64/linux32/linux.h
head/sys/compat/linux/linux_futex.c
head/sys/compat/linux/linux_futex.h
head/sys/i386/linux/linux.h
Modified: head/sys/amd64/linux32/linux.h
==============================================================================
--- head/sys/amd64/linux32/linux.h Tue Oct 14 07:58:18 2008 (r183870)
+++ head/sys/amd64/linux32/linux.h Tue Oct 14 07:59:23 2008 (r183871)
@@ -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_ */
Modified: head/sys/compat/linux/linux_futex.c
==============================================================================
--- head/sys/compat/linux/linux_futex.c Tue Oct 14 07:58:18 2008 (r183870)
+++ head/sys/compat/linux/linux_futex.c Tue Oct 14 07:59:23 2008 (r183871)
@@ -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,
Modified: head/sys/compat/linux/linux_futex.h
==============================================================================
--- head/sys/compat/linux/linux_futex.h Tue Oct 14 07:58:18 2008 (r183870)
+++ head/sys/compat/linux/linux_futex.h Tue Oct 14 07:59:23 2008 (r183871)
@@ -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
Modified: head/sys/i386/linux/linux.h
==============================================================================
--- head/sys/i386/linux/linux.h Tue Oct 14 07:58:18 2008 (r183870)
+++ head/sys/i386/linux/linux.h Tue Oct 14 07:59:23 2008 (r183871)
@@ -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_ */
More information about the svn-src-all
mailing list