Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 updates from Catalin Marinas: - Pseudo NMI support for arm64 using GICv3 interrupt priorities - uaccess macros clean-up (unsafe user accessors also merged but reverted, waiting for objtool support on arm64) - ptrace regsets for Pointer Authentication (ARMv8.3) key management - inX() ordering w.r.t. delay() on arm64 and riscv (acks in place by the riscv maintainers) - arm64/perf updates: PMU bindings converted to json-schema, unused variable and misleading comment removed - arm64/debug fixes to ensure checking of the triggering exception level and to avoid the propagation of the UNKNOWN FAR value into the si_code for debug signals - Workaround for Fujitsu A64FX erratum 010001 - lib/raid6 ARM NEON optimisations - NR_CPUS now defaults to 256 on arm64 - Minor clean-ups (documentation/comments, Kconfig warning, unused asm-offsets, clang warnings) - MAINTAINERS update for list information to the ARM64 ACPI entry * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (54 commits) arm64: mmu: drop paging_init comments arm64: debug: Ensure debug handlers check triggering exception level arm64: debug: Don't propagate UNKNOWN FAR into si_code for debug signals Revert "arm64: uaccess: Implement unsafe accessors" arm64: avoid clang warning about self-assignment arm64: Kconfig.platforms: fix warning unmet direct dependencies lib/raid6: arm: optimize away a mask operation in NEON recovery routine lib/raid6: use vdupq_n_u8 to avoid endianness warnings arm64: io: Hook up __io_par() for inX() ordering riscv: io: Update __io_[p]ar() macros to take an argument asm-generic/io: Pass result of I/O accessor to __io_[p]ar() arm64: Add workaround for Fujitsu A64FX erratum 010001 arm64: Rename get_thread_info() arm64: Remove documentation about TIF_USEDFPU arm64: irqflags: Fix clang build warnings arm64: Enable the support of pseudo-NMIs arm64: Skip irqflags tracing for NMI in IRQs disabled context arm64: Skip preemption when exiting an NMI arm64: Handle serror in NMI context irqchip/gic-v3: Allow interrupts to be set as pseudo-NMI ...
This commit is contained in:
Linus Torvalds
@@ -979,6 +979,131 @@ static int pac_mask_get(struct task_struct *target,
|
||||
|
||||
return user_regset_copyout(&pos, &count, &kbuf, &ubuf, &uregs, 0, -1);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CHECKPOINT_RESTORE
|
||||
static __uint128_t pac_key_to_user(const struct ptrauth_key *key)
|
||||
{
|
||||
return (__uint128_t)key->hi << 64 | key->lo;
|
||||
}
|
||||
|
||||
static struct ptrauth_key pac_key_from_user(__uint128_t ukey)
|
||||
{
|
||||
struct ptrauth_key key = {
|
||||
.lo = (unsigned long)ukey,
|
||||
.hi = (unsigned long)(ukey >> 64),
|
||||
};
|
||||
|
||||
return key;
|
||||
}
|
||||
|
||||
static void pac_address_keys_to_user(struct user_pac_address_keys *ukeys,
|
||||
const struct ptrauth_keys *keys)
|
||||
{
|
||||
ukeys->apiakey = pac_key_to_user(&keys->apia);
|
||||
ukeys->apibkey = pac_key_to_user(&keys->apib);
|
||||
ukeys->apdakey = pac_key_to_user(&keys->apda);
|
||||
ukeys->apdbkey = pac_key_to_user(&keys->apdb);
|
||||
}
|
||||
|
||||
static void pac_address_keys_from_user(struct ptrauth_keys *keys,
|
||||
const struct user_pac_address_keys *ukeys)
|
||||
{
|
||||
keys->apia = pac_key_from_user(ukeys->apiakey);
|
||||
keys->apib = pac_key_from_user(ukeys->apibkey);
|
||||
keys->apda = pac_key_from_user(ukeys->apdakey);
|
||||
keys->apdb = pac_key_from_user(ukeys->apdbkey);
|
||||
}
|
||||
|
||||
static int pac_address_keys_get(struct task_struct *target,
|
||||
const struct user_regset *regset,
|
||||
unsigned int pos, unsigned int count,
|
||||
void *kbuf, void __user *ubuf)
|
||||
{
|
||||
struct ptrauth_keys *keys = &target->thread.keys_user;
|
||||
struct user_pac_address_keys user_keys;
|
||||
|
||||
if (!system_supports_address_auth())
|
||||
return -EINVAL;
|
||||
|
||||
pac_address_keys_to_user(&user_keys, keys);
|
||||
|
||||
return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
|
||||
&user_keys, 0, -1);
|
||||
}
|
||||
|
||||
static int pac_address_keys_set(struct task_struct *target,
|
||||
const struct user_regset *regset,
|
||||
unsigned int pos, unsigned int count,
|
||||
const void *kbuf, const void __user *ubuf)
|
||||
{
|
||||
struct ptrauth_keys *keys = &target->thread.keys_user;
|
||||
struct user_pac_address_keys user_keys;
|
||||
int ret;
|
||||
|
||||
if (!system_supports_address_auth())
|
||||
return -EINVAL;
|
||||
|
||||
pac_address_keys_to_user(&user_keys, keys);
|
||||
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
|
||||
&user_keys, 0, -1);
|
||||
if (ret)
|
||||
return ret;
|
||||
pac_address_keys_from_user(keys, &user_keys);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void pac_generic_keys_to_user(struct user_pac_generic_keys *ukeys,
|
||||
const struct ptrauth_keys *keys)
|
||||
{
|
||||
ukeys->apgakey = pac_key_to_user(&keys->apga);
|
||||
}
|
||||
|
||||
static void pac_generic_keys_from_user(struct ptrauth_keys *keys,
|
||||
const struct user_pac_generic_keys *ukeys)
|
||||
{
|
||||
keys->apga = pac_key_from_user(ukeys->apgakey);
|
||||
}
|
||||
|
||||
static int pac_generic_keys_get(struct task_struct *target,
|
||||
const struct user_regset *regset,
|
||||
unsigned int pos, unsigned int count,
|
||||
void *kbuf, void __user *ubuf)
|
||||
{
|
||||
struct ptrauth_keys *keys = &target->thread.keys_user;
|
||||
struct user_pac_generic_keys user_keys;
|
||||
|
||||
if (!system_supports_generic_auth())
|
||||
return -EINVAL;
|
||||
|
||||
pac_generic_keys_to_user(&user_keys, keys);
|
||||
|
||||
return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
|
||||
&user_keys, 0, -1);
|
||||
}
|
||||
|
||||
static int pac_generic_keys_set(struct task_struct *target,
|
||||
const struct user_regset *regset,
|
||||
unsigned int pos, unsigned int count,
|
||||
const void *kbuf, const void __user *ubuf)
|
||||
{
|
||||
struct ptrauth_keys *keys = &target->thread.keys_user;
|
||||
struct user_pac_generic_keys user_keys;
|
||||
int ret;
|
||||
|
||||
if (!system_supports_generic_auth())
|
||||
return -EINVAL;
|
||||
|
||||
pac_generic_keys_to_user(&user_keys, keys);
|
||||
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
|
||||
&user_keys, 0, -1);
|
||||
if (ret)
|
||||
return ret;
|
||||
pac_generic_keys_from_user(keys, &user_keys);
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_CHECKPOINT_RESTORE */
|
||||
#endif /* CONFIG_ARM64_PTR_AUTH */
|
||||
|
||||
enum aarch64_regset {
|
||||
@@ -995,6 +1120,10 @@ enum aarch64_regset {
|
||||
#endif
|
||||
#ifdef CONFIG_ARM64_PTR_AUTH
|
||||
REGSET_PAC_MASK,
|
||||
#ifdef CONFIG_CHECKPOINT_RESTORE
|
||||
REGSET_PACA_KEYS,
|
||||
REGSET_PACG_KEYS,
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
|
||||
@@ -1074,6 +1203,24 @@ static const struct user_regset aarch64_regsets[] = {
|
||||
.get = pac_mask_get,
|
||||
/* this cannot be set dynamically */
|
||||
},
|
||||
#ifdef CONFIG_CHECKPOINT_RESTORE
|
||||
[REGSET_PACA_KEYS] = {
|
||||
.core_note_type = NT_ARM_PACA_KEYS,
|
||||
.n = sizeof(struct user_pac_address_keys) / sizeof(__uint128_t),
|
||||
.size = sizeof(__uint128_t),
|
||||
.align = sizeof(__uint128_t),
|
||||
.get = pac_address_keys_get,
|
||||
.set = pac_address_keys_set,
|
||||
},
|
||||
[REGSET_PACG_KEYS] = {
|
||||
.core_note_type = NT_ARM_PACG_KEYS,
|
||||
.n = sizeof(struct user_pac_generic_keys) / sizeof(__uint128_t),
|
||||
.size = sizeof(__uint128_t),
|
||||
.align = sizeof(__uint128_t),
|
||||
.get = pac_generic_keys_get,
|
||||
.set = pac_generic_keys_set,
|
||||
},
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user