From: Matthew Rosato <mjrosato@linux.ibm.com>
To: Pierre Morel <pmorel@linux.ibm.com>, qemu-s390x@nongnu.org
Cc: farman@linux.ibm.com, kvm@vger.kernel.org,
schnelle@linux.ibm.com, cohuck@redhat.com,
richard.henderson@linaro.org, thuth@redhat.com,
qemu-devel@nongnu.org, pasic@linux.ibm.com,
alex.williamson@redhat.com, mst@redhat.com, pbonzini@redhat.com,
david@redhat.com, borntraeger@linux.ibm.com
Subject: Re: [PATCH v5 2/9] vfio: tolerate migration protocol v1 uapi renames
Date: Tue, 12 Apr 2022 12:07:27 -0400 [thread overview]
Message-ID: <791ee8c8-a2f4-6644-7155-3bacdb3c4074@linux.ibm.com> (raw)
In-Reply-To: <ed4889b8-28c4-a3ed-b5ef-add3999023d4@linux.ibm.com>
On 4/12/22 11:50 AM, Pierre Morel wrote:
>
>
> On 4/4/22 20:17, Matthew Rosato wrote:
>> The v1 uapi is deprecated and will be replaced by v2 at some point;
>> this patch just tolerates the renaming of uapi fields to reflect
>> v1 / deprecated status.
>>
>> Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
>> ---
>> hw/vfio/common.c | 2 +-
>> hw/vfio/migration.c | 19 +++++++++++--------
>> 2 files changed, 12 insertions(+), 9 deletions(-)
>
>
> I do not understand why you need this patch in this series.
> Shouldn't it be separate?
This patch is included because of the patch 1 kernel header sync, which
pulls in uapi headers from kernel version 5.18-rc1 + my unmerged kernel
uapi changes.
This patch is unnecessary without a header sync (and in fact would break
QEMU compile), and is unrelated to the rest of the series -- but QEMU
will not compile without it once you update linux uapi headers to
5.18-rc1 (or greater) due to the v1 uapi for vfio migration being
deprecated [1]. This means that ANY series that does a linux header
sync starting from here on will need something like this patch to go
along with the header sync (or a series that replaces v1 usage with v2?).
If this patch looks good it could be included whenever a header sync is
next needed, doesn't necessarily have to be with this series.
[1] https://www.spinics.net/lists/kernel/msg4288200.html
>
>>
>> diff --git a/hw/vfio/common.c b/hw/vfio/common.c
>> index 080046e3f5..7b1e12fb69 100644
>> --- a/hw/vfio/common.c
>> +++ b/hw/vfio/common.c
>> @@ -380,7 +380,7 @@ static bool
>> vfio_devices_all_running_and_saving(VFIOContainer *container)
>> return false;
>> }
>> - if ((migration->device_state & VFIO_DEVICE_STATE_SAVING) &&
>> + if ((migration->device_state &
>> VFIO_DEVICE_STATE_V1_SAVING) &&
>> (migration->device_state &
>> VFIO_DEVICE_STATE_RUNNING)) {
>> continue;
>> } else {
>> diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
>> index ff6b45de6b..e109cee551 100644
>> --- a/hw/vfio/migration.c
>> +++ b/hw/vfio/migration.c
>> @@ -432,7 +432,7 @@ static int vfio_save_setup(QEMUFile *f, void *opaque)
>> }
>> ret = vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_MASK,
>> - VFIO_DEVICE_STATE_SAVING);
>> + VFIO_DEVICE_STATE_V1_SAVING);
>> if (ret) {
>> error_report("%s: Failed to set state SAVING", vbasedev->name);
>> return ret;
>> @@ -532,7 +532,7 @@ static int vfio_save_complete_precopy(QEMUFile *f,
>> void *opaque)
>> int ret;
>> ret = vfio_migration_set_state(vbasedev,
>> ~VFIO_DEVICE_STATE_RUNNING,
>> - VFIO_DEVICE_STATE_SAVING);
>> + VFIO_DEVICE_STATE_V1_SAVING);
>> if (ret) {
>> error_report("%s: Failed to set state STOP and SAVING",
>> vbasedev->name);
>> @@ -569,7 +569,7 @@ static int vfio_save_complete_precopy(QEMUFile *f,
>> void *opaque)
>> return ret;
>> }
>> - ret = vfio_migration_set_state(vbasedev,
>> ~VFIO_DEVICE_STATE_SAVING, 0);
>> + ret = vfio_migration_set_state(vbasedev,
>> ~VFIO_DEVICE_STATE_V1_SAVING, 0);
>> if (ret) {
>> error_report("%s: Failed to set state STOPPED",
>> vbasedev->name);
>> return ret;
>> @@ -730,7 +730,7 @@ static void vfio_vmstate_change(void *opaque, bool
>> running, RunState state)
>> * start saving data.
>> */
>> if (state == RUN_STATE_SAVE_VM) {
>> - value = VFIO_DEVICE_STATE_SAVING;
>> + value = VFIO_DEVICE_STATE_V1_SAVING;
>> } else {
>> value = 0;
>> }
>> @@ -768,8 +768,9 @@ static void vfio_migration_state_notifier(Notifier
>> *notifier, void *data)
>> case MIGRATION_STATUS_FAILED:
>> bytes_transferred = 0;
>> ret = vfio_migration_set_state(vbasedev,
>> - ~(VFIO_DEVICE_STATE_SAVING |
>> VFIO_DEVICE_STATE_RESUMING),
>> - VFIO_DEVICE_STATE_RUNNING);
>> + ~(VFIO_DEVICE_STATE_V1_SAVING |
>> + VFIO_DEVICE_STATE_RESUMING),
>> + VFIO_DEVICE_STATE_RUNNING);
>> if (ret) {
>> error_report("%s: Failed to set state RUNNING",
>> vbasedev->name);
>> }
>> @@ -864,8 +865,10 @@ int vfio_migration_probe(VFIODevice *vbasedev,
>> Error **errp)
>> goto add_blocker;
>> }
>> - ret = vfio_get_dev_region_info(vbasedev, VFIO_REGION_TYPE_MIGRATION,
>> - VFIO_REGION_SUBTYPE_MIGRATION,
>> &info);
>> + ret = vfio_get_dev_region_info(vbasedev,
>> +
>> VFIO_REGION_TYPE_MIGRATION_DEPRECATED,
>> +
>> VFIO_REGION_SUBTYPE_MIGRATION_DEPRECATED,
>> + &info);
>> if (ret) {
>> goto add_blocker;
>> }
>>
>
next prev parent reply other threads:[~2022-04-12 16:09 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-04 18:17 [PATCH v5 0/9] s390x/pci: zPCI interpretation support Matthew Rosato
2022-04-04 18:17 ` [PATCH v5 1/9] Update linux headers Matthew Rosato
2022-04-04 18:17 ` [PATCH v5 2/9] vfio: tolerate migration protocol v1 uapi renames Matthew Rosato
2022-04-12 15:50 ` Pierre Morel
2022-04-12 16:07 ` Matthew Rosato [this message]
2022-04-19 15:44 ` Pierre Morel
2022-04-04 18:17 ` [PATCH v5 3/9] target/s390x: add zpci-interp to cpu models Matthew Rosato
2022-05-18 8:01 ` Thomas Huth
2022-05-18 8:02 ` Thomas Huth
2022-05-18 8:05 ` Thomas Huth
2022-04-04 18:17 ` [PATCH v5 4/9] s390x/pci: add routine to get host function handle from CLP info Matthew Rosato
2022-04-19 19:15 ` Pierre Morel
2022-05-18 8:13 ` Thomas Huth
2022-04-04 18:17 ` [PATCH v5 5/9] s390x/pci: enable for load/store intepretation Matthew Rosato
2022-04-19 19:47 ` Pierre Morel
2022-04-20 15:12 ` Matthew Rosato
2022-04-22 9:27 ` Pierre Morel
2022-04-04 18:17 ` [PATCH v5 6/9] s390x/pci: don't fence interpreted devices without MSI-X Matthew Rosato
2022-04-04 18:17 ` [PATCH v5 7/9] s390x/pci: enable adapter event notification for interpreted devices Matthew Rosato
2022-04-22 9:39 ` Pierre Morel
2022-04-22 12:10 ` Matthew Rosato
2022-05-02 7:48 ` Pierre Morel
2022-05-02 9:19 ` Niklas Schnelle
2022-05-02 11:30 ` Pierre Morel
2022-05-02 19:57 ` Matthew Rosato
2022-05-03 14:53 ` Pierre Morel
2022-05-04 14:20 ` Matthew Rosato
2022-04-04 18:17 ` [PATCH v5 8/9] s390x/pci: let intercept devices have separate PCI groups Matthew Rosato
2022-04-04 18:17 ` [PATCH v5 9/9] s390x/pci: reflect proper maxstbl for groups of interpreted devices Matthew Rosato
2022-04-19 19:49 ` Pierre Morel
2022-04-22 9:43 ` Pierre Morel
2022-05-06 9:03 ` Pierre Morel
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=791ee8c8-a2f4-6644-7155-3bacdb3c4074@linux.ibm.com \
--to=mjrosato@linux.ibm.com \
--cc=alex.williamson@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=farman@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=mst@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=pmorel@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=schnelle@linux.ibm.com \
--cc=thuth@redhat.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).