[RFC/PATCH] FUSYN 3/10: Support for i386

inaky.perez-gonzalez
2003-12-03T08:52:59Z

arch/i386/kernel/entry.S | 5 +++
include/asm-i386/fulock.h | 69 ++++++++++++++++++++++++++++++++++++++++++++++
include/asm-i386/unistd.h | 7 ++++
3 files changed, 80 insertions(+), 1 deletion(-)

--- linux/arch/i386/kernel/entry.S:1.1.1.6 Sat Nov 15 01:38:16 2003
+++ linux/arch/i386/kernel/entry.S Fri Nov 21 13:25:56 2003
@@ -906,6 +906,11 @@
.long sys_utimes
.long sys_fadvise64_64
.long sys_ni_syscall /* sys_vserver */
+ .long sys_ufulock_lock
+ .long sys_ufulock_unlock /* 275 */
+ .long sys_ufulock_consistency
+ .long sys_ufuqueue_wait
+ .long sys_ufuqueue_wake /* 278 */

nr_syscalls=(.-sys_call_table)/4

--- /dev/null Tue Dec 2 20:07:55 2003
+++ linux/include/asm-i386/fulock.h Tue Nov 18 11:51:06 2003
@@ -0,0 +1,69 @@
+
+/*
+ * Fast User real-time/pi/pp/robust/deadlock SYNchronization
+ * (C) 2002-2003 Intel Corp
+ * Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>.
+ *
+ * Licensed under the FSF's GNU Public License v2 or later.
+ *
+ * Based on normal futexes (futex.c), (C) Rusty Russell.
+ * Please refer to Documentation/fusyn.txt for more info.
+ */
+
+#ifndef __asm_i386_fulock_h__
+#define __asm_i386_fulock_h__
+
+ /* fulock value / state; anything that is not this is a PID that
+ * currently owns the fulock. */
+
+enum vfulock {
+ VFULOCK_UNLOCKED = 0x00000000, /* Unlocked */
+ VFULOCK_KCO = 0xfffffffd, /* KCO: kernel controls ownership */
+ VFULOCK_DEAD = 0xfffffffe, /* KCO: dead, kernel controls ownership */
+ VFULOCK_NR = 0xffffffff /* KCO: fulock is not-recoverable */
+};
+
+
+#ifdef __KERNEL__
+
+/**
+ * [User usable] Atomic compare and swap.
+ *
+ * Used for locking a vfulock.
+ *
+ * @value Pointer to the value to compare and swap.
+ * @old_value Value that *value has to have for the swap to occur.
+ * @new_value New value to set it *value == old_value.
+ * @return !0 if the swap succeeded. 0 if failed.
+ */
+static inline
+unsigned vfulock_acas (volatile unsigned *value,
+ unsigned old_value, unsigned new_value)
+{
+ unsigned result;
+ asm __volatile__ (
+ "lock cmpxchg %3, %1"
+ : "=a" (result), "+m" ((*value))
+ : "a" (old_value), "r" (new_value)
+ : "memory");
+ return result == old_value;
+}
+
+
+/**
+ * Set an ufulock's associated value.
+ *
+ * @vfulock: Pointer to the address of the ufulock to contain for.
+ * @value: New value to assign.
+ *
+ * Wrapper for arch-specific idiosyncrasies when setting a value that
+ * is shared across different address mappings.
+ */
+static inline
+void vfulock_set (volatile unsigned *vfulock, unsigned value)
+{
+ *vfulock = value;
+}
+
+#endif /* #ifdef __KERNEL__ */
+#endif /* #ifndef __asm_i386_fulock_h__ */
--- linux/include/asm-i386/unistd.h:1.1.1.5 Mon Oct 20 13:55:33 2003
+++ linux/include/asm-i386/unistd.h Fri Nov 21 13:26:01 2003
@@ -279,8 +279,13 @@
#define __NR_utimes 271
#define __NR_fadvise64_64 272
#define __NR_vserver 273
+#define __NR_ufulock_lock 274
+#define __NR_ufulock_unlock 275
+#define __NR_ufulock_consistency 276
+#define __NR_ufuqueue_wait 277
+#define __NR_ufuqueue_wake 278

-#define NR_syscalls 274
+#define NR_syscalls 279

/* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */