[Qemu-devel] [PATCH v3 0/2] s390x/vfio-ap: hot plug/unplug vfio-ap device

[Qemu-devel] [PATCH v3 0/2] s390x/vfio-ap: hot plug/unplug vfio-ap device

[Tony Krowiak]

This patch series introduces hot plug/unplug of a vfio-ap device.

To hot plug a vfio-ap device, the QEMU device_add function may be used:

   (qemu) device_add vfio-ap,sysfsdev=$path-to-mdev

   Where $path-to-mdev is the absolute path to the mediated matrix device
   to which AP resources to be used by the guest have been assigned.

   A vfio-ap device can be hot plugged only if:

   1. A vfio-ap device has not been attached to the ap-bus (only one is
      allowed per guest) either via the QEMU command line or a prior hot
      plug action.

   2. The guest was started with the CPU model feature for AP enabled
      (e.g., -cpu host,ap=on).

To hot unplug a vfio-ap device, the QEMU device-del function may be used:

   (qemu) device_del vfio-ap,sysfsdev=$path-to-mdev

   Where $path-to-mdev is the absolute path to the mediated matrix device
   specified when the vfio-ap device was attached to the virtual machine's
   ap-bus.

   A vfio-ap device can be hot unplugged only if:

   1. A vfio-ap device has been attached to the virtual machine's ap-abus
      either via the QEMU command line or a prior hot plug action. 

   2. The guest was started with the CPU model feature for AP enabled
      (e.g., -cpu host,ap=on).

Tony Krowiak (2):
  s390x/vfio-ap: Implement hot plug/unplug of vfio-ap device
  s390x/vfio-ap: document hot plug/unplug of vfio-ap device

 docs/vfio-ap.txt     | 58 +++++++++++++++++++++++++++++++++++++++++++++++-----
 hw/s390x/ap-bridge.c | 12 ++++++++++-
 hw/vfio/ap.c         |  2 +-
 3 files changed, 65 insertions(+), 7 deletions(-)

-- 
Changes: v2==>v3
* Split documentation changes into a separate patch
* Grammatical changes recommended by Connie
2.7.4

[Qemu-devel] [PATCH v3 1/2] s390x/vfio-ap: Implement hot plug/unplug of vfio-ap device

[Tony Krowiak]

Introduces hot plug/unplug support for the vfio-ap device.

To hot plug a vfio-ap device using the QEMU device_add command:

	(qemu) device_add vfio-ap,sysfsdev=$path-to-mdev

	Where $path-to-mdev is the absolute path to the mediated matrix device
	to which AP resources to be used by the guest have been assigned.

A vfio-ap device can be hot plugged only if:

1. A vfio-ap device has not been attached to the virtual machine's ap-bus
   via the QEMU command line or a prior hot plug action.

2. The guest was started with the CPU model feature for AP enabled
   (e.g., -cpu host,ap=on)

To hot unplug a vfio-ap device using the QEMU device_del command:

	(qemu) device_del vfio-ap,sysfsdev=$path-to-mdev

	Where $path-to-mdev is the absolute path to the mediated matrix device
	specified when the vfio-ap device was attached to the virtual machine's
	ap-bus.

A vfio-ap device can be hot unplugged only if:

1. A vfio-ap device has been attached to the virtual machine's ap-bus
   via the QEMU command line or a prior hot plug action.

2. The guest was started with the CPU model feature for AP enabled
   (e.g., -cpu host,ap=on)

Please note that a hot plug handler is not necessary for the vfio-ap device
because the AP matrix configuration for the guest is performed by the
kernel device driver when the vfio-ap device is realized. The vfio-ap device
represents a VFIO mediated device created in the host sysfs for use by a guest.
The mdev device is configured with an AP matrix (i.e., adapters and domains) via
its sysfs attribute interfaces prior to starting the guest or plugging a vfio-ap
device in. When the device is realized, a file descriptor is opened on the mdev
device which results in a callback to the vfio_ap kernel device driver. The
device driver then configures the AP matrix in the guest's SIE state description
from the AP matrix assigned via the mdev device's sysfs interfaces. The AP
devices will be created for the guest when the AP bus running on the guest
subsequently performs its periodic scan for AP devices.

