[dpdk-dev,42/53] net/sfc/base: fix probes in licensing support

Message ID 1510819481-6809-43-git-send-email-arybchenko@solarflare.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Andrew Rybchenko Nov. 16, 2017, 8:04 a.m. UTC
  From: Mark Spender <mspender@solarflare.com>

Fixes: 05fce2ce8451 ("net/sfc/base: import libefx licensing")
Cc: stable@dpdk.org

Signed-off-by: Mark Spender <mspender@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 drivers/net/sfc/base/efx_lic.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
  

Comments

Ferruh Yigit Nov. 27, 2017, 7:58 p.m. UTC | #1
On 11/16/2017 12:04 AM, Andrew Rybchenko wrote:
> From: Mark Spender <mspender@solarflare.com>
> 

What has been fixed here?
If you can provide more details I can amend the commit later.

> Fixes: 05fce2ce8451 ("net/sfc/base: import libefx licensing")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Mark Spender <mspender@solarflare.com>
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
> ---
>  drivers/net/sfc/base/efx_lic.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/sfc/base/efx_lic.c b/drivers/net/sfc/base/efx_lic.c
> index de25c5c..cfff51a 100644
> --- a/drivers/net/sfc/base/efx_lic.c
> +++ b/drivers/net/sfc/base/efx_lic.c
> @@ -498,7 +498,7 @@ efx_lic_v1v2_find_key(
>  	return (found);
>  
>  fail1:
> -	EFSYS_PROBE(fail1);
> +	EFSYS_PROBE1(fail1, boolean_t, B_FALSE);
>  
>  	return (B_FALSE);
>  }
> @@ -540,7 +540,7 @@ efx_lic_v1v2_validate_key(
>  fail2:
>  	EFSYS_PROBE(fail2);
>  fail1:
> -	EFSYS_PROBE(fail1);
> +	EFSYS_PROBE1(fail1, boolean_t, B_FALSE);
>  
>  	return (B_FALSE);
>  }
> @@ -1158,7 +1158,7 @@ efx_lic_v3_validate_key(
>  fail2:
>  	EFSYS_PROBE(fail2);
>  fail1:
> -	EFSYS_PROBE(fail1);
> +	EFSYS_PROBE1(fail1, boolean_t, B_FALSE);
>  
>  	return (B_FALSE);
>  }
>
  
Andrew Rybchenko Nov. 28, 2017, 10:17 a.m. UTC | #2
On 11/27/2017 10:58 PM, Ferruh Yigit wrote:
> On 11/16/2017 12:04 AM, Andrew Rybchenko wrote:
>> From: Mark Spender <mspender@solarflare.com>
>>
> What has been fixed here?
> If you can provide more details I can amend the commit later.

EFSYS_PROBE1 takes one typed value (in addition to the probe name),
whereas EFSYS_PROBE has just the probe name.

Which to use is determined by the probe name – “fail1” probes are
expected to include the function result.

Thanks,
Andrew.

>> Fixes: 05fce2ce8451 ("net/sfc/base: import libefx licensing")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Mark Spender <mspender@solarflare.com>
>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>> ---
>>   drivers/net/sfc/base/efx_lic.c | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/sfc/base/efx_lic.c b/drivers/net/sfc/base/efx_lic.c
>> index de25c5c..cfff51a 100644
>> --- a/drivers/net/sfc/base/efx_lic.c
>> +++ b/drivers/net/sfc/base/efx_lic.c
>> @@ -498,7 +498,7 @@ efx_lic_v1v2_find_key(
>>   	return (found);
>>   
>>   fail1:
>> -	EFSYS_PROBE(fail1);
>> +	EFSYS_PROBE1(fail1, boolean_t, B_FALSE);
>>   
>>   	return (B_FALSE);
>>   }
>> @@ -540,7 +540,7 @@ efx_lic_v1v2_validate_key(
>>   fail2:
>>   	EFSYS_PROBE(fail2);
>>   fail1:
>> -	EFSYS_PROBE(fail1);
>> +	EFSYS_PROBE1(fail1, boolean_t, B_FALSE);
>>   
>>   	return (B_FALSE);
>>   }
>> @@ -1158,7 +1158,7 @@ efx_lic_v3_validate_key(
>>   fail2:
>>   	EFSYS_PROBE(fail2);
>>   fail1:
>> -	EFSYS_PROBE(fail1);
>> +	EFSYS_PROBE1(fail1, boolean_t, B_FALSE);
>>   
>>   	return (B_FALSE);
>>   }
>>
  
