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

Pull arm64 fixes from Catalin Marinas: - support for nr_cpus= command line argument (maxcpus was previously changed to allow secondary CPUs to be hot-plugged) - ARM PMU interrupt handling fix - fix potential TLB conflict in the hibernate code - improved handling of EL1 instruction aborts (better error reporting) - removal of useless jprobes code for stack saving/restoring - defconfig updates * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: defconfig: enable CONFIG_LOCALVERSION_AUTO arm64: defconfig: add options for virtualization and containers arm64: hibernate: handle allocation failures arm64: hibernate: avoid potential TLB conflict arm64: Handle el1 synchronous instruction aborts cleanly arm64: Remove stack duplicating code from jprobes drivers/perf: arm-pmu: Fix handling of SPI lacking "interrupt-affinity" property drivers/perf: arm-pmu: convert arm_pmu_mutex to spinlock arm64: Support hard limit of cpu count by nr_cpus

Linus Torvalds committed 10 years ago

Commit 120c5472 parents 329f415 53fb45d8 files · +136 −86Browse files

Unified · Split

8 files

arch/arm64/configs/defconfig +46 −7
arch/arm64/include/asm/kprobes.h +0 −2
arch/arm64/kernel/entry.S +7 −0
arch/arm64/kernel/hibernate.c +49 −33
arch/arm64/kernel/probes/kprobes.c +5 −26
arch/arm64/kernel/smp.c +4 −4
arch/arm64/mm/fault.c +12 −2
drivers/perf/arm_pmu.c +13 −12

arch/arm64/configs/defconfig+46−7

@@ -1,4 +1,3 @@
1		−# CONFIG_LOCALVERSION_AUTO is not set
2	1	CONFIG_SYSVIPC=y
3	2	CONFIG_POSIX_MQUEUE=y
4	3	CONFIG_AUDIT=y
@@ -15,10 +14,14 @@ CONFIG_IKCONFIG_PROC=y · 10 unmodified lines
15	14	CONFIG_LOG_BUF_SHIFT=14
16	15	CONFIG_MEMCG=y
17	16	CONFIG_MEMCG_SWAP=y
	17	+CONFIG_BLK_CGROUP=y
	18	+CONFIG_CGROUP_PIDS=y
18	19	CONFIG_CGROUP_HUGETLB=y
19		−# CONFIG_UTS_NS is not set
20		−# CONFIG_IPC_NS is not set
21		−# CONFIG_NET_NS is not set
	20	+CONFIG_CPUSETS=y
	21	+CONFIG_CGROUP_DEVICE=y
	22	+CONFIG_CGROUP_CPUACCT=y
	23	+CONFIG_CGROUP_PERF=y
	24	+CONFIG_USER_NS=y
22	25	CONFIG_SCHED_AUTOGROUP=y
23	26	CONFIG_BLK_DEV_INITRD=y
24	27	CONFIG_KALLSYMS_ALL=y
@@ -71,6 +74,7 @@ CONFIG_PREEMPT=y · 46 unmodified lines
71	74	CONFIG_KSM=y
72	75	CONFIG_TRANSPARENT_HUGEPAGE=y
73	76	CONFIG_CMA=y
	77	+CONFIG_SECCOMP=y
74	78	CONFIG_XEN=y
75	79	CONFIG_KEXEC=y
76	80	# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -84,10 +88,37 @@ CONFIG_NET=y · 7 unmodified lines
84	88	CONFIG_PACKET=y
85	89	CONFIG_UNIX=y
86	90	CONFIG_INET=y
	91	+CONFIG_IP_MULTICAST=y
