diff mbox series

[v2,10/17] vhost: add support for postcopy's listen message

Message ID 20181002093651.24795-11-maxime.coquelin@redhat.com (mailing list archive)
State Superseded, archived
Delegated to: Maxime Coquelin
Headers
Series vhost: add postcopy live-migration support |

Checks

Context Check Description
ci/Intel-compilation success Compilation OK

Commit Message

Maxime Coquelin Oct. 2, 2018, 9:36 a.m. UTC 
  Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 lib/librte_vhost/vhost.h      |  1 +
 lib/librte_vhost/vhost_user.c | 19 +++++++++++++++++++
 lib/librte_vhost/vhost_user.h |  4 +++-
 3 files changed, 23 insertions(+), 1 deletion(-)

Comments

Ilya Maximets Oct. 2, 2018, 2:11 p.m. UTC | #1 
On 02.10.2018 12:36, Maxime Coquelin wrote:
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
>  lib/librte_vhost/vhost.h      |  1 +
>  lib/librte_vhost/vhost_user.c | 19 +++++++++++++++++++
>  lib/librte_vhost/vhost_user.h |  4 +++-
>  3 files changed, 23 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
> index 21722d8a8..9453cb28d 100644
> --- a/lib/librte_vhost/vhost.h
> +++ b/lib/librte_vhost/vhost.h
> @@ -364,6 +364,7 @@ struct virtio_net {
>  	rte_spinlock_t		slave_req_lock;
>  
>  	int			postcopy_ufd;
> +	int			postcopy_listening;
>  
>  	/*
>  	 * Device id to identify a specific backend device.
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
> index 71721edc7..bd468ca12 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -76,6 +76,7 @@ static const char *vhost_message_str[VHOST_USER_MAX] = {
>  	[VHOST_USER_CRYPTO_CREATE_SESS] = "VHOST_USER_CRYPTO_CREATE_SESS",
>  	[VHOST_USER_CRYPTO_CLOSE_SESS] = "VHOST_USER_CRYPTO_CLOSE_SESS",
>  	[VHOST_USER_POSTCOPY_ADVISE]  = "VHOST_USER_POSTCOPY_ADVISE",
> +	[VHOST_USER_POSTCOPY_LISTEN]  = "VHOST_USER_POSTCOPY_LISTEN",
>  };
>  
>  /* The possible results of a message handling function */
> @@ -1548,6 +1549,23 @@ vhost_user_set_postcopy_advise(struct virtio_net **pdev,
>  #endif
>  }
>  
> +static int
> +vhost_user_set_postcopy_listen(struct virtio_net **pdev,
> +			struct VhostUserMsg *msg __rte_unused,
> +			int main_fd __rte_unused)
> +{
> +	struct virtio_net *dev = *pdev;
> +
> +	if (dev->mem && dev->mem->nregions) {
> +		RTE_LOG(ERR, VHOST_CONFIG,
> +				"Regions already registered at postcopy-listen\n");
> +		return VH_RESULT_ERR;
> +	}
> +	dev->postcopy_listening = 1;
> +
> +	return VH_RESULT_OK;
> +}
> +
>  typedef int (*vhost_message_handler_t)(struct virtio_net **pdev,
>  					struct VhostUserMsg *msg,
>  					int main_fd);
> @@ -1576,6 +1594,7 @@ static vhost_message_handler_t vhost_message_handlers[VHOST_USER_MAX] = {
>  	[VHOST_USER_SET_SLAVE_REQ_FD] = vhost_user_set_req_fd,
>  	[VHOST_USER_IOTLB_MSG] = vhost_user_iotlb_msg,
>  	[VHOST_USER_POSTCOPY_ADVISE] = vhost_user_set_postcopy_advise,
> +	[VHOST_USER_POSTCOPY_LISTEN] = vhost_user_set_postcopy_listen,
>  };
>  
>  
> diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h
> index 2030b40a5..73b1fe2b9 100644
> --- a/lib/librte_vhost/vhost_user.h
> +++ b/lib/librte_vhost/vhost_user.h
> @@ -51,7 +51,9 @@ typedef enum VhostUserRequest {
>  	VHOST_USER_CRYPTO_CREATE_SESS = 26,
>  	VHOST_USER_CRYPTO_CLOSE_SESS = 27,
>  	VHOST_USER_POSTCOPY_ADVISE = 28,
> -	VHOST_USER_MAX = 29
> +	VHOST_USER_POSTCOPY_LISTEN = 29,
> +	VHOST_USER_POSTCOPY_END = 30,

I think, this should be part of patch 14 for consistency.

> +	VHOST_USER_MAX = 31
>  } VhostUserRequest;
>  
>  typedef enum VhostUserSlaveRequest {
>
Maxime Coquelin Oct. 3, 2018, 7:46 a.m. UTC | #2 
On 10/02/2018 04:11 PM, Ilya Maximets wrote:
> On 02.10.2018 12:36, Maxime Coquelin wrote:
>> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>> ---
>>   lib/librte_vhost/vhost.h      |  1 +
>>   lib/librte_vhost/vhost_user.c | 19 +++++++++++++++++++
>>   lib/librte_vhost/vhost_user.h |  4 +++-
>>   3 files changed, 23 insertions(+), 1 deletion(-)
>>
>> diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
>> index 21722d8a8..9453cb28d 100644
>> --- a/lib/librte_vhost/vhost.h
>> +++ b/lib/librte_vhost/vhost.h
>> @@ -364,6 +364,7 @@ struct virtio_net {
>>   	rte_spinlock_t		slave_req_lock;
>>   
>>   	int			postcopy_ufd;
>> +	int			postcopy_listening;
>>   
>>   	/*
>>   	 * Device id to identify a specific backend device.
>> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
>> index 71721edc7..bd468ca12 100644
>> --- a/lib/librte_vhost/vhost_user.c
>> +++ b/lib/librte_vhost/vhost_user.c
>> @@ -76,6 +76,7 @@ static const char *vhost_message_str[VHOST_USER_MAX] = {
>>   	[VHOST_USER_CRYPTO_CREATE_SESS] = "VHOST_USER_CRYPTO_CREATE_SESS",
>>   	[VHOST_USER_CRYPTO_CLOSE_SESS] = "VHOST_USER_CRYPTO_CLOSE_SESS",
>>   	[VHOST_USER_POSTCOPY_ADVISE]  = "VHOST_USER_POSTCOPY_ADVISE",
>> +	[VHOST_USER_POSTCOPY_LISTEN]  = "VHOST_USER_POSTCOPY_LISTEN",
>>   };
>>   
>>   /* The possible results of a message handling function */
>> @@ -1548,6 +1549,23 @@ vhost_user_set_postcopy_advise(struct virtio_net **pdev,
>>   #endif
>>   }
>>   
>> +static int
>> +vhost_user_set_postcopy_listen(struct virtio_net **pdev,
>> +			struct VhostUserMsg *msg __rte_unused,
>> +			int main_fd __rte_unused)
>> +{
>> +	struct virtio_net *dev = *pdev;
>> +
>> +	if (dev->mem && dev->mem->nregions) {
>> +		RTE_LOG(ERR, VHOST_CONFIG,
>> +				"Regions already registered at postcopy-listen\n");
>> +		return VH_RESULT_ERR;
>> +	}
>> +	dev->postcopy_listening = 1;
>> +
>> +	return VH_RESULT_OK;
>> +}
>> +
>>   typedef int (*vhost_message_handler_t)(struct virtio_net **pdev,
>>   					struct VhostUserMsg *msg,
>>   					int main_fd);
>> @@ -1576,6 +1594,7 @@ static vhost_message_handler_t vhost_message_handlers[VHOST_USER_MAX] = {
>>   	[VHOST_USER_SET_SLAVE_REQ_FD] = vhost_user_set_req_fd,
>>   	[VHOST_USER_IOTLB_MSG] = vhost_user_iotlb_msg,
>>   	[VHOST_USER_POSTCOPY_ADVISE] = vhost_user_set_postcopy_advise,
>> +	[VHOST_USER_POSTCOPY_LISTEN] = vhost_user_set_postcopy_listen,
>>   };
>>   
>>   
>> diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h
>> index 2030b40a5..73b1fe2b9 100644
>> --- a/lib/librte_vhost/vhost_user.h
>> +++ b/lib/librte_vhost/vhost_user.h
>> @@ -51,7 +51,9 @@ typedef enum VhostUserRequest {
>>   	VHOST_USER_CRYPTO_CREATE_SESS = 26,
>>   	VHOST_USER_CRYPTO_CLOSE_SESS = 27,
>>   	VHOST_USER_POSTCOPY_ADVISE = 28,
>> -	VHOST_USER_MAX = 29
>> +	VHOST_USER_POSTCOPY_LISTEN = 29,
>> +	VHOST_USER_POSTCOPY_END = 30,
> 
> I think, this should be part of patch 14 for consistency.

Indeed, it has been fixed-up in wrong commit I guess.

Thanks for spotting it.
Maxime

>> +	VHOST_USER_MAX = 31
>>   } VhostUserRequest;
>>   
>>   typedef enum VhostUserSlaveRequest {
>>
diff mbox series

Patch

diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
index 21722d8a8..9453cb28d 100644
--- a/lib/librte_vhost/vhost.h
+++ b/lib/librte_vhost/vhost.h
@@ -364,6 +364,7 @@  struct virtio_net {
 	rte_spinlock_t		slave_req_lock;
 
 	int			postcopy_ufd;
+	int			postcopy_listening;
 
 	/*
 	 * Device id to identify a specific backend device.
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 71721edc7..bd468ca12 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -76,6 +76,7 @@  static const char *vhost_message_str[VHOST_USER_MAX] = {
 	[VHOST_USER_CRYPTO_CREATE_SESS] = "VHOST_USER_CRYPTO_CREATE_SESS",
 	[VHOST_USER_CRYPTO_CLOSE_SESS] = "VHOST_USER_CRYPTO_CLOSE_SESS",
 	[VHOST_USER_POSTCOPY_ADVISE]  = "VHOST_USER_POSTCOPY_ADVISE",
+	[VHOST_USER_POSTCOPY_LISTEN]  = "VHOST_USER_POSTCOPY_LISTEN",
 };
 
 /* The possible results of a message handling function */
@@ -1548,6 +1549,23 @@  vhost_user_set_postcopy_advise(struct virtio_net **pdev,
 #endif
 }
 
+static int
+vhost_user_set_postcopy_listen(struct virtio_net **pdev,
+			struct VhostUserMsg *msg __rte_unused,
+			int main_fd __rte_unused)
+{
+	struct virtio_net *dev = *pdev;
+
+	if (dev->mem && dev->mem->nregions) {
+		RTE_LOG(ERR, VHOST_CONFIG,
+				"Regions already registered at postcopy-listen\n");
+		return VH_RESULT_ERR;
+	}
+	dev->postcopy_listening = 1;
+
+	return VH_RESULT_OK;
+}
+
 typedef int (*vhost_message_handler_t)(struct virtio_net **pdev,
 					struct VhostUserMsg *msg,
 					int main_fd);
@@ -1576,6 +1594,7 @@  static vhost_message_handler_t vhost_message_handlers[VHOST_USER_MAX] = {
 	[VHOST_USER_SET_SLAVE_REQ_FD] = vhost_user_set_req_fd,
 	[VHOST_USER_IOTLB_MSG] = vhost_user_iotlb_msg,
 	[VHOST_USER_POSTCOPY_ADVISE] = vhost_user_set_postcopy_advise,
+	[VHOST_USER_POSTCOPY_LISTEN] = vhost_user_set_postcopy_listen,
 };
 
 
diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h
index 2030b40a5..73b1fe2b9 100644
--- a/lib/librte_vhost/vhost_user.h
+++ b/lib/librte_vhost/vhost_user.h
@@ -51,7 +51,9 @@  typedef enum VhostUserRequest {
 	VHOST_USER_CRYPTO_CREATE_SESS = 26,
 	VHOST_USER_CRYPTO_CLOSE_SESS = 27,
 	VHOST_USER_POSTCOPY_ADVISE = 28,
-	VHOST_USER_MAX = 29
+	VHOST_USER_POSTCOPY_LISTEN = 29,
+	VHOST_USER_POSTCOPY_END = 30,
+	VHOST_USER_MAX = 31
 } VhostUserRequest;
 
 typedef enum VhostUserSlaveRequest {