From: Simon Horman <horms@kernel.org>
To: Vincent Choiniere <choiniere.vincent@hydroquebec.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>,
Przemek Kitszel <przemyslaw.kitszel@intel.com>,
intel-wired-lan@lists.osuosl.org,
Aleksandr Loktionov <aleksandr.loktionov@intel.com>,
Michal Kubiak <michal.kubiak@intel.com>,
Wojciech Drewek <wojciech.drewek@intel.com>,
Mateusz Polchlopek <mateusz.polchlopek@intel.com>,
Paul Menzel <pmenzel@molgen.mpg.de>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@kernel.org>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org
Subject: Re: [PATCH net v4] ice: fix Tx hang dump using stale tx_buf[0].skb
Date: Thu, 19 Nov 2026 11:24:09 +0000 [thread overview]
Message-ID: <20261119112409.GU860048@horms.kernel.org> (raw)
In-Reply-To: <20261112-ice-tx-hang-dump-v4-1-9125f687669b@hydroquebec.com>
On Thu, Nov 12, 2026 at 01:45:56PM -0500, Vincent Choiniere wrote:
...
> @@ -424,6 +429,78 @@ void ice_prep_tx_hang_report(struct ice_pf *pf, struct ice_tx_ring *tx_ring,
> buf->vsi_num = vsi_num;
> buf->head = head;
> buf->intr = intr;
> + buf->queue = tx_ring->q_index;
> + buf->next_to_clean = tx_ring->next_to_clean;
> + buf->next_to_use = tx_ring->next_to_use;
> +}
> +
> +/**
> + * ice_tx_hang_snapshot - copy the timed-out queue's ring at report time
> + * @pf: PF on which the Tx hang was detected
> + * @tx_ring: ring saved by ice_tx_timeout(), possibly stale
> + * @ev: event to fill in
> + *
> + * The saved ring may have been freed or replaced since the timeout (e.g. by
> + * ethtool -G or -L), and a freed ring may be reused for another queue. Use it
> + * only if the timeout was on the PF VSI, that VSI is up and the timed-out
> + * queue still maps to it. Those paths, and the reset paths, replace or free
> + * the rings under RTNL or from the service task itself, so with RTNL held the
> + * accesses below are to live memory for them. The ring may still have been
> + * reset in place since the timeout (e.g. by ethtool -G or an MTU change); as
> + * before, its state is read when the report is generated. Driver removal and
> + * devlink reload tear the VSIs down before the service task is stopped and are
> + * not covered here. ice_clean_tx_irq() may still run and free the skb at
> + * next_to_clean at any time, so only the pointer value is recorded and the skb
> + * itself is never dereferenced.
> + */
> +static void ice_tx_hang_snapshot(struct ice_pf *pf, struct ice_tx_ring *tx_ring,
> + struct ice_tx_hang_event *ev)
> +{
> + struct ice_vsi *vsi = ice_get_main_vsi(pf);
> + struct ice_q_vector *q_vector;
> + struct ice_tx_buf *tx_buf;
> + u16 ntc, ntu;
> + void *desc;
> + u32 size;
> +
> + ASSERT_RTNL();
> +
> + if (!tx_ring || !vsi || !vsi->tx_rings ||
> + test_bit(ICE_VSI_DOWN, vsi->state))
> + return;
> +
> + if (ev->vsi_num != vsi->vsi_num || ev->queue >= vsi->num_txq ||
> + vsi->tx_rings[ev->queue] != tx_ring)
> + return;
> +
> + q_vector = tx_ring->q_vector;
> + if (!q_vector || !tx_ring->desc || !tx_ring->tx_buf || !tx_ring->count)
> + return;
> +
> + size = tx_ring->count * sizeof(struct ice_tx_desc);
> + desc = kvmalloc(size, GFP_KERNEL);
> + if (!desc)
> + return;
> +
> + ntc = READ_ONCE(tx_ring->next_to_clean);
> + ntu = READ_ONCE(tx_ring->next_to_use);
> +
> + if (ntc < tx_ring->count) {
Sorry to nit-pick, but I wonder if it would be nicer to move the kvmalloc()
call and associated error checking be moved here...
> + tx_buf = &tx_ring->tx_buf[ntc];
> + if (tx_buf->type == ICE_TX_BUF_SKB)
> + ev->skb_ptr = READ_ONCE(tx_buf->skb);
> +
> + memcpy(desc, tx_ring->desc, size);
> + ev->next_to_clean = ntc;
> + ev->next_to_use = ntu;
> + strscpy(ev->irq_name, q_vector->name);
> + ev->desc_ptr = tx_ring->desc;
> + ev->dma = tx_ring->dma;
> + ev->desc_size = size;
> + ev->desc = desc;
> + } else {
> + kvfree(desc);
... and remove the else arm of the condition.
> + }
> }
And further, the sense of the condition could be reversed, saving some
indentation:
if (ntc >= tx_ring->count)
return
desc = kvmalloc(size, GFP_KERNEL);
if (!desc)
return;
tx_buf = &tx_ring->tx_buf[ntc];
if (tx_buf->type == ICE_TX_BUF_SKB)
ev->skb_ptr = READ_ONCE(tx_buf->skb);
memcpy(desc, tx_ring->desc, size);
ev->next_to_clean = ntc;
ev->next_to_use = ntu;
strscpy(ev->irq_name, q_vector->name);
ev->desc_ptr = tx_ring->desc;
ev->dma = tx_ring->dma;
ev->desc_size = size;
ev->desc = desc;
Regardless, this looks good to me.
Reviewed-by: Simon Horman <horms@kernel.org>
prev parent reply other threads:[~2026-11-19 11:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-12 18:45 Vincent Choiniere via B4 Relay
2026-11-19 11:24 ` Simon Horman [this message]
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=20261119112409.GU860048@horms.kernel.org \
--to=horms@kernel.org \
--cc=aleksandr.loktionov@intel.com \
--cc=andrew+netdev@lunn.ch \
--cc=anthony.l.nguyen@intel.com \
--cc=choiniere.vincent@hydroquebec.com \
--cc=davem@davemloft.net \
--cc=edumazet@kernel.org \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mateusz.polchlopek@intel.com \
--cc=michal.kubiak@intel.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pmenzel@molgen.mpg.de \
--cc=przemyslaw.kitszel@intel.com \
--cc=stable@vger.kernel.org \
--cc=wojciech.drewek@intel.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®