Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20c724f5 authored by Will Deacon's avatar Will Deacon Committed by Alistair Delva
Browse files

UPSTREAM: arm64: memory: Implement __tag_set() as common function 



(Upstream commit 6bbd497f027332b14cf2a6792c418c32286b66c2).

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.

Tested-by: default avatarSteve Capper <steve.capper@arm.com>
Reviewed-by: default avatarSteve Capper <steve.capper@arm.com>
Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Bug: 135692346
Change-Id: If1389aebf185a187e1008cd7f4b21308ce3c5790
parent c620677d

arch/arm64/include/asm/memory.h

+7 −7
Original line number Diff line number Diff line
@@ -221,20 +221,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