From: Benjamin Mikailenko <benjamin.mikailenko@intel.com>
To: intel-wired-lan@lists.osuosl.org
Cc: Benjamin Mikailenko <benjamin.mikailenko@intel.com>
Subject: [Intel-wired-lan] [net,v1] ice: Fix l2-fwd-offload toggle crash
Date: Wed, 12 Oct 2022 11:55:35 -0400 [thread overview]
Message-ID: <20221012155535.666933-1-benjamin.mikailenko@intel.com> (raw)
Running netperf traffic and toggling l2-fwd-offload in quick succession
caused the driver to crash.
BUG: kernel NULL pointer dereference, address: 0000000000000020
[ 861.517803] #PF: supervisor read access in kernel mode
[ 861.517805] #PF: error_code(0x0000) - not-present page
[ 861.517808] PGD 0 P4D 0
[ 861.517811] Oops: 0000 [#1] PREEMPT SMP PTI
[ 861.517815] CPU: 60 PID: 16471 Comm: netperf Kdump: loaded Tainted: G S
[ 861.517818] Hardware name: Intel Corporation S2600WTT/S2600WTT, BIOS SE
[ 861.517820] RIP: 0010:ice_start_xmit+0xb0/0x1420 [ice]
This crash would happen because during l2-fwd-offload configuration,
ice_init_macvlan or ice_deinit_macvlan would temporarily work on Tx rings.
At the same time, ice_start_xmit would attempt to select the correct send
buffer from Tx rings but reach a NULL pointer.
Fix this by checking if ring exists before proceeding xmit. If ring does
not exist, return NETDEV_TX_BUSY.
Fixes: 2b245cb29421 ("ice: Implement transmit and NAPI support")
Signed-off-by: Benjamin Mikailenko <benjamin.mikailenko@intel.com>
---
drivers/net/ethernet/intel/ice/ice_txrx.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
index 086f0b3ab68d..96bc8fad39c0 100644
--- a/drivers/net/ethernet/intel/ice/ice_txrx.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
@@ -2405,6 +2405,8 @@ netdev_tx_t ice_start_xmit(struct sk_buff *skb, struct net_device *netdev)
struct ice_tx_ring *tx_ring;
tx_ring = vsi->tx_rings[skb->queue_mapping];
+ if (!tx_ring)
+ return NETDEV_TX_BUSY;
/* hardware can't handle really short frames, hardware padding works
* beyond this point
--
2.34.3
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
next reply other threads:[~2022-10-12 16:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-12 15:55 Benjamin Mikailenko [this message]
2022-10-13 15:25 ` [Intel-wired-lan] [net, v1] ice: Fix l2-fwd-offload toggle crash Michal Schmidt
2022-10-13 16:51 ` Benjamin Mikailenko
2022-10-17 21:14 ` Jacob Keller
2022-10-17 21:13 ` Jacob Keller
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=20221012155535.666933-1-benjamin.mikailenko@intel.com \
--to=benjamin.mikailenko@intel.com \
--cc=intel-wired-lan@lists.osuosl.org \
/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