87	92	CONFIG_IP_PNP=y
88	93	CONFIG_IP_PNP_DHCP=y
89	94	CONFIG_IP_PNP_BOOTP=y
90		−# CONFIG_IPV6 is not set
	95	+CONFIG_IPV6=m
	96	+CONFIG_NETFILTER=y
	97	+CONFIG_NF_CONNTRACK=m
	98	+CONFIG_NF_CONNTRACK_EVENTS=y
	99	+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
	100	+CONFIG_NETFILTER_XT_TARGET_LOG=m
	101	+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
	102	+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
	103	+CONFIG_NF_CONNTRACK_IPV4=m
	104	+CONFIG_IP_NF_IPTABLES=m
	105	+CONFIG_IP_NF_FILTER=m
	106	+CONFIG_IP_NF_TARGET_REJECT=m
	107	+CONFIG_IP_NF_NAT=m
	108	+CONFIG_IP_NF_TARGET_MASQUERADE=m
	109	+CONFIG_IP_NF_MANGLE=m
	110	+CONFIG_NF_CONNTRACK_IPV6=m
	111	+CONFIG_IP6_NF_IPTABLES=m
	112	+CONFIG_IP6_NF_FILTER=m
	113	+CONFIG_IP6_NF_TARGET_REJECT=m
	114	+CONFIG_IP6_NF_MANGLE=m
	115	+CONFIG_IP6_NF_NAT=m
	116	+CONFIG_IP6_NF_TARGET_MASQUERADE=m
	117	+CONFIG_BRIDGE=m
	118	+CONFIG_BRIDGE_VLAN_FILTERING=y
	119	+CONFIG_VLAN_8021Q=m
	120	+CONFIG_VLAN_8021Q_GVRP=y
	121	+CONFIG_VLAN_8021Q_MVRP=y
91	122	CONFIG_BPF_JIT=y
92	123	CONFIG_CFG80211=m
93	124	CONFIG_MAC80211=m
@@ -103,6 +134,7 @@ CONFIG_MTD=y · 9 unmodified lines
103	134	CONFIG_MTD_M25P80=y
104	135	CONFIG_MTD_SPI_NOR=y
105	136	CONFIG_BLK_DEV_LOOP=y
	137	+CONFIG_BLK_DEV_NBD=m
106	138	CONFIG_VIRTIO_BLK=y
107	139	CONFIG_SRAM=y
108	140	# CONFIG_SCSI_PROC_FS is not set
@@ -120,7 +152,10 @@ CONFIG_SATA_SIL24=y · 11 unmodified lines
120	152	CONFIG_PATA_PLATFORM=y
121	153	CONFIG_PATA_OF_PLATFORM=y
122	154	CONFIG_NETDEVICES=y
	155	+CONFIG_MACVLAN=m
	156	+CONFIG_MACVTAP=m
123	157	CONFIG_TUN=y
	158	+CONFIG_VETH=m
124	159	CONFIG_VIRTIO_NET=y
125	160	CONFIG_AMD_XGBE=y
126	161	CONFIG_NET_XGENE=y
@@ -350,12 +385,16 @@ CONFIG_EXYNOS_ADC=y · 223 unmodified lines
350	385	CONFIG_PWM_SAMSUNG=y
351	386	CONFIG_EXT2_FS=y
352	387	CONFIG_EXT3_FS=y
	388	+CONFIG_EXT4_FS_POSIX_ACL=y
	389	+CONFIG_BTRFS_FS=m
	390	+CONFIG_BTRFS_FS_POSIX_ACL=y
353	391	CONFIG_FANOTIFY=y
354	392	CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
355	393	CONFIG_QUOTA=y
356	394	CONFIG_AUTOFS4_FS=y
357		−CONFIG_FUSE_FS=y
358		−CONFIG_CUSE=y
	395	+CONFIG_FUSE_FS=m
	396	+CONFIG_CUSE=m
	397	+CONFIG_OVERLAY_FS=m
359	398	CONFIG_VFAT_FS=y
360	399	CONFIG_TMPFS=y
361	400	CONFIG_HUGETLBFS=y

arch/arm64/include/asm/kprobes.h+0−2

@@ -22,7 +22,6 @@ · 21 unmodified lines
22	22
23	23	#define __ARCH_WANT_KPROBES_INSN_SLOT
24	24	#define MAX_INSN_SIZE 1
25		−#define MAX_STACK_SIZE 128
26	25
27	26	#define flush_insn_slot(p) do { } while (0)
28	27	#define kretprobe_blacklist_size 0
@@ -47,7 +46,6 @@ struct kprobe_ctlblk { · 18 unmodified lines
47	46	struct prev_kprobe prev_kprobe;
48	47	struct kprobe_step_ctx ss_ctx;
49	48	struct pt_regs jprobe_saved_regs;
50		− char jprobes_stack[MAX_STACK_SIZE];
51	49	};
52	50
53	51	void arch_remove_kprobe(struct kprobe *);

arch/arm64/kernel/entry.S+7−0

