From patchwork Fri Nov 8 07:45:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shinas Rasheed X-Patchwork-Id: 13867696 X-Patchwork-Delegate: kuba@kernel.org Received: from mx0a-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E26471DFE1D; Fri, 8 Nov 2024 07:46:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.148.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731051972; cv=none; b=lbSIGWeAzQJIuEbFm83XgKc5Y7DfVMCDExK6HqTSM7XSlYb70BbIGB6GBbzsM+Y5rL+nTNDPCgKh1pvlRyvfoab0kaNYyXu+BoNsnS/GfpjRMOsI6cSyovUIbkFx9An52IaeRdrVDC4vJmv9qN7oQZHC7fmCDP4VmRIwmK1DNPQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731051972; c=relaxed/simple; bh=UcujsZpogw2k58eXliUjEfbuY/Mi96YOb6arNOas3Wk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LLxYbCG/+XC5CdpVEjvyzFhNZ+14wl+Md9GKg0rIQ3wbhkW68KAUwoU++PNTwcgriTDzk25SSGugYQg35+jxNVay/Ja61wTkIXoCBtL7tjcxPeYFhUTb5Cypy1H6Nuyq4vjZK1nA3xmOt6ppEsTTEH0kCYzKNnZFvG1uQ3ppCrg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marvell.com; spf=pass smtp.mailfrom=marvell.com; dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b=X3KCjzzW; arc=none smtp.client-ip=67.231.148.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=marvell.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com header.b="X3KCjzzW" Received: from pps.filterd (m0431384.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4A7Mbwps022799; Thu, 7 Nov 2024 23:45:58 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pfpt0220; bh=q kQ1jiLZhUMeLIUDhokeQeMRcnt1hZUtcxqwDbIZTNs=; b=X3KCjzzWnzsamPqeL bPF6FzO4XcWPPRKoOLLXSkO3Sm/aK7T74ZVVVsPwMdlvZxdv8hrTA1tqIPiuYkLz 2z18U6RZS6Lkaw5NKA40FR5AywqY0SXfbenaF+cvOnxWW//IJhu5N+R7/q7ioH+X zcirrrImCtM7Bs4Z8yq3Se2M2fWUeqjEhiBpYEi9CeFwJ3MAQLQl/QASlBUt9aQc O/Ud1Nyd/etJFvwnOFrDuEVDycyPqJMBGT8nNt+Z+iabsks9h5ciwTK1JFgoMe7Y sbFWKpGt7qrYxX/PhlgIKDCJ/+vXLMiMdIyw2Ahu0kgbvbQjKTi+nzkfxwfL3h7X xBPhg== Received: from dc5-exch05.marvell.com ([199.233.59.128]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 42s6gu90bc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 07 Nov 2024 23:45:58 -0800 (PST) Received: from DC5-EXCH05.marvell.com (10.69.176.209) by DC5-EXCH05.marvell.com (10.69.176.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 7 Nov 2024 23:45:57 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH05.marvell.com (10.69.176.209) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Thu, 7 Nov 2024 23:45:57 -0800 Received: from ubuntu-PowerEdge-T110-II.sclab.marvell.com (unknown [10.106.27.86]) by maili.marvell.com (Postfix) with ESMTP id CC8943F7082; Thu, 7 Nov 2024 23:45:56 -0800 (PST) From: Shinas Rasheed To: , CC: , , , , , , , , , , Shinas Rasheed , Veerasenareddy Burru , Satananda Burla , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH net v3 7/7] octeon_ep_vf: add protective null checks in napi callbacks for cnxk cards Date: Thu, 7 Nov 2024 23:45:43 -0800 Message-ID: <20241108074543.1123036-8-srasheed@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241108074543.1123036-1-srasheed@marvell.com> References: <20241108074543.1123036-1-srasheed@marvell.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: Bf-NFOFGZcPZEL6sQckzyCeROYGT3O9z X-Proofpoint-GUID: Bf-NFOFGZcPZEL6sQckzyCeROYGT3O9z X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.687,Hydra:6.0.235,FMLib:17.0.607.475 definitions=2020-10-13_15,2020-10-13_02,2020-04-07_01 X-Patchwork-Delegate: kuba@kernel.org 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 --- V3: - 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(-) diff --git a/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c b/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c index 1f79dfad42c6..31c0d7c0492a 100644 --- a/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c +++ b/drivers/net/ethernet/marvell/octeon_ep_vf/octep_vf_cnxk.c @@ -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; }