diff mbox series

[v3] ethdev: silence error message on rte_eth_dev_owner_unset

Message ID 20180821084515.2a802429@xeon-e3 (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers
Series [v3] ethdev: silence error message on rte_eth_dev_owner_unset |

Checks

Context Check Description
ci/Intel-compilation success Compilation OK

Commit Message

Stephen Hemminger Aug. 21, 2018, 3:45 p.m. UTC 
  From 74ad4c60262b1451a5a2fabf79a2df89c6c5373d Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 16 Aug 2018 15:37:14 -0700
Subject: [PATCH 1/5] ethdev: silence error message on rte_eth_dev_owner_unset

The rte_eth_dev_owner_unset function always generates a log
message because the unset value for owner id is 0.

Also, when rte_eth_dev_owner_delete is called with a valid
owner id, the log message should be at NOTICE not ERROR
severity.

Fixes: 5b7ba31148a8 ("ethdev: add port ownership")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
v3 - handle rte_eth_dev_owner_delete
     leave other cleanups to later patch series

 lib/librte_ethdev/rte_ethdev.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

Comments

Matan Azrad Aug. 21, 2018, 3:53 p.m. UTC | #1 
Hi

From: Stephen Hemminger
> From 74ad4c60262b1451a5a2fabf79a2df89c6c5373d Mon Sep 17 00:00:00 2001
> From: Stephen Hemminger <stephen@networkplumber.org>
> Date: Thu, 16 Aug 2018 15:37:14 -0700
> Subject: [PATCH 1/5] ethdev: silence error message on
> rte_eth_dev_owner_unset
> 
> The rte_eth_dev_owner_unset function always generates a log message
> because the unset value for owner id is 0.
> 
> Also, when rte_eth_dev_owner_delete is called with a valid owner id, the
> log message should be at NOTICE not ERROR severity.
> 
> Fixes: 5b7ba31148a8 ("ethdev: add port ownership")
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
> v3 - handle rte_eth_dev_owner_delete
>      leave other cleanups to later patch series
> 
>  lib/librte_ethdev/rte_ethdev.c | 17 +++++++++++------
>  1 file changed, 11 insertions(+), 6 deletions(-)
> 
> diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
> index 4c320250589a..56dd9c2e83d9 100644
> --- a/lib/librte_ethdev/rte_ethdev.c
> +++ b/lib/librte_ethdev/rte_ethdev.c
> @@ -393,11 +393,8 @@ static int
>  rte_eth_is_valid_owner_id(uint64_t owner_id)  {
>  	if (owner_id == RTE_ETH_DEV_NO_OWNER ||
> -	    rte_eth_dev_shared_data->next_owner_id <= owner_id) {
> -		RTE_ETHDEV_LOG(ERR, "Invalid owner_id=%016"PRIx64"\n",
> -			owner_id);
> +	    rte_eth_dev_shared_data->next_owner_id <= owner_id)
>  		return 0;
> -	}
>  	return 1;
>  }
> 
> @@ -444,8 +441,12 @@ _rte_eth_dev_owner_set(const uint16_t port_id,
> const uint64_t old_owner_id,
>  	}
> 
>  	if (!rte_eth_is_valid_owner_id(new_owner->id) &&
> -	    !rte_eth_is_valid_owner_id(old_owner_id))
> +	    !rte_eth_is_valid_owner_id(old_owner_id)) {
> +		RTE_ETHDEV_LOG(ERR,
> +			       "Invalid owner old_id=%016"PRIx64"
> new_id=%016"PRIx64"\n",
> +			       old_owner_id, new_owner->id);
>  		return -EINVAL;
> +	}
> 
>  	port_owner = &rte_eth_devices[port_id].data->owner;
>  	if (port_owner->id != old_owner_id) {
> @@ -516,9 +517,13 @@ rte_eth_dev_owner_delete(const uint64_t
> owner_id)
>  			if (rte_eth_devices[port_id].data->owner.id ==
> owner_id)
>  				memset(&rte_eth_devices[port_id].data-
> >owner, 0,
>  				       sizeof(struct rte_eth_dev_owner));
> -		RTE_ETHDEV_LOG(ERR,
> +		RTE_ETHDEV_LOG(NOTICE,
>  			"All port owners owned by %016"PRIx64" identifier
> have removed\n",
>  			owner_id);
> +	} else {
> +		RTE_ETHDEV_LOG(ERR,
> +			       "Invalid owner id=%016"PRIx64"\n",
> +			       owner_id);
>  	}
> 
>  	rte_spinlock_unlock(&rte_eth_dev_shared_data->ownership_lock);
> --
> 2.18.0
> 

I think the title should be:
ethdev: fix port ownership logs

while adding the fixes commits (at list 2 because of the NOTICE change)
and updating stable.

Besides that,
Acked-by: Matan Azrad <matan@mellanox.com>
Ferruh Yigit Aug. 27, 2018, 1:01 p.m. UTC | #2 
On 8/21/2018 4:53 PM, Matan Azrad wrote:
> Hi
> 
> From: Stephen Hemminger
>> From 74ad4c60262b1451a5a2fabf79a2df89c6c5373d Mon Sep 17 00:00:00 2001
>> From: Stephen Hemminger <stephen@networkplumber.org>
>> Date: Thu, 16 Aug 2018 15:37:14 -0700
>> Subject: [PATCH 1/5] ethdev: silence error message on
>> rte_eth_dev_owner_unset
>>
>> The rte_eth_dev_owner_unset function always generates a log message
>> because the unset value for owner id is 0.
>>
>> Also, when rte_eth_dev_owner_delete is called with a valid owner id, the
>> log message should be at NOTICE not ERROR severity.
>>
>> Fixes: 5b7ba31148a8 ("ethdev: add port ownership")
>> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

<...>

> I think the title should be:
> ethdev: fix port ownership logs
> 
> while adding the fixes commits (at list 2 because of the NOTICE change)
> and updating stable.
> 
> Besides that,
> Acked-by: Matan Azrad <matan@mellanox.com>

Applied to dpdk-next-net/master, thanks.

(Used suggested title.)
diff mbox series

Patch

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 4c320250589a..56dd9c2e83d9 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -393,11 +393,8 @@  static int
 rte_eth_is_valid_owner_id(uint64_t owner_id)
 {
 	if (owner_id == RTE_ETH_DEV_NO_OWNER ||
-	    rte_eth_dev_shared_data->next_owner_id <= owner_id) {
-		RTE_ETHDEV_LOG(ERR, "Invalid owner_id=%016"PRIx64"\n",
-			owner_id);
+	    rte_eth_dev_shared_data->next_owner_id <= owner_id)
 		return 0;
-	}
 	return 1;
 }
 
