From: Shinas Rasheed <srasheed@marvell.com>
To: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <hgani@marvell.com>, <sedara@marvell.com>, <vimleshk@marvell.com>,
<thaller@redhat.com>, <wizhao@redhat.com>, <kheib@redhat.com>,
<egallen@redhat.com>, <konguyen@redhat.com>, <horms@kernel.org>,
"Shinas Rasheed" <srasheed@marvell.com>,
Veerasenareddy Burru <vburru@marvell.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
Abhijit Ayarekar <aayarekar@marvell.com>,
Satananda Burla <sburla@marvell.com>
Subject: [PATCH net v4 1/7] octeon_ep: Add checks to fix double free crashes
Date: Wed, 13 Nov 2024 03:13:13 -0800 [thread overview]
Message-ID: <20241113111319.1156507-2-srasheed@marvell.com> (raw)
In-Reply-To: <20241113111319.1156507-1-srasheed@marvell.com>
From: Vimlesh Kumar <vimleshk@marvell.com>
Add required checks to avoid double free. Crashes were
observed due to the same on reset scenarios, when reset
was tried multiple times, and the first reset had torn
down resources already.
Fixes: 37d79d059606 ("octeon_ep: add Tx/Rx processing and interrupt support")
Signed-off-by: Vimlesh Kumar <vimleshk@marvell.com>
Signed-off-by: Shinas Rasheed <srasheed@marvell.com>
---
V4:
- Removed unnecessary protective code. Added fast return from
octep_free_irqs()
- Improved commit message
V3: https://lore.kernel.org/all/20241108074543.1123036-2-srasheed@marvell.com/
- Added back "Fixes" to the changelist
V2: https://lore.kernel.org/all/20241107132846.1118835-2-srasheed@marvell.com/
- No changes
V1: https://lore.kernel.org/all/20241101103416.1064930-2-srasheed@marvell.com/
.../net/ethernet/marvell/octeon_ep/octep_main.c | 14 ++++++++++----
drivers/net/ethernet/marvell/octeon_ep/octep_tx.c | 2 ++
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
index 549436efc204..29796544feb6 100644
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
@@ -496,6 +496,9 @@ static void octep_free_irqs(struct octep_device *oct)
{
int i;
+ if (!oct->msix_entries)
+ return;
+
/* First few MSI-X interrupts are non queue interrupts; free them */
for (i = 0; i < CFG_GET_NON_IOQ_MSIX(oct->conf); i++)
free_irq(oct->msix_entries[i].vector, oct);
@@ -505,7 +508,7 @@ static void octep_free_irqs(struct octep_device *oct)
for (i = CFG_GET_NON_IOQ_MSIX(oct->conf); i < oct->num_irqs; i++) {
irq_set_affinity_hint(oct->msix_entries[i].vector, NULL);
free_irq(oct->msix_entries[i].vector,
- oct->ioq_vector[i - CFG_GET_NON_IOQ_MSIX(oct->conf)]);
+ oct->ioq_vector[i - CFG_GET_NON_IOQ_MSIX(oct->conf)]);
}
netdev_info(oct->netdev, "IRQs freed\n");
}
@@ -635,8 +638,10 @@ static void octep_napi_delete(struct octep_device *oct)
for (i = 0; i < oct->num_oqs; i++) {
netdev_dbg(oct->netdev, "Deleting NAPI on Q-%d\n", i);
- netif_napi_del(&oct->ioq_vector[i]->napi);
- oct->oq[i]->napi = NULL;
+ if (oct->oq[i]->napi) {
+ netif_napi_del(&oct->ioq_vector[i]->napi);
+ oct->oq[i]->napi = NULL;
+ }
}
}
@@ -666,7 +671,8 @@ static void octep_napi_disable(struct octep_device *oct)
for (i = 0; i < oct->num_oqs; i++) {
netdev_dbg(oct->netdev, "Disabling NAPI on Q-%d\n", i);
- napi_disable(&oct->ioq_vector[i]->napi);
+ if (oct->oq[i]->napi)
+ napi_disable(&oct->ioq_vector[i]->napi);
}
}
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_tx.c b/drivers/net/ethernet/marvell/octeon_ep/octep_tx.c
index 06851b78aa28..157bf489ae19 100644
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_tx.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_tx.c
@@ -323,6 +323,8 @@ void octep_free_iqs(struct octep_device *oct)
int i;
for (i = 0; i < CFG_GET_PORTS_ACTIVE_IO_RINGS(oct->conf); i++) {
+ if (!oct->iq[i])
+ continue;
octep_free_iq(oct->iq[i]);
dev_dbg(&oct->pdev->dev,
"Successfully destroyed IQ(TxQ)-%d.\n", i);
--
2.25.1
next prev parent reply other threads:[~2024-11-13 11:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-13 11:13 [PATCH net v4 0/7] Double free fixes and NULL pointer checks Shinas Rasheed
2024-11-13 11:13 ` Shinas Rasheed [this message]
2024-11-13 14:59 ` [PATCH net v4 1/7] octeon_ep: Add checks to fix double free crashes Vadim Fedorenko
2024-11-13 22:38 ` Vadim Fedorenko
2024-11-16 17:25 ` [EXTERNAL] " Shinas Rasheed
2024-11-13 11:13 ` [PATCH net v4 2/7] octeon_ep: Fix null dereferences to IQ/OQ pointers Shinas Rasheed
2024-11-13 11:13 ` [PATCH net v4 3/7] octeon_ep: add protective null checks in napi callbacks for cn9k cards Shinas Rasheed
2024-11-13 17:59 ` Vadim Fedorenko
2024-11-13 11:13 ` [PATCH net v4 4/7] octeon_ep: add protective null checks in napi callbacks for cnxk cards Shinas Rasheed
2024-11-13 18:01 ` Vadim Fedorenko
2024-11-13 11:13 ` [PATCH net v4 5/7] octeon_ep_vf: Fix null dereferences to IQ/OQ pointers Shinas Rasheed
2024-11-13 11:13 ` [PATCH net v4 6/7] octeon_ep_vf: add protective null checks in napi callbacks for cn9k cards Shinas Rasheed
2024-11-13 18:02 ` Vadim Fedorenko
2024-11-13 11:13 ` [PATCH net v4 7/7] octeon_ep_vf: add protective null checks in napi callbacks for cnxk cards Shinas Rasheed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241113111319.1156507-2-srasheed@marvell.com \
--to=srasheed@marvell.com \
--cc=aayarekar@marvell.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=egallen@redhat.com \
--cc=hgani@marvell.com \
--cc=horms@kernel.org \
--cc=kheib@redhat.com \
--cc=konguyen@redhat.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sburla@marvell.com \
--cc=sedara@marvell.com \
--cc=thaller@redhat.com \
--cc=vburru@marvell.com \
--cc=vimleshk@marvell.com \
--cc=wizhao@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®