Commit 2743cf75 authored by Nam Cao's avatar Nam Cao Committed by Madhavan Srinivasan
Browse files

powerpc, ocxl: Fix extraction of struct xive_irq_data 



Commit cc0cc23b ("powerpc/xive: Untangle xive from child interrupt
controller drivers") changed xive_irq_data to be stashed to chip_data
instead of handler_data. However, multiple places are still attempting to
read xive_irq_data from handler_data and get a NULL pointer deference bug.

Update them to read xive_irq_data from chip_data.

Non-XIVE files which touch xive_irq_data seem quite strange to me,
especially the ocxl driver. I think there ought to be an alternative
platform-independent solution, instead of touching XIVE's data directly.
Therefore, I think this whole thing should be cleaned up. But perhaps I
just misunderstand something. In any case, this cleanup would not be
trivial; for now, just get things working again.

Fixes: cc0cc23b ("powerpc/xive: Untangle xive from child interrupt controller drivers")
Reported-by: default avatarRitesh Harjani (IBM) <ritesh.list@gmail.com>
Closes: https://lore.kernel.org/linuxppc-dev/68e48df8.170a0220.4b4b0.217d@mx.google.com/


Signed-off-by: default avatarNam Cao <namcao@linutronix.de>
Reviewed-by: default avatarGanesh Goudar <ganeshgr@linux.ibm.com>
Acked-by: Andrew Donnellan <ajd@linux.ibm.com>  # ocxl
Signed-off-by: default avatarMadhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/20251008081359.1382699-1-namcao@linutronix.de
parent ef3e73a9

arch/powerpc/kvm/book3s_xive.c

+4 −8
Original line number Diff line number Diff line
@@ -916,8 +916,7 @@ int kvmppc_xive_attach_escalation(struct kvm_vcpu *vcpu, u8 prio, 
	 * it fires once.

	 */

	if (single_escalation) {

		struct irq_data *d = irq_get_irq_data(xc->esc_virq[prio]);

		struct xive_irq_data *xd = irq_data_get_irq_handler_data(d);

		struct xive_irq_data *xd = irq_get_chip_data(xc->esc_virq[prio]);



		xive_vm_esb_load(xd, XIVE_ESB_SET_PQ_01);

		vcpu->arch.xive_esc_raddr = xd->eoi_page;
@@ -1612,7 +1611,7 @@ int kvmppc_xive_set_mapped(struct kvm *kvm, unsigned long guest_irq, 


	/* Grab info about irq */

	state->pt_number = hw_irq;

	state->pt_data = irq_data_get_irq_handler_data(host_data);

	state->pt_data = irq_data_get_irq_chip_data(host_data);



	/*

	 * Configure the IRQ to match the existing configuration of
@@ -1787,8 +1786,7 @@ void kvmppc_xive_disable_vcpu_interrupts(struct kvm_vcpu *vcpu) 
 */

void xive_cleanup_single_escalation(struct kvm_vcpu *vcpu, int irq)

{

	struct irq_data *d = irq_get_irq_data(irq);

	struct xive_irq_data *xd = irq_data_get_irq_handler_data(d);

	struct xive_irq_data *xd = irq_get_chip_data(irq);



	/*

	 * This slightly odd sequence gives the right result
@@ -2827,9 +2825,7 @@ int kvmppc_xive_debug_show_queues(struct seq_file *m, struct kvm_vcpu *vcpu) 
				   i0, i1);

		}

		if (xc->esc_virq[i]) {

			struct irq_data *d = irq_get_irq_data(xc->esc_virq[i]);

			struct xive_irq_data *xd =

				irq_data_get_irq_handler_data(d);

			struct xive_irq_data *xd = irq_get_chip_data(xc->esc_virq[i]);

			u64 pq = xive_vm_esb_load(xd, XIVE_ESB_GET);



			seq_printf(m, "    ESC %d %c%c EOI @%llx",

arch/powerpc/platforms/powernv/vas.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int init_vas_instance(struct platform_device *pdev) 
		return -EINVAL;

	}



	xd = irq_get_handler_data(vinst->virq);

	xd = irq_get_chip_data(vinst->virq);

	if (!xd) {

		pr_err("Inst%d: Invalid virq %d\n",

				vinst->vas_id, vinst->virq);

arch/powerpc/sysdev/xive/common.c

+1 −1
Original line number Diff line number Diff line
@@ -1580,7 +1580,7 @@ static void xive_flush_cpu_queue(unsigned int cpu, struct xive_cpu *xc) 
			cpu, irq);

#endif

		raw_spin_lock(&desc->lock);

		xd = irq_desc_get_handler_data(desc);

		xd = irq_desc_get_chip_data(desc);



		/*

		 * Clear saved_p to indicate that it's no longer pending

drivers/misc/ocxl/afu_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id) 
	mutex_lock(&ctx->irq_lock);

	irq = idr_find(&ctx->irq_idr, irq_id);

	if (irq) {

		xd = irq_get_handler_data(irq->virq);

		xd = irq_get_chip_data(irq->virq);

		addr = xd ? xd->trig_page : 0;

	}

	mutex_unlock(&ctx->irq_lock);