@@ -444,8 +441,12 @@  _rte_eth_dev_owner_set(const uint16_t port_id, const uint64_t old_owner_id,
 	}
 
 	if (!rte_eth_is_valid_owner_id(new_owner->id) &&
-	    !rte_eth_is_valid_owner_id(old_owner_id))
+	    !rte_eth_is_valid_owner_id(old_owner_id)) {
+		RTE_ETHDEV_LOG(ERR,
+			       "Invalid owner old_id=%016"PRIx64" new_id=%016"PRIx64"\n",
+			       old_owner_id, new_owner->id);
 		return -EINVAL;
+	}
 
 	port_owner = &rte_eth_devices[port_id].data->owner;
 	if (port_owner->id != old_owner_id) {
@@ -516,9 +517,13 @@  rte_eth_dev_owner_delete(const uint64_t owner_id)
 			if (rte_eth_devices[port_id].data->owner.id == owner_id)
 				memset(&rte_eth_devices[port_id].data->owner, 0,
 				       sizeof(struct rte_eth_dev_owner));
-		RTE_ETHDEV_LOG(ERR,
+		RTE_ETHDEV_LOG(NOTICE,
 			"All port owners owned by %016"PRIx64" identifier have removed\n",
 			owner_id);
+	} else {
+		RTE_ETHDEV_LOG(ERR,
+			       "Invalid owner id=%016"PRIx64"\n",
+			       owner_id);
 	}
 
 	rte_spinlock_unlock(&rte_eth_dev_shared_data->ownership_lock);