From: Richard Henderson <richard.henderson@linaro.org>
To: linux-arm-kernel@lists.infradead.org
Cc: mark.rutland@arm.com, robin.murphy@arm.com
Subject: [PATCH v2] arm64: Simplify __range_ok
Date: Thu, 26 Mar 2020 20:09:18 -0700 [thread overview]
Message-ID: <20200327030918.7292-1-richard.henderson@linaro.org> (raw)
The general case is not quite as compact as the inline assembly,
but with a sufficiently advanced compiler it is only 6 insns vs 5.
The real improvement comes from assuming that limit is never tiny,
and using __builtin_constant_p to make sure the constant folding
does not go awry. This produces a 2 insn sequence even for older
compilers.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
Thanks for the v1 review, Mark.
Text section size change:
$ scripts/bloat-o-meter -t vmlinux{-orig,} | tail -1
* When built with gcc-10 (master) + cmpti patch set:
Total: Before=12820824, After=12774708, chg -0.36%
* When built with gcc-7.5.0-3ubuntu1~18.04:
Total: Before=13564038, After=13513258, chg -0.37%
Changes in v2:
* Adjust initialization of iaddr.
* Use USER_DS as the constant limit and update commentary.
r~
---
arch/arm64/include/asm/uaccess.h | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
index 32fc8061aa76..04ef201e6179 100644
--- a/arch/arm64/include/asm/uaccess.h
+++ b/arch/arm64/include/asm/uaccess.h
@@ -60,7 +60,8 @@ static inline void set_fs(mm_segment_t fs)
*/
static inline unsigned long __range_ok(const void __user *addr, unsigned long size)
{
- unsigned long ret, limit = current_thread_info()->addr_limit;
+ unsigned long limit = current_thread_info()->addr_limit;
+ unsigned long iaddr = (unsigned long)addr;
/*
* Asynchronous I/O running in a kernel thread does not have the
@@ -72,24 +73,17 @@ static inline unsigned long __range_ok(const void __user *addr, unsigned long si
addr = untagged_addr(addr);
__chk_user_ptr(addr);
- asm volatile(
- // A + B <= C + 1 for all A,B,C, in four easy steps:
- // 1: X = A + B; X' = X % 2^64
- " adds %0, %3, %2\n"
- // 2: Set C = 0 if X > 2^64, to guarantee X' > C in step 4
- " csel %1, xzr, %1, hi\n"
- // 3: Set X' = ~0 if X >= 2^64. For X == 2^64, this decrements X'
- // to compensate for the carry flag being set in step 4. For
- // X > 2^64, X' merely has to remain nonzero, which it does.
- " csinv %0, %0, xzr, cc\n"
- // 4: For X < 2^64, this gives us X' - C - 1 <= 0, where the -1
- // comes from the carry in being clear. Otherwise, we are
- // testing X' - C == 0, subject to the previous adjustments.
- " sbcs xzr, %0, %1\n"
- " cset %0, ls\n"
- : "=&r" (ret), "+r" (limit) : "Ir" (size), "0" (addr) : "cc");
-
- return ret;
+
+ /*
+ * The minimum value for limit is USER_DS, and quite a lot of
+ * range checks use sizeof(some_type). With both constants,
+ * we can rearrange the computation to avoid the need for
+ * 65-bit arithmetic.
+ */
+ if (__builtin_constant_p(size) && size > 0 && size < USER_DS)
+ return iaddr <= limit + 1 - size;
+
+ return (__uint128_t)iaddr + size <= (__uint128_t)limit + 1;
}
#define access_ok(addr, size) __range_ok(addr, size)
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2020-03-27 3:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-27 3:09 Richard Henderson [this message]
2020-04-03 10:50 ` [PATCH v2] arm64: Simplify __range_ok Mark Rutland
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=20200327030918.7292-1-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=robin.murphy@arm.com \
/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).