Same here. 'postcopy_listening' should be cleared on backend cleanup.
One minor comment inline.
Best regards, Ilya Maximets.
On 04.10.2018 11:13, Maxime Coquelin wrote:
> Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> Signed-off-by: Maxime Coquelin <maxime.coque...@redhat.com>
> ---
> lib/librte_vhost/vhost.h | 1 +
> lib/librte_vhost/vhost_user.c | 19 +++++++++++++++++++
> lib/librte_vhost/vhost_user.h | 3 ++-
> 3 files changed, 22 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 3d4fc60fc..ffb3ea60a 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 */
> @@ -1552,6 +1553,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);
> @@ -1580,6 +1598,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..298279b91 100644
> --- a/lib/librte_vhost/vhost_user.h
> +++ b/lib/librte_vhost/vhost_user.h
> @@ -51,7 +51,8 @@ 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_MAX = 31
You didn't change the MAX value after moving the END request to another patch.
Not sure if this is important, but I'd like to keep it correct here.
> } VhostUserRequest;
>
> typedef enum VhostUserSlaveRequest {
>
