Re: [dpdk-dev] [PATCH v4 8/8] net/mlx5: support new flow counter API

[Ferruh Yigit <ferruh.yigit@intel.com>]

On 10/24/2018 5:31 PM, Ferruh Yigit wrote:
> 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;
  }