Commit 6361c845 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 (and cleanups) from Catalin Marinas:
 "Various arm64 fixes:

   - suspicious RCU usage warning
   - BPF (out of bounds array read and endianness conversion)
   - perf (of_node usage after of_node_put, cpu_pmu->plat_device
     assignment)
   - huge pmd/pud check for value 0
   - rate-limiting should only take unhandled signals into account

  Clean-up:

   - incorrect use of pgprot_t type
   - unused header include
   - __init annotation to arm_cpuidle_init
   - pr_debug instead of pr_error for disabled GICC entries in
     ACPI/MADT"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: Fix show_unhandled_signal_ratelimited usage
  ARM64 / SMP: Switch pr_err() to pr_debug() for disabled GICC entry
  arm64: cpuidle: add __init section marker to arm_cpuidle_init
  arm64: Don't report clear pmds and puds as huge
  arm64: perf: fix unassigned cpu_pmu->plat_device when probing PMU PPIs
  arm64: perf: Don't use of_node after putting it
  arm64: fix incorrect use of pgprot_t variable
  arm64/hw_breakpoint.c: remove unnecessary header
  arm64: bpf: fix endianness conversion bugs
  arm64: bpf: fix out-of-bounds read in bpf2a64_offset()
  ARM64: smp: Fix suspicious RCU usage with ipi tracepoints
parents 31351f73 f871d268

arch/arm64/kernel/cpuidle.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <asm/cpuidle.h>

#include <asm/cpu_ops.h>



int arm_cpuidle_init(unsigned int cpu)

int __init arm_cpuidle_init(unsigned int cpu)

{

	int ret = -EOPNOTSUPP;

arch/arm64/kernel/hw_breakpoint.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <asm/current.h>

#include <asm/debug-monitors.h>

#include <asm/hw_breakpoint.h>

#include <asm/kdebug.h>

#include <asm/traps.h>

#include <asm/cputype.h>

#include <asm/system_misc.h>

arch/arm64/kernel/perf_event.c

+4 −2
Original line number Diff line number Diff line
@@ -1318,7 +1318,7 @@ static int armpmu_device_probe(struct platform_device *pdev) 
	/* Don't bother with PPIs; they're already affine */

	irq = platform_get_irq(pdev, 0);

	if (irq >= 0 && irq_is_percpu(irq))

		return 0;

		goto out;



	irqs = kcalloc(pdev->num_resources, sizeof(*irqs), GFP_KERNEL);

	if (!irqs)
@@ -1340,12 +1340,13 @@ static int armpmu_device_probe(struct platform_device *pdev) 
			if (arch_find_n_match_cpu_physical_id(dn, cpu, NULL))

				break;



		of_node_put(dn);

		if (cpu >= nr_cpu_ids) {

			pr_warn("Failed to find logical CPU for %s\n",

				dn->name);

			of_node_put(dn);

			break;

		}

		of_node_put(dn);



		irqs[i] = cpu;

	}
@@ -1355,6 +1356,7 @@ static int armpmu_device_probe(struct platform_device *pdev) 
	else

		kfree(irqs);



out:

	cpu_pmu->plat_device = pdev;

	return 0;

}

arch/arm64/kernel/smp.c

+6 −6
Original line number Diff line number Diff line
@@ -396,13 +396,13 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor) 
{

	u64 hwid = processor->arm_mpidr;



	if (hwid & ~MPIDR_HWID_BITMASK || hwid == INVALID_HWID) {

		pr_err("skipping CPU entry with invalid MPIDR 0x%llx\n", hwid);

	if (!(processor->flags & ACPI_MADT_ENABLED)) {

		pr_debug("skipping disabled CPU entry with 0x%llx MPIDR\n", hwid);

		return;

	}



	if (!(processor->flags & ACPI_MADT_ENABLED)) {

		pr_err("skipping disabled CPU entry with 0x%llx MPIDR\n", hwid);

	if (hwid & ~MPIDR_HWID_BITMASK || hwid == INVALID_HWID) {

		pr_err("skipping CPU entry with invalid MPIDR 0x%llx\n", hwid);

		return;

	}
@@ -693,7 +693,7 @@ void handle_IPI(int ipinr, struct pt_regs *regs) 
	struct pt_regs *old_regs = set_irq_regs(regs);



	if ((unsigned)ipinr < NR_IPI) {

		trace_ipi_entry(ipi_types[ipinr]);

		trace_ipi_entry_rcuidle(ipi_types[ipinr]);

		__inc_irq_stat(cpu, ipi_irqs[ipinr]);

	}
@@ -736,7 +736,7 @@ void handle_IPI(int ipinr, struct pt_regs *regs) 
	}



	if ((unsigned)ipinr < NR_IPI)

		trace_ipi_exit(ipi_types[ipinr]);

		trace_ipi_exit_rcuidle(ipi_types[ipinr]);

	set_irq_regs(old_regs);

}

arch/arm64/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) 
	if (call_undef_hook(regs) == 0)

		return;



	if (show_unhandled_signals_ratelimited() && unhandled_signal(current, SIGILL)) {

	if (unhandled_signal(current, SIGILL) && show_unhandled_signals_ratelimited()) {

		pr_info("%s[%d]: undefined instruction: pc=%p\n",

			current->comm, task_pid_nr(current), pc);

		dump_instr(KERN_INFO, regs);

CRA Git | Maintained and supported by SUSTech CRA and CCSE