patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: Ilya Maximets <i.maximets@samsung.com>,
	dev@dpdk.org, tiwei.bie@intel.com, zhihong.wang@intel.com,
	jfreimann@redhat.com, nicknickolaev@gmail.com,
	bruce.richardson@intel.com, alejandro.lucero@netronome.com
Cc: dgilbert@redhat.com, stable@dpdk.org
Subject: Re: [dpdk-stable] [PATCH v3 11/19] vhost: introduce postcopy's advise message
Date: Fri, 5 Oct 2018 15:36:22 +0200	[thread overview]
Message-ID: <e7c9eda1-2abc-53ad-6741-3318931fa069@redhat.com> (raw)
In-Reply-To: <20181005115541eucas1p1893250ad7dc2d2ab3c7da5000a68b199~atF62GFUW1471914719eucas1p1O@eucas1p1.samsung.com>



On 10/05/2018 01:58 PM, Ilya Maximets wrote:
> Cleanup part is missing in this patch.
> We should close and clear postcopy_ufd in vhost_backend_cleanup().

Good catch, I'll spin a v4 with your suggestion.

Thanks,
Maxime

> Best regards, Ilya Maximets.
> 
> On 04.10.2018 11:13, Maxime Coquelin wrote:
>> This patch opens a userfaultfd and sends it back to Qemu's
>> VHOST_USER_POSTCOPY_ADVISE request.
>>
>> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>> ---
>>   lib/librte_vhost/vhost.h      |  2 ++
>>   lib/librte_vhost/vhost_user.c | 44 +++++++++++++++++++++++++++++++++++
>>   lib/librte_vhost/vhost_user.h |  3 ++-
>>   3 files changed, 48 insertions(+), 1 deletion(-)
>>
>> diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
>> index 25ffd7614..21722d8a8 100644
>> --- a/lib/librte_vhost/vhost.h
>> +++ b/lib/librte_vhost/vhost.h
>> @@ -363,6 +363,8 @@ struct virtio_net {
>>   	int			slave_req_fd;
>>   	rte_spinlock_t		slave_req_lock;
>>   
>> +	int			postcopy_ufd;
>> +
>>   	/*
>>   	 * Device id to identify a specific backend device.
>>   	 * It's set to -1 for the default software implementation.
>> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
>> index 0a1934649..3d4fc60fc 100644
>> --- a/lib/librte_vhost/vhost_user.c
>> +++ b/lib/librte_vhost/vhost_user.c
>> @@ -24,13 +24,19 @@
>>   #include <stdlib.h>
>>   #include <string.h>
>>   #include <unistd.h>
>> +#include <fcntl.h>
>> +#include <sys/ioctl.h>
>>   #include <sys/mman.h>
>>   #include <sys/types.h>
>>   #include <sys/stat.h>
>> +#include <sys/syscall.h>
>>   #include <assert.h>
>>   #ifdef RTE_LIBRTE_VHOST_NUMA
>>   #include <numaif.h>
>>   #endif
>> +#ifdef RTE_LIBRTE_VHOST_POSTCOPY
>> +#include <linux/userfaultfd.h>
>> +#endif
>>   
>>   #include <rte_common.h>
>>   #include <rte_malloc.h>
>> @@ -69,6 +75,7 @@ static const char *vhost_message_str[VHOST_USER_MAX] = {
>>   	[VHOST_USER_IOTLB_MSG]  = "VHOST_USER_IOTLB_MSG",
>>   	[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",
>>   };
>>   
>>   /* The possible results of a message handling function */
>> @@ -1509,6 +1516,42 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg,
>>   	return VH_RESULT_OK;
>>   }
>>   
>> +static int
>> +vhost_user_set_postcopy_advise(struct virtio_net **pdev,
>> +			struct VhostUserMsg *msg,
>> +			int main_fd __rte_unused)
>> +{
>> +	struct virtio_net *dev = *pdev;
>> +#ifdef RTE_LIBRTE_VHOST_POSTCOPY
>> +	struct uffdio_api api_struct;
>> +
>> +	dev->postcopy_ufd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK);
>> +
>> +	if (dev->postcopy_ufd == -1) {
>> +		RTE_LOG(ERR, VHOST_CONFIG, "Userfaultfd not available: %s\n",
>> +				strerror(errno));
>> +		return VH_RESULT_ERR;
>> +	}
>> +	api_struct.api = UFFD_API;
>> +	api_struct.features = 0;
>> +	if (ioctl(dev->postcopy_ufd, UFFDIO_API, &api_struct)) {
>> +		RTE_LOG(ERR, VHOST_CONFIG, "UFFDIO_API ioctl failure: %s\n",
>> +				strerror(errno));
>> +		close(dev->postcopy_ufd);
>> +		return VH_RESULT_ERR;
>> +	}
>> +	msg->fds[0] = dev->postcopy_ufd;
>> +	msg->fd_num = 1;
>> +
>> +	return VH_RESULT_REPLY;
>> +#else
>> +	dev->postcopy_ufd = -1;
>> +	msg->fd_num = 0;
>> +
>> +	return VH_RESULT_ERR;
>> +#endif
>> +}
>> +
>>   typedef int (*vhost_message_handler_t)(struct virtio_net **pdev,
>>   					struct VhostUserMsg *msg,
>>   					int main_fd);
>> @@ -1536,6 +1579,7 @@ static vhost_message_handler_t vhost_message_handlers[VHOST_USER_MAX] = {
>>   	[VHOST_USER_NET_SET_MTU] = vhost_user_net_set_mtu,
>>   	[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,
>>   };
>>   
>>   
>> diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h
>> index dd0262f8f..2030b40a5 100644
>> --- a/lib/librte_vhost/vhost_user.h
>> +++ b/lib/librte_vhost/vhost_user.h
>> @@ -50,7 +50,8 @@ typedef enum VhostUserRequest {
>>   	VHOST_USER_IOTLB_MSG = 22,
>>   	VHOST_USER_CRYPTO_CREATE_SESS = 26,
>>   	VHOST_USER_CRYPTO_CLOSE_SESS = 27,
>> -	VHOST_USER_MAX = 28
>> +	VHOST_USER_POSTCOPY_ADVISE = 28,
>> +	VHOST_USER_MAX = 29
>>   } VhostUserRequest;
>>   
>>   typedef enum VhostUserSlaveRequest {
>>

  reply	other threads:[~2018-10-05 13:36 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-04  8:13 [dpdk-stable] [PATCH v3 00/19] vhost: add postcopy live-migration support Maxime Coquelin
2018-10-04  8:13 ` [dpdk-stable] [PATCH v3 01/19] vhost: fix messages error checks Maxime Coquelin
2018-10-04 14:48   ` Ilya Maximets
2018-10-04  8:13 ` [dpdk-stable] [PATCH v3 02/19] vhost: fix return code of messages requiring replies Maxime Coquelin
2018-10-04 14:48   ` Ilya Maximets
2018-10-04  8:13 ` [dpdk-stable] [PATCH v3 03/19] vhost: clarify reply-ack in case a reply was already sent Maxime Coquelin
2018-10-04 14:50   ` Ilya Maximets
2018-10-04  8:13 ` [dpdk-stable] [PATCH v3 04/19] vhost: fix payload size of reply Maxime Coquelin
2018-10-04 14:49   ` Ilya Maximets
2018-10-04  8:13 ` [dpdk-stable] [PATCH v3 05/19] vhost: fix error handling when mem table gets updated Maxime Coquelin
2018-10-04 14:59   ` Ilya Maximets
2018-10-04 15:06     ` Maxime Coquelin
2018-10-04 15:11       ` Ilya Maximets
2018-10-04  8:13 ` [dpdk-stable] [PATCH v3 06/19] vhost: define postcopy protocol flag Maxime Coquelin
2018-10-04 14:59   ` Ilya Maximets
2018-10-04  8:13 ` [dpdk-stable] [PATCH v3 07/19] vhost: add number of fds to vhost-user messages and use it Maxime Coquelin
2018-10-05  9:56   ` Ilya Maximets
2018-10-08 12:56     ` Maxime Coquelin
2018-10-04  8:13 ` [dpdk-stable] [PATCH v3 08/19] vhost: pass socket fd to message handling callbacks Maxime Coquelin
2018-10-04  8:13 ` [dpdk-stable] [PATCH v3 09/19] vhost: enable fds passing when sending vhost-user messages Maxime Coquelin
2018-10-04  8:13 ` [dpdk-stable] [PATCH v3 10/19] vhost: add config flag for postcopy feature Maxime Coquelin
2018-10-05 11:55   ` Ilya Maximets
2018-10-04  8:13 ` [dpdk-stable] [PATCH v3 11/19] vhost: introduce postcopy's advise message Maxime Coquelin
2018-10-05 11:58   ` Ilya Maximets
2018-10-05 13:36     ` Maxime Coquelin [this message]
2018-10-04  8:13 ` [dpdk-stable] [PATCH v3 12/19] vhost: add support for postcopy's listen message Maxime Coquelin
2018-10-05 12:02   ` Ilya Maximets
2018-10-04  8:13 ` [dpdk-stable] [PATCH v3 13/19] vhost: register new regions with userfaultfd Maxime Coquelin
2018-10-05 12:34   ` Ilya Maximets
2018-10-08 13:03     ` Maxime Coquelin
2018-10-04  8:13 ` [dpdk-stable] [PATCH v3 14/19] vhost: avoid useless VhostUserMemory copy Maxime Coquelin
2018-10-05 12:37   ` Ilya Maximets
2018-10-04  8:13 ` [dpdk-stable] [PATCH v3 15/19] vhost: send userfault range addresses back to qemu Maxime Coquelin
2018-10-04  8:14 ` [dpdk-stable] [PATCH v3 16/19] vhost: add support to postcopy's end request Maxime Coquelin
2018-10-04  8:14 ` [dpdk-stable] [PATCH v3 17/19] vhost: enable postcopy protocol feature Maxime Coquelin
2018-10-04  8:14 ` [dpdk-stable] [PATCH v3 18/19] vhost: add flag to enable postcopy live-migration Maxime Coquelin
2018-10-05 14:24   ` Ilya Maximets
2018-10-08 16:25     ` Ilya Maximets
2018-10-08 16:54       ` Maxime Coquelin
2018-10-04  8:14 ` [dpdk-stable] [PATCH v3 19/19] net/vhost: add parameter to enable postcopy support Maxime Coquelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e7c9eda1-2abc-53ad-6741-3318931fa069@redhat.com \
    --to=maxime.coquelin@redhat.com \
    --cc=alejandro.lucero@netronome.com \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=dgilbert@redhat.com \
    --cc=i.maximets@samsung.com \
    --cc=jfreimann@redhat.com \
    --cc=nicknickolaev@gmail.com \
    --cc=stable@dpdk.org \
    --cc=tiwei.bie@intel.com \
    --cc=zhihong.wang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).