From: Saeed Mahameed <saeed@kernel.org>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Eric Dumazet <edumazet@google.com>
Cc: Saeed Mahameed <saeedm@nvidia.com>,
netdev@vger.kernel.org, Tariq Toukan <tariqt@nvidia.com>,
Rahul Rameshbabu <rrameshbabu@nvidia.com>
Subject: [net 10/17] net/mlx5e: Avoid referencing skb after free-ing in drop path of mlx5e_sq_xmit_wqe
Date: Mon, 13 Nov 2023 13:08:19 -0800 [thread overview]
Message-ID: <20231113210826.47593-11-saeed@kernel.org> (raw)
In-Reply-To: <20231113210826.47593-1-saeed@kernel.org>
From: Rahul Rameshbabu <rrameshbabu@nvidia.com>
When SQ is a port timestamping SQ for PTP, do not access tx flags of skb
after free-ing the skb. Free the skb only after all references that depend
on it have been handled in the dropped WQE path.
Fixes: 3178308ad4ca ("net/mlx5e: Make tx_port_ts logic resilient to out-of-order CQEs")
Signed-off-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
index d41435c22ce5..19f2c25b05a0 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
@@ -494,10 +494,10 @@ mlx5e_sq_xmit_wqe(struct mlx5e_txqsq *sq, struct sk_buff *skb,
err_drop:
stats->dropped++;
- dev_kfree_skb_any(skb);
if (unlikely(sq->ptpsq && (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)))
mlx5e_ptp_metadata_fifo_push(&sq->ptpsq->metadata_freelist,
be32_to_cpu(eseg->flow_table_metadata));
+ dev_kfree_skb_any(skb);
mlx5e_tx_flush(sq);
}
--
2.41.0
next prev parent reply other threads:[~2023-11-13 21:08 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-13 21:08 [pull request][net 00/17] mlx5 fixes 2023-11-13 Saeed Mahameed
2023-11-13 21:08 ` [net 01/17] Revert "net/mlx5: DR, Supporting inline WQE when possible" Saeed Mahameed
2023-11-13 21:08 ` [net 02/17] net/mlx5: Free used cpus mask when an IRQ is released Saeed Mahameed
2023-11-13 21:08 ` [net 03/17] net/mlx5: DR, Allow old devices to use multi destination FTE Saeed Mahameed
2023-11-13 21:08 ` [net 04/17] net/mlx5: Decouple PHC .adjtime and .adjphase implementations Saeed Mahameed
2023-11-13 21:08 ` [net 05/17] net/mlx5e: fix double free of encap_header Saeed Mahameed
2023-11-13 21:08 ` [net 06/17] net/mlx5e: fix double free of encap_header in update funcs Saeed Mahameed
2023-11-13 21:08 ` [net 07/17] net/mlx5e: Fix pedit endianness Saeed Mahameed
2023-11-13 21:08 ` [net 08/17] net/mlx5e: TC, Don't offload post action rule if not supported Saeed Mahameed
2023-11-13 21:08 ` [net 09/17] net/mlx5e: Don't modify the peer sent-to-vport rules for IPSec offload Saeed Mahameed
2023-11-13 21:08 ` Saeed Mahameed [this message]
2023-11-13 21:08 ` [net 11/17] net/mlx5e: Track xmit submission to PTP WQ after populating metadata map Saeed Mahameed
2023-11-13 21:08 ` [net 12/17] net/mlx5e: Update doorbell for port timestamping CQ before the software counter Saeed Mahameed
2023-11-13 21:08 ` [net 13/17] net/mlx5: Fix a NULL vs IS_ERR() check Saeed Mahameed
2023-11-13 21:08 ` [net 14/17] net/mlx5: Increase size of irq name buffer Saeed Mahameed
2023-11-13 21:08 ` [net 15/17] net/mlx5e: Reduce the size of icosq_str Saeed Mahameed
2023-11-13 21:08 ` [net 16/17] net/mlx5e: Check return value of snprintf writing to fw_version buffer Saeed Mahameed
2023-11-13 21:08 ` [net 17/17] net/mlx5e: Check return value of snprintf writing to fw_version buffer for representors Saeed Mahameed
2023-11-14 5:02 ` [pull request][net 00/17] mlx5 fixes 2023-11-13 Jakub Kicinski
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=20231113210826.47593-11-saeed@kernel.org \
--to=saeed@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rrameshbabu@nvidia.com \
--cc=saeedm@nvidia.com \
--cc=tariqt@nvidia.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.