The qdev_simple_device_unplug_cb() callback function is used for the same
reaons; namely, the vfio_ap kernel device driver will perform the AP resource
de-configuration for the guest when the vfio-ap device is unplugged. When the
vfio-ap device is unrealized, the mdev device file descriptor is closed which
results in a callback to the vfio_ap kernel device driver. The device driver
then clears the AP matrix configuration in the guest's SIE state description
and resets all of the affected queues. The AP devices created for the guest
will be removed when the AP bus running on the guest subsequently performs
its periodic scan and finds there are no longer any AP resources assigned to the
guest.

Signed-off-by: Tony Krowiak <akrowiak@linux.ibm.com>
Reviewed-by: Pierre Morel<pmorel@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Halil Pasic <pasic@linux.ibm.com>
Tested-by: Pierre Morel<pmorel@linux.ibm.com>
---
 hw/s390x/ap-bridge.c | 12 +++++++++++-
 hw/vfio/ap.c         |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/hw/s390x/ap-bridge.c b/hw/s390x/ap-bridge.c
index 3795d30dd7c9..25a03412fcb9 100644
--- a/hw/s390x/ap-bridge.c
+++ b/hw/s390x/ap-bridge.c
@@ -39,6 +39,7 @@ static const TypeInfo ap_bus_info = {
 void s390_init_ap(void)
 {
     DeviceState *dev;
+    BusState *bus;
 
     /* If no AP instructions then no need for AP bridge */
     if (!s390_has_feat(S390_FEAT_AP)) {
@@ -52,13 +53,18 @@ void s390_init_ap(void)
     qdev_init_nofail(dev);
 
     /* Create bus on bridge device */
-    qbus_create(TYPE_AP_BUS, dev, TYPE_AP_BUS);
+    bus = qbus_create(TYPE_AP_BUS, dev, TYPE_AP_BUS);
+
+    /* Enable hotplugging */
+    qbus_set_hotplug_handler(bus, dev, &error_abort);
  }
 
 static void ap_bridge_class_init(ObjectClass *oc, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(oc);
+    HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
 
+    hc->unplug = qdev_simple_device_unplug_cb;
     set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
@@ -67,6 +73,10 @@ static const TypeInfo ap_bridge_info = {
     .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = 0,
     .class_init    = ap_bridge_class_init,
+    .interfaces = (InterfaceInfo[]) {
+        { TYPE_HOTPLUG_HANDLER },
+        { }
+    }
 };
 
 static void ap_register(void)
diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
index 6166ccd47a4a..d8b79ebe53ae 100644
--- a/hw/vfio/ap.c
+++ b/hw/vfio/ap.c
@@ -169,7 +169,7 @@ static void vfio_ap_class_init(ObjectClass *klass, void *data)
     set_bit(DEVICE_CATEGORY_MISC, dc->categories);
     dc->realize = vfio_ap_realize;
     dc->unrealize = vfio_ap_unrealize;
-    dc->hotpluggable = false;
+    dc->hotpluggable = true;
     dc->reset = vfio_ap_reset;
     dc->bus_type = TYPE_AP_BUS;
 }
-- 
2.7.4

[Qemu-devel] [PATCH v3 2/2] s390x/vfio-ap: document hot plug/unplug of vfio-ap device

[Tony Krowiak]

Let's update the vfio-ap.txt document to include the hot plug/unplug
support introduced in this patch set.

Signed-off-by: Tony Krowiak <akrowiak@linux.ibm.com>
---
 docs/vfio-ap.txt | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 56 insertions(+), 5 deletions(-)

diff --git a/docs/vfio-ap.txt b/docs/vfio-ap.txt
index 12339684cd52..8cd060a01e10 100644
--- a/docs/vfio-ap.txt
+++ b/docs/vfio-ap.txt
@@ -440,8 +440,7 @@ unassign_control_domain
    'unassign_domain' file. This may be done multiple times to unassign more than
    one control domain.
 
-Notes: Hot plug/unplug is not currently supported for mediated AP matrix
-devices, so no changes to the AP matrix will be allowed while a guest using
+Notes: No changes to the AP matrix will be allowed while a guest using
 the mediated matrix device is running. Attempts to assign an adapter,
 domain or control domain will be rejected and an error (EBUSY) returned.
 
@@ -562,6 +561,54 @@ facilities:
                      for guest usage, no AP devices can be made accessible to a
                      guest started without APFT installed.
 
+Hot plug a vfio-ap device into a running guest:
+==============================================
+Only one vfio-ap device can be attached to the virtual machine's ap-bus, so a
+vfio-ap device can be hot plugged if and only if no vfio-ap device is attached
+to the bus already, whether via the QEMU command line or a prior hot plug
+action.
+
+To hot plug a vfio-ap device, use the QEMU device_add command:
+
+    (qemu) device_add vfio-ap,sysfsdev="$path-to-mdev"
+
+    Where the '$path-to-mdev' value specifies the absolute path to a mediated
+    device to which AP resources to be used by the guest have been assigned.
+
+Note that on Linux guests, the AP devices will be created in the
+/sys/bus/ap/devices directory when the AP bus subsequently performs its periodic
+scan, so there may be a short delay before the AP devices are accessible on the
+guest.
+
+The command will fail if:
+
+* A vfio-ap device has already been attached to the virtual machine's ap-bus.
+
+* The CPU model features for controlling guest access to AP facilities are not
+  enabled (see 'CPU model features' subsection in the previous section).
+
+Hot unplug a vfio-ap device from a running guest:
+================================================
+A vfio-ap device can be unplugged from a running KVM guest if a vfio-ap device
+has been attached to the virtual machine's ap-bus via the QEMU command line
+or a prior hot plug action.
+
+To hot unplug a vfio-ap device, use the QEMU device_del command:
+
+    (qemu) device_del vfio-ap,sysfsdev="$path-to-mdev"
+
+    Where $path-to-mdev is the same as the path specified when the vfio-ap
+    device was attached to the virtual machine's ap-bus.
+
+On a Linux guest, the AP devices will be removed from the /sys/bus/ap/devices
+directory on the guest when the AP bus subsequently performs its periodic scan,
+so there may be a short delay before the AP devices are no longer accessible by
+the guest.
+
+The command will fail if the $path-to-mdev specified on the device_del command
+does not match the value specified when the vfio-ap device was attached to
+the virtual machine's ap-bus.
+
 Example: Configure AP Matrixes for Three Linux Guests:
 =====================================================
 Let's now provide an example to illustrate how KVM guests may be given
@@ -819,7 +866,11 @@ Limitations
   assigned lest the host be given access to the private data of the AP queue
   device, such as a private key configured specifically for the guest.
 
-* Dynamically modifying the AP matrix for a running guest (which would amount to
-  hot(un)plug of AP devices for the guest) is currently not supported
+* Dynamically assigning AP resources to or unassigning AP resources from a
+  mediated matrix device - see 'Configuring an AP matrix for a linux guest'
+  section above - while a running guest is using it is currently not supported.
 
-* Live guest migration is not supported for guests using AP devices.
+* Live guest migration is not supported for guests using AP devices. If a guest
+  is using AP devices, the vfio-ap device configured for the guest must be
+  unplugged before migrating the guest (see 'Hot unplug a vfio-ap device from a
+  running guest' section above.
-- 
2.7.4

Re: [Qemu-devel] [PATCH v3 2/2] s390x/vfio-ap: document hot plug/unplug of vfio-ap device

[Cornelia Huck]

On Mon, 18 Feb 2019 14:49:57 -0500
Tony Krowiak <akrowiak@linux.ibm.com> wrote:

> Let's update the vfio-ap.txt document to include the hot plug/unplug
> support introduced in this patch set.

s/ introduced in this patch set//

Nobody will know about this patch set when they look at the commit in
the future :)

> 
> Signed-off-by: Tony Krowiak <akrowiak@linux.ibm.com>
> ---
>  docs/vfio-ap.txt | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
>  1 file changed, 56 insertions(+), 5 deletions(-)

Looks good to me, but would not mind a R-b before queuing.

Re: [Qemu-devel] [PATCH v3 2/2] s390x/vfio-ap: document hot plug/unplug of vfio-ap device

[Tony Krowiak]

On 2/20/19 10:51 AM, Cornelia Huck wrote:
> On Mon, 18 Feb 2019 14:49:57 -0500
> Tony Krowiak <akrowiak@linux.ibm.com> wrote:
> 
>> Let's update the vfio-ap.txt document to include the hot plug/unplug
>> support introduced in this patch set.
> 
> s/ introduced in this patch set//
> 
> Nobody will know about this patch set when they look at the commit in
> the future :)

Good point, I'll remove it.

> 
>>
>> Signed-off-by: Tony Krowiak <akrowiak@linux.ibm.com>
>> ---
>>   docs/vfio-ap.txt | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
>>   1 file changed, 56 insertions(+), 5 deletions(-)
> 
> Looks good to me, but would not mind a R-b before queuing.
> 

Re: [Qemu-devel] [PATCH v3 2/2] s390x/vfio-ap: document hot plug/unplug of vfio-ap device

[Cornelia Huck]

On Thu, 21 Feb 2019 11:26:53 -0500
Tony Krowiak <akrowiak@linux.ibm.com> wrote:

> On 2/20/19 10:51 AM, Cornelia Huck wrote:
> > On Mon, 18 Feb 2019 14:49:57 -0500
> > Tony Krowiak <akrowiak@linux.ibm.com> wrote:
> >   
> >> Let's update the vfio-ap.txt document to include the hot plug/unplug
> >> support introduced in this patch set.  
> > 
> > s/ introduced in this patch set//
> > 
> > Nobody will know about this patch set when they look at the commit in
> > the future :)  
> 
> Good point, I'll remove it.