@@ -353,6 +353,8 @@ el1_sync: · 352 unmodified lines
353	353	lsr x24, x1, #ESR_ELx_EC_SHIFT // exception class
354	354	cmp x24, #ESR_ELx_EC_DABT_CUR // data abort in EL1
355	355	b.eq el1_da
	356	+ cmp x24, #ESR_ELx_EC_IABT_CUR // instruction abort in EL1
	357	+ b.eq el1_ia
356	358	cmp x24, #ESR_ELx_EC_SYS64 // configurable trap
357	359	b.eq el1_undef
358	360	cmp x24, #ESR_ELx_EC_SP_ALIGN // stack alignment exception
@@ -364,6 +366,11 @@ el1_sync: · 5 unmodified lines
364	366	cmp x24, #ESR_ELx_EC_BREAKPT_CUR // debug exception in EL1
365	367	b.ge el1_dbg
366	368	b el1_inv
	369	+
	370	+el1_ia:
	371	+ /*
	372	+ * Fall through to the Data abort case
	373	+ */
367	374	el1_da:
368	375	/*
369	376	* Data abort handling

arch/arm64/kernel/hibernate.c+49−33

@@ -35,6 +35,7 @@ · 34 unmodified lines
35	35	#include <asm/sections.h>
36	36	#include <asm/smp.h>
37	37	#include <asm/suspend.h>
	38	+#include <asm/sysreg.h>
38	39	#include <asm/virt.h>
39	40
40	41	/*
@@ -217,12 +218,22 @@ static int create_safe_exec_page(void *src_start, size_t length, · 176 unmodified lines
217	218	set_pte(pte, __pte(virt_to_phys((void *)dst) \|
218	219	pgprot_val(PAGE_KERNEL_EXEC)));
219	220
220		− /* Load our new page tables */
221		− asm volatile("msr ttbr0_el1, %0;"
222		− "isb;"
223		− "tlbi vmalle1is;"
224		− "dsb ish;"
225		− "isb" : : "r"(virt_to_phys(pgd)));
	221	+ /*
	222	+ * Load our new page tables. A strict BBM approach requires that we
	223	+ * ensure that TLBs are free of any entries that may overlap with the
	224	+ * global mappings we are about to install.
	225	+ *
	226	+ * For a real hibernate/resume cycle TTBR0 currently points to a zero
	227	+ * page, but TLBs may contain stale ASID-tagged entries (e.g. for EFI
	228	+ * runtime services), while for a userspace-driven test_resume cycle it
	229	+ * points to userspace page tables (and we must point it at a zero page
	230	+ * ourselves). Elsewhere we only (un)install the idmap with preemption
	231	+ * disabled, so T0SZ should be as required regardless.
	232	+ */
	233	+ cpu_set_reserved_ttbr0();
	234	+ local_flush_tlb_all();
	235	+ write_sysreg(virt_to_phys(pgd), ttbr0_el1);
	236	+ isb();
226	237
227	238	phys_dst_addr = virt_to_phys((void )dst);
228	239
@@ -393,6 +404,38 @@ int swsusp_arch_resume(void) · 164 unmodified lines
393	404	void __noreturn (hibernate_exit)(phys_addr_t, phys_addr_t, void ,
394	405	void *, phys_addr_t, phys_addr_t);
395	406
	407	+ /*
	408	+ * Restoring the memory image will overwrite the ttbr1 page tables.
	409	+ * Create a second copy of just the linear map, and use this when
	410	+ * restoring.
	411	+ */
	412	+ tmp_pg_dir = (pgd_t *)get_safe_page(GFP_ATOMIC);
	413	+ if (!tmp_pg_dir) {
	414	+ pr_err("Failed to allocate memory for temporary page tables.");
	415	+ rc = -ENOMEM;
	416	+ goto out;
	417	+ }
	418	+ rc = copy_page_tables(tmp_pg_dir, PAGE_OFFSET, 0);
	419	+ if (rc)
	420	+ goto out;
	421	+
	422	+ /*
	423	+ * Since we only copied the linear map, we need to find restore_pblist's
	424	+ * linear map address.
	425	+ */
	426	+ lm_restore_pblist = LMADDR(restore_pblist);
	427	+
	428	+ /*
	429	+ * We need a zero page that is zero before & after resume in order to
	430	+ * to break before make on the ttbr1 page tables.
	431	+ */
	432	+ zero_page = (void *)get_safe_page(GFP_ATOMIC);
	433	+ if (!zero_page) {
	434	+ pr_err("Failed to allocate zero page.");
	435	+ rc = -ENOMEM;
	436	+ goto out;
	437	+ }
	438	+
