All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ley Foon Tan <lftan@altera.com>
To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-doc@vger.kernel.org
Cc: Ley Foon Tan <lftan@altera.com>,
	lftan.linux@gmail.com, cltang@codesourcery.com
Subject: [PATCH v3 01/29] asm-generic: add generic futex for !CONFIG_SMP
Date: Mon, 8 Sep 2014 17:22:12 +0800	[thread overview]
Message-ID: <1410168160-3624-2-git-send-email-lftan@altera.com> (raw)
In-Reply-To: <1410168160-3624-1-git-send-email-lftan@altera.com>

Follow m68k futex implementation for !CONFIG_SMP.

Signed-off-by: Ley Foon Tan <lftan@altera.com>
---
 include/asm-generic/futex.h | 82 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
index 01f227e..f5650a5 100644
--- a/include/asm-generic/futex.h
+++ b/include/asm-generic/futex.h
@@ -5,6 +5,87 @@
 #include <linux/uaccess.h>
 #include <asm/errno.h>
 
+#ifndef CONFIG_SMP
+static inline int
+futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
+{
+	int op = (encoded_op >> 28) & 7;
+	int cmp = (encoded_op >> 24) & 15;
+	int oparg = (encoded_op << 8) >> 20;
+	int cmparg = (encoded_op << 20) >> 20;
+	int oldval, ret;
+	u32 tmp;
+
+	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
+		oparg = 1 << oparg;
+
+	pagefault_disable();	/* implies preempt_disable() */
+
+	ret = -EFAULT;
+	if (unlikely(get_user(oldval, uaddr) != 0))
+		goto out_pagefault_enable;
+
+	ret = 0;
+	tmp = oldval;
+
+	switch (op) {
+	case FUTEX_OP_SET:
+		tmp = oparg;
+		break;
+	case FUTEX_OP_ADD:
+		tmp += oparg;
+		break;
+	case FUTEX_OP_OR:
+		tmp |= oparg;
+		break;
+	case FUTEX_OP_ANDN:
+		tmp &= ~oparg;
+		break;
+	case FUTEX_OP_XOR:
+		tmp ^= oparg;
+		break;
+	default:
+		ret = -ENOSYS;
+	}
+
+	if (ret == 0 && unlikely(put_user(tmp, uaddr) != 0))
+		ret = -EFAULT;
+
+out_pagefault_enable:
+	pagefault_enable();	/* subsumes preempt_enable() */
+
+	if (ret == 0) {
+		switch (cmp) {
+		case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break;
+		case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;
+		case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break;
+		case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break;
+		case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break;
+		case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break;
+		default: ret = -ENOSYS;
+		}
+	}
+	return ret;
+}
+
+static inline int
+futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
+			      u32 oldval, u32 newval)
+{
+	u32 val;
+
+	if (unlikely(get_user(val, uaddr) != 0))
+		return -EFAULT;
+
+	if (val == oldval && unlikely(put_user(newval, uaddr) != 0))
+		return -EFAULT;
+
+	*uval = val;
+
+	return 0;
+}
+
+#else
 static inline int
 futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
 {
@@ -54,4 +135,5 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
 	return -ENOSYS;
 }
 
+#endif /* CONFIG_SMP */
 #endif
-- 
1.8.2.1

WARNING: multiple messages have this Message-ID (diff)
From: Ley Foon Tan <lftan@altera.com>
To: <linux-arch@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linux-doc@vger.kernel.org>
Cc: Ley Foon Tan <lftan@altera.com>, <lftan.linux@gmail.com>,
	<cltang@codesourcery.com>
Subject: [PATCH v3 01/29] asm-generic: add generic futex for !CONFIG_SMP
Date: Mon, 8 Sep 2014 17:22:12 +0800	[thread overview]
Message-ID: <1410168160-3624-2-git-send-email-lftan@altera.com> (raw)
In-Reply-To: <1410168160-3624-1-git-send-email-lftan@altera.com>

Follow m68k futex implementation for !CONFIG_SMP.

Signed-off-by: Ley Foon Tan <lftan@altera.com>
---
 include/asm-generic/futex.h | 82 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
index 01f227e..f5650a5 100644
--- a/include/asm-generic/futex.h
+++ b/include/asm-generic/futex.h
@@ -5,6 +5,87 @@
 #include <linux/uaccess.h>
 #include <asm/errno.h>
 