I can do that while applying if no other feedback comes in.

> 
> >   
> >>
> >> Signed-off-by: Tony Krowiak <akrowiak@linux.ibm.com>
> >> ---
> >>   docs/vfio-ap.txt | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
> >>   1 file changed, 56 insertions(+), 5 deletions(-)  
> > 
> > Looks good to me, but would not mind a R-b before queuing.
> >   
> 

Re: [Qemu-devel] [PATCH v3 2/2] s390x/vfio-ap: document hot plug/unplug of vfio-ap device

[Tony Krowiak]

On 2/21/19 11:32 AM, Cornelia Huck wrote:
> On Thu, 21 Feb 2019 11:26:53 -0500
> Tony Krowiak <akrowiak@linux.ibm.com> wrote:
> 
>> On 2/20/19 10:51 AM, Cornelia Huck wrote:
>>> On Mon, 18 Feb 2019 14:49:57 -0500
>>> Tony Krowiak <akrowiak@linux.ibm.com> wrote:
>>>    
>>>> Let's update the vfio-ap.txt document to include the hot plug/unplug
>>>> support introduced in this patch set.
>>>
>>> s/ introduced in this patch set//
>>>
>>> Nobody will know about this patch set when they look at the commit in
>>> the future :)
>>
>> Good point, I'll remove it.
> 
> I can do that while applying if no other feedback comes in.

