From: "Creeley, Brett" <bcreeley@amd.com>
To: Anand Khoje <anand.a.khoje@oracle.com>,
Brett Creeley <brett.creeley@amd.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Abhijit Gangurde <abhijit.gangurde@amd.com>,
Shannon Nelson <sln@onemain.com>,
Leon Romanovsky <leon@kernel.org>,
Eric Joyner <eric.joyner@amd.com>,
Vadim Fedorenko <vadim.fedorenko@linux.dev>,
Kees Cook <kees@kernel.org>, Mohammad Heib <mheib@redhat.com>,
Jacob Keller <jacob.e.keller@intel.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org
Subject: Re: [PATCH net-next v3] net/ionic: avoid OOB TX partner lookup for hwstamp RXQ
Date: Mon, 17 Aug 2026 09:45:25 -0700 [thread overview]
Message-ID: <a2054afb-31a9-41c5-b27a-7c70d382a10d@amd.com> (raw)
In-Reply-To: <20260813083705.454897-1-anand.a.khoje@oracle.com>
On 8/13/2026 1:37 AM, Anand Khoje wrote:
> Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.
>
>
> The dedicated hardware timestamp RX queue is allocated with q->index
> equal to lif->ionic->nrxqs_per_lif. The normal txqcqs array only
> contains the regular queue pairs, so using that index to set rxq->partner
> can read one entry past txqcqs[] and then write through the derived
> pointer.
> Only link RX/TX partners for normal queue-pair indexes. Leave the hwstamp
> RX queue unpaired, and make the XDP_TX path abort cleanly if an RX queue
> has no TX partner.
>
> Fixes: 8eeed8373e1c ("ionic: Add XDP_TX support")
> Signed-off-by: Anand Khoje <anand.a.khoje@oracle.com>
> Reviewed-by: Si-Wei Liu <si-wei.liu@oracle.com>
> Reviewed-by: Shannon Nelson <sln@onemain.com>
> Cc: stable@vger.kernel.org
> ---
> v3:
> Use dev_err() and return -ENXIO for a missing normal TX partner.
>
> v2:
> Correct the Fixes tag.
>
> drivers/net/ethernet/pensando/ionic/ionic_lif.c | 17 +++++++++++++++--
> .../net/ethernet/pensando/ionic/ionic_txrx.c | 7 ++++++-
> 2 files changed, 21 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
> index fd3ee98..abc8e35 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
> @@ -920,8 +920,21 @@ static int ionic_lif_rxq_init(struct ionic_lif *lif, struct ionic_qcq *qcq)
> };
> int err;
>
> - q->partner = &lif->txqcqs[q->index]->q;
> - q->partner->partner = q;
> + q->partner = NULL;
> +
> + /* Only normal RX queues have matching TX queue partners. */
> + if (q->index < lif->nxqs) {
> + if (!lif->txqcqs ||
> + q->index >= lif->ionic->ntxqs_per_lif ||
> + !lif->txqcqs[q->index]) {
> + dev_err(dev, "missing TX queue partner for RX queue %u\n",
> + q->index);
> + return -ENXIO;
> + }
> +
> + q->partner = &lif->txqcqs[q->index]->q;
> + q->partner->partner = q;
> + }
>
> if (!lif->xdp_prog ||
> (lif->xdp_prog->aux && lif->xdp_prog->aux->xdp_has_frags))
> diff --git a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
> index 301ebee..73998d6 100644
> --- a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
> +++ b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
> @@ -545,13 +545,18 @@ static bool ionic_run_xdp(struct ionic_rx_stats *stats,
> break;
>
> case XDP_TX:
> + txq = rxq->partner;
> + if (unlikely(!txq)) {
> + err = -EIO;
> + break;
> + }
> +
> xdpf = xdp_convert_buff_to_frame(&xdp_buf);
> if (!xdpf) {
> err = -ENOSPC;
> break;
> }
>
> - txq = rxq->partner;
> nq = netdev_get_tx_queue(netdev, txq->index);
> __netif_tx_lock(nq, smp_processor_id());
> txq_trans_cond_update(nq);
LGTM. Thanks for the fix.
Reviewed-by: Brett Creeley <brett.creeley@amd.com>
> --
> 2.52.0
next prev parent reply other threads:[~2026-08-17 16:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-13 8:37 [PATCH net-next v3] net/ionic: avoid OOB TX partner lookup for hwstamp RXQ Anand Khoje
2026-08-14 17:47 ` Simon Horman
2026-08-17 16:45 ` Creeley, Brett [this message]
2026-08-18 11:11 ` Paolo Abeni
2026-08-18 11:20 ` patchwork-bot+netdevbpf
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=a2054afb-31a9-41c5-b27a-7c70d382a10d@amd.com \
--to=bcreeley@amd.com \
--cc=abhijit.gangurde@amd.com \
--cc=anand.a.khoje@oracle.com \
--cc=andrew+netdev@lunn.ch \
--cc=brett.creeley@amd.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=eric.joyner@amd.com \
--cc=jacob.e.keller@intel.com \
--cc=kees@kernel.org \
--cc=kuba@kernel.org \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mheib@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sln@onemain.com \
--cc=stable@vger.kernel.org \
--cc=vadim.fedorenko@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