From: Nithin Dabilpuram <nithind1988@gmail.com>
To: skori@marvell.com
Cc: Jerin Jacob <jerinj@marvell.com>,
Kiran Kumar K <kirankumark@marvell.com>,
dev@dpdk.org, stable@dpdk.org
Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH] net/octeontx2: fix corruption in segments list
Date: Mon, 28 Dec 2020 17:47:43 +0530 [thread overview]
Message-ID: <X+nM1w0dKtUHbQJx@gmail.com> (raw)
In-Reply-To: <20201221140308.9809-1-skori@marvell.com>
On Mon, Dec 21, 2020 at 07:33:08PM +0530, skori@marvell.com wrote:
> From: Sunil Kumar Kori <skori@marvell.com>
>
> On Tx, lastseg->next is not being reset to null for multi segmented packet
> and same mbuf can be used on Rx which has a stale mbuf entry into
> mbuf->next.
>
> On Rx, application receives mbuf with mbuf->next uninitialized though
> mbuf->nb_segs is correct. Application iterates over all segments using
> mbuf->next ignoring mbuf->nb_segs which leads to undefined behavior.
>
> So earlier assumption of just having right value in mbuf->nb_segs is
> enough, is incorrect. Mbuf must contain valid and synced value in
> nb_segs and next pointer.
>
> Fixes: 364eb0e46683 ("net/octeontx2: avoid per packet barrier with multi segment")
> Cc: stable@dpdk.org
>
> Signed-off-by: Sunil Kumar Kori <skori@marvell.com>
> ---
> drivers/net/octeontx2/otx2_rx.c | 6 ++++++
> drivers/net/octeontx2/otx2_rx.h | 7 +++++--
> 2 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/octeontx2/otx2_rx.c b/drivers/net/octeontx2/otx2_rx.c
> index 2da8efe77..ffeade595 100644
> --- a/drivers/net/octeontx2/otx2_rx.c
> +++ b/drivers/net/octeontx2/otx2_rx.c
> @@ -279,6 +279,12 @@ nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,
> vst1q_u64((uint64_t *)mbuf2->rearm_data, rearm2);
> vst1q_u64((uint64_t *)mbuf3->rearm_data, rearm3);
>
> + /* Update that no more segments */
> + mbuf0->next = NULL;
> + mbuf1->next = NULL;
> + mbuf2->next = NULL;
> + mbuf3->next = NULL;
> +
> /* Store the mbufs to rx_pkts */
> vst1q_u64((uint64_t *)&rx_pkts[packets], mbuf01);
> vst1q_u64((uint64_t *)&rx_pkts[packets + 2], mbuf23);
> diff --git a/drivers/net/octeontx2/otx2_rx.h b/drivers/net/octeontx2/otx2_rx.h
> index 926f614a4..0ba3d3d96 100644
> --- a/drivers/net/octeontx2/otx2_rx.h
> +++ b/drivers/net/octeontx2/otx2_rx.h
> @@ -215,6 +215,7 @@ nix_cqe_xtract_mseg(const struct nix_rx_parse_s *rx,
> iova_list = (const rte_iova_t *)(iova_list + 1);
> }
> }
> + mbuf->next = NULL;
> }
>
> static __rte_always_inline uint16_t
> @@ -330,10 +331,12 @@ otx2_nix_cqe_to_mbuf(const struct nix_cqe_hdr_s *cq, const uint32_t tag,
> *(uint64_t *)(&mbuf->rearm_data) = val;
> mbuf->pkt_len = len;
>
> - if (flag & NIX_RX_MULTI_SEG_F)
> + if (flag & NIX_RX_MULTI_SEG_F) {
> nix_cqe_xtract_mseg(rx, mbuf, val);
> - else
> + } else {
> mbuf->data_len = len;
> + mbuf->next = NULL;
> + }
> }
>
> #define CKSUM_F NIX_RX_OFFLOAD_CHECKSUM_F
> --
> 2.25.1
>
Acked-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
next prev parent reply other threads:[~2020-12-28 12:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-21 14:03 [dpdk-stable] " skori
2020-12-28 12:17 ` Nithin Dabilpuram [this message]
2021-01-12 18:13 ` [dpdk-stable] [dpdk-dev] " Jerin Jacob
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=X+nM1w0dKtUHbQJx@gmail.com \
--to=nithind1988@gmail.com \
--cc=dev@dpdk.org \
--cc=jerinj@marvell.com \
--cc=kirankumark@marvell.com \
--cc=skori@marvell.com \
--cc=stable@dpdk.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;
as well as URLs for NNTP newsgroup(s).