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: Ley Foon Tan <lftan@altera.com>,
	lftan.linux@gmail.com, cltang@codesourcery.com
Subject: [PATCH v2 21/29] nios2: Futex operations
Date: Tue, 15 Jul 2014 16:45:48 +0800	[thread overview]
Message-ID: <1405413956-2772-22-git-send-email-lftan@altera.com> (raw)
In-Reply-To: <1405413956-2772-1-git-send-email-lftan@altera.com>

This patch introduces the futex operation.

Signed-off-by: Ley Foon Tan <lftan@altera.com>
---
 arch/nios2/include/asm/futex-irq.h | 130 +++++++++++++++++++++++++++++++++++++
 arch/nios2/include/asm/futex.h     | 110 +++++++++++++++++++++++++++++++
 2 files changed, 240 insertions(+)
 create mode 100644 arch/nios2/include/asm/futex-irq.h
 create mode 100644 arch/nios2/include/asm/futex.h

diff --git a/arch/nios2/include/asm/futex-irq.h b/arch/nios2/include/asm/futex-irq.h
new file mode 100644
index 0000000..ade9296
--- /dev/null
+++ b/arch/nios2/include/asm/futex-irq.h
@@ -0,0 +1,130 @@
+/*
+ *  Copyright (C) 2013 Altera Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Based on asm/futex.h from sh platform.
+ *
+ */
+
+#ifndef __ASM_NIOS2_FUTEX_IRQ_H
+#define __ASM_NIOS2_FUTEX_IRQ_H
+
+
+static inline int atomic_futex_op_xchg_set(int oparg, u32 __user *uaddr,
+					   int *oldval)
+{
+	unsigned long flags;
+	int ret;
+
+	local_irq_save(flags);
+
+	ret = get_user(*oldval, uaddr);
+	if (!ret)
+		ret = put_user(oparg, uaddr);
+
+	local_irq_restore(flags);
+
+	return ret;
+}
+
+static inline int atomic_futex_op_xchg_add(int oparg, u32 __user *uaddr,
+					   int *oldval)
+{
+	unsigned long flags;
+	int ret;
+
+	local_irq_save(flags);
+
+	ret = get_user(*oldval, uaddr);
+	if (!ret)
+		ret = put_user(*oldval + oparg, uaddr);
+
+	local_irq_restore(flags);
+
+	return ret;
+}
+
+static inline int atomic_futex_op_xchg_or(int oparg, u32 __user *uaddr,
+					  int *oldval)
+{
+	unsigned long flags;
+	int ret;
+
+	local_irq_save(flags);
+
+	ret = get_user(*oldval, uaddr);
+	if (!ret)
+		ret = put_user(*oldval | oparg, uaddr);
+
+	local_irq_restore(flags);
+
+	return ret;
+}
+
+static inline int atomic_futex_op_xchg_and(int oparg, u32 __user *uaddr,
+					   int *oldval)
+{
+	unsigned long flags;
+	int ret;
+
+	local_irq_save(flags);
+
+	ret = get_user(*oldval, uaddr);
+	if (!ret)
+		ret = put_user(*oldval & oparg, uaddr);
+
+	local_irq_restore(flags);
+
+	return ret;
+}
+
+static inline int atomic_futex_op_xchg_xor(int oparg, u32 __user *uaddr,
+					   int *oldval)
+{
+	unsigned long flags;
+	int ret;
+
+	local_irq_save(flags);
+
+	ret = get_user(*oldval, uaddr);
+	if (!ret)
+		ret = put_user(*oldval ^ oparg, uaddr);
+
+	local_irq_restore(flags);
+
+	return ret;
+}
+
+static inline int atomic_futex_op_cmpxchg_inatomic(u32 *uval,
+						u32 __user *uaddr,
+						u32 oldval, u32 newval)
+{
+	unsigned long flags;
+	int ret;
+	u32 prev = 0;
+
+	local_irq_save(flags);
+
+	ret = get_user(prev, uaddr);
+	if (!ret && oldval == prev)
+		ret = put_user(newval, uaddr);
+
+	local_irq_restore(flags);
+
+	*uval = prev;
+	return ret;
+}
+
+#endif /* __ASM_NIOS2_FUTEX_IRQ_H */
diff --git a/arch/nios2/include/asm/futex.h b/arch/nios2/include/asm/futex.h
new file mode 100644
index 0000000..52b2fa9
--- /dev/null
+++ b/arch/nios2/include/asm/futex.h
@@ -0,0 +1,110 @@
+/*
+ *  Copyright (C) 2013 Altera Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Based on asm/futex.h from sh platform.
+ *
+ */
+
+#ifndef __ASM_NIOS2_FUTEX_H
+#define __ASM_NIOS2_FUTEX_H
+
+#ifdef __KERNEL__
+
+#include <linux/futex.h>
+#include <linux/uaccess.h>
+#include <linux/errno.h>
+
+#include <asm/futex-irq.h>
+
+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 = 0, ret;
+
+	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
+		oparg = 1 << oparg;
+
+	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
+		return -EFAULT;
+
+	pagefault_disable();
+
+	switch (op) {
+	case FUTEX_OP_SET:
+		ret = atomic_futex_op_xchg_set(oparg, uaddr, &oldval);
+		break;
+	case FUTEX_OP_ADD:
+		ret = atomic_futex_op_xchg_add(oparg, uaddr, &oldval);
+		break;
+	case FUTEX_OP_OR:
+		ret = atomic_futex_op_xchg_or(oparg, uaddr, &oldval);
+		break;
+	case FUTEX_OP_ANDN:
+		ret = atomic_futex_op_xchg_and(~oparg, uaddr, &oldval);
+		break;
+	case FUTEX_OP_XOR:
+		ret = atomic_futex_op_xchg_xor(oparg, uaddr, &oldval);
+		break;
+	default:
+		ret = -ENOSYS;
+		break;
+	}
+
+	pagefault_enable();
+
+	if (!ret) {
+		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)
+{
+	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
+		return -EFAULT;
+
+	return atomic_futex_op_cmpxchg_inatomic(uval, uaddr, oldval, newval);
+}
+
+#endif /* __KERNEL__ */
+#endif /* __ASM_NIOS2_FUTEX_H */
-- 
1.8.2.1

  parent reply	other threads:[~2014-07-15  8:45 UTC|newest]

