Commit c8bc81a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Catalin Marinas:

 - CFI failure due to kpti_ng_pgd_alloc() signature mismatch

 - Underallocation bug in the SVE ptrace kselftest

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  kselftest/arm64: Don't open code SVE_PT_SIZE() in fp-ptrace
  arm64: mm: Fix CFI failure due to kpti_ng_pgd_alloc function signature
parents 11e7861d d82aa5d3

arch/arm64/include/asm/mmu.h

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,13 @@ 
#include <linux/refcount.h>

#include <asm/cpufeature.h>



enum pgtable_type {

	TABLE_PTE,

	TABLE_PMD,

	TABLE_PUD,

	TABLE_P4D,

};



typedef struct {

	atomic64_t	id;

#ifdef CONFIG_COMPAT

arch/arm64/kernel/cpufeature.c

+3 −2
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ 
#include <asm/hwcap.h>

#include <asm/insn.h>

#include <asm/kvm_host.h>

#include <asm/mmu.h>

#include <asm/mmu_context.h>

#include <asm/mte.h>

#include <asm/hypervisor.h>
@@ -1945,11 +1946,11 @@ static bool has_pmuv3(const struct arm64_cpu_capabilities *entry, int scope) 
extern

void create_kpti_ng_temp_pgd(pgd_t *pgdir, phys_addr_t phys, unsigned long virt,

			     phys_addr_t size, pgprot_t prot,

			     phys_addr_t (*pgtable_alloc)(int), int flags);

			     phys_addr_t (*pgtable_alloc)(enum pgtable_type), int flags);



static phys_addr_t __initdata kpti_ng_temp_alloc;



static phys_addr_t __init kpti_ng_pgd_alloc(int shift)

static phys_addr_t __init kpti_ng_pgd_alloc(enum pgtable_type type)

{

	kpti_ng_temp_alloc -= PAGE_SIZE;

	return kpti_ng_temp_alloc;

arch/arm64/mm/mmu.c

+0 −7
Original line number Diff line number Diff line
@@ -47,13 +47,6 @@ 
#define NO_CONT_MAPPINGS	BIT(1)

#define NO_EXEC_MAPPINGS	BIT(2)	/* assumes FEAT_HPDS is not used */



enum pgtable_type {

	TABLE_PTE,

	TABLE_PMD,

	TABLE_PUD,

	TABLE_P4D,

};



u64 kimage_voffset __ro_after_init;

EXPORT_SYMBOL(kimage_voffset);

tools/testing/selftests/arm64/fp/fp-ptrace.c

+2 −3
Original line number Diff line number Diff line
@@ -1187,7 +1187,7 @@ static void sve_write_sve(pid_t child, struct test_config *config) 
	if (!vl)

		return;



	iov.iov_len = SVE_PT_SVE_OFFSET + SVE_PT_SVE_SIZE(vq, SVE_PT_REGS_SVE);

	iov.iov_len = SVE_PT_SIZE(vq, SVE_PT_REGS_SVE);

	iov.iov_base = malloc(iov.iov_len);

	if (!iov.iov_base) {

		ksft_print_msg("Failed allocating %lu byte SVE write buffer\n",
@@ -1234,8 +1234,7 @@ static void sve_write_fpsimd(pid_t child, struct test_config *config) 
	if (!vl)

		return;



	iov.iov_len = SVE_PT_SVE_OFFSET + SVE_PT_SVE_SIZE(vq,

							  SVE_PT_REGS_FPSIMD);

	iov.iov_len = SVE_PT_SIZE(vq, SVE_PT_REGS_FPSIMD);

	iov.iov_base = malloc(iov.iov_len);

	if (!iov.iov_base) {

		ksft_print_msg("Failed allocating %lu byte SVE write buffer\n",