patches for DPDK stable branches
 help / color / Atom feed
From: Matan Azrad <matan@mellanox.com>
To: Slava Ovsiienko <viacheslavo@mellanox.com>,
	"dev@dpdk.org" <dev@dpdk.org>
Cc: "stable@dpdk.org" <stable@dpdk.org>
Subject: Re: [dpdk-stable] [PATCH] net/mlx5: fix transmit descriptor with VLAN insertions
Date: Tue, 3 Sep 2019 13:05:12 +0000
Message-ID: <AM0PR0502MB40191834C29F8CFBC54C7334D2B90@AM0PR0502MB4019.eurprd05.prod.outlook.com> (raw)
In-Reply-To: <1567514105-24264-1-git-send-email-viacheslavo@mellanox.com>

Hi Slava

From: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
> If VLAN tag insertion transmit offload is engaged
> (DEV_TX_OFFLOAD_VLAN_INSERT in tx queue configuration is set) the
> transmit descriptor may be built with wrong format, due to packet length is
> not adjusted. Also, the ring buffer wrapup is not handled correctly.
> 
> Fixes: 18a1c20044c0 ("net/mlx5: implement Tx burst template")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_rxtx.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
> index 8ec90c3..f540977 100644
> --- a/drivers/net/mlx5/mlx5_rxtx.c
> +++ b/drivers/net/mlx5/mlx5_rxtx.c
> @@ -2861,13 +2861,14 @@ enum mlx5_txcmp_code {
>  	memcpy(pdst, buf, MLX5_DSEG_MIN_INLINE_SIZE);
>  	buf += MLX5_DSEG_MIN_INLINE_SIZE;
>  	pdst += MLX5_DSEG_MIN_INLINE_SIZE;
> +	len -= MLX5_DSEG_MIN_INLINE_SIZE;
>  	/* Insert VLAN ethertype + VLAN tag. Pointer is aligned. */
>  	assert(pdst == RTE_PTR_ALIGN(pdst, MLX5_WSEG_SIZE));
> +	if (unlikely(pdst >= (uint8_t *)txq->wqes_end))

Why unlikely?
Wraparound is expected even in good cases, no?



> +		pdst = (uint8_t *)txq->wqes;
>  	*(uint32_t *)pdst = rte_cpu_to_be_32((RTE_ETHER_TYPE_VLAN <<
> 16) |
>  					      loc->mbuf->vlan_tci);
>  	pdst += sizeof(struct rte_vlan_hdr);
> -	if (unlikely(pdst >= (uint8_t *)txq->wqes_end))
> -		pdst = (uint8_t *)txq->wqes;
>  	/*
>  	 * The WQEBB space availability is checked by caller.
>  	 * Here we should be aware of WQE ring buffer wraparound only.
> --
> 1.8.3.1


  reply index

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-03 12:35 Viacheslav Ovsiienko
2019-09-03 13:05 ` Matan Azrad [this message]
2019-09-03 13:43   ` Slava Ovsiienko
2019-09-04  6:17     ` Matan Azrad
2019-09-10  7:35 ` Matan Azrad
2019-09-10 12:08 ` [dpdk-stable] [dpdk-dev] " Raslan Darawsheh

Reply instructions:

You may reply publically 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=AM0PR0502MB40191834C29F8CFBC54C7334D2B90@AM0PR0502MB4019.eurprd05.prod.outlook.com \
    --to=matan@mellanox.com \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    --cc=viacheslavo@mellanox.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

patches for DPDK stable branches

Archives are clonable:
	git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/ public-inbox