From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ferruh Yigit <ferruh.yigit@intel.com>
Subject: Re: [PATCH v4 8/8] net/mlx5: support new flow counter API
Date: Wed, 24 Oct 2018 17:31:21 +0100
Message-ID: <61c99e8e-b802-1ae6-99ed-a67fac652ad8@intel.com>
References: <1539962470-10950-1-git-send-email-viacheslavo@mellanox.com>
 <1540289032-29628-1-git-send-email-viacheslavo@mellanox.com>
 <1540289032-29628-9-git-send-email-viacheslavo@mellanox.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Cc: "dev@dpdk.org" <dev@dpdk.org>, Thomas Monjalon <thomas@monjalon.net>
To: Slava Ovsiienko <viacheslavo@mellanox.com>,
 Shahaf Shuler <shahafs@mellanox.com>
Return-path: <dev-bounces@dpdk.org>
Received: from mga05.intel.com (mga05.intel.com [192.55.52.43])
 by dpdk.org (Postfix) with ESMTP id AC44E1B11B
 for <dev@dpdk.org>; Wed, 24 Oct 2018 18:31:33 +0200 (CEST)
In-Reply-To: <1540289032-29628-9-git-send-email-viacheslavo@mellanox.com>
Content-Language: en-US
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

On 10/23/2018 11:04 AM, Slava Ovsiienko wrote:
> @@ -1012,9 +1079,12 @@
>  						  " context.");
>  	}
>  	*action_flags |= MLX5_FLOW_ACTION_COUNT;
> -#ifdef HAVE_IBV_DEVICE_COUNTERS_SET_V42
> +#if defined(HAVE_IBV_DEVICE_COUNTERS_SET_V42)
>  	counter.counter_set_handle = flow->counter->cs->handle;
>  	flow_verbs_spec_add(dev_flow, &counter, size);
> +#elif defined(HAVE_IBV_DEVICE_COUNTERS_SET_V45)
> +	counter.counters = flow->counter->cs;
> +	flow_verbs_spec_add(dev_flow, &counter, size);
>  #endif
>  	return 0;
>  }

Hi Slava, Shahaf,

There is something wrong related above code.
In next-net-mlx the above code is different than the patch itself [1] and
causing build error.

This can be because of merge/conflict issues. Please fix issue on next-net-mlx,
I will drop the patches I have pulled and wait until this is fixed.

But my concern is what would be if this doesn't cause a build error!
If this is because of merge/conflict, this data is lost, we really should
consider using git merge.
If this is because of you updated the code in the tree, I think that is worse,
we shouldn't change code in the tree, please ask for changes in mail list.


[1]
 @@ -1012,10 +1077,12 @@ flow_verbs_translate_action_count(struct rte_eth_dev
*dev,


                                                   " context.");
         }
         *action_flags |= MLX5_FLOW_ACTION_COUNT;
 -#ifdef HAVE_IBV_DEVICE_COUNTERS_SET_V42



 +#if defined(HAVE_IBV_DEVICE_COUNTERS_SET_V42)



         counter.counter_set_handle = flow->counter->cs->handle;
 -       flow_verbs_spec_add(dev_flow, &counter, size);



 +#elif defined(HAVE_IBV_DEVICE_COUNTERS_SET_V45)



 +       counter.counters = flow->counter->cs;



  #endif
 +       flow_verbs_spec_add(dev_flow, &counter, size);



         return 0;
  }