patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Raslan Darawsheh <rasland@mellanox.com>
To: Asaf Penso <asafp@mellanox.com>, "dev@dpdk.org" <dev@dpdk.org>
Cc: Slava Ovsiienko <viacheslavo@mellanox.com>,
	Matan Azrad <matan@mellanox.com>,
	Dekel Peled <dekelp@mellanox.com>,
	"stable@dpdk.org" <stable@dpdk.org>
Subject: Re: [dpdk-stable] [dpdk-dev] [PATCH] net/mlx5: fix call to modify action without init	item
Date: Sun, 29 Mar 2020 11:17:04 +0000	[thread overview]
Message-ID: <AM0PR05MB67078F209D00B2C03CFE9C95C2CA0@AM0PR05MB6707.eurprd05.prod.outlook.com> (raw)
In-Reply-To: <1585165998-14221-1-git-send-email-asafp@mellanox.com>

Hi,
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Asaf Penso
> Sent: Wednesday, March 25, 2020 9:53 PM
> To: dev@dpdk.org
> Cc: Slava Ovsiienko <viacheslavo@mellanox.com>; Matan Azrad
> <matan@mellanox.com>; Dekel Peled <dekelp@mellanox.com>;
> stable@dpdk.org
> Subject: [dpdk-dev] [PATCH] net/mlx5: fix call to modify action without init
> item
> 
> The item is being set according to the attribute value, whether it is
> udp/tcp or ipv4/6.
> Also, there are two condition calls.
> 
> If the attribute is neither udp/tcp or ipv4/6 the item is not initialized
> at all, but the call to the flow_dv_convert_modify_action is still being
> done.
> Also, even if the attribute is tcp/udp or ipv4/6, we still have two
> conditions.
> 
> This patch changes the conditions, so the item will always be set.
> By doing this, there is also a save in the number of condition calls.
> 
> Fixes: 4bb14c83 ("net/mlx5: support modify header using Direct Verbs")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Asaf Penso <asafp@mellanox.com>
> Reviewed-by: Dekel Peled <dekelp@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_flow_dv.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c
> index 809833b..eabc745 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -702,8 +702,8 @@ struct field_modify_info modify_tcp[] = {
>  		item.spec = &udp;
>  		item.mask = &udp_mask;
>  		field = modify_udp;
> -	}
> -	if (attr->tcp) {
> +	} else {
> +		MLX5_ASSERT(attr->tcp);
>  		memset(&tcp, 0, sizeof(tcp));
>  		memset(&tcp_mask, 0, sizeof(tcp_mask));
>  		if (action->type == RTE_FLOW_ACTION_TYPE_SET_TP_SRC) {
> @@ -773,8 +773,8 @@ struct field_modify_info modify_tcp[] = {
>  		item.spec = &ipv4;
>  		item.mask = &ipv4_mask;
>  		field = modify_ipv4;
> -	}
> -	if (attr->ipv6) {
> +	} else {
> +		MLX5_ASSERT(attr->ipv6);
>  		memset(&ipv6, 0, sizeof(ipv6));
>  		memset(&ipv6_mask, 0, sizeof(ipv6_mask));
>  		ipv6.hdr.hop_limits = conf->ttl_value;
> @@ -834,8 +834,8 @@ struct field_modify_info modify_tcp[] = {
>  		item.spec = &ipv4;
>  		item.mask = &ipv4_mask;
>  		field = modify_ipv4;
> -	}
> -	if (attr->ipv6) {
> +	} else {
> +		MLX5_ASSERT(attr->ipv6);
>  		memset(&ipv6, 0, sizeof(ipv6));
>  		memset(&ipv6_mask, 0, sizeof(ipv6_mask));
>  		ipv6.hdr.hop_limits = 0xFF;
> --
> 1.8.3.1

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh


      parent reply	other threads:[~2020-03-29 11:17 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-25 19:53 [dpdk-stable] " Asaf Penso
2020-03-26  8:37 ` Matan Azrad
2020-03-29 11:17 ` Raslan Darawsheh [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=AM0PR05MB67078F209D00B2C03CFE9C95C2CA0@AM0PR05MB6707.eurprd05.prod.outlook.com \
    --to=rasland@mellanox.com \
    --cc=asafp@mellanox.com \
    --cc=dekelp@mellanox.com \
    --cc=dev@dpdk.org \
    --cc=matan@mellanox.com \
    --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
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).