linux-arch.vger.kernel.org archive mirror
 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: Arnd Bergmann <arnd@arndb.de>, Ley Foon Tan <lftan@altera.com>,
	lftan.linux@gmail.com, cltang@codesourcery.com
Subject: [PATCH v5 01/29] asm-generic: add generic futex for !CONFIG_SMP
Date: Fri, 24 Oct 2014 16:24:03 +0800	[thread overview]
Message-ID: <1414139071-3818-2-git-send-email-lftan@altera.com> (raw)
In-Reply-To: <1414139071-3818-1-git-send-email-lftan@altera.com>

Follow m68k futex implementation for !CONFIG_SMP.

Signed-off-by: Ley Foon Tan <lftan@altera.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
 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


  parent reply	other threads:[~2014-10-24  8:24 UTC|newest]

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

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=1414139071-3818-2-git-send-email-lftan@altera.com \
    --to=lftan@altera.com \
    --cc=arnd@arndb.de \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).