+#ifndef CONFIG_SMP
+static inline int
+futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
+{
+	int op = (encoded_op >> 28) & 7;
+	int cmp = (encoded_op >> 24) & 15;
+	int oparg = (encoded_op << 8) >> 20;
+	int cmparg = (encoded_op << 20) >> 20;
+	int oldval, ret;
+	u32 tmp;
+
+	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
+		oparg = 1 << oparg;
+
+	pagefault_disable();	/* implies preempt_disable() */
+
+	ret = -EFAULT;
+	if (unlikely(get_user(oldval, uaddr) != 0))
+		goto out_pagefault_enable;
+
+	ret = 0;
+	tmp = oldval;
+
+	switch (op) {
+	case FUTEX_OP_SET:
+		tmp = oparg;
+		break;
+	case FUTEX_OP_ADD:
+		tmp += oparg;
+		break;
+	case FUTEX_OP_OR:
+		tmp |= oparg;
+		break;
+	case FUTEX_OP_ANDN:
+		tmp &= ~oparg;
+		break;
+	case FUTEX_OP_XOR:
+		tmp ^= oparg;
+		break;
+	default:
+		ret = -ENOSYS;
+	}
+
+	if (ret == 0 && unlikely(put_user(tmp, uaddr) != 0))
+		ret = -EFAULT;
+
+out_pagefault_enable:
+	pagefault_enable();	/* subsumes preempt_enable() */
+
+	if (ret == 0) {
+		switch (cmp) {
+		case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break;
+		case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;
+		case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break;
+		case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break;
+		case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break;
+		case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break;
+		default: ret = -ENOSYS;
+		}
+	}
+	return ret;
+}
+
+static inline int
+futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
+			      u32 oldval, u32 newval)
+{
+	u32 val;
+
+	if (unlikely(get_user(val, uaddr) != 0))
+		return -EFAULT;
+
+	if (val == oldval && unlikely(put_user(newval, uaddr) != 0))
+		return -EFAULT;
+
+	*uval = val;
+
+	return 0;
+}
+
+#else
 static inline int
 futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
 {
@@ -54,4 +135,5 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
 	return -ENOSYS;
 }
 
+#endif /* CONFIG_SMP */
 #endif
-- 
1.8.2.1


  reply	other threads:[~2014-09-08  9:37 UTC|newest]

Thread overview: 85+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-08  9:22 [PATCH v3 00/29] nios2 Linux kernel port Ley Foon Tan
2014-09-08  9:22 ` Ley Foon Tan
2014-09-08  9:22 ` Ley Foon Tan [this message]
2014-09-08  9:22   ` [PATCH v3 01/29] asm-generic: add generic futex for !CONFIG_SMP Ley Foon Tan
2014-09-23 10:20   ` LF.Tan
2014-09-23 10:40     ` Arnd Bergmann
2014-09-24 10:18       ` Ley Foon Tan
2014-09-24 10:40         ` Arnd Bergmann
2014-09-24 10:57           ` Ley Foon Tan
2014-09-24 11:10             ` Arnd Bergmann
2014-09-25  8:33               ` Ley Foon Tan
2014-09-25 10:54                 ` Arnd Bergmann
2014-09-26  2:22                   ` Ley Foon Tan
2014-09-26  6:41                     ` Geert Uytterhoeven
2014-09-26  8:30                       ` Ley Foon Tan
2014-09-26 13:17               ` Tobias Klauser
2014-09-26 13:33                 ` Arnd Bergmann
2014-09-23 21:47     ` Thomas Gleixner
2014-09-24 10:29       ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 02/29] nios2: Assembly macros and definitions Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 03/29] nios2: Kernel booting and initialization Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 04/29] nios2: Exception handling Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 05/29] nios2: Traps exception handling Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 06/29] nios2: Memory management Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 07/29] nios2: I/O Mapping Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 08/29] nios2: MMU Fault handling Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 09/29] nios2: Page table management Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 10/29] nios2: Process management Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 11/29] nios2: Cache handling Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 12/29] nios2: TLB handling Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 13/29] nios2: Interrupt handling Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 14/29] nios2: DMA mapping API Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 15/29] Add ELF machine define for Nios2 Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 16/29] nios2: ELF definitions Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 17/29] nios2: System calls handling Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 18/29] nios2: Signal handling support Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 19/29] nios2: Library functions Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 20/29] nios2: Device tree support Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 21/29] nios2: Time keeping Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 22/29] nios2: Cpuinfo handling Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 23/29] nios2: Miscellaneous header files Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 24/29] nios2: Nios2 registers Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 25/29] nios2: Module support Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-09 21:25   ` Valdis.Kletnieks
2014-09-10  7:29     ` Chung-Lin Tang
2014-09-10  7:29       ` Chung-Lin Tang
2014-09-10  7:49       ` Tobias Klauser
2014-09-08  9:22 ` [PATCH v3 26/29] nios2: ptrace support Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-16  9:43   ` Tobias Klauser
2014-09-18  5:10     ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 27/29] MAINTAINERS: Add nios2 maintainer Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 28/29] Documentation: Add documentation for Nios2 architecture Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-26  2:27   ` Ley Foon Tan
2014-09-26  8:31     ` Ley Foon Tan
2014-09-08  9:22 ` [PATCH v3 29/29] nios2: Build infrastructure Ley Foon Tan
2014-09-08  9:22   ` Ley Foon Tan
2014-09-08 12:13 ` [PATCH v3 00/29] nios2 Linux kernel port David Howells
2014-09-09  2:02 ` Al Viro

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1410168160-3624-2-git-send-email-lftan@altera.com \
    --to=lftan@altera.com \
    --cc=cltang@codesourcery.com \
    --cc=lftan.linux@gmail.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.