396	439	/*
397	440	* Locate the exit code in the bottom-but-one page, so that *NULL
398	441	* still has disastrous affects.
@@ -418,27 +461,6 @@ int swsusp_arch_resume(void) · 19 unmodified lines
418	461	*/
419	462	__flush_dcache_area(hibernate_exit, exit_size);
420	463
421		− /*
422		− * Restoring the memory image will overwrite the ttbr1 page tables.
423		− * Create a second copy of just the linear map, and use this when
424		− * restoring.
425		− */
426		− tmp_pg_dir = (pgd_t *)get_safe_page(GFP_ATOMIC);
427		− if (!tmp_pg_dir) {
428		− pr_err("Failed to allocate memory for temporary page tables.");
429		− rc = -ENOMEM;
430		− goto out;
431		− }
432		− rc = copy_page_tables(tmp_pg_dir, PAGE_OFFSET, 0);
433		− if (rc)
434		− goto out;
435		−
436		− /*
437		− * Since we only copied the linear map, we need to find restore_pblist's
438		− * linear map address.
439		− */
440		− lm_restore_pblist = LMADDR(restore_pblist);
441		−
442	464	/*
443	465	* KASLR will cause the el2 vectors to be in a different location in
444	466	* the resumed kernel. Load hibernate's temporary copy into el2.
@@ -453,12 +475,6 @@ int swsusp_arch_resume(void) · 8 unmodified lines
453	475	__hyp_set_vectors(el2_vectors);
454	476	}
455	477
456		− /*
457		− * We need a zero page that is zero before & after resume in order to
458		− * to break before make on the ttbr1 page tables.
459		− */
460		− zero_page = (void *)get_safe_page(GFP_ATOMIC);
461		−
462	478	hibernate_exit(virt_to_phys(tmp_pg_dir), resume_hdr.ttbr1_el1,
463	479	resume_hdr.reenter_kernel, lm_restore_pblist,
464	480	resume_hdr.__hyp_stub_vectors, virt_to_phys(zero_page));

arch/arm64/kernel/probes/kprobes.c+5−26

@@ -41,18 +41,6 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); · 40 unmodified lines
41	41	static void __kprobes
42	42	post_kprobe_handler(struct kprobe_ctlblk , struct pt_regs );
43	43
44		−static inline unsigned long min_stack_size(unsigned long addr)
45		−{
46		− unsigned long size;
47		−
48		− if (on_irq_stack(addr, raw_smp_processor_id()))
49		− size = IRQ_STACK_PTR(raw_smp_processor_id()) - addr;
50		− else
51		− size = (unsigned long)current_thread_info() + THREAD_START_SP - addr;
52		−
53		− return min(size, FIELD_SIZEOF(struct kprobe_ctlblk, jprobes_stack));
54		−}
55		−
56	44	static void __kprobes arch_prepare_ss_slot(struct kprobe *p)
57	45	{
58	46	/* prepare insn slot */
@@ -489,20 +477,15 @@ int __kprobes setjmp_pre_handler(struct kprobe p, struct pt_regs regs) · 430 unmodified lines
489	477	{
490	478	struct jprobe *jp = container_of(p, struct jprobe, kp);
491	479	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
492		− long stack_ptr = kernel_stack_pointer(regs);
493	480
494	481	kcb->jprobe_saved_regs = *regs;
495	482	/*
496		− * As Linus pointed out, gcc assumes that the callee
497		− * owns the argument space and could overwrite it, e.g.
498		− * tailcall optimization. So, to be absolutely safe
499		− * we also save and restore enough stack bytes to cover
500		− * the argument area.
	483	+ * Since we can't be sure where in the stack frame "stacked"
	484	+ * pass-by-value arguments are stored we just don't try to
	485	+ * duplicate any of the stack. Do not use jprobes on functions that
	486	+ * use more than 64 bytes (after padding each to an 8 byte boundary)
	487	+ * of arguments, or pass individual arguments larger than 16 bytes.
501	488	*/
502		− kasan_disable_current();
503		− memcpy(kcb->jprobes_stack, (void *)stack_ptr,
504		− min_stack_size(stack_ptr));
505		− kasan_enable_current();
506	489
507	490	instruction_pointer_set(regs, (unsigned long) jp->entry);
508	491	preempt_disable();
@@ -554,10 +537,6 @@ int __kprobes longjmp_break_handler(struct kprobe p, struct pt_regs regs) · 45 unmodified lines
554	537	}
555	538	unpause_graph_tracing();
556	539	*regs = kcb->jprobe_saved_regs;
557		− kasan_disable_current();
558		− memcpy((void *)stack_addr, kcb->jprobes_stack,
559		− min_stack_size(stack_addr));
560		− kasan_enable_current();
561	540	preempt_enable_no_resched();
562	541	return 1;
563	542	}

