diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-11-21 12:54:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-11-21 12:54:27 -0800 |
| commit | 7b7fe306dd86b5342d3be8a3f1cbf3bb1ebf280f (patch) | |
| tree | ee51f4e199e72192b23f4f33e46ad21a0104fa52 | |
| parent | f1cc4be7687a058ecbe2b6178034a70b76e07e92 (diff) | |
| parent | bd6d2f87c2239d10bf5f37ab52b3968565528417 (diff) | |
Pull powerpc fixes from Madhavan Srinivasan:
- powerpc32/bpf: return false from bpf_jit_supports_fsession() on ppc32
- PPC32: Fix hard_irq_disable to follow tracing and lockdep state
- KVM: PPC: Book3S HV: Clean up on uvmem initialization failure
- KVM: PPC: BookE: Load FP and Altivec before enabling the interrupts
- KVM: PPC: Hard disable interrupts before guest entry
- KVM: PPC: BookE: Use vcpu_err() instead of printk() in kvmppc_dump_vcpu()
- MAINTAINERS updates
- misc fixes and cleanups
Thanks to Christian Zigotzky, Dan Carpenter, Fabiano Rosas, Gaurav
Yadav, Gautam Menghani, Haoxiang Li, Karl Mehltretter, Mahesh
Salgaonkar, Mukesh Kumar Chaurasiya, Narayana Murty N, Nathan
Chancellor, Ritesh Harjani, R Nageswara Sastry, and Shrikanth Hegde
* tag 'powerpc-7.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
KVM: PPC: Fix TOCTOU kernel stack disclosure via kvm_run->mmio.len
KVM: PPC: Book3S HV: Use u8 to store guest's interrupt priorities
KVM: PPC: BookE: Use vcpu_err() instead of printk() in kvmppc_dump_vcpu()
powerpc32/bpf: return false from bpf_jit_supports_fsession() on ppc32
KVM: PPC: Book3s: nestedv2: Free the guest state buffers if vcpu create fails
KVM: PPC: Book3S HV: Fix error handling during vcore create
KVM: PPC: Book3S HV nestedv2: reject vCPU ids beyond the PAPR limit
KVM: PPC: Book3S HV nestedv2: cap max vcpus to PAPR limit
KVM: PPC: BookE: Don't call __ffs() on an empty pending_exceptions bitmap
KVM: PPC: Book3S: Don't call __ffs() on an empty pending_exceptions bitmap
KVM: PPC: Book3S HV: Read EX_DSISR as a 32-bit field on guest exit
powerpc/xmon: Avoid unsequenced accesses to tsk in show_task()
KVM: PPC: Hard disable interrupts before guest entry
KVM: PPC: BookE: Load FP and Altivec before enabling the interrupts
PPC32: Fix hard_irq_disable to follow tracing and lockdep state
KVM: PPC: Book3S HV: Clean up on uvmem initialization failure
MAINTAINERS: Update OCXL maintainer details
MAINTAINERS: Update EEH maintainer details
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/hw_irq.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/kvm_host.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/kvm_ppc.h | 4 | ||||
| -rw-r--r-- | arch/powerpc/kvm/book3s.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv.c | 17 | ||||
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv_p9_entry.c | 13 | ||||
| -rw-r--r-- | arch/powerpc/kvm/book3s_rtas.c | 5 | ||||
| -rw-r--r-- | arch/powerpc/kvm/book3s_xive.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/kvm/booke.c | 31 | ||||
| -rw-r--r-- | arch/powerpc/kvm/powerpc.c | 82 | ||||
| -rw-r--r-- | arch/powerpc/net/bpf_jit_comp.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/xmon/xmon.c | 3 |
13 files changed, 101 insertions, 68 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2ac5128b756e..44540a1eb2b8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -20471,7 +20471,7 @@ F: drivers/net/dsa/ocelot/ocelot_ext.c F: include/linux/mfd/ocelot.h OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER -M: Mahesh J Salgaonkar <mahesh@linux.ibm.com> +M: Madhavan Srinivasan <maddy@linux.ibm.com> R: Andrew Donnellan <andrew+kernel@donnellan.id.au> L: linuxppc-dev@lists.ozlabs.org S: Odd Fixes @@ -21614,7 +21614,7 @@ F: drivers/pci/endpoint/ F: tools/testing/selftests/pci_endpoint/ PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC -M: Mahesh J Salgaonkar <mahesh@linux.ibm.com> +M: Sourabh Jain <sourabhjain@linux.ibm.com> R: Oliver O'Halloran <oohall@gmail.com> L: linuxppc-dev@lists.ozlabs.org S: Supported diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h index b7eee6385ae5..ddb850e62abd 100644 --- a/arch/powerpc/include/asm/hw_irq.h +++ b/arch/powerpc/include/asm/hw_irq.h @@ -464,7 +464,7 @@ static inline bool arch_irqs_disabled(void) return arch_irqs_disabled_flags(arch_local_save_flags()); } -#define hard_irq_disable() arch_local_irq_disable() +#define hard_irq_disable() local_irq_disable() static inline bool regs_irqs_disabled(struct pt_regs *regs) { diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h index 708a32f89776..d447c847f7ef 100644 --- a/arch/powerpc/include/asm/kvm_host.h +++ b/arch/powerpc/include/asm/kvm_host.h @@ -35,6 +35,7 @@ #define KVM_MAX_VCPUS NR_CPUS #define KVM_MAX_VCORES NR_CPUS +#define KVM_MAX_VCPU_IDS_NESTEDv2 2048 /* PAPR H_GUEST_CREATE_VCPU vcpuId */ #include <asm/cputhreads.h> @@ -745,6 +746,7 @@ struct kvm_vcpu_arch { pgd_t *pgdir; u16 io_gpr; /* GPR used as IO source/target */ + u8 mmio_len; /* kernel-private copy of mmio.len, immune to TOCTOU */ u8 mmio_host_swabbed; u8 mmio_sign_extend; /* conversion between single and double precision */ diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h index 169ea6a7fbad..0b85c13baf28 100644 --- a/arch/powerpc/include/asm/kvm_ppc.h +++ b/arch/powerpc/include/asm/kvm_ppc.h @@ -720,7 +720,7 @@ static inline int kvmppc_xive_xics_hcall(struct kvm_vcpu *vcpu, u32 req) * new "XIVE" interrupt controller. */ extern int kvmppc_xive_set_xive(struct kvm *kvm, u32 irq, u32 server, - u32 priority); + u8 priority); extern int kvmppc_xive_get_xive(struct kvm *kvm, u32 irq, u32 *server, u32 *priority); extern int kvmppc_xive_int_on(struct kvm *kvm, u32 irq); @@ -758,7 +758,7 @@ extern bool kvmppc_xive_native_supported(void); #else static inline int kvmppc_xive_set_xive(struct kvm *kvm, u32 irq, u32 server, - u32 priority) { return -1; } + u8 priority) { return -1; } static inline int kvmppc_xive_get_xive(struct kvm *kvm, u32 irq, u32 *server, u32 *priority) { return -1; } static inline int kvmppc_xive_int_on(struct kvm *kvm, u32 irq) { return -1; } diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c index 2efbe05caed7..5de4b6e86656 100644 --- a/arch/powerpc/kvm/book3s.c +++ b/arch/powerpc/kvm/book3s.c @@ -401,7 +401,7 @@ int kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu) if (vcpu->arch.pending_exceptions) printk(KERN_EMERG "KVM: Check pending: %lx\n", vcpu->arch.pending_exceptions); #endif - priority = __ffs(*pending); + priority = find_first_bit(pending, BITS_PER_BYTE * sizeof(*pending)); while (priority < BOOK3S_IRQPRIO_MAX) { if (kvmppc_book3s_irqprio_deliver(vcpu, priority) && clear_irqprio(vcpu, priority)) { diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index bafe9546087b..89a1e0cd35af 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -3092,15 +3092,20 @@ static int kvmppc_core_vcpu_create_hv(struct kvm_vcpu *vcpu) err = -ENOMEM; vcore = kvmppc_vcore_create(kvm, id & ~(kvm->arch.smt_mode - 1)); - mutex_lock(&kvm->arch.mmu_setup_lock); - kvm->arch.vcores[core] = vcore; - kvm->arch.online_vcores++; - mutex_unlock(&kvm->arch.mmu_setup_lock); + if (vcore) { + mutex_lock(&kvm->arch.mmu_setup_lock); + kvm->arch.vcores[core] = vcore; + kvm->arch.online_vcores++; + mutex_unlock(&kvm->arch.mmu_setup_lock); + } } } - if (!vcore) + if (!vcore) { + if (kvmhv_is_nestedv2()) + kvmhv_nestedv2_vcpu_free(vcpu, &vcpu->arch.nestedv2_io); return err; + } spin_lock(&vcore->lock); ++vcore->num_threads; @@ -6745,7 +6750,7 @@ static int kvmppc_book3s_init_hv(void) r = kvmppc_uvmem_init(); if (r < 0) { pr_err("KVM-HV: kvmppc_uvmem_init failed %d\n", r); - return r; + goto err; } #if defined(CONFIG_KVM_XICS) diff --git a/arch/powerpc/kvm/book3s_hv_p9_entry.c b/arch/powerpc/kvm/book3s_hv_p9_entry.c index 34bc0a8a1288..16aa8582b888 100644 --- a/arch/powerpc/kvm/book3s_hv_p9_entry.c +++ b/arch/powerpc/kvm/book3s_hv_p9_entry.c @@ -529,6 +529,15 @@ unsigned long kvmppc_msr_hard_disable_set_facilities(struct kvm_vcpu *vcpu, unsi } EXPORT_SYMBOL_GPL(kvmppc_msr_hard_disable_set_facilities); +/* + * EX_DSISR is a 32-bit field that shares a doubleword with EX_CCR. + * Small helper for reading it back at its natural width. + */ +static u32 exsave_dsisr(u64 *exsave) +{ + return *(u32 *)((void *)exsave + EX_DSISR); +} + int kvmhv_vcpu_entry_p9(struct kvm_vcpu *vcpu, u64 time_limit, unsigned long lpcr, u64 *tb) { struct p9_host_os_sprs host_os_sprs; @@ -770,7 +779,7 @@ tm_return_to_guest: if (unlikely(trap == BOOK3S_INTERRUPT_MACHINE_CHECK)) { vcpu->arch.fault_dar = exsave[EX_DAR/sizeof(u64)]; - vcpu->arch.fault_dsisr = exsave[EX_DSISR/sizeof(u64)]; + vcpu->arch.fault_dsisr = exsave_dsisr(exsave); kvmppc_realmode_machine_check(vcpu); } else if (unlikely(trap == BOOK3S_INTERRUPT_HMI)) { @@ -781,7 +790,7 @@ tm_return_to_guest: } else if (trap == BOOK3S_INTERRUPT_H_DATA_STORAGE) { vcpu->arch.fault_dar = exsave[EX_DAR/sizeof(u64)]; - vcpu->arch.fault_dsisr = exsave[EX_DSISR/sizeof(u64)]; + vcpu->arch.fault_dsisr = exsave_dsisr(exsave); vcpu->arch.fault_gpa = mfspr(SPRN_ASDR); } else if (trap == BOOK3S_INTERRUPT_H_INST_STORAGE) { diff --git a/arch/powerpc/kvm/book3s_rtas.c b/arch/powerpc/kvm/book3s_rtas.c index 0507715d0fdd..125e06d99884 100644 --- a/arch/powerpc/kvm/book3s_rtas.c +++ b/arch/powerpc/kvm/book3s_rtas.c @@ -18,7 +18,8 @@ #ifdef CONFIG_KVM_XICS static void kvm_rtas_set_xive(struct kvm_vcpu *vcpu, struct rtas_args *args) { - u32 irq, server, priority; + u32 irq, server; + u8 priority; int rc; if (be32_to_cpu(args->nargs) != 3 || be32_to_cpu(args->nret) != 1) { @@ -28,7 +29,7 @@ static void kvm_rtas_set_xive(struct kvm_vcpu *vcpu, struct rtas_args *args) irq = be32_to_cpu(args->args[0]); server = be32_to_cpu(args->args[1]); - priority = be32_to_cpu(args->args[2]); + priority = (u8) be32_to_cpu(args->args[2]); if (xics_on_xive()) rc = kvmppc_xive_set_xive(vcpu->kvm, irq, server, priority); diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c index 9d2039ee37b2..00218a7dc688 100644 --- a/arch/powerpc/kvm/book3s_xive.c +++ b/arch/powerpc/kvm/book3s_xive.c @@ -1267,7 +1267,7 @@ static int xive_target_interrupt(struct kvm *kvm, */ int kvmppc_xive_set_xive(struct kvm *kvm, u32 irq, u32 server, - u32 priority) + u8 priority) { struct kvmppc_xive *xive = kvm->arch.xive; struct kvmppc_xive_src_block *sb; diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index 13ad4cf5fa71..d328e94c26db 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -86,26 +86,25 @@ const struct kvm_stats_header kvm_vcpu_stats_header = { sizeof(kvm_vcpu_stats_desc), }; -/* TODO: use vcpu_printf() */ void kvmppc_dump_vcpu(struct kvm_vcpu *vcpu) { int i; - printk("pc: %08lx msr: %08llx\n", vcpu->arch.regs.nip, - vcpu->arch.shared->msr); - printk("lr: %08lx ctr: %08lx\n", vcpu->arch.regs.link, - vcpu->arch.regs.ctr); - printk("srr0: %08llx srr1: %08llx\n", vcpu->arch.shared->srr0, - vcpu->arch.shared->srr1); + vcpu_err(vcpu, "pc: %08lx msr: %08llx\n", vcpu->arch.regs.nip, + vcpu->arch.shared->msr); + vcpu_err(vcpu, "lr: %08lx ctr: %08lx\n", vcpu->arch.regs.link, + vcpu->arch.regs.ctr); + vcpu_err(vcpu, "srr0: %08llx srr1: %08llx\n", vcpu->arch.shared->srr0, + vcpu->arch.shared->srr1); - printk("exceptions: %08lx\n", vcpu->arch.pending_exceptions); + vcpu_err(vcpu, "exceptions: %08lx\n", vcpu->arch.pending_exceptions); for (i = 0; i < 32; i += 4) { - printk("gpr%02d: %08lx %08lx %08lx %08lx\n", i, - kvmppc_get_gpr(vcpu, i), - kvmppc_get_gpr(vcpu, i+1), - kvmppc_get_gpr(vcpu, i+2), - kvmppc_get_gpr(vcpu, i+3)); + vcpu_err(vcpu, "gpr%02d: %08lx %08lx %08lx %08lx\n", i, + kvmppc_get_gpr(vcpu, i), + kvmppc_get_gpr(vcpu, i+1), + kvmppc_get_gpr(vcpu, i+2), + kvmppc_get_gpr(vcpu, i+3)); } } @@ -692,7 +691,7 @@ static void kvmppc_core_check_exceptions(struct kvm_vcpu *vcpu) unsigned long *pending = &vcpu->arch.pending_exceptions; unsigned int priority; - priority = __ffs(*pending); + priority = find_first_bit(pending, BITS_PER_BYTE * sizeof(*pending)); while (priority < BOOKE_IRQPRIO_MAX) { if (kvmppc_booke_irqprio_deliver(vcpu, priority)) break; @@ -722,7 +721,6 @@ int kvmppc_core_prepare_to_enter(struct kvm_vcpu *vcpu) if (vcpu->arch.shared->msr & MSR_WE) { local_irq_enable(); kvm_vcpu_halt(vcpu); - local_irq_disable(); hard_irq_disable(); kvmppc_set_exit_type(vcpu, EMULATED_MTMSRWE_EXITS); @@ -1404,10 +1402,9 @@ out: if (s <= 0) r = (s << 2) | RESUME_HOST | (r & RESUME_FLAG_NV); else { - /* interrupts now hard-disabled */ - kvmppc_fix_ee_before_entry(); kvmppc_load_guest_fp(vcpu); kvmppc_load_guest_altivec(vcpu); + kvmppc_fix_ee_before_entry(); } } diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 9194cf492d1c..4da6659c5d9d 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -81,12 +81,6 @@ int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu) int r; WARN_ON(irqs_disabled()); - /* - * local_irq_disable() first: on 32-bit, hard_irq_disable() alone is a - * raw MSR[EE] clear that bypasses the lockdep/irq-tracing state, and - * the xfer_to_guest_mode helpers assert IRQs are seen as disabled. - */ - local_irq_disable(); hard_irq_disable(); while (true) { @@ -101,7 +95,6 @@ int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu) */ local_irq_enable(); r = kvm_xfer_to_guest_mode_handle_work(vcpu); - local_irq_disable(); hard_irq_disable(); if (r) { /* @@ -134,7 +127,6 @@ int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu) local_irq_enable(); trace_kvm_check_requests(vcpu); r = kvmppc_core_check_requests(vcpu); - local_irq_disable(); hard_irq_disable(); if (r > 0) continue; @@ -663,12 +655,18 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) r = min(num_present_cpus(), KVM_MAX_VCPUS); else r = min(num_online_cpus(), KVM_MAX_VCPUS); + if (kvmhv_is_nestedv2()) + r = min(r, KVM_MAX_VCPU_IDS_NESTEDv2); break; case KVM_CAP_MAX_VCPUS: r = KVM_MAX_VCPUS; + if (kvmhv_is_nestedv2()) + r = min(r, KVM_MAX_VCPU_IDS_NESTEDv2); break; case KVM_CAP_MAX_VCPU_ID: r = KVM_MAX_VCPU_IDS; + if (kvmhv_is_nestedv2()) + r = min(r, KVM_MAX_VCPU_IDS_NESTEDv2); break; #ifdef CONFIG_PPC_BOOK3S_64 case KVM_CAP_PPC_GET_SMMU_INFO: @@ -772,6 +770,9 @@ void kvm_arch_flush_shadow_memslot(struct kvm *kvm, int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id) { + if (kvmhv_is_nestedv2() && id >= KVM_MAX_VCPU_IDS_NESTEDv2) + return -EINVAL; + return 0; } @@ -1156,23 +1157,29 @@ static inline u32 dp_to_sp(u64 fprd) #define dp_to_sp(x) (x) #endif /* CONFIG_PPC_FPU */ -static void kvmppc_complete_mmio_load(struct kvm_vcpu *vcpu) +static int kvmppc_complete_mmio_load(struct kvm_vcpu *vcpu) { struct kvm_run *run = vcpu->run; - u64 gpr; + u64 gpr = 0; + u8 len = vcpu->arch.mmio_len; /* use kernel-private copy, not run->mmio.len */ - if (run->mmio.len > sizeof(gpr)) - return; + /* Reject lengths that have no corresponding switch case below. */ + switch (len) { + case 1: case 2: case 4: case 8: + break; + default: + return EMULATE_FAIL; + } if (!vcpu->arch.mmio_host_swabbed) { - switch (run->mmio.len) { + switch (len) { case 8: gpr = *(u64 *)run->mmio.data; break; case 4: gpr = *(u32 *)run->mmio.data; break; case 2: gpr = *(u16 *)run->mmio.data; break; case 1: gpr = *(u8 *)run->mmio.data; break; } } else { - switch (run->mmio.len) { + switch (len) { case 8: gpr = swab64(*(u64 *)run->mmio.data); break; case 4: gpr = swab32(*(u32 *)run->mmio.data); break; case 2: gpr = swab16(*(u16 *)run->mmio.data); break; @@ -1181,11 +1188,11 @@ static void kvmppc_complete_mmio_load(struct kvm_vcpu *vcpu) } /* conversion between single and double precision */ - if ((vcpu->arch.mmio_sp64_extend) && (run->mmio.len == 4)) + if ((vcpu->arch.mmio_sp64_extend) && (len == 4)) gpr = sp_to_dp(gpr); if (vcpu->arch.mmio_sign_extend) { - switch (run->mmio.len) { + switch (len) { #ifdef CONFIG_PPC64 case 4: gpr = (s64)(s32)gpr; @@ -1264,6 +1271,7 @@ static void kvmppc_complete_mmio_load(struct kvm_vcpu *vcpu) default: BUG(); } + return EMULATE_DONE; } static int __kvmppc_handle_load(struct kvm_vcpu *vcpu, @@ -1289,6 +1297,7 @@ static int __kvmppc_handle_load(struct kvm_vcpu *vcpu, run->mmio.is_write = 0; vcpu->arch.io_gpr = rt; + vcpu->arch.mmio_len = bytes; /* kernel-private, immune to TOCTOU */ vcpu->arch.mmio_host_swabbed = host_swabbed; vcpu->mmio_needed = 1; vcpu->mmio_is_write = 0; @@ -1302,8 +1311,11 @@ static int __kvmppc_handle_load(struct kvm_vcpu *vcpu, srcu_read_unlock(&vcpu->kvm->srcu, idx); if (!ret) { - kvmppc_complete_mmio_load(vcpu); vcpu->mmio_needed = 0; + + if (kvmppc_complete_mmio_load(vcpu) != EMULATE_DONE) + return EMULATE_FAIL; + return EMULATE_DONE; } @@ -1344,7 +1356,7 @@ int kvmppc_handle_vsx_load(struct kvm_vcpu *vcpu, if (emulated != EMULATE_DONE) break; - vcpu->arch.paddr_accessed += vcpu->run->mmio.len; + vcpu->arch.paddr_accessed += vcpu->arch.mmio_len; vcpu->arch.mmio_vsx_copy_nums--; vcpu->arch.mmio_vsx_offset++; @@ -1374,6 +1386,7 @@ int kvmppc_handle_store(struct kvm_vcpu *vcpu, run->mmio.phys_addr = vcpu->arch.paddr_accessed; run->mmio.len = bytes; run->mmio.is_write = 1; + vcpu->arch.mmio_len = bytes; /* kernel-private, immune to TOCTOU */ vcpu->mmio_needed = 1; vcpu->mmio_is_write = 1; @@ -1490,7 +1503,7 @@ int kvmppc_handle_vsx_store(struct kvm_vcpu *vcpu, if (emulated != EMULATE_DONE) break; - vcpu->arch.paddr_accessed += vcpu->run->mmio.len; + vcpu->arch.paddr_accessed += vcpu->arch.mmio_len; vcpu->arch.mmio_vsx_copy_nums--; vcpu->arch.mmio_vsx_offset++; @@ -1505,14 +1518,14 @@ static int kvmppc_emulate_mmio_vsx_loadstore(struct kvm_vcpu *vcpu) enum emulation_result emulated = EMULATE_FAIL; int r; - vcpu->arch.paddr_accessed += run->mmio.len; + vcpu->arch.paddr_accessed += vcpu->arch.mmio_len; if (!vcpu->mmio_is_write) { emulated = kvmppc_handle_vsx_load(vcpu, vcpu->arch.io_gpr, - run->mmio.len, 1, vcpu->arch.mmio_sign_extend); + vcpu->arch.mmio_len, 1, vcpu->arch.mmio_sign_extend); } else { emulated = kvmppc_handle_vsx_store(vcpu, - vcpu->arch.io_gpr, run->mmio.len, 1); + vcpu->arch.io_gpr, vcpu->arch.mmio_len, 1); } switch (emulated) { @@ -1550,7 +1563,7 @@ int kvmppc_handle_vmx_load(struct kvm_vcpu *vcpu, if (emulated != EMULATE_DONE) break; - vcpu->arch.paddr_accessed += vcpu->run->mmio.len; + vcpu->arch.paddr_accessed += vcpu->arch.mmio_len; vcpu->arch.mmio_vmx_copy_nums--; vcpu->arch.mmio_vmx_offset++; } @@ -1670,7 +1683,7 @@ int kvmppc_handle_vmx_store(struct kvm_vcpu *vcpu, if (emulated != EMULATE_DONE) break; - vcpu->arch.paddr_accessed += vcpu->run->mmio.len; + vcpu->arch.paddr_accessed += vcpu->arch.mmio_len; vcpu->arch.mmio_vmx_copy_nums--; vcpu->arch.mmio_vmx_offset++; } @@ -1684,14 +1697,14 @@ static int kvmppc_emulate_mmio_vmx_loadstore(struct kvm_vcpu *vcpu) enum emulation_result emulated = EMULATE_FAIL; int r; - vcpu->arch.paddr_accessed += run->mmio.len; + vcpu->arch.paddr_accessed += vcpu->arch.mmio_len; if (!vcpu->mmio_is_write) { emulated = kvmppc_handle_vmx_load(vcpu, - vcpu->arch.io_gpr, run->mmio.len, 1); + vcpu->arch.io_gpr, vcpu->arch.mmio_len, 1); } else { emulated = kvmppc_handle_vmx_store(vcpu, - vcpu->arch.io_gpr, run->mmio.len, 1); + vcpu->arch.io_gpr, vcpu->arch.mmio_len, 1); } switch (emulated) { @@ -1819,8 +1832,16 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) if (vcpu->mmio_needed) { vcpu->mmio_needed = 0; - if (!vcpu->mmio_is_write) - kvmppc_complete_mmio_load(vcpu); + if (!vcpu->mmio_is_write) { + if (kvmppc_complete_mmio_load(vcpu) != EMULATE_DONE) { + run->exit_reason = KVM_EXIT_INTERNAL_ERROR; + run->internal.suberror = + KVM_INTERNAL_ERROR_EMULATION; + run->internal.ndata = 0; + r = 0; + goto out; + } + } #ifdef CONFIG_VSX if (vcpu->arch.mmio_vsx_copy_nums > 0) { vcpu->arch.mmio_vsx_copy_nums--; @@ -1879,10 +1900,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) kvm_sigset_deactivate(vcpu); -#ifdef CONFIG_ALTIVEC out: -#endif - /* * We're already returning to userspace, don't pass the * RESUME_HOST flags along. diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c index ce2966c52ac5..c246709a15ce 100644 --- a/arch/powerpc/net/bpf_jit_comp.c +++ b/arch/powerpc/net/bpf_jit_comp.c @@ -586,7 +586,7 @@ bool bpf_jit_supports_fsession(void) * for fsession and trampoline on ppc32. */ if (IS_ENABLED(CONFIG_PPC32)) - return -EOPNOTSUPP; + return false; return true; } diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index cb3a3244ae6f..90a8d7a8f42d 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -3240,8 +3240,9 @@ memzcan(void) printf("%.8lx\n", a - mskip); } -static void show_task(struct task_struct *volatile tsk) +static void show_task(struct task_struct *volatile vol_tsk) { + struct task_struct *tsk = vol_tsk; unsigned int p_state = READ_ONCE(tsk->__state); char state; |