Ferruh Yigit Nov. 28, 2017, 9:38 p.m. UTC | #3
On 11/28/2017 2:17 AM, Andrew Rybchenko wrote:
> On 11/27/2017 10:58 PM, Ferruh Yigit wrote:
>> On 11/16/2017 12:04 AM, Andrew Rybchenko wrote:
>>> From: Mark Spender <mspender@solarflare.com>
>>>
>> What has been fixed here?
>> If you can provide more details I can amend the commit later.
> 
> EFSYS_PROBE1 takes one typed value (in addition to the probe name),
> whereas EFSYS_PROBE has just the probe name.
> 
> Which to use is determined by the probe name – “fail1” probes are
> expected to include the function result.

Commits are amended with shared updates and pushed, this and other ones.

Thanks,
ferruh

> 
> Thanks,
> Andrew.
> 
>>> Fixes: 05fce2ce8451 ("net/sfc/base: import libefx licensing")
>>> Cc: stable@dpdk.org
>>>
>>> Signed-off-by: Mark Spender <mspender@solarflare.com>
>>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
<...>
  
Andrew Rybchenko Nov. 29, 2017, 9:51 a.m. UTC | #4
On 11/29/2017 12:38 AM, Ferruh Yigit wrote:
> On 11/28/2017 2:17 AM, Andrew Rybchenko wrote:
>> On 11/27/2017 10:58 PM, Ferruh Yigit wrote:
>>> On 11/16/2017 12:04 AM, Andrew Rybchenko wrote:
>>>> From: Mark Spender <mspender@solarflare.com>
>>>>
>>> What has been fixed here?
>>> If you can provide more details I can amend the commit later.
>> EFSYS_PROBE1 takes one typed value (in addition to the probe name),
>> whereas EFSYS_PROBE has just the probe name.
>>
>> Which to use is determined by the probe name – “fail1” probes are
>> expected to include the function result.
> Commits are amended with shared updates and pushed, this and other ones.

Ferruh, many thanks for review and your notes/questions.

> Thanks,
> ferruh
>
>> Thanks,
>> Andrew.
>>
>>>> Fixes: 05fce2ce8451 ("net/sfc/base: import libefx licensing")
>>>> Cc: stable@dpdk.org
>>>>
>>>> Signed-off-by: Mark Spender <mspender@solarflare.com>
>>>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
> <...>
  

Patch

diff --git a/drivers/net/sfc/base/efx_lic.c b/drivers/net/sfc/base/efx_lic.c
index de25c5c..cfff51a 100644
--- a/drivers/net/sfc/base/efx_lic.c
+++ b/drivers/net/sfc/base/efx_lic.c
@@ -498,7 +498,7 @@  efx_lic_v1v2_find_key(
 	return (found);
 
 fail1:
-	EFSYS_PROBE(fail1);
+	EFSYS_PROBE1(fail1, boolean_t, B_FALSE);
 
 	return (B_FALSE);
 }
@@ -540,7 +540,7 @@  efx_lic_v1v2_validate_key(
 fail2:
 	EFSYS_PROBE(fail2);
 fail1:
-	EFSYS_PROBE(fail1);
+	EFSYS_PROBE1(fail1, boolean_t, B_FALSE);
 
 	return (B_FALSE);
 }
@@ -1158,7 +1158,7 @@  efx_lic_v3_validate_key(
 fail2:
 	EFSYS_PROBE(fail2);
 fail1:
-	EFSYS_PROBE(fail1);
+	EFSYS_PROBE1(fail1, boolean_t, B_FALSE);
 
 	return (B_FALSE);
 }