Okay, sounds good to me.

> 
>>
>>>    
>>>>
>>>> Signed-off-by: Tony Krowiak <akrowiak@linux.ibm.com>
>>>> ---
>>>>    docs/vfio-ap.txt | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
>>>>    1 file changed, 56 insertions(+), 5 deletions(-)
>>>
>>> Looks good to me, but would not mind a R-b before queuing.
>>>    
>>
> 

Re: [Qemu-devel] [PATCH v3 0/2] s390x/vfio-ap: hot plug/unplug vfio-ap device

[Cornelia Huck]

On Mon, 18 Feb 2019 14:49:55 -0500
Tony Krowiak <akrowiak@linux.ibm.com> wrote:

> This patch series introduces hot plug/unplug of a vfio-ap device.
> 
> To hot plug a vfio-ap device, the QEMU device_add function may be used:
> 
>    (qemu) device_add vfio-ap,sysfsdev=$path-to-mdev
> 
>    Where $path-to-mdev is the absolute path to the mediated matrix device
>    to which AP resources to be used by the guest have been assigned.
> 
>    A vfio-ap device can be hot plugged only if:
> 
>    1. A vfio-ap device has not been attached to the ap-bus (only one is
>       allowed per guest) either via the QEMU command line or a prior hot
>       plug action.
> 
>    2. The guest was started with the CPU model feature for AP enabled
>       (e.g., -cpu host,ap=on).
> 
> To hot unplug a vfio-ap device, the QEMU device-del function may be used:
> 
>    (qemu) device_del vfio-ap,sysfsdev=$path-to-mdev
> 
>    Where $path-to-mdev is the absolute path to the mediated matrix device
>    specified when the vfio-ap device was attached to the virtual machine's
>    ap-bus.
> 
>    A vfio-ap device can be hot unplugged only if:
> 
>    1. A vfio-ap device has been attached to the virtual machine's ap-abus
>       either via the QEMU command line or a prior hot plug action. 
> 
>    2. The guest was started with the CPU model feature for AP enabled
>       (e.g., -cpu host,ap=on).
> 
> Tony Krowiak (2):
>   s390x/vfio-ap: Implement hot plug/unplug of vfio-ap device
>   s390x/vfio-ap: document hot plug/unplug of vfio-ap device
> 
>  docs/vfio-ap.txt     | 58 +++++++++++++++++++++++++++++++++++++++++++++++-----
>  hw/s390x/ap-bridge.c | 12 ++++++++++-
>  hw/vfio/ap.c         |  2 +-
>  3 files changed, 65 insertions(+), 7 deletions(-)
> 

