From: Steve Capper <Steve.Capper@arm.com>
To: Will Deacon <will@kernel.org>
Cc: Mark Rutland <Mark.Rutland@arm.com>,
Catalin Marinas <Catalin.Marinas@arm.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Andrey Konovalov <andreyknvl@google.com>, Qian Cai <cai@lca.pw>,
nd <nd@arm.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH 6/8] arm64: memory: Implement __tag_set() as common function
Date: Tue, 13 Aug 2019 18:56:40 +0000 [thread overview]
Message-ID: <20190813185638.GG19835@capper-ampere.manchester.arm.com> (raw)
In-Reply-To: <20190813170149.26037-7-will@kernel.org>
On Tue, Aug 13, 2019 at 06:01:47PM +0100, Will Deacon wrote:
> There's no need for __tag_set() to be a complicated macro when
> CONFIG_KASAN_SW_TAGS=y and a simple static inline otherwise. Rewrite
> the thing as a common static inline function.
>
> Signed-off-by: Will Deacon <will@kernel.org>
Reviewed-by: Steve Capper <steve.capper@arm.com>
> ---
> arch/arm64/include/asm/memory.h | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
> index 5552c8cba1e2..e902132b808c 100644
> --- a/arch/arm64/include/asm/memory.h
> +++ b/arch/arm64/include/asm/memory.h
> @@ -218,20 +218,20 @@ static inline unsigned long kaslr_offset(void)
>
> #ifdef CONFIG_KASAN_SW_TAGS
> #define __tag_shifted(tag) ((u64)(tag) << 56)
> -#define __tag_set(addr, tag) (__typeof__(addr))( \
> - ((u64)(addr) & ~__tag_shifted(0xff)) | __tag_shifted(tag))
> #define __tag_reset(addr) untagged_addr(addr)
> #define __tag_get(addr) (__u8)((u64)(addr) >> 56)
> #else
> -static inline const void *__tag_set(const void *addr, u8 tag)
> -{
> - return addr;
> -}
> -
> +#define __tag_shifted(tag) 0UL
> #define __tag_reset(addr) (addr)
> #define __tag_get(addr) 0
> #endif
>
> +static inline const void *__tag_set(const void *addr, u8 tag)
> +{
> + u64 __addr = (u64)addr & ~__tag_shifted(0xff);
> + return (const void *)(__addr | __tag_shifted(tag));
> +}
> +
> /*
> * Physical vs virtual RAM address space conversion. These are
> * private definitions which should NOT be used outside memory.h
> --
> 2.11.0
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-08-13 18:57 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-13 17:01 [PATCH 0/8] Fix issues with 52-bit kernel virtual addressing Will Deacon
2019-08-13 17:01 ` [PATCH 1/8] arm64: memory: Fix virt_addr_valid() using __is_lm_address() Will Deacon
2019-08-13 18:09 ` Ard Biesheuvel
2019-08-13 19:11 ` Steve Capper
2019-08-13 19:25 ` Ard Biesheuvel
2019-08-13 20:34 ` Steve Capper
2019-08-14 15:17 ` Ard Biesheuvel
2019-08-14 8:32 ` Will Deacon
2019-08-13 18:53 ` Steve Capper
2019-08-14 9:19 ` Catalin Marinas
2019-08-14 9:48 ` Will Deacon
2019-08-14 10:40 ` Catalin Marinas
2019-08-14 12:02 ` Will Deacon
2019-08-13 17:01 ` [PATCH 2/8] arm64: memory: Ensure address tag is masked in conversion macros Will Deacon
2019-08-13 18:54 ` Steve Capper
2019-08-14 9:23 ` Catalin Marinas
2019-08-13 17:01 ` [PATCH 3/8] arm64: memory: Rewrite default page_to_virt()/virt_to_page() Will Deacon
2019-08-13 18:54 ` Steve Capper
2019-08-14 9:30 ` Catalin Marinas
2019-08-14 9:41 ` Will Deacon
2019-08-14 10:56 ` Mark Rutland
2019-08-14 11:17 ` Will Deacon
2019-08-14 11:26 ` Mark Rutland
2019-08-13 17:01 ` [PATCH 4/8] arm64: memory: Simplify virt_to_page() implementation Will Deacon
2019-08-13 18:55 ` Steve Capper
2019-08-14 9:32 ` Catalin Marinas
2019-08-13 17:01 ` [PATCH 5/8] arm64: memory: Simplify _VA_START and _PAGE_OFFSET definitions Will Deacon
2019-08-13 18:55 ` Steve Capper
2019-08-14 9:33 ` Catalin Marinas
2019-08-14 11:23 ` Mark Rutland
2019-08-14 12:00 ` Will Deacon
2019-08-14 13:18 ` Mark Rutland
2019-08-13 17:01 ` [PATCH 6/8] arm64: memory: Implement __tag_set() as common function Will Deacon
2019-08-13 18:56 ` Steve Capper [this message]
2019-08-14 9:34 ` Catalin Marinas
2019-08-13 17:01 ` [PATCH 7/8] arm64: memory: Add comments to end of non-trivial #ifdef blocks Will Deacon
2019-08-13 18:57 ` Steve Capper
2019-08-14 9:35 ` Catalin Marinas
2019-08-13 17:01 ` [PATCH 8/8] arm64: memory: Cosmetic cleanups Will Deacon
2019-08-13 18:57 ` Steve Capper
2019-08-14 9:35 ` Catalin Marinas
2019-08-13 18:53 ` [PATCH 0/8] Fix issues with 52-bit kernel virtual addressing Steve Capper
2019-08-14 8:01 ` Geert Uytterhoeven
2019-08-14 11:29 ` 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=20190813185638.GG19835@capper-ampere.manchester.arm.com \
--to=steve.capper@arm.com \
--cc=Catalin.Marinas@arm.com \
--cc=Mark.Rutland@arm.com \
--cc=andreyknvl@google.com \
--cc=cai@lca.pw \
--cc=geert@linux-m68k.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=nd@arm.com \
--cc=will@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).