[dpdk-dev] net/virtio-user: fix dev_init in legacy-mem mode

Message ID 20180517073525.103984-1-xiao.w.wang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Maxime Coquelin
Headers

Checks

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

Commit Message

Xiao Wang May 17, 2018, 7:35 a.m. UTC
  In legacy-mem mode, memory event callback registering is not supported,
we should not return error in dev_init on this case.

Fixes: 12ecb2f63b12 ("net/virtio-user: support memory hotplug")

Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
Suggested-by: Tiwei Bie <tiwei.bie@intel.com>
---
 drivers/net/virtio/virtio_user/virtio_user_dev.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
  

Comments

Maxime Coquelin May 17, 2018, 8:03 a.m. UTC | #1
Hi Xiao,

Next time, could you please devtools/check-git-log.sh script before
posting.

I tihnk the commit title should be changed to:
net/virtio-user: fix device init in legacy-mem mode

On 05/17/2018 09:35 AM, Xiao Wang wrote:
> In legacy-mem mode, memory event callback registering is not supported,
> we should not return error in dev_init on this case.
> 
> Fixes: 12ecb2f63b12 ("net/virtio-user: support memory hotplug")
> 
> Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
> Suggested-by: Tiwei Bie <tiwei.bie@intel.com>

I think the suggested-by line should go above the signed-off one,
as it was suggested before being implemented.

> ---
>   drivers/net/virtio/virtio_user/virtio_user_dev.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> index 992a68757..bd16fbb60 100644
> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
> @@ -445,8 +445,11 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
>   
>   	if (rte_mem_event_callback_register(VIRTIO_USER_MEM_EVENT_CLB_NAME,
>   				virtio_user_mem_event_cb, dev)) {
> -		PMD_INIT_LOG(ERR, "Failed to register mem event callback\n");
> -		return -1;
> +		if (rte_errno != ENOTSUP) {
> +			PMD_INIT_LOG(ERR, "Failed to register mem event"
> +					" callback\n");
> +			return -1;
> +		}
>   	}
>   
>   	return 0;
> 

Apart above minor comments, the patch looks good to me:
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

I'll handle the changes when applying.

Thanks,
Maxime
  
Xiao Wang May 17, 2018, 8:07 a.m. UTC | #2
Hi,


> -----Original Message-----

> From: Maxime Coquelin [mailto:maxime.coquelin@redhat.com]

> Sent: Thursday, May 17, 2018 4:03 PM

> To: Wang, Xiao W <xiao.w.wang@intel.com>

> Cc: dev@dpdk.org; Bie, Tiwei <tiwei.bie@intel.com>; Yao, Lei A

> <lei.a.yao@intel.com>

> Subject: Re: [PATCH] net/virtio-user: fix dev_init in legacy-mem mode

> 

> Hi Xiao,

> 

> Next time, could you please devtools/check-git-log.sh script before

> posting.


OK, thanks!

BRs,
Xiao
> 

> I tihnk the commit title should be changed to:

> net/virtio-user: fix device init in legacy-mem mode

> 

> On 05/17/2018 09:35 AM, Xiao Wang wrote:

> > In legacy-mem mode, memory event callback registering is not supported,

> > we should not return error in dev_init on this case.

> >

> > Fixes: 12ecb2f63b12 ("net/virtio-user: support memory hotplug")

> >

> > Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>

> > Suggested-by: Tiwei Bie <tiwei.bie@intel.com>

> 

> I think the suggested-by line should go above the signed-off one,

> as it was suggested before being implemented.

> 

> > ---

> >   drivers/net/virtio/virtio_user/virtio_user_dev.c | 7 +++++--

> >   1 file changed, 5 insertions(+), 2 deletions(-)

> >

> > diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c

> b/drivers/net/virtio/virtio_user/virtio_user_dev.c

> > index 992a68757..bd16fbb60 100644

> > --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c

> > +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c

> > @@ -445,8 +445,11 @@ virtio_user_dev_init(struct virtio_user_dev *dev,

> char *path, int queues,

> >

> >   	if

> (rte_mem_event_callback_register(VIRTIO_USER_MEM_EVENT_CLB_NAME,

> >   				virtio_user_mem_event_cb, dev)) {

> > -		PMD_INIT_LOG(ERR, "Failed to register mem event

> callback\n");

> > -		return -1;

> > +		if (rte_errno != ENOTSUP) {

> > +			PMD_INIT_LOG(ERR, "Failed to register mem event"

> > +					" callback\n");

> > +			return -1;

> > +		}

> >   	}

> >

> >   	return 0;

> >

> 

> Apart above minor comments, the patch looks good to me:

> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

> 

> I'll handle the changes when applying.

> 

> Thanks,

> Maxime
  
Maxime Coquelin May 17, 2018, 8:28 a.m. UTC | #3
On 05/17/2018 09:35 AM, Xiao Wang wrote:
> In legacy-mem mode, memory event callback registering is not supported,
> we should not return error in dev_init on this case.
> 
> Fixes: 12ecb2f63b12 ("net/virtio-user: support memory hotplug")
> 
> Signed-off-by: Xiao Wang<xiao.w.wang@intel.com>
> Suggested-by: Tiwei Bie<tiwei.bie@intel.com>
> ---
>   drivers/net/virtio/virtio_user/virtio_user_dev.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)


Applied to dpdk-next-virtio/master with suggested changes.

Thanks,
Maxime
  

Patch

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 992a68757..bd16fbb60 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -445,8 +445,11 @@  virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,
 
 	if (rte_mem_event_callback_register(VIRTIO_USER_MEM_EVENT_CLB_NAME,
 				virtio_user_mem_event_cb, dev)) {
-		PMD_INIT_LOG(ERR, "Failed to register mem event callback\n");
-		return -1;
+		if (rte_errno != ENOTSUP) {
+			PMD_INIT_LOG(ERR, "Failed to register mem event"
+					" callback\n");
+			return -1;
+		}
 	}
 
 	return 0;