Thread overview: 182+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-15  8:45 [PATCH v2 00/29] nios2 Linux kernel port Ley Foon Tan
2014-07-15  8:45 ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 01/29] nios2: Assembly macros and definitions Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 02/29] nios2: Kernel booting and initialization Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-30  9:12   ` Tobias Klauser
2014-07-30  9:12     ` Tobias Klauser
2014-07-30 10:58     ` Ley Foon Tan
2014-07-30 10:58       ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 03/29] nios2: Exception handling Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 04/29] nios2: Traps exception handling Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 05/29] nios2: Memory management Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-28 14:59   ` Geert Uytterhoeven
2014-07-28 14:59     ` Geert Uytterhoeven
2014-07-30  6:42     ` Ley Foon Tan
2014-07-30  8:18       ` Geert Uytterhoeven
2014-07-30  8:18         ` Geert Uytterhoeven
2014-07-30  8:57         ` Tobias Klauser
2014-07-30  8:57           ` Tobias Klauser
2014-07-30 10:52           ` Ley Foon Tan
2014-07-30 10:52             ` Ley Foon Tan
2014-07-30  9:01   ` Tobias Klauser
2014-07-30  9:01     ` Tobias Klauser
2014-07-30 10:50     ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 06/29] nios2: I/O Mapping Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15  9:22   ` Arnd Bergmann
2014-07-15  9:22     ` Arnd Bergmann
2014-07-15 10:51     ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 07/29] nios2: MMU Fault handling Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 08/29] nios2: Page table management Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 09/29] nios2: Process management Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 10/29] nios2: Cache handling Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 11/29] nios2: TLB handling Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 12/29] nios2: Interrupt handling Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15  9:27   ` Arnd Bergmann
2014-07-15  9:27     ` Arnd Bergmann
2014-07-17  6:15     ` Ley Foon Tan
2014-07-17  6:15       ` Ley Foon Tan
2014-07-17  9:24       ` Arnd Bergmann
2014-07-17  9:24         ` Arnd Bergmann
2014-07-17 10:48         ` Ley Foon Tan
2014-07-17 10:48           ` Ley Foon Tan
2014-07-15  9:51   ` Thomas Gleixner
2014-07-17  6:33     ` Ley Foon Tan
2014-07-17  6:33       ` Ley Foon Tan
2014-07-17 13:58       ` Thomas Gleixner
2014-07-17 13:58         ` Thomas Gleixner
2014-07-18  6:55         ` Ley Foon Tan
2014-07-18  6:55           ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 13/29] nios2: DMA mapping API Ley Foon Tan
2014-07-15  9:38   ` Arnd Bergmann
2014-07-24 11:37     ` Ley Foon Tan
2014-07-24 11:37       ` Ley Foon Tan
2014-07-24 12:05       ` Arnd Bergmann
2014-07-24 12:05         ` Arnd Bergmann
2014-07-28 15:48         ` rkuo
2014-07-30  3:42         ` Ley Foon Tan
2014-07-30  3:42           ` Ley Foon Tan
2014-07-30 12:56     ` James Bottomley
2014-07-30 12:56       ` James Bottomley
2014-07-15  8:45 ` [PATCH v2 14/29] nios2: ELF definitions Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 15/29] nios2: System calls handling Ley Foon Tan
2014-07-18 12:56   ` James Hogan
2014-07-21 11:17     ` Ley Foon Tan
2014-07-21 11:17       ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 16/29] nios2: Signal handling support Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-18  8:04   ` Richard Weinberger
2014-07-18  8:04     ` Richard Weinberger
2014-08-08  7:21     ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 17/29] nios2: Library functions Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 18/29] nios2: Device tree support Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15  9:41   ` Arnd Bergmann
2014-07-15 10:02     ` Ley Foon Tan
2014-07-15 10:02       ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 19/29] nios2: Time keeping Ley Foon Tan
2014-07-15  9:45   ` Arnd Bergmann
2014-07-15  9:45     ` Arnd Bergmann
2014-07-21 10:07     ` Ley Foon Tan
2014-07-21 10:07       ` Ley Foon Tan
2014-07-21 10:51       ` Arnd Bergmann
2014-07-21 11:10         ` Ley Foon Tan
2014-07-21 11:10           ` Ley Foon Tan
2014-07-15 10:00   ` Thomas Gleixner
2014-07-21 11:09     ` Ley Foon Tan
2014-07-21 11:09       ` Ley Foon Tan
2014-07-21 12:35       ` Thomas Gleixner
2014-07-15  8:45 ` [PATCH v2 20/29] nios2: Cpuinfo handling Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15  9:47   ` Arnd Bergmann
2014-07-15  9:47     ` Arnd Bergmann
2014-07-18  2:43     ` Ley Foon Tan
2014-08-07  5:06       ` Ley Foon Tan
2014-07-15  8:45 ` Ley Foon Tan [this message]
2014-07-15  8:45   ` [PATCH v2 21/29] nios2: Futex operations Ley Foon Tan
2014-07-15 10:03   ` Thomas Gleixner
2014-07-15 10:03     ` Thomas Gleixner
2014-07-17 10:55     ` Ley Foon Tan
2014-07-17 11:07       ` Arnd Bergmann
2014-07-17 11:07         ` Arnd Bergmann
2014-07-18  6:07         ` Ley Foon Tan
2014-07-18  9:09           ` Arnd Bergmann
2014-07-18  9:42             ` Thomas Gleixner
2014-07-18  9:42               ` Thomas Gleixner
2014-07-18  9:55               ` Arnd Bergmann
2014-07-21  3:20                 ` Ley Foon Tan
2014-07-21  3:20                   ` Ley Foon Tan
2014-07-21  8:01                   ` Arnd Bergmann
2014-07-21 10:24                     ` Ley Foon Tan
2014-08-05  8:49                 ` Geert Uytterhoeven
2014-07-15  8:45 ` [PATCH v2 22/29] nios2: Miscellaneous header files Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15 10:22   ` Arnd Bergmann
2014-07-15 10:22     ` Arnd Bergmann
2014-07-15 11:03     ` Chung-Lin Tang
2014-07-15 12:27       ` Arnd Bergmann
2014-07-18  6:15         ` Chung-Lin Tang
2014-07-18  6:15           ` Chung-Lin Tang
2014-07-18  9:18           ` Arnd Bergmann
2014-07-18  9:18             ` Arnd Bergmann
2014-07-16  7:03     ` Ley Foon Tan
2014-07-16  7:03       ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 23/29] nios2: Nios2 registers Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 24/29] nios2: Module support Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15 10:24   ` Arnd Bergmann
2014-07-15 10:24     ` Arnd Bergmann
2014-07-15 11:12     ` Tobias Klauser
2014-07-15 11:12       ` Tobias Klauser
2014-07-15 12:21       ` Arnd Bergmann
2014-07-15 12:21         ` Arnd Bergmann
2014-07-16  1:36         ` LF.Tan
2014-07-16  1:36           ` LF.Tan
2014-07-16  1:32     ` Ley Foon Tan
2014-07-16  1:32       ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 25/29] nios2: ptrace support Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 26/29] Add ELF machine define for Nios2 Ley Foon Tan
2014-07-15  9:04   ` Tobias Klauser
2014-07-15  9:04     ` Tobias Klauser
2014-07-15  9:40     ` Ley Foon Tan
2014-07-15  9:40       ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 27/29] MAINTAINERS: Add nios2 maintainer Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15 11:10   ` Joe Perches
2014-07-16  1:08     ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 28/29] Documentation: Add documentation for Nios2 architecture Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-15  8:45 ` [PATCH v2 29/29] nios2: Build infrastructure Ley Foon Tan
2014-07-15  8:45   ` Ley Foon Tan
2014-07-16 19:50   ` Paul Bolle
2014-07-16 19:50     ` Paul Bolle
2014-07-17  9:35   ` Sam Ravnborg
2014-07-17  9:35     ` Sam Ravnborg
2014-07-15  9:08 ` [PATCH v2 00/29] nios2 Linux kernel port Tobias Klauser
2014-07-15  9:08   ` Tobias Klauser
2014-07-15  9:38   ` Ley Foon Tan
2014-07-15  9:38     ` Ley Foon Tan
2014-07-15 11:15     ` Tobias Klauser
2014-07-16  1:21       ` Ley Foon Tan
2014-07-16  1:21         ` Ley Foon Tan
2014-07-15 13:16 ` David Howells
2014-07-15 13:16   ` David Howells
2014-07-15 13:19   ` Richard Weinberger
2014-07-15 14:20   ` David Howells
2014-07-15 20:27     ` Richard Weinberger
2014-07-15 22:36     ` David Howells
2014-07-15 22:36       ` David Howells
2014-07-15 22:45       ` Greg KH
2014-07-15 22:45         ` Greg KH

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=1405413956-2772-22-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 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).