arm64: tags: Preserve tags for addresses translated via TTBR1
authorWill Deacon <will@kernel.org>
Wed, 16 Oct 2019 04:04:18 +0000 (21:04 -0700)
committerWill Deacon <will@kernel.org>
Wed, 16 Oct 2019 17:11:38 +0000 (10:11 -0700)
commit597399d0cb91d049fcb78fb45c7694771b583bb7
tree3cb46f903b734e7bae7a63e3cde1f0872398efdc
parent3813733595c0c7c0674d106309b04e871d54dc1c
arm64: tags: Preserve tags for addresses translated via TTBR1

Sign-extending TTBR1 addresses when converting to an untagged address
breaks the documented POSIX semantics for mlock() in some obscure error
cases where we end up returning -EINVAL instead of -ENOMEM as a direct
result of rewriting the upper address bits.

Rework the untagged_addr() macro to preserve the upper address bits for
TTBR1 addresses and only clear the tag bits for user addresses. This
matches the behaviour of the 'clear_address_tag' assembly macro, so
rename that and align the implementations at the same time so that they
use the same instruction sequences for the tag manipulation.

Link: https://lore.kernel.org/stable/20191014162651.GF19200@arrakis.emea.arm.com/
Reported-by: Jan Stancek <jstancek@redhat.com>
Tested-by: Jan Stancek <jstancek@redhat.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Tested-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Tested-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/include/asm/asm-uaccess.h
arch/arm64/include/asm/memory.h
arch/arm64/kernel/entry.S