arch/arm64/kernel/smp.c+4−4

@@ -661,9 +661,9 @@ void __init smp_init_cpus(void) · 660 unmodified lines
661	661	acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_INTERRUPT,
662	662	acpi_parse_gic_cpu_interface, 0);
663	663
664		− if (cpu_count > NR_CPUS)
665		− pr_warn("no. of cores (%d) greater than configured maximum of %d - clipping\n",
666		− cpu_count, NR_CPUS);
	664	+ if (cpu_count > nr_cpu_ids)
	665	+ pr_warn("Number of cores (%d) exceeds configured maximum of %d - clipping\n",
	666	+ cpu_count, nr_cpu_ids);
667	667
668	668	if (!bootcpu_valid) {
669	669	pr_err("missing boot CPU MPIDR, not enabling secondaries\n");
@@ -677,7 +677,7 @@ void __init smp_init_cpus(void) · 7 unmodified lines
677	677	* with entries in cpu_logical_map while initializing the cpus.
678	678	* If the cpu set-up fails, invalidate the cpu_logical_map entry.
679	679	*/
680		− for (i = 1; i < NR_CPUS; i++) {
	680	+ for (i = 1; i < nr_cpu_ids; i++) {
681	681	if (cpu_logical_map(i) != INVALID_HWID) {
682	682	if (smp_cpu_setup(i))
683	683	cpu_logical_map(i) = INVALID_HWID;

arch/arm64/mm/fault.c+12−2

@@ -153,6 +153,11 @@ int ptep_set_access_flags(struct vm_area_struct *vma, · 152 unmodified lines
153	153	}
154	154	#endif
155	155
	156	+static bool is_el1_instruction_abort(unsigned int esr)
	157	+{
	158	+ return ESR_ELx_EC(esr) == ESR_ELx_EC_IABT_CUR;
	159	+}
	160	+
156	161	/*
157	162	* The kernel tried to access some page that wasn't present.
158	163	*/
@@ -161,8 +166,9 @@ static void __do_kernel_fault(struct mm_struct *mm, unsigned long addr, · 2 unmodified lines
161	166	{
162	167	/*
163	168	* Are we prepared to handle this kernel fault?
	169	+ * We are almost certainly not prepared to handle instruction faults.
164	170	*/
165		− if (fixup_exception(regs))
	171	+ if (!is_el1_instruction_abort(esr) && fixup_exception(regs))
166	172	return;
167	173
168	174	/*
@@ -267,7 +273,8 @@ static inline bool is_permission_fault(unsigned int esr) · 98 unmodified lines
267	273	unsigned int ec = ESR_ELx_EC(esr);
268	274	unsigned int fsc_type = esr & ESR_ELx_FSC_TYPE;
269	275
270		− return (ec == ESR_ELx_EC_DABT_CUR && fsc_type == ESR_ELx_FSC_PERM);
	276	+ return (ec == ESR_ELx_EC_DABT_CUR && fsc_type == ESR_ELx_FSC_PERM) \|\|
	277	+ (ec == ESR_ELx_EC_IABT_CUR && fsc_type == ESR_ELx_FSC_PERM);
271	278	}
272	279
273	280	static bool is_el0_instruction_abort(unsigned int esr)
@@ -312,6 +319,9 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, · 38 unmodified lines
312	319	if (regs->orig_addr_limit == KERNEL_DS)
313	320	die("Accessing user space memory with fs=KERNEL_DS", regs, esr);
314	321
	322	+ if (is_el1_instruction_abort(esr))
	323	+ die("Attempting to execute userspace memory", regs, esr);
	324	+
315	325	if (!search_exception_tables(regs->pc))
316	326	die("Accessing user space memory outside uaccess.h routines", regs, esr);
317	327	}

drivers/perf/arm_pmu.c+13−12

@@ -688,7 +688,7 @@ static int cpu_pmu_request_irq(struct arm_pmu *cpu_pmu, irq_handler_t handler) · 687 unmodified lines
688	688	return 0;
689	689	}
690	690
691		−static DEFINE_MUTEX(arm_pmu_mutex);
	691	+static DEFINE_SPINLOCK(arm_pmu_lock);
692	692	static LIST_HEAD(arm_pmu_list);
693	693
694	694	/*
@@ -701,7 +701,7 @@ static int arm_perf_starting_cpu(unsigned int cpu) · 6 unmodified lines
701	701	{
702	702	struct arm_pmu *pmu;
703	703
704		− mutex_lock(&arm_pmu_mutex);
	704	+ spin_lock(&arm_pmu_lock);
705	705	list_for_each_entry(pmu, &arm_pmu_list, entry) {
706	706
707	707	if (!cpumask_test_cpu(cpu, &pmu->supported_cpus))
@@ -709,7 +709,7 @@ static int arm_perf_starting_cpu(unsigned int cpu) · 1 unmodified line
709	709	if (pmu->reset)
710	710	pmu->reset(pmu);
711	711	}
712		− mutex_unlock(&arm_pmu_mutex);
	712	+ spin_unlock(&arm_pmu_lock);
713	713	return 0;
714	714	}
715	715
@@ -821,9 +821,9 @@ static int cpu_pmu_init(struct arm_pmu *cpu_pmu) · 105 unmodified lines
821	821	if (!cpu_hw_events)
822	822	return -ENOMEM;
823	823
824		− mutex_lock(&arm_pmu_mutex);
	824	+ spin_lock(&arm_pmu_lock);
825	825	list_add_tail(&cpu_pmu->entry, &arm_pmu_list);
826		− mutex_unlock(&arm_pmu_mutex);
	826	+ spin_unlock(&arm_pmu_lock);
827	827
828	828	err = cpu_pm_pmu_register(cpu_pmu);
829	829	if (err)
@@ -859,9 +859,9 @@ static int cpu_pmu_init(struct arm_pmu *cpu_pmu) · 29 unmodified lines
859	859	return 0;
860	860
861	861	out_unregister:
862		− mutex_lock(&arm_pmu_mutex);
	862	+ spin_lock(&arm_pmu_lock);
863	863	list_del(&cpu_pmu->entry);
864		− mutex_unlock(&arm_pmu_mutex);
	864	+ spin_unlock(&arm_pmu_lock);
865	865	free_percpu(cpu_hw_events);
866	866	return err;
867	867	}
@@ -869,9 +869,9 @@ out_unregister: · 1 unmodified line
869	869	static void cpu_pmu_destroy(struct arm_pmu *cpu_pmu)
870	870	{
871	871	cpu_pm_pmu_unregister(cpu_pmu);
872		− mutex_lock(&arm_pmu_mutex);
	872	+ spin_lock(&arm_pmu_lock);
873	873	list_del(&cpu_pmu->entry);
874		− mutex_unlock(&arm_pmu_mutex);
	874	+ spin_unlock(&arm_pmu_lock);
875	875	free_percpu(cpu_pmu->hw_events);
876	876	}
877	877
@@ -967,11 +967,12 @@ static int of_pmu_irq_cfg(struct arm_pmu *pmu) · 89 unmodified lines
967	967
968	968	/* If we didn't manage to parse anything, try the interrupt affinity */
969	969	if (cpumask_weight(&pmu->supported_cpus) == 0) {
970		− if (!using_spi) {
	970	+ int irq = platform_get_irq(pdev, 0);
	971	+
	972	+ if (irq_is_percpu(irq)) {
971	973	/* If using PPIs, check the affinity of the partition */
972		− int ret, irq;
	974	+ int ret;
973	975
974		− irq = platform_get_irq(pdev, 0);
975	976	ret = irq_get_percpu_devid_partition(irq, &pmu->supported_cpus);
976	977	if (ret) {
977	978	kfree(irqs);

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code