[v2] bus/vdev: fix wrong error log on secondary device scan

Message ID 20180903085022.45183-1-qi.z.zhang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series [v2] bus/vdev: fix wrong error log on secondary device scan |

Checks

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

Commit Message

Qi Zhang Sept. 3, 2018, 8:50 a.m. UTC
  When a secondary process handles VDEV_SCAN_ONE mp action, it is possible
the device is already be inserted. This happens when we have multiple
secondary processes which cause multiple broadcasts from primary during
bus->scan. So we don't need to log any error for -EEXIST.

Bugzilla ID: 84
Fixes: cdb068f031c6 ("bus/vdev: scan by multi-process channel")
Cc: stable@dpdk.org

Reported-by: Eads Gage <gage.eads@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---

v2:
- change log level to DEBUG for the case device already exist.

 drivers/bus/vdev/vdev.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
  

Comments

Eads, Gage Sept. 4, 2018, 2:45 p.m. UTC | #1
Acked-by: Gage Eads <gage.eads@intel.com>

Thanks!
Gage

> -----Original Message-----
> From: Zhang, Qi Z
> Sent: Monday, September 3, 2018 3:50 AM
> To: dev@dpdk.org
> Cc: thomas@monjalon.net; Burakov, Anatoly <anatoly.burakov@intel.com>;
> Eads, Gage <gage.eads@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>;
> stable@dpdk.org
> Subject: [PATCH v2] bus/vdev: fix wrong error log on secondary device scan
> 
> When a secondary process handles VDEV_SCAN_ONE mp action, it is possible
> the device is already be inserted. This happens when we have multiple secondary
> processes which cause multiple broadcasts from primary during
> bus->scan. So we don't need to log any error for -EEXIST.
> 
> Bugzilla ID: 84
> Fixes: cdb068f031c6 ("bus/vdev: scan by multi-process channel")
> Cc: stable@dpdk.org
> 
> Reported-by: Eads Gage <gage.eads@intel.com>
> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
> ---
> 
> v2:
> - change log level to DEBUG for the case device already exist.
> 
>  drivers/bus/vdev/vdev.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index
> 6139dd551..69dee89a8 100644
> --- a/drivers/bus/vdev/vdev.c
> +++ b/drivers/bus/vdev/vdev.c
> @@ -346,6 +346,7 @@ vdev_action(const struct rte_mp_msg *mp_msg, const
> void *peer)
>  	const struct vdev_param *in = (const struct vdev_param *)mp_msg-
> >param;
>  	const char *devname;
>  	int num;
> +	int ret;
> 
>  	strlcpy(mp_resp.name, VDEV_MP_KEY, sizeof(mp_resp.name));
>  	mp_resp.len_param = sizeof(*ou);
> @@ -380,7 +381,10 @@ vdev_action(const struct rte_mp_msg *mp_msg, const
> void *peer)
>  		break;
>  	case VDEV_SCAN_ONE:
>  		VDEV_LOG(INFO, "receive vdev, %s", in->name);
> -		if (insert_vdev(in->name, NULL, NULL) < 0)
> +		ret = insert_vdev(in->name, NULL, NULL);
> +		if (ret == -EEXIST)
> +			VDEV_LOG(DEBUG, "device already exist, %s", in-
> >name);
> +		else if (ret < 0)
>  			VDEV_LOG(ERR, "failed to add vdev, %s", in->name);
>  		break;
>  	default:
> --
> 2.13.6
  
Thomas Monjalon Sept. 16, 2018, 9:35 a.m. UTC | #2
> > When a secondary process handles VDEV_SCAN_ONE mp action, it is possible
> > the device is already be inserted. This happens when we have multiple secondary
> > processes which cause multiple broadcasts from primary during
> > bus->scan. So we don't need to log any error for -EEXIST.
> > 
> > Bugzilla ID: 84
> > Fixes: cdb068f031c6 ("bus/vdev: scan by multi-process channel")
> > Cc: stable@dpdk.org
> > 
> > Reported-by: Eads Gage <gage.eads@intel.com>
> > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
> Acked-by: Gage Eads <gage.eads@intel.com>

Applied, thanks
  

Patch

diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
index 6139dd551..69dee89a8 100644
--- a/drivers/bus/vdev/vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -346,6 +346,7 @@  vdev_action(const struct rte_mp_msg *mp_msg, const void *peer)
 	const struct vdev_param *in = (const struct vdev_param *)mp_msg->param;
 	const char *devname;
 	int num;
+	int ret;
 
 	strlcpy(mp_resp.name, VDEV_MP_KEY, sizeof(mp_resp.name));
 	mp_resp.len_param = sizeof(*ou);
@@ -380,7 +381,10 @@  vdev_action(const struct rte_mp_msg *mp_msg, const void *peer)
 		break;
 	case VDEV_SCAN_ONE:
 		VDEV_LOG(INFO, "receive vdev, %s", in->name);
-		if (insert_vdev(in->name, NULL, NULL) < 0)
+		ret = insert_vdev(in->name, NULL, NULL);
+		if (ret == -EEXIST)
+			VDEV_LOG(DEBUG, "device already exist, %s", in->name);
+		else if (ret < 0)
 			VDEV_LOG(ERR, "failed to add vdev, %s", in->name);
 		break;
 	default: