* [PATCH v1] vhost: make SET_VRING_ADDR, SET_FEATURES send replies
@ 2021-07-08 8:28 Denis Plotnikov
2021-07-08 12:04 ` Michael S. Tsirkin
0 siblings, 1 reply; 4+ messages in thread
From: Denis Plotnikov @ 2021-07-08 8:28 UTC (permalink / raw)
To: qemu-devel; +Cc: yc-core, mst
On vhost-user-blk migration, qemu normally sends a number of commands
to enable logging if VHOST_USER_PROTOCOL_F_LOG_SHMFD is negotiated.
Qemu sends VHOST_USER_SET_FEATURES to enable buffers logging and
VHOST_USER_SET_VRING_ADDR per each started ring to enable "used ring"
data logging.
The issue is that qemu doesn't wait for reply from the vhost daemon
for these commands which may result in races between qemu expectation
of logging starting and actual login starting in vhost daemon.
The race can appear as follows: on migration setup, qemu enables dirty page
logging by sending VHOST_USER_SET_FEATURES. The command doesn't arrive to a
vhost-user-blk daemon immediately and the daemon needs some time to turn the
logging on internally. If qemu doesn't wait for reply, after sending the
command, qemu may start migrate memory pages to a destination. At this time,
the logging may not be actually turned on in the daemon but some guest pages,
which the daemon is about to write to, may have already been transferred
without logging to the destination. Since the logging wasn't turned on,
those pages won't be transferred again as dirty. So we may end up with
corrupted data on the destination.
The same scenario is applicable for "used ring" data logging, which is
turned on with VHOST_USER_SET_VRING_ADDR command.
To resolve this issue, this patch makes qemu wait for the commands result
explicilty if VHOST_USER_PROTOCOL_F_REPLY_ACK is negotiated.
Signed-off-by: Denis Plotnikov <den-plotnikov@yandex-team.ru>
---
hw/virtio/vhost-user.c | 31 ++++++++++++++++++++++++++++---
1 file changed, 28 insertions(+), 3 deletions(-)
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index ee57abe04526..15b5fac67cf3 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -1105,10 +1105,20 @@ static int vhost_user_set_vring_addr(struct vhost_dev *dev,
.hdr.size = sizeof(msg.payload.addr),
};
+ bool reply_supported = virtio_has_feature(dev->protocol_features,
+ VHOST_USER_PROTOCOL_F_REPLY_ACK);
+ if (reply_supported) {
+ msg.hdr.flags |= VHOST_USER_NEED_REPLY_MASK;
+ }
+
if (vhost_user_write(dev, &msg, NULL, 0) < 0) {
return -1;
}
+ if (reply_supported) {
+ return process_message_reply(dev, &msg);
+ }
+
return 0;
}
@@ -1288,7 +1298,8 @@ static int vhost_user_set_vring_call(struct vhost_dev *dev,
return vhost_set_vring_file(dev, VHOST_USER_SET_VRING_CALL, file);
}
-static int vhost_user_set_u64(struct vhost_dev *dev, int request, uint64_t u64)
+static int vhost_user_set_u64(struct vhost_dev *dev, int request, uint64_t u64,
+ bool need_reply)
{
VhostUserMsg msg = {
.hdr.request = request,
@@ -1297,23 +1308,37 @@ static int vhost_user_set_u64(struct vhost_dev *dev, int request, uint64_t u64)
.hdr.size = sizeof(msg.payload.u64),
};
+ if (need_reply) {
+ bool reply_supported = virtio_has_feature(dev->protocol_features,
+ VHOST_USER_PROTOCOL_F_REPLY_ACK);
+ if (reply_supported) {
+ msg.hdr.flags |= VHOST_USER_NEED_REPLY_MASK;
+ }
+ }
+
if (vhost_user_write(dev, &msg, NULL, 0) < 0) {
return -1;
}
+ if (msg.hdr.flags & VHOST_USER_NEED_REPLY_MASK) {
+ return process_message_reply(dev, &msg);
+ }
+
return 0;
}
static int vhost_user_set_features(struct vhost_dev *dev,
uint64_t features)
{
- return vhost_user_set_u64(dev, VHOST_USER_SET_FEATURES, features);
+ return vhost_user_set_u64(dev, VHOST_USER_SET_FEATURES, features,
+ true);
}
static int vhost_user_set_protocol_features(struct vhost_dev *dev,
uint64_t features)
{
- return vhost_user_set_u64(dev, VHOST_USER_SET_PROTOCOL_FEATURES, features);
+ return vhost_user_set_u64(dev, VHOST_USER_SET_PROTOCOL_FEATURES, features,
+ false);
}
static int vhost_user_get_u64(struct vhost_dev *dev, int request, uint64_t *u64)
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v1] vhost: make SET_VRING_ADDR, SET_FEATURES send replies
2021-07-08 8:28 [PATCH v1] vhost: make SET_VRING_ADDR, SET_FEATURES send replies Denis Plotnikov
@ 2021-07-08 12:04 ` Michael S. Tsirkin
2021-07-08 13:02 ` Denis Plotnikov
0 siblings, 1 reply; 4+ messages in thread
From: Michael S. Tsirkin @ 2021-07-08 12:04 UTC (permalink / raw)
To: Denis Plotnikov; +Cc: qemu-devel, yc-core
On Thu, Jul 08, 2021 at 11:28:40AM +0300, Denis Plotnikov wrote:
> On vhost-user-blk migration, qemu normally sends a number of commands
> to enable logging if VHOST_USER_PROTOCOL_F_LOG_SHMFD is negotiated.
> Qemu sends VHOST_USER_SET_FEATURES to enable buffers logging and
> VHOST_USER_SET_VRING_ADDR per each started ring to enable "used ring"
> data logging.
> The issue is that qemu doesn't wait for reply from the vhost daemon
> for these commands which may result in races between qemu expectation
> of logging starting and actual login starting in vhost daemon.
>
> The race can appear as follows: on migration setup, qemu enables dirty page
> logging by sending VHOST_USER_SET_FEATURES. The command doesn't arrive to a
> vhost-user-blk daemon immediately and the daemon needs some time to turn the
> logging on internally. If qemu doesn't wait for reply, after sending the
> command, qemu may start migrate memory pages to a destination. At this time,
> the logging may not be actually turned on in the daemon but some guest pages,
> which the daemon is about to write to, may have already been transferred
> without logging to the destination. Since the logging wasn't turned on,
> those pages won't be transferred again as dirty. So we may end up with
> corrupted data on the destination.
> The same scenario is applicable for "used ring" data logging, which is
> turned on with VHOST_USER_SET_VRING_ADDR command.
>
> To resolve this issue, this patch makes qemu wait for the commands result
> explicilty if VHOST_USER_PROTOCOL_F_REPLY_ACK is negotiated.
>
> Signed-off-by: Denis Plotnikov <den-plotnikov@yandex-team.ru>
> ---
> hw/virtio/vhost-user.c | 31 ++++++++++++++++++++++++++++---
> 1 file changed, 28 insertions(+), 3 deletions(-)
>
> diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
> index ee57abe04526..15b5fac67cf3 100644
> --- a/hw/virtio/vhost-user.c
> +++ b/hw/virtio/vhost-user.c
> @@ -1105,10 +1105,20 @@ static int vhost_user_set_vring_addr(struct vhost_dev *dev,
> .hdr.size = sizeof(msg.payload.addr),
> };
>
> + bool reply_supported = virtio_has_feature(dev->protocol_features,
> + VHOST_USER_PROTOCOL_F_REPLY_ACK);
> + if (reply_supported) {
> + msg.hdr.flags |= VHOST_USER_NEED_REPLY_MASK;
> + }
> +
> if (vhost_user_write(dev, &msg, NULL, 0) < 0) {
> return -1;
> }
>
> + if (reply_supported) {
> + return process_message_reply(dev, &msg);
> + }
> +
> return 0;
> }
>
Same - can we limit this to when logging is being enabled?
> @@ -1288,7 +1298,8 @@ static int vhost_user_set_vring_call(struct vhost_dev *dev,
> return vhost_set_vring_file(dev, VHOST_USER_SET_VRING_CALL, file);
> }
>
> -static int vhost_user_set_u64(struct vhost_dev *dev, int request, uint64_t u64)
> +static int vhost_user_set_u64(struct vhost_dev *dev, int request, uint64_t u64,
> + bool need_reply)
> {
> VhostUserMsg msg = {
> .hdr.request = request,
> @@ -1297,23 +1308,37 @@ static int vhost_user_set_u64(struct vhost_dev *dev, int request, uint64_t u64)
> .hdr.size = sizeof(msg.payload.u64),
> };
>
> + if (need_reply) {
> + bool reply_supported = virtio_has_feature(dev->protocol_features,
> + VHOST_USER_PROTOCOL_F_REPLY_ACK);
> + if (reply_supported) {
> + msg.hdr.flags |= VHOST_USER_NEED_REPLY_MASK;
> + }
> + }
> +
> if (vhost_user_write(dev, &msg, NULL, 0) < 0) {
> return -1;
> }
>
> + if (msg.hdr.flags & VHOST_USER_NEED_REPLY_MASK) {
> + return process_message_reply(dev, &msg);
> + }
> +
> return 0;
> }
>
> static int vhost_user_set_features(struct vhost_dev *dev,
> uint64_t features)
> {
> - return vhost_user_set_u64(dev, VHOST_USER_SET_FEATURES, features);
> + return vhost_user_set_u64(dev, VHOST_USER_SET_FEATURES, features,
> + true);
> }
>
Same here. In fact,
> static int vhost_user_set_protocol_features(struct vhost_dev *dev,
> uint64_t features)
> {
> - return vhost_user_set_u64(dev, VHOST_USER_SET_PROTOCOL_FEATURES, features);
> + return vhost_user_set_u64(dev, VHOST_USER_SET_PROTOCOL_FEATURES, features,
> + false);
> }
>
> static int vhost_user_get_u64(struct vhost_dev *dev, int request, uint64_t *u64)
> --
> 2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] vhost: make SET_VRING_ADDR, SET_FEATURES send replies
2021-07-08 12:04 ` Michael S. Tsirkin
@ 2021-07-08 13:02 ` Denis Plotnikov
2021-07-14 6:26 ` Denis Plotnikov
0 siblings, 1 reply; 4+ messages in thread
From: Denis Plotnikov @ 2021-07-08 13:02 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: qemu-devel, yc-core
On 08.07.2021 15:04, Michael S. Tsirkin wrote:
> On Thu, Jul 08, 2021 at 11:28:40AM +0300, Denis Plotnikov wrote:
>> On vhost-user-blk migration, qemu normally sends a number of commands
>> to enable logging if VHOST_USER_PROTOCOL_F_LOG_SHMFD is negotiated.
>> Qemu sends VHOST_USER_SET_FEATURES to enable buffers logging and
>> VHOST_USER_SET_VRING_ADDR per each started ring to enable "used ring"
>> data logging.
>> The issue is that qemu doesn't wait for reply from the vhost daemon
>> for these commands which may result in races between qemu expectation
>> of logging starting and actual login starting in vhost daemon.
>>
>> The race can appear as follows: on migration setup, qemu enables dirty page
>> logging by sending VHOST_USER_SET_FEATURES. The command doesn't arrive to a
>> vhost-user-blk daemon immediately and the daemon needs some time to turn the
>> logging on internally. If qemu doesn't wait for reply, after sending the
>> command, qemu may start migrate memory pages to a destination. At this time,
>> the logging may not be actually turned on in the daemon but some guest pages,
>> which the daemon is about to write to, may have already been transferred
>> without logging to the destination. Since the logging wasn't turned on,
>> those pages won't be transferred again as dirty. So we may end up with
>> corrupted data on the destination.
>> The same scenario is applicable for "used ring" data logging, which is
>> turned on with VHOST_USER_SET_VRING_ADDR command.
>>
>> To resolve this issue, this patch makes qemu wait for the commands result
>> explicilty if VHOST_USER_PROTOCOL_F_REPLY_ACK is negotiated.
>>
>> Signed-off-by: Denis Plotnikov <den-plotnikov@yandex-team.ru>
>> ---
>> hw/virtio/vhost-user.c | 31 ++++++++++++++++++++++++++++---
>> 1 file changed, 28 insertions(+), 3 deletions(-)
>>
>> diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
>> index ee57abe04526..15b5fac67cf3 100644
>> --- a/hw/virtio/vhost-user.c
>> +++ b/hw/virtio/vhost-user.c
>> @@ -1105,10 +1105,20 @@ static int vhost_user_set_vring_addr(struct vhost_dev *dev,
>> .hdr.size = sizeof(msg.payload.addr),
>> };
>>
>> + bool reply_supported = virtio_has_feature(dev->protocol_features,
>> + VHOST_USER_PROTOCOL_F_REPLY_ACK);
>> + if (reply_supported) {
>> + msg.hdr.flags |= VHOST_USER_NEED_REPLY_MASK;
>> + }
>> +
>> if (vhost_user_write(dev, &msg, NULL, 0) < 0) {
>> return -1;
>> }
>>
>> + if (reply_supported) {
>> + return process_message_reply(dev, &msg);
>> + }
>> +
>> return 0;
>> }
>>
> Same - can we limit this to when logging is being enabled?
I think it's possible but do we really need some additional complexity?
Do you bother about delays on device initialization? Would the reply
for the command introduce significant device initialization time delay?
In my understanding, this is done rarely on vhost-user device
initialization. So, may be we can afford it to be a little bit longer?
According to the migration case, in my understanding, major time the
migration of vhost-user should be done with logging enabled. Otherwise
it's hard to tell how to make sure that the memory migrates with
consistent data. So here we shouldn't care too much about setup speed
and should care more about data consistency. What do you think?
Thanks!
Denis
>
>> @@ -1288,7 +1298,8 @@ static int vhost_user_set_vring_call(struct vhost_dev *dev,
>> return vhost_set_vring_file(dev, VHOST_USER_SET_VRING_CALL, file);
>> }
>>
>> -static int vhost_user_set_u64(struct vhost_dev *dev, int request, uint64_t u64)
>> +static int vhost_user_set_u64(struct vhost_dev *dev, int request, uint64_t u64,
>> + bool need_reply)
>> {
>> VhostUserMsg msg = {
>> .hdr.request = request,
>> @@ -1297,23 +1308,37 @@ static int vhost_user_set_u64(struct vhost_dev *dev, int request, uint64_t u64)
>> .hdr.size = sizeof(msg.payload.u64),
>> };
>>
>> + if (need_reply) {
>> + bool reply_supported = virtio_has_feature(dev->protocol_features,
>> + VHOST_USER_PROTOCOL_F_REPLY_ACK);
>> + if (reply_supported) {
>> + msg.hdr.flags |= VHOST_USER_NEED_REPLY_MASK;
>> + }
>> + }
>> +
>> if (vhost_user_write(dev, &msg, NULL, 0) < 0) {
>> return -1;
>> }
>>
>> + if (msg.hdr.flags & VHOST_USER_NEED_REPLY_MASK) {
>> + return process_message_reply(dev, &msg);
>> + }
>> +
>> return 0;
>> }
>>
>> static int vhost_user_set_features(struct vhost_dev *dev,
>> uint64_t features)
>> {
>> - return vhost_user_set_u64(dev, VHOST_USER_SET_FEATURES, features);
>> + return vhost_user_set_u64(dev, VHOST_USER_SET_FEATURES, features,
>> + true);
>> }
>>
> Same here. In fact,
>
>> static int vhost_user_set_protocol_features(struct vhost_dev *dev,
>> uint64_t features)
>> {
>> - return vhost_user_set_u64(dev, VHOST_USER_SET_PROTOCOL_FEATURES, features);
>> + return vhost_user_set_u64(dev, VHOST_USER_SET_PROTOCOL_FEATURES, features,
>> + false);
>> }
>>
>> static int vhost_user_get_u64(struct vhost_dev *dev, int request, uint64_t *u64)
>> --
>> 2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] vhost: make SET_VRING_ADDR, SET_FEATURES send replies
2021-07-08 13:02 ` Denis Plotnikov
@ 2021-07-14 6:26 ` Denis Plotnikov
0 siblings, 0 replies; 4+ messages in thread
From: Denis Plotnikov @ 2021-07-14 6:26 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: qemu-devel, yc-core
On 08.07.2021 16:02, Denis Plotnikov wrote:
>
> On 08.07.2021 15:04, Michael S. Tsirkin wrote:
>> On Thu, Jul 08, 2021 at 11:28:40AM +0300, Denis Plotnikov wrote:
>>> On vhost-user-blk migration, qemu normally sends a number of commands
>>> to enable logging if VHOST_USER_PROTOCOL_F_LOG_SHMFD is negotiated.
>>> Qemu sends VHOST_USER_SET_FEATURES to enable buffers logging and
>>> VHOST_USER_SET_VRING_ADDR per each started ring to enable "used ring"
>>> data logging.
>>> The issue is that qemu doesn't wait for reply from the vhost daemon
>>> for these commands which may result in races between qemu expectation
>>> of logging starting and actual login starting in vhost daemon.
>>>
>>> The race can appear as follows: on migration setup, qemu enables
>>> dirty page
>>> logging by sending VHOST_USER_SET_FEATURES. The command doesn't
>>> arrive to a
>>> vhost-user-blk daemon immediately and the daemon needs some time to
>>> turn the
>>> logging on internally. If qemu doesn't wait for reply, after sending
>>> the
>>> command, qemu may start migrate memory pages to a destination. At
>>> this time,
>>> the logging may not be actually turned on in the daemon but some
>>> guest pages,
>>> which the daemon is about to write to, may have already been
>>> transferred
>>> without logging to the destination. Since the logging wasn't turned on,
>>> those pages won't be transferred again as dirty. So we may end up with
>>> corrupted data on the destination.
>>> The same scenario is applicable for "used ring" data logging, which is
>>> turned on with VHOST_USER_SET_VRING_ADDR command.
>>>
>>> To resolve this issue, this patch makes qemu wait for the commands
>>> result
>>> explicilty if VHOST_USER_PROTOCOL_F_REPLY_ACK is negotiated.
>>>
>>> Signed-off-by: Denis Plotnikov <den-plotnikov@yandex-team.ru>
>>> ---
>>> hw/virtio/vhost-user.c | 31 ++++++++++++++++++++++++++++---
>>> 1 file changed, 28 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
>>> index ee57abe04526..15b5fac67cf3 100644
>>> --- a/hw/virtio/vhost-user.c
>>> +++ b/hw/virtio/vhost-user.c
>>> @@ -1105,10 +1105,20 @@ static int vhost_user_set_vring_addr(struct
>>> vhost_dev *dev,
>>> .hdr.size = sizeof(msg.payload.addr),
>>> };
>>> + bool reply_supported =
>>> virtio_has_feature(dev->protocol_features,
>>> + VHOST_USER_PROTOCOL_F_REPLY_ACK);
>>> + if (reply_supported) {
>>> + msg.hdr.flags |= VHOST_USER_NEED_REPLY_MASK;
>>> + }
>>> +
>>> if (vhost_user_write(dev, &msg, NULL, 0) < 0) {
>>> return -1;
>>> }
>>> + if (reply_supported) {
>>> + return process_message_reply(dev, &msg);
>>> + }
>>> +
>>> return 0;
>>> }
>> Same - can we limit this to when logging is being enabled?
>
> I think it's possible but do we really need some additional complexity?
>
> Do you bother about delays on device initialization? Would the reply
> for the command introduce significant device initialization time
> delay? In my understanding, this is done rarely on vhost-user device
> initialization. So, may be we can afford it to be a little bit longer?
>
> According to the migration case, in my understanding, major time the
> migration of vhost-user should be done with logging enabled. Otherwise
> it's hard to tell how to make sure that the memory migrates with
> consistent data. So here we shouldn't care too much about setup speed
> and should care more about data consistency. What do you think?
>
> Thanks!
>
> Denis
please, let me know if my points above seem to be unreasonable and I'll
send another version with reply sending only when logging is enabled.
Thanks!
Denis
>
>>
>>> @@ -1288,7 +1298,8 @@ static int vhost_user_set_vring_call(struct
>>> vhost_dev *dev,
>>> return vhost_set_vring_file(dev, VHOST_USER_SET_VRING_CALL,
>>> file);
>>> }
>>> -static int vhost_user_set_u64(struct vhost_dev *dev, int request,
>>> uint64_t u64)
>>> +static int vhost_user_set_u64(struct vhost_dev *dev, int request,
>>> uint64_t u64,
>>> + bool need_reply)
>>> {
>>> VhostUserMsg msg = {
>>> .hdr.request = request,
>>> @@ -1297,23 +1308,37 @@ static int vhost_user_set_u64(struct
>>> vhost_dev *dev, int request, uint64_t u64)
>>> .hdr.size = sizeof(msg.payload.u64),
>>> };
>>> + if (need_reply) {
>>> + bool reply_supported =
>>> virtio_has_feature(dev->protocol_features,
>>> + VHOST_USER_PROTOCOL_F_REPLY_ACK);
>>> + if (reply_supported) {
>>> + msg.hdr.flags |= VHOST_USER_NEED_REPLY_MASK;
>>> + }
>>> + }
>>> +
>>> if (vhost_user_write(dev, &msg, NULL, 0) < 0) {
>>> return -1;
>>> }
>>> + if (msg.hdr.flags & VHOST_USER_NEED_REPLY_MASK) {
>>> + return process_message_reply(dev, &msg);
>>> + }
>>> +
>>> return 0;
>>> }
>>> static int vhost_user_set_features(struct vhost_dev *dev,
>>> uint64_t features)
>>> {
>>> - return vhost_user_set_u64(dev, VHOST_USER_SET_FEATURES, features);
>>> + return vhost_user_set_u64(dev, VHOST_USER_SET_FEATURES, features,
>>> + true);
>>> }
>> Same here. In fact,
>>
>>> static int vhost_user_set_protocol_features(struct vhost_dev *dev,
>>> uint64_t features)
>>> {
>>> - return vhost_user_set_u64(dev,
>>> VHOST_USER_SET_PROTOCOL_FEATURES, features);
>>> + return vhost_user_set_u64(dev,
>>> VHOST_USER_SET_PROTOCOL_FEATURES, features,
>>> + false);
>>> }
>>> static int vhost_user_get_u64(struct vhost_dev *dev, int
>>> request, uint64_t *u64)
>>> --
>>> 2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-07-14 6:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-08 8:28 [PATCH v1] vhost: make SET_VRING_ADDR, SET_FEATURES send replies Denis Plotnikov
2021-07-08 12:04 ` Michael S. Tsirkin
2021-07-08 13:02 ` Denis Plotnikov
2021-07-14 6:26 ` Denis Plotnikov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.