From: sashiko-bot@kernel.org
To: "Magnus Karlsson" <magnus.karlsson@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Subject: Re: [PATCH net-next 3/5] xsk: ice: add USO zero-copy support
Date: Thu, 19 Nov 2026 14:59:39 +0000 [thread overview]
Message-ID: <sashiko-outbox-223332@kernel.org> (raw)
In-Reply-To: <20261119141032.1070446-4-magnus.karlsson@intel.com>
Thank you for your contribution! Sashiko AI review found 2 potential
issues to consider:
- [High] ice: xsk: missing descriptor count check in ice_xsk_bufs_fit()
and USO parse
- [High] ice: xsk: XDP ring mismatch in ice_tx_xsk_pool() frees active
USO DMA slots
--
commit fb6d44af668d56b22c97560cb76b6bdaca838144
Author: Magnus Karlsson <magnus.karlsson@intel.com>
xsk: ice: add USO zero-copy support
This commit adds UDP Segmentation Offload (USO) support for AF_XDP
zero-copy transmission and implements it in the ice driver using per-ring
DMA-mapped header slots.
> diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
> index 432da05c48c08..e19929b37e110 100644
> --- a/drivers/net/ethernet/intel/ice/ice.h
> +++ b/drivers/net/ethernet/intel/ice/ice.h
> @@ -833,16 +833,24 @@ static inline void ice_rx_xsk_pool(struct ice_rx_ring *ring)
> * carries a pointer to one of these XDP rings for its own purposes, such as
> * handling XDP_TX action, therefore we can piggyback here on the
> * rx_ring->xdp_ring assignment that was done during XDP rings initialization.
> + * The ring must be stopped, as its USO header slots are matched to the pool.
> + * If they cannot be allocated, the ring keeps the pool without USO.
> */
> static inline void ice_tx_xsk_pool(struct ice_vsi *vsi, u16 qid)
> {
> + struct xsk_buff_pool *pool;
> struct ice_tx_ring *ring;
>
> ring = vsi->rx_rings[qid]->xdp_ring;
> if (!ring)
> return;
>
> - WRITE_ONCE(ring->xsk_pool, ice_get_xp_from_qid(vsi, qid));
> + pool = ice_get_xp_from_qid(vsi, qid);
> + if (ice_xsk_cfg_uso_slots(ring, pool))
> + netdev_warn(vsi->netdev,
> + "Failed to allocate USO header buffers, USO requests on queue %u are ignored\n",
> + qid);
> + WRITE_ONCE(ring->xsk_pool, pool);
> }
[Severity: High]
Can ice_tx_xsk_pool() free ring->xsk_uso_pages while the ring is still
active and holds in-flight ICE_TX_BUF_XSK_USO descriptors?
When a queue vector has more than one XDP ring (vsi->num_q_vectors <
vsi->num_xdp_txq, for example after reducing queues with ethtool -L),
ice_map_xdp_rings() prepends multiple XDP rings to q_vector->tx, so
vsi->rx_rings[qid]->xdp_ring is not vsi->xdp_rings[qid]. On pool teardown,
ice_xsk_pool_setup() calls ice_qp_dis() and ice_qp_ena(), but ice_qp_dis()
and ice_qp_clean_rings() stop and clean vsi->xdp_rings[qid]:
drivers/net/ethernet/intel/ice/ice_base.c:ice_qp_clean_rings() {
ice_clean_tx_ring(vsi->tx_rings[q_idx]);
if (vsi->xdp_rings)
ice_clean_tx_ring(vsi->xdp_rings[q_idx]);
ice_clean_rx_ring(vsi->rx_rings[q_idx]);
}
ice_qp_ena() then calls ice_tx_xsk_pool() -> ice_xsk_cfg_uso_slots(ring,
NULL) -> ice_xsk_free_uso_slots() on the unstopped
vsi->rx_rings[qid]->xdp_ring. This frees the noncoherent DMA pages while
hardware is still transmitting from them, and zeroes
ring->xsk_uso_slots_per_page and ring->xsk_uso_pages so the next
ice_clean_xsk_buf() -> ice_xsk_uso_slot() divides by zero and dereferences
NULL.
Also, when a pool is disabled while the VSI is down, ice_xsk_pool_setup()
skips ice_qp_ena(), and ice_xsk_pool_disable() does not free the USO slots
that ice_xsk_pool_enable() allocated on vsi->rx_rings[qid]->xdp_ring.
> diff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c
> index 0c1ce3e86a45b..7fa1127480b66 100644
> --- a/drivers/net/ethernet/intel/ice/ice_xsk.c
> +++ b/drivers/net/ethernet/intel/ice/ice_xsk.c
[ ... ]
> +/* A buffer longer than one data descriptor is split, so a packet without USO
> + * can then need more data descriptors than the hardware allows.
> + */
> +static bool ice_xsk_bufs_fit(const struct xsk_buff_pool *pool,
> + const struct xdp_desc *descs, u32 nr)
> +{
> + u32 buffers = 0, i;
> +
> + if (likely(pool->chunk_size <= ICE_MAX_DATA_PER_TXD_ALIGNED))
> + return true;
> + for (i = 0; i < nr; i++)
> + buffers += DIV_ROUND_UP(descs[i].len,
> + ICE_MAX_DATA_PER_TXD_ALIGNED);
> + return buffers <= ICE_MAX_BUF_TXD;
> +}
[Severity: High]
Can a multi-descriptor packet on the shared-UMEM fallback path bypass the
ICE_MAX_BUF_TXD limit here?
When multiple sockets share a UMEM without XDP_UMEM_SG_FLAG,
xsk_tx_peek_release_desc_batch() falls back to
xsk_tx_peek_release_fallback(), which peeks descriptors through
xsk_tx_peek_desc() without enforcing pool->xdp_zc_max_segs on
XDP_PKT_CONTD chains. ice_xmit_zc_metadata() gathers up to count
descriptors into one packet of nr descriptors. When pool->chunk_size <=
ICE_MAX_DATA_PER_TXD_ALIGNED, ice_xsk_bufs_fit() returns true without
checking nr <= ICE_MAX_BUF_TXD, so ice_xsk_xmit_descs() emits more than 8
data descriptors for a single non-USO packet and triggers a hardware MDD
event on the Tx queue.
For USO packets on the same fallback path, neither xsk_tx_uso_parse() nor
ice_xsk_uso_fits() checks nr <= pool->xdp_zc_max_segs (ice_xsk_uso_fits()
resets buffers = 1 at each segment boundary), allowing a USO packet to
exceed xdp-zc-max-segs descriptors.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261119141032.1070446-1-magnus.karlsson@intel.com?part=3
next prev parent reply other threads:[~2026-11-19 14:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 14:10 [PATCH net-next 0/5] xsk: ice: USO support for AF_XDP Magnus Karlsson
2026-11-19 14:10 ` [PATCH net-next 1/5] xsk: add USO support for skb path Magnus Karlsson
2026-11-19 14:10 ` [PATCH net-next 2/5] ice: add Tx descriptor builders and header length check Magnus Karlsson
2026-11-19 14:10 ` [PATCH net-next 3/5] xsk: ice: add USO zero-copy support Magnus Karlsson
2026-11-19 14:59 ` sashiko-bot [this message]
2026-11-19 14:10 ` [PATCH net-next 4/5] xsk: add KUnit tests for AF_XDP USO header helpers Magnus Karlsson
2026-11-19 14:10 ` [PATCH net-next 5/5] selftests: net: add AF_XDP USO test Magnus Karlsson
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=sashiko-outbox-223332@kernel.org \
--to=sashiko-bot@kernel.org \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=magnus.karlsson@intel.com \
--cc=sashiko-reviews@lists.linux.dev \
/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