From: Alexander Lobakin <alobakin@marvell.com>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: Igor Russkikh <irusskikh@marvell.com>,
Michal Kalderon <michal.kalderon@marvell.com>,
Ariel Elior <aelior@marvell.com>,
"Denis Bolotin" <denis.bolotin@marvell.com>,
Tomer Tayar <tomer.tayar@marvell.com>,
Alexander Lobakin <alobakin@marvell.com>,
<GR-everest-linux-l2@marvell.com>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v2 net 8/9] net: qed: reset ILT block sizes before recomputing to fix crashes
Date: Tue, 23 Jun 2020 16:51:36 +0300 [thread overview]
Message-ID: <20200623135136.3185-9-alobakin@marvell.com> (raw)
In-Reply-To: <20200623135136.3185-1-alobakin@marvell.com>
Sizes of all ILT blocks must be reset before ILT recomputing when
disabling clients, or memory allocation may exceed ILT shadow array
and provoke system crashes.
Fixes: 1408cc1fa48c ("qed: Introduce VFs")
Signed-off-by: Alexander Lobakin <alobakin@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
Signed-off-by: Michal Kalderon <michal.kalderon@marvell.com>
---
drivers/net/ethernet/qlogic/qed/qed_cxt.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/drivers/net/ethernet/qlogic/qed/qed_cxt.c b/drivers/net/ethernet/qlogic/qed/qed_cxt.c
index c0a769b5358c..08ba9d54ab63 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_cxt.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_cxt.c
@@ -465,6 +465,20 @@ static struct qed_ilt_cli_blk *qed_cxt_set_blk(struct qed_ilt_cli_blk *p_blk)
return p_blk;
}
+static void qed_cxt_ilt_blk_reset(struct qed_hwfn *p_hwfn)
+{
+ struct qed_ilt_client_cfg *clients = p_hwfn->p_cxt_mngr->clients;
+ u32 cli_idx, blk_idx;
+
+ for (cli_idx = 0; cli_idx < MAX_ILT_CLIENTS; cli_idx++) {
+ for (blk_idx = 0; blk_idx < ILT_CLI_PF_BLOCKS; blk_idx++)
+ clients[cli_idx].pf_blks[blk_idx].total_size = 0;
+
+ for (blk_idx = 0; blk_idx < ILT_CLI_VF_BLOCKS; blk_idx++)
+ clients[cli_idx].vf_blks[blk_idx].total_size = 0;
+ }
+}
+
int qed_cxt_cfg_ilt_compute(struct qed_hwfn *p_hwfn, u32 *line_count)
{
struct qed_cxt_mngr *p_mngr = p_hwfn->p_cxt_mngr;
@@ -484,6 +498,11 @@ int qed_cxt_cfg_ilt_compute(struct qed_hwfn *p_hwfn, u32 *line_count)
p_mngr->pf_start_line = RESC_START(p_hwfn, QED_ILT);
+ /* Reset all ILT blocks at the beginning of ILT computing in order
+ * to prevent memory allocation for irrelevant blocks afterwards.
+ */
+ qed_cxt_ilt_blk_reset(p_hwfn);
+
DP_VERBOSE(p_hwfn, QED_MSG_ILT,
"hwfn [%d] - Set context manager starting line to be 0x%08x\n",
p_hwfn->my_id, p_hwfn->p_cxt_mngr->pf_start_line);
--
2.25.1
next prev parent reply other threads:[~2020-06-23 13:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 13:51 [PATCH v2 net 0/9] net: qed/qede: various stability fixes Alexander Lobakin
2020-06-23 13:51 ` [PATCH v2 net 1/9] net: qed: fix left elements count calculation Alexander Lobakin
2020-06-23 13:51 ` [PATCH v2 net 2/9] net: qed: fix async event callbacks unregistering Alexander Lobakin
2020-06-23 13:51 ` [PATCH v2 net 3/9] net: qede: stop adding events on an already destroyed workqueue Alexander Lobakin
2020-06-23 13:51 ` [PATCH v2 net 4/9] net: qed: fix NVMe login fails over VFs Alexander Lobakin
2020-06-23 13:51 ` [PATCH v2 net 5/9] net: qed: fix excessive QM ILT lines consumption Alexander Lobakin
2020-06-23 13:51 ` [PATCH v2 net 6/9] net: qede: fix PTP initialization on recovery Alexander Lobakin
2020-06-23 13:51 ` [PATCH v2 net 7/9] net: qede: fix use-after-free on recovery and AER handling Alexander Lobakin
2020-06-23 13:51 ` Alexander Lobakin [this message]
2020-06-23 13:51 ` [PATCH v2 net 9/9] net: qed: fix "maybe uninitialized" warning Alexander Lobakin
2020-06-23 22:01 ` [PATCH v2 net 0/9] net: qed/qede: various stability fixes David Miller
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=20200623135136.3185-9-alobakin@marvell.com \
--to=alobakin@marvell.com \
--cc=GR-everest-linux-l2@marvell.com \
--cc=aelior@marvell.com \
--cc=davem@davemloft.net \
--cc=denis.bolotin@marvell.com \
--cc=irusskikh@marvell.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.kalderon@marvell.com \
--cc=netdev@vger.kernel.org \
--cc=tomer.tayar@marvell.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;
as well as URLs for NNTP newsgroup(s).