From: "David S. Miller" <davem@redhat.com>
To: joshk@triplehelix.org
Cc: sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] fix bug in sparc64 user copy patch
Date: Fri, 20 Aug 2004 15:52:50 -0700 [thread overview]
Message-ID: <20040820155250.69c09781.davem@redhat.com> (raw)
There were a few slight bugs in the UltraSPARC-I/II/IIi/IIe
parts of that patch I sent you, here is the fix.
===== arch/sparc64/lib/U1copy_from_user.S 1.1 vs edited =====
--- 1.1/arch/sparc64/lib/U1copy_from_user.S 2004-08-19 20:10:28 -07:00
+++ edited/arch/sparc64/lib/U1copy_from_user.S 2004-08-20 10:22:41 -07:00
@@ -20,4 +20,14 @@
#define LOAD_BLK(addr,dest) ldda [addr] ASI_BLK_AIUS, dest
#define EX_RETVAL(x) 0
+ /* Writing to %asi is _expensive_ so we hardcode it.
+ * Reading %asi to check for KERNEL_DS is comparatively
+ * cheap.
+ */
+#define PREAMBLE \
+ rd %asi, %g1; \
+ cmp %g1, ASI_AIUS; \
+ bne,pn %icc, memcpy_user_stub; \
+ nop; \
+
#include "U1memcpy.S"
===== arch/sparc64/lib/U1memcpy.S 1.1 vs edited =====
--- 1.1/arch/sparc64/lib/U1memcpy.S 2004-08-19 20:10:30 -07:00
+++ edited/arch/sparc64/lib/U1memcpy.S 2004-08-20 11:37:27 -07:00
@@ -193,6 +193,7 @@
and %g2, 7, %g2
andncc %g3, 0x7, %g3
fmovd %f0, %f2
+ sub %g3, 0x8, %g3
sub %o2, %o4, %o2
add %g1, %o4, %g1
@@ -444,7 +445,7 @@
2: membar #StoreLoad | #StoreStore
VISExit
retl
- mov %g5, %o0
+ mov EX_RETVAL(%g5), %o0
.align 64
70: /* 16 < len <= (5 * 64) */
@@ -539,7 +540,7 @@
add %o1, 4, %o1
85: retl
- mov %g5, %o0
+ mov EX_RETVAL(%g5), %o0
.align 32
90: EX_LD(LOAD(ldub, %o1, %g1))
@@ -548,4 +549,4 @@
bgu,pt %XCC, 90b
add %o1, 1, %o1
retl
- mov %g5, %o0
+ mov EX_RETVAL(%g5), %o0
next reply other threads:[~2004-08-20 22:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-08-20 22:52 David S. Miller [this message]
2004-08-26 23:50 ` [PATCH] fix bug in sparc64 user copy patch Joshua Kwan
2004-08-27 0:06 ` David S. Miller
2004-08-27 0:22 ` Joshua Kwan
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=20040820155250.69c09781.davem@redhat.com \
--to=davem@redhat.com \
--cc=joshk@triplehelix.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sparclinux@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