In the meantime, the signature of qbus_set_hotplug_handler() has
changed to take an Object instead of a DeviceState, but I just went
ahead and did that trivial change myself.

Thanks, applied.

Re: [Qemu-devel] [PATCH v3 0/2] s390x/vfio-ap: hot plug/unplug vfio-ap device

[Tony Krowiak]

On 2/25/19 7:42 AM, Cornelia Huck wrote:
> On Mon, 18 Feb 2019 14:49:55 -0500
> Tony Krowiak <akrowiak@linux.ibm.com> wrote:
> 
>> This patch series introduces hot plug/unplug of a vfio-ap device.
>>
>> To hot plug a vfio-ap device, the QEMU device_add function may be used:
>>
>>     (qemu) device_add vfio-ap,sysfsdev=$path-to-mdev
>>
>>     Where $path-to-mdev is the absolute path to the mediated matrix device
>>     to which AP resources to be used by the guest have been assigned.
>>
>>     A vfio-ap device can be hot plugged only if:
>>
>>     1. A vfio-ap device has not been attached to the ap-bus (only one is
>>        allowed per guest) either via the QEMU command line or a prior hot
>>        plug action.
>>
>>     2. The guest was started with the CPU model feature for AP enabled
>>        (e.g., -cpu host,ap=on).
>>
>> To hot unplug a vfio-ap device, the QEMU device-del function may be used:
>>
>>     (qemu) device_del vfio-ap,sysfsdev=$path-to-mdev
>>
>>     Where $path-to-mdev is the absolute path to the mediated matrix device
>>     specified when the vfio-ap device was attached to the virtual machine's
>>     ap-bus.
>>
>>     A vfio-ap device can be hot unplugged only if:
>>
>>     1. A vfio-ap device has been attached to the virtual machine's ap-abus
>>        either via the QEMU command line or a prior hot plug action.
>>
>>     2. The guest was started with the CPU model feature for AP enabled
>>        (e.g., -cpu host,ap=on).
>>
>> Tony Krowiak (2):
>>    s390x/vfio-ap: Implement hot plug/unplug of vfio-ap device
>>    s390x/vfio-ap: document hot plug/unplug of vfio-ap device
>>
>>   docs/vfio-ap.txt     | 58 +++++++++++++++++++++++++++++++++++++++++++++++-----
>>   hw/s390x/ap-bridge.c | 12 ++++++++++-
>>   hw/vfio/ap.c         |  2 +-
>>   3 files changed, 65 insertions(+), 7 deletions(-)
>>
> 
> In the meantime, the signature of qbus_set_hotplug_handler() has
> changed to take an Object instead of a DeviceState, but I just went
> ahead and did that trivial change myself.
> 
> Thanks, applied.

Thanks Connie.

>