Skip to content

Commit 2743cf7

Browse files
covanammaddy-kerneldev
authored andcommitted
powerpc, ocxl: Fix extraction of struct xive_irq_data
Commit cc0cc23 ("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: cc0cc23 ("powerpc/xive: Untangle xive from child interrupt controller drivers") Reported-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com> Closes: https://lore.kernel.org/linuxppc-dev/68e48df8.170a0220.4b4b0.217d@mx.google.com/ Signed-off-by: Nam Cao <namcao@linutronix.de> Reviewed-by: Ganesh Goudar <ganeshgr@linux.ibm.com> Acked-by: Andrew Donnellan <ajd@linux.ibm.com> # ocxl Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com> Link: https://patch.msgid.link/20251008081359.1382699-1-namcao@linutronix.de
1 parent ef3e73a commit 2743cf7

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

arch/powerpc/kvm/book3s_xive.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -916,8 +916,7 @@ int kvmppc_xive_attach_escalation(struct kvm_vcpu *vcpu, u8 prio,
916916
* it fires once.
917917
*/
918918
if (single_escalation) {
919-
struct irq_data *d = irq_get_irq_data(xc->esc_virq[prio]);
920-
struct xive_irq_data *xd = irq_data_get_irq_handler_data(d);
919+
struct xive_irq_data *xd = irq_get_chip_data(xc->esc_virq[prio]);
921920

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

16131612
/* Grab info about irq */
16141613
state->pt_number = hw_irq;
1615-
state->pt_data = irq_data_get_irq_handler_data(host_data);
1614+
state->pt_data = irq_data_get_irq_chip_data(host_data);
16161615

16171616
/*
16181617
* Configure the IRQ to match the existing configuration of
@@ -1787,8 +1786,7 @@ void kvmppc_xive_disable_vcpu_interrupts(struct kvm_vcpu *vcpu)
17871786
*/
17881787
void xive_cleanup_single_escalation(struct kvm_vcpu *vcpu, int irq)
17891788
{
1790-
struct irq_data *d = irq_get_irq_data(irq);
1791-
struct xive_irq_data *xd = irq_data_get_irq_handler_data(d);
1789+
struct xive_irq_data *xd = irq_get_chip_data(irq);
17921790

17931791
/*
17941792
* 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)
28272825
i0, i1);
28282826
}
28292827
if (xc->esc_virq[i]) {
2830-
struct irq_data *d = irq_get_irq_data(xc->esc_virq[i]);
2831-
struct xive_irq_data *xd =
2832-
irq_data_get_irq_handler_data(d);
2828+
struct xive_irq_data *xd = irq_get_chip_data(xc->esc_virq[i]);
28332829
u64 pq = xive_vm_esb_load(xd, XIVE_ESB_GET);
28342830

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

arch/powerpc/platforms/powernv/vas.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ static int init_vas_instance(struct platform_device *pdev)
121121
return -EINVAL;
122122
}
123123

124-
xd = irq_get_handler_data(vinst->virq);
124+
xd = irq_get_chip_data(vinst->virq);
125125
if (!xd) {
126126
pr_err("Inst%d: Invalid virq %d\n",
127127
vinst->vas_id, vinst->virq);

arch/powerpc/sysdev/xive/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1580,7 +1580,7 @@ static void xive_flush_cpu_queue(unsigned int cpu, struct xive_cpu *xc)
15801580
cpu, irq);
15811581
#endif
15821582
raw_spin_lock(&desc->lock);
1583-
xd = irq_desc_get_handler_data(desc);
1583+
xd = irq_desc_get_chip_data(desc);
15841584

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

drivers/misc/ocxl/afu_irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id)
203203
mutex_lock(&ctx->irq_lock);
204204
irq = idr_find(&ctx->irq_idr, irq_id);
205205
if (irq) {
206-
xd = irq_get_handler_data(irq->virq);
206+
xd = irq_get_chip_data(irq->virq);
207207
addr = xd ? xd->trig_page : 0;
208208
}
209209
mutex_unlock(&ctx->irq_lock);

0 commit comments

Comments
 (0)