@@ -284,8 +284,14 @@ static irqreturn_t octep_vf_ioq_intr_handler_cnxk(void *data)
struct octep_vf_oq *oq;
u64 reg_val;
- oct = vector->octep_vf_dev;
+ if (!vector)
+ return IRQ_HANDLED;
+
oq = vector->oq;
+ if (!oq)
+ return IRQ_HANDLED;
+
+ oct = vector->octep_vf_dev;
/* Mailbox interrupt arrives along with interrupt of tx/rx ring pair 0 */
if (oq->q_no == 0) {
reg_val = octep_vf_read_csr64(oct, CNXK_VF_SDP_R_MBOX_PF_VF_INT(0));
@@ -294,6 +300,10 @@ static irqreturn_t octep_vf_ioq_intr_handler_cnxk(void *data)
octep_vf_write_csr64(oct, CNXK_VF_SDP_R_MBOX_PF_VF_INT(0), reg_val);
}
}
+
+ if (!(oq->napi))
+ return IRQ_HANDLED;
+
napi_schedule_irqoff(oq->napi);
return IRQ_HANDLED;
}
During unload, at times the OQ parsed in the napi callbacks have been observed to be null, causing system crash. Add protective checks to avoid the same, for cnxk cards. Fixes: cb7dd712189f ("octeon_ep_vf: Add driver framework and device initialization") Signed-off-by: Shinas Rasheed <srasheed@marvell.com> --- V4: - No Changes V3: https://lore.kernel.org/all/20241108074543.1123036-8-srasheed@marvell.com/ - Added back "Fixes" to the changelist V2: https://lore.kernel.org/all/20241107132846.1118835-8-srasheed@marvell.com/ - Split into a separate patch - Added more context V1: https://lore.kernel.org/all/20241101103416.1064930-4-srasheed@marvell.com/ .../ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)