From: <shaibran@amazon.com>
To: <ferruh.yigit@amd.com>
Cc: <dev@dpdk.org>, Shai Brandes <shaibran@amazon.com>
Subject: [PATCH 14/33] net/ena/hal: add completion descriptor corruption check
Date: Mon, 4 Mar 2024 11:01:17 +0200 [thread overview]
Message-ID: <20240304090136.861-15-shaibran@amazon.com> (raw)
In-Reply-To: <20240304090136.861-1-shaibran@amazon.com>
From: Shai Brandes <shaibran@amazon.com>
Adding a check of the MBZ (Must Be Zero) fields in the
incoming tx and rx completion descriptors in order to
identify corrupted descriptors.
Signed-off-by: Shai Brandes <shaibran@amazon.com>
Reviewed-by: Amit Bernstein <amitbern@amazon.com>
---
drivers/net/ena/hal/ena_eth_com.c | 13 +++++++++++--
drivers/net/ena/hal/ena_eth_com.h | 14 +++++++++++++-
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ena/hal/ena_eth_com.c b/drivers/net/ena/hal/ena_eth_com.c
index dc2935a53e..988fa013a7 100644
--- a/drivers/net/ena/hal/ena_eth_com.c
+++ b/drivers/net/ena/hal/ena_eth_com.c
@@ -237,6 +237,7 @@ static int ena_com_cdesc_rx_pkt_get(struct ena_com_io_cq *io_cq,
u16 *first_cdesc_idx,
u16 *num_descs)
{
+ struct ena_com_dev *dev = ena_com_io_cq_to_ena_dev(io_cq);
u16 count = io_cq->cur_rx_pkt_cdesc_count, head_masked;
struct ena_eth_io_rx_cdesc_base *cdesc;
u32 last = 0;
@@ -252,13 +253,21 @@ static int ena_com_cdesc_rx_pkt_get(struct ena_com_io_cq *io_cq,
ena_com_cq_inc_head(io_cq);
if (unlikely((status & ENA_ETH_IO_RX_CDESC_BASE_FIRST_MASK) >>
ENA_ETH_IO_RX_CDESC_BASE_FIRST_SHIFT && count != 0)) {
- struct ena_com_dev *dev = ena_com_io_cq_to_ena_dev(io_cq);
-
ena_trc_err(dev,
"First bit is on in descriptor #%d on q_id: %d, req_id: %u\n",
count, io_cq->qid, cdesc->req_id);
return ENA_COM_FAULT;
}
+
+ if (unlikely((status & (ENA_ETH_IO_RX_CDESC_BASE_MBZ7_MASK |
+ ENA_ETH_IO_RX_CDESC_BASE_MBZ17_MASK)) &&
+ ena_com_get_cap(dev, ENA_ADMIN_CDESC_MBZ))) {
+ ena_trc_err(dev,
+ "Corrupted RX descriptor #%d on q_id: %d, req_id: %u\n",
+ count, io_cq->qid, cdesc->req_id);
+ return ENA_COM_FAULT;
+ }
+
count++;
last = (status & ENA_ETH_IO_RX_CDESC_BASE_LAST_MASK) >>
ENA_ETH_IO_RX_CDESC_BASE_LAST_SHIFT;
diff --git a/drivers/net/ena/hal/ena_eth_com.h b/drivers/net/ena/hal/ena_eth_com.h
index 6a7c17f84f..2fac10e678 100644
--- a/drivers/net/ena/hal/ena_eth_com.h
+++ b/drivers/net/ena/hal/ena_eth_com.h
@@ -204,9 +204,11 @@ static inline void ena_com_cq_inc_head(struct ena_com_io_cq *io_cq)
static inline int ena_com_tx_comp_req_id_get(struct ena_com_io_cq *io_cq,
u16 *req_id)
{
+ struct ena_com_dev *dev = ena_com_io_cq_to_ena_dev(io_cq);
u8 expected_phase, cdesc_phase;
struct ena_eth_io_tx_cdesc *cdesc;
u16 masked_head;
+ u8 flags;
masked_head = io_cq->head & (io_cq->q_depth - 1);
expected_phase = io_cq->phase;
@@ -215,14 +217,24 @@ static inline int ena_com_tx_comp_req_id_get(struct ena_com_io_cq *io_cq,
((uintptr_t)io_cq->cdesc_addr.virt_addr +
(masked_head * io_cq->cdesc_entry_size_in_bytes));
+ flags = READ_ONCE8(cdesc->flags);
+
/* When the current completion descriptor phase isn't the same as the
* expected, it mean that the device still didn't update
* this completion.
*/
- cdesc_phase = READ_ONCE8(cdesc->flags) & ENA_ETH_IO_TX_CDESC_PHASE_MASK;
+ cdesc_phase = flags & ENA_ETH_IO_TX_CDESC_PHASE_MASK;
if (cdesc_phase != expected_phase)
return ENA_COM_TRY_AGAIN;
+ if (unlikely((flags & ENA_ETH_IO_TX_CDESC_MBZ6_MASK) &&
+ ena_com_get_cap(dev, ENA_ADMIN_CDESC_MBZ))) {
+ ena_trc_err(dev,
+ "Corrupted TX descriptor on q_id: %d, req_id: %u\n",
+ io_cq->qid, cdesc->req_id);
+ return ENA_COM_FAULT;
+ }
+
dma_rmb();
*req_id = READ_ONCE16(cdesc->req_id);
--
2.17.1
next prev parent reply other threads:[~2024-03-04 9:04 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-04 9:01 [PATCH 00/33] net/ena: v2.9.0 driver release shaibran
2024-03-04 9:01 ` [PATCH 01/33] net/ena: rework the metrics multi-process functions shaibran
2024-03-04 9:01 ` [PATCH 02/33] net/ena: report new supported link speed capabilities shaibran
2024-03-04 9:01 ` [PATCH 03/33] net/ena: update imissed stat with Rx overruns shaibran
2024-03-04 9:01 ` [PATCH 04/33] net/ena: sub-optimal configuration notifications support shaibran
2024-03-04 9:01 ` [PATCH 05/33] net/ena: fix fast mbuf free shaibran
2024-03-04 9:01 ` [PATCH 06/33] net/ena: rename base folder to hal shaibran
2024-03-04 9:01 ` [PATCH 07/33] net/ena: restructure the llq policy setting process shaibran
2024-03-04 9:01 ` [PATCH 08/33] net/ena/hal: exponential backoff exp limit shaibran
2024-03-04 9:01 ` [PATCH 09/33] net/ena/hal: add a new csum offload bit shaibran
2024-03-04 9:01 ` [PATCH 10/33] net/ena/hal: added a bus parameter to ena memcpy macro shaibran
2024-03-04 9:01 ` [PATCH 11/33] net/ena/hal: optimize Rx ring submission queue shaibran
2024-03-04 9:01 ` [PATCH 12/33] net/ena/hal: rename fields in completion descriptors shaibran
2024-03-04 9:01 ` [PATCH 13/33] net/ena/hal: use correct read once on u8 field shaibran
2024-03-04 9:01 ` shaibran [this message]
2024-03-04 9:01 ` [PATCH 15/33] net/ena/hal: malformed Tx descriptor error reason shaibran
2024-03-04 9:01 ` [PATCH 16/33] net/ena/hal: phc feature modifications shaibran
2024-03-04 9:01 ` [PATCH 17/33] net/ena/hal: restructure interrupt handling shaibran
2024-03-04 9:01 ` [PATCH 18/33] net/ena/hal: add unlikely to error checks shaibran
2024-03-04 9:01 ` [PATCH 19/33] net/ena/hal: missing admin interrupt reset reason shaibran
2024-03-04 9:01 ` [PATCH 20/33] net/ena/hal: check for existing keep alive notification shaibran
2024-03-04 9:01 ` [PATCH 21/33] net/ena/hal: modify memory barrier comment shaibran
2024-03-04 9:01 ` [PATCH 22/33] net/ena/hal: rework Rx ring submission queue shaibran
2024-03-04 9:01 ` [PATCH 23/33] net/ena/hal: remove operating system type enum shaibran
2024-03-04 9:01 ` [PATCH 24/33] net/ena/hal: handle command abort shaibran
2024-03-04 9:01 ` [PATCH 25/33] net/ena/hal: add support for device reset request shaibran
2024-03-04 9:01 ` [PATCH 26/33] net/ena: cosmetic changes shaibran
2024-03-04 9:01 ` [PATCH 27/33] net/ena/hal: modify customer metrics memory management shaibran
2024-03-04 9:01 ` [PATCH 28/33] net/ena/hal: cosmetic changes shaibran
2024-03-04 9:01 ` [PATCH 29/33] net/ena: update device-preferred size of rings shaibran
2024-03-04 9:01 ` [PATCH 30/33] net/ena: exhaust interrupt callbacks in device close shaibran
2024-03-04 9:01 ` [PATCH 31/33] net/ena: support max large llq depth from the device shaibran
2024-03-04 9:01 ` [PATCH 32/33] net/ena: control path pure polling mode shaibran
2024-03-04 9:01 ` [PATCH 33/33] net/ena: upgrade driver version to 2.9.0 shaibran
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=20240304090136.861-15-shaibran@amazon.com \
--to=shaibran@amazon.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@amd.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).