Re: [Qemu-devel] [PATCH v4 4/5] s390x/vfio: ap: Introduce VFIO AP device

2018-04-26 Thread Tony Krowiak 

On 04/23/2018 03:00 AM, Cornelia Huck wrote:

On Sun, 22 Apr 2018 12:05:44 -0400
Tony Krowiak  wrote:


On 04/19/2018 08:03 AM, Cornelia Huck wrote:

On Sun, 15 Apr 2018 15:07:23 -0400
Tony Krowiak  wrote:
  

Introduces a VFIO based AP device. The device is defined via
the QEMU command line by specifying:

  -device vfio-ap,sysfsdev=

There may be only one vfio-ap device configured for a guest.

The mediated matrix device is created by the VFIO AP device
driver by writing a UUID to a sysfs attribute file (see
docs/vfio-ap.txt). The mediated matrix device will be named
after the UUID. Symbolic links to the $uuid are created in
many places, so the path to the mediated matrix device $uuid
can be specified in any of the following ways:

/sys/devices/vfio_ap/matrix/$uuid
/sys/devices/vfio_ap/matrix/mdev_supported_types/vfio_ap-passthrough/devices/$uuid
/sys/bus/mdev/devices/$uuid
/sys/bus/mdev/drivers/vfio_mdev/$uuid

When the vfio-ap device is realized, it acquires and opens the
VFIO iommu group to which the mediated matrix device is
bound. This causes a VFIO group notification event to be
signaled. The vfio_ap device driver's group notification
handler will get called at which time the device driver
will configure the the AP devices to which the guest will
be granted access.

Signed-off-by: Tony Krowiak 
---
   default-configs/s390x-softmmu.mak |1 +
   hw/vfio/Makefile.objs |1 +
   hw/vfio/ap.c  |  191 
+
   include/hw/vfio/vfio-common.h |1 +
   4 files changed, 194 insertions(+), 0 deletions(-)
   create mode 100644 hw/vfio/ap.c
+static void vfio_ap_realize(DeviceState *dev, Error **errp)
+{
+VFIODevice *vbasedev;
+VFIOGroup *vfio_group;
+APDevice *apdev = DO_UPCAST(APDevice, parent_obj, dev);
+char *mdevid;
+Error *local_err = NULL;
+int ret;
+
+/*
+ * Since a guest's matrix is configured in its entirety by the mediated
+ * matrix device and hot plug is not currently supported, there is no
+ * need to have more than one vfio-ap device. Check if a vfio-ap device
+ * has already been defined.
+ */
+if (vfio_apdev) {
+error_setg(_err, "Only one %s device is allowed",
+   VFIO_AP_DEVICE_TYPE);
+goto out_err;
+}
+
+if (!s390_has_feat(S390_FEAT_AP)) {
+error_setg(_err, "AP support not enabled");
+goto out_err;
+}
+
+vfio_apdev = DO_UPCAST(VFIOAPDevice, apdev, apdev);
+
+vfio_group = vfio_ap_get_group(vfio_apdev, _err);
+if (!vfio_group) {
+goto out_err;
+}
+
+vfio_apdev->vdev.ops = _ap_ops;
+vfio_apdev->vdev.type = VFIO_DEVICE_TYPE_AP;
+mdevid = basename(vfio_apdev->vdev.sysfsdev);
+vfio_apdev->vdev.name = g_strdup_printf("%s", mdevid);
+vfio_apdev->vdev.dev = dev;
+QLIST_FOREACH(vbasedev, _group->device_list, next) {
+if (strcmp(vbasedev->name, vfio_apdev->vdev.name) == 0) {
+error_setg(_err,
+   "%s: AP device %s has already been realized",
+   VFIO_AP_DEVICE_TYPE, vfio_apdev->vdev.name);
+goto out_device_err;
+}
+}
+
+ret = vfio_get_device(vfio_group, mdevid, _apdev->vdev, _err);
+if (ret) {
+goto out_device_err;
+}

Don't you need a put somewhere to avoid memory leaks?

There is a call to vfio_put_device in the unrealize function.

I don't think unrealize is called if realize failed, so you need to
clean up in the error cases?


Very true. I  misinterpreted your point. Yes, I need to clean up
if realize fails.



  

+
+return;
+
+
+out_device_err:
+vfio_put_group(vfio_group);
+out_err:
+vfio_apdev = NULL;
+error_propagate(errp, local_err);
+}

Re: [Qemu-devel] [PATCH v4 4/5] s390x/vfio: ap: Introduce VFIO AP device

2018-04-23 Thread Cornelia Huck 
On Sun, 22 Apr 2018 12:05:44 -0400
Tony Krowiak  wrote:

> On 04/19/2018 08:03 AM, Cornelia Huck wrote:
> > On Sun, 15 Apr 2018 15:07:23 -0400
> > Tony Krowiak  wrote:
> >  
> >> Introduces a VFIO based AP device. The device is defined via
> >> the QEMU command line by specifying:
> >>
> >>  -device vfio-ap,sysfsdev=
> >>
> >> There may be only one vfio-ap device configured for a guest.
> >>
> >> The mediated matrix device is created by the VFIO AP device
> >> driver by writing a UUID to a sysfs attribute file (see
> >> docs/vfio-ap.txt). The mediated matrix device will be named
> >> after the UUID. Symbolic links to the $uuid are created in
> >> many places, so the path to the mediated matrix device $uuid
> >> can be specified in any of the following ways:
> >>
> >> /sys/devices/vfio_ap/matrix/$uuid
> >> /sys/devices/vfio_ap/matrix/mdev_supported_types/vfio_ap-passthrough/devices/$uuid
> >> /sys/bus/mdev/devices/$uuid
> >> /sys/bus/mdev/drivers/vfio_mdev/$uuid
> >>
> >> When the vfio-ap device is realized, it acquires and opens the
> >> VFIO iommu group to which the mediated matrix device is
> >> bound. This causes a VFIO group notification event to be
> >> signaled. The vfio_ap device driver's group notification
> >> handler will get called at which time the device driver
> >> will configure the the AP devices to which the guest will
> >> be granted access.
> >>
> >> Signed-off-by: Tony Krowiak 
> >> ---
> >>   default-configs/s390x-softmmu.mak |1 +
> >>   hw/vfio/Makefile.objs |1 +
> >>   hw/vfio/ap.c  |  191 
> >> +
> >>   include/hw/vfio/vfio-common.h |1 +
> >>   4 files changed, 194 insertions(+), 0 deletions(-)
> >>   create mode 100644 hw/vfio/ap.c
> >> +static void vfio_ap_realize(DeviceState *dev, Error **errp)
> >> +{
> >> +VFIODevice *vbasedev;
> >> +VFIOGroup *vfio_group;
> >> +APDevice *apdev = DO_UPCAST(APDevice, parent_obj, dev);
> >> +char *mdevid;
> >> +Error *local_err = NULL;
> >> +int ret;
> >> +
> >> +/*
> >> + * Since a guest's matrix is configured in its entirety by the 
> >> mediated
> >> + * matrix device and hot plug is not currently supported, there is no
> >> + * need to have more than one vfio-ap device. Check if a vfio-ap 
> >> device
> >> + * has already been defined.
> >> + */
> >> +if (vfio_apdev) {
> >> +error_setg(_err, "Only one %s device is allowed",
> >> +   VFIO_AP_DEVICE_TYPE);
> >> +goto out_err;
> >> +}
> >> +
> >> +if (!s390_has_feat(S390_FEAT_AP)) {
> >> +error_setg(_err, "AP support not enabled");
> >> +goto out_err;
> >> +}
> >> +
> >> +vfio_apdev = DO_UPCAST(VFIOAPDevice, apdev, apdev);
> >> +
> >> +vfio_group = vfio_ap_get_group(vfio_apdev, _err);
> >> +if (!vfio_group) {
> >> +goto out_err;
> >> +}
> >> +
> >> +vfio_apdev->vdev.ops = _ap_ops;
> >> +vfio_apdev->vdev.type = VFIO_DEVICE_TYPE_AP;
> >> +mdevid = basename(vfio_apdev->vdev.sysfsdev);
> >> +vfio_apdev->vdev.name = g_strdup_printf("%s", mdevid);
> >> +vfio_apdev->vdev.dev = dev;
> >> +QLIST_FOREACH(vbasedev, _group->device_list, next) {
> >> +if (strcmp(vbasedev->name, vfio_apdev->vdev.name) == 0) {
> >> +error_setg(_err,
> >> +   "%s: AP device %s has already been realized",
> >> +   VFIO_AP_DEVICE_TYPE, vfio_apdev->vdev.name);
> >> +goto out_device_err;
> >> +}
> >> +}
> >> +
> >> +ret = vfio_get_device(vfio_group, mdevid, _apdev->vdev, 
> >> _err);
> >> +if (ret) {
> >> +goto out_device_err;
> >> +}  
> > Don't you need a put somewhere to avoid memory leaks?  
> 
> There is a call to vfio_put_device in the unrealize function.

I don't think unrealize is called if realize failed, so you need to
clean up in the error cases?

> 
> >  
> >> +
> >> +return;
> >> +
> >> +
> >> +out_device_err:
> >> +vfio_put_group(vfio_group);
> >> +out_err:
> >> +vfio_apdev = NULL;
> >> +error_propagate(errp, local_err);
> >> +}  
> 
>

Re: [Qemu-devel] [PATCH v4 4/5] s390x/vfio: ap: Introduce VFIO AP device

2018-04-22 Thread Tony Krowiak 

On 04/19/2018 08:03 AM, Cornelia Huck wrote:

On Sun, 15 Apr 2018 15:07:23 -0400
Tony Krowiak  wrote:


Introduces a VFIO based AP device. The device is defined via
the QEMU command line by specifying:

 -device vfio-ap,sysfsdev=

There may be only one vfio-ap device configured for a guest.

The mediated matrix device is created by the VFIO AP device
driver by writing a UUID to a sysfs attribute file (see
docs/vfio-ap.txt). The mediated matrix device will be named
after the UUID. Symbolic links to the $uuid are created in
many places, so the path to the mediated matrix device $uuid
can be specified in any of the following ways:

/sys/devices/vfio_ap/matrix/$uuid
/sys/devices/vfio_ap/matrix/mdev_supported_types/vfio_ap-passthrough/devices/$uuid
/sys/bus/mdev/devices/$uuid
/sys/bus/mdev/drivers/vfio_mdev/$uuid

When the vfio-ap device is realized, it acquires and opens the
VFIO iommu group to which the mediated matrix device is
bound. This causes a VFIO group notification event to be
signaled. The vfio_ap device driver's group notification
handler will get called at which time the device driver
will configure the the AP devices to which the guest will
be granted access.

Signed-off-by: Tony Krowiak 
---
  default-configs/s390x-softmmu.mak |1 +
  hw/vfio/Makefile.objs |1 +
  hw/vfio/ap.c  |  191 +
  include/hw/vfio/vfio-common.h |1 +
  4 files changed, 194 insertions(+), 0 deletions(-)
  create mode 100644 hw/vfio/ap.c
+static void vfio_ap_realize(DeviceState *dev, Error **errp)
+{
+VFIODevice *vbasedev;
+VFIOGroup *vfio_group;
+APDevice *apdev = DO_UPCAST(APDevice, parent_obj, dev);
+char *mdevid;
+Error *local_err = NULL;
+int ret;
+
+/*
+ * Since a guest's matrix is configured in its entirety by the mediated
+ * matrix device and hot plug is not currently supported, there is no
+ * need to have more than one vfio-ap device. Check if a vfio-ap device
+ * has already been defined.
+ */
+if (vfio_apdev) {
+error_setg(_err, "Only one %s device is allowed",
+   VFIO_AP_DEVICE_TYPE);
+goto out_err;
+}
+
+if (!s390_has_feat(S390_FEAT_AP)) {
+error_setg(_err, "AP support not enabled");
+goto out_err;
+}
+
+vfio_apdev = DO_UPCAST(VFIOAPDevice, apdev, apdev);
+
+vfio_group = vfio_ap_get_group(vfio_apdev, _err);
+if (!vfio_group) {
+goto out_err;
+}
+
+vfio_apdev->vdev.ops = _ap_ops;
+vfio_apdev->vdev.type = VFIO_DEVICE_TYPE_AP;
+mdevid = basename(vfio_apdev->vdev.sysfsdev);
+vfio_apdev->vdev.name = g_strdup_printf("%s", mdevid);
+vfio_apdev->vdev.dev = dev;
+QLIST_FOREACH(vbasedev, _group->device_list, next) {
+if (strcmp(vbasedev->name, vfio_apdev->vdev.name) == 0) {
+error_setg(_err,
+   "%s: AP device %s has already been realized",
+   VFIO_AP_DEVICE_TYPE, vfio_apdev->vdev.name);
+goto out_device_err;
+}
+}
+
+ret = vfio_get_device(vfio_group, mdevid, _apdev->vdev, _err);
+if (ret) {
+goto out_device_err;
+}

Don't you need a put somewhere to avoid memory leaks?


There is a call to vfio_put_device in the unrealize function.




+
+return;
+
+
+out_device_err:
+vfio_put_group(vfio_group);
+out_err:
+vfio_apdev = NULL;
+error_propagate(errp, local_err);
+}

Re: [Qemu-devel] [PATCH v4 4/5] s390x/vfio: ap: Introduce VFIO AP device

2018-04-22 Thread Tony Krowiak 

On 04/18/2018 05:11 AM, Pierre Morel wrote:

On 15/04/2018 21:07, Tony Krowiak wrote:

Introduces a VFIO based AP device. The device is defined via
the QEMU command line by specifying:

 -device vfio-ap,sysfsdev=

There may be only one vfio-ap device configured for a guest.

The mediated matrix device is created by the VFIO AP device
driver by writing a UUID to a sysfs attribute file (see
docs/vfio-ap.txt). The mediated matrix device will be named
after the UUID. Symbolic links to the $uuid are created in
many places, so the path to the mediated matrix device $uuid
can be specified in any of the following ways:

/sys/devices/vfio_ap/matrix/$uuid
/sys/devices/vfio_ap/matrix/mdev_supported_types/vfio_ap-passthrough/devices/$uuid 


/sys/bus/mdev/devices/$uuid
/sys/bus/mdev/drivers/vfio_mdev/$uuid

When the vfio-ap device is realized, it acquires and opens the
VFIO iommu group to which the mediated matrix device is
bound. This causes a VFIO group notification event to be
signaled. The vfio_ap device driver's group notification
handler will get called at which time the device driver
will configure the the AP devices to which the guest will
be granted access.

Signed-off-by: Tony Krowiak 
---
  default-configs/s390x-softmmu.mak |1 +
  hw/vfio/Makefile.objs |1 +
  hw/vfio/ap.c  |  191 
+

  include/hw/vfio/vfio-common.h |1 +
  4 files changed, 194 insertions(+), 0 deletions(-)
  create mode 100644 hw/vfio/ap.c

diff --git a/default-configs/s390x-softmmu.mak 
b/default-configs/s390x-softmmu.mak

index 2f4bfe7..0b784b6 100644
--- a/default-configs/s390x-softmmu.mak
+++ b/default-configs/s390x-softmmu.mak
@@ -9,3 +9,4 @@ CONFIG_S390_FLIC=y
  CONFIG_S390_FLIC_KVM=$(CONFIG_KVM)
  CONFIG_VFIO_CCW=$(CONFIG_LINUX)
  CONFIG_WDT_DIAG288=y
+CONFIG_VFIO_AP=$(CONFIG_LINUX)
diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs
index a2e7a0a..8b3f664 100644
--- a/hw/vfio/Makefile.objs
+++ b/hw/vfio/Makefile.objs
@@ -6,4 +6,5 @@ obj-$(CONFIG_SOFTMMU) += platform.o
  obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o
  obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o
  obj-$(CONFIG_SOFTMMU) += spapr.o
+obj-$(CONFIG_VFIO_AP) += ap.o
  endif
diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
new file mode 100644
index 000..7b48a3a
--- /dev/null
+++ b/hw/vfio/ap.c
@@ -0,0 +1,191 @@
+/*
+ * VFIO based AP matrix device assignment
+ *
+ * Copyright 2018 IBM Corp.
+ * Author(s): Tony Krowiak 
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 
or (at
+ * your option) any later version. See the COPYING file in the 
top-level

+ * directory.
+ */
+
+#include 
+#include 
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "hw/sysbus.h"
+#include "hw/vfio/vfio.h"
+#include "hw/vfio/vfio-common.h"
+#include "hw/s390x/ap-device.h"
+#include "qemu/error-report.h"
+#include "qemu/queue.h"
+#include "qemu/option.h"
+#include "qemu/config-file.h"
+#include "cpu.h"
+#include "kvm_s390x.h"
+#include "sysemu/sysemu.h"
+
+#define VFIO_AP_DEVICE_TYPE  "vfio-ap"
+
+typedef struct VFIOAPDevice {
+APDevice apdev;
+VFIODevice vdev;
+QTAILQ_ENTRY(VFIOAPDevice) sibling;
+} VFIOAPDevice;
+
+VFIOAPDevice *vfio_apdev;
+
+static void vfio_ap_compute_needs_reset(VFIODevice *vdev)
+{
+vdev->needs_reset = false;
+}
+
+/*
+ * We don't need vfio_hot_reset_multi and vfio_eoi operations for
+ * vfio-ap-matrix device now.
+ */
+struct VFIODeviceOps vfio_ap_ops = {
+.vfio_compute_needs_reset = vfio_ap_compute_needs_reset,
+};
+
+static void vfio_put_device(VFIOAPDevice *vapdev)
+{
+g_free(vapdev->vdev.name);
+vfio_put_base_device(>vdev);
+}
+
+static VFIOGroup *vfio_ap_get_group(VFIOAPDevice *vapdev, Error **errp)
+{
+char *tmp, group_path[PATH_MAX];
+ssize_t len;
+int groupid;
+
+tmp = g_strdup_printf("%s/iommu_group", vapdev->vdev.sysfsdev);
+len = readlink(tmp, group_path, sizeof(group_path));
+g_free(tmp);
+
+if (len <= 0 || len >= sizeof(group_path)) {
+error_setg(errp, "%s: no iommu_group found for %s",
+   VFIO_AP_DEVICE_TYPE, vapdev->vdev.sysfsdev);
+return NULL;
+}
+
+group_path[len] = 0;
+
+if (sscanf(basename(group_path), "%d", ) != 1) {
+error_setg(errp, "vfio: failed to read %s", group_path);
+return NULL;
+}
+
+return vfio_get_group(groupid, _space_memory, errp);
+}
+
+static void vfio_ap_realize(DeviceState *dev, Error **errp)
+{
+VFIODevice *vbasedev;
+VFIOGroup *vfio_group;
+APDevice *apdev = DO_UPCAST(APDevice, parent_obj, dev);
+char *mdevid;
+Error *local_err = NULL;
+int ret;
+
+/*
+ * Since a guest's matrix is configured in its entirety by the 
mediated
+ * matrix device and hot plug is not currently supported, there 
is no
+ * need to have more than one vfio-ap device. Check if a vfio-ap 
device

+ * has already been

Re: [Qemu-devel] [PATCH v4 4/5] s390x/vfio: ap: Introduce VFIO AP device

2018-04-19 Thread Cornelia Huck 
On Sun, 15 Apr 2018 15:07:23 -0400
Tony Krowiak  wrote:

> Introduces a VFIO based AP device. The device is defined via
> the QEMU command line by specifying:
> 
> -device vfio-ap,sysfsdev=
> 
> There may be only one vfio-ap device configured for a guest.
> 
> The mediated matrix device is created by the VFIO AP device
> driver by writing a UUID to a sysfs attribute file (see
> docs/vfio-ap.txt). The mediated matrix device will be named
> after the UUID. Symbolic links to the $uuid are created in
> many places, so the path to the mediated matrix device $uuid
> can be specified in any of the following ways:
> 
> /sys/devices/vfio_ap/matrix/$uuid
> /sys/devices/vfio_ap/matrix/mdev_supported_types/vfio_ap-passthrough/devices/$uuid
> /sys/bus/mdev/devices/$uuid
> /sys/bus/mdev/drivers/vfio_mdev/$uuid
> 
> When the vfio-ap device is realized, it acquires and opens the
> VFIO iommu group to which the mediated matrix device is
> bound. This causes a VFIO group notification event to be
> signaled. The vfio_ap device driver's group notification
> handler will get called at which time the device driver
> will configure the the AP devices to which the guest will
> be granted access.
> 
> Signed-off-by: Tony Krowiak 
> ---
>  default-configs/s390x-softmmu.mak |1 +
>  hw/vfio/Makefile.objs |1 +
>  hw/vfio/ap.c  |  191 
> +
>  include/hw/vfio/vfio-common.h |1 +
>  4 files changed, 194 insertions(+), 0 deletions(-)
>  create mode 100644 hw/vfio/ap.c

> +static void vfio_ap_realize(DeviceState *dev, Error **errp)
> +{
> +VFIODevice *vbasedev;
> +VFIOGroup *vfio_group;
> +APDevice *apdev = DO_UPCAST(APDevice, parent_obj, dev);
> +char *mdevid;
> +Error *local_err = NULL;
> +int ret;
> +
> +/*
> + * Since a guest's matrix is configured in its entirety by the mediated
> + * matrix device and hot plug is not currently supported, there is no
> + * need to have more than one vfio-ap device. Check if a vfio-ap device
> + * has already been defined.
> + */
> +if (vfio_apdev) {
> +error_setg(_err, "Only one %s device is allowed",
> +   VFIO_AP_DEVICE_TYPE);
> +goto out_err;
> +}
> +
> +if (!s390_has_feat(S390_FEAT_AP)) {
> +error_setg(_err, "AP support not enabled");
> +goto out_err;
> +}
> +
> +vfio_apdev = DO_UPCAST(VFIOAPDevice, apdev, apdev);
> +
> +vfio_group = vfio_ap_get_group(vfio_apdev, _err);
> +if (!vfio_group) {
> +goto out_err;
> +}
> +
> +vfio_apdev->vdev.ops = _ap_ops;
> +vfio_apdev->vdev.type = VFIO_DEVICE_TYPE_AP;
> +mdevid = basename(vfio_apdev->vdev.sysfsdev);
> +vfio_apdev->vdev.name = g_strdup_printf("%s", mdevid);
> +vfio_apdev->vdev.dev = dev;
> +QLIST_FOREACH(vbasedev, _group->device_list, next) {
> +if (strcmp(vbasedev->name, vfio_apdev->vdev.name) == 0) {
> +error_setg(_err,
> +   "%s: AP device %s has already been realized",
> +   VFIO_AP_DEVICE_TYPE, vfio_apdev->vdev.name);
> +goto out_device_err;
> +}
> +}
> +
> +ret = vfio_get_device(vfio_group, mdevid, _apdev->vdev, _err);
> +if (ret) {
> +goto out_device_err;
> +}

Don't you need a put somewhere to avoid memory leaks?

> +
> +return;
> +
> +
> +out_device_err:
> +vfio_put_group(vfio_group);
> +out_err:
> +vfio_apdev = NULL;
> +error_propagate(errp, local_err);
> +}

Re: [Qemu-devel] [PATCH v4 4/5] s390x/vfio: ap: Introduce VFIO AP device

2018-04-18 Thread Pierre Morel 

On 15/04/2018 21:07, Tony Krowiak wrote:

Introduces a VFIO based AP device. The device is defined via
the QEMU command line by specifying:

 -device vfio-ap,sysfsdev=

There may be only one vfio-ap device configured for a guest.

The mediated matrix device is created by the VFIO AP device
driver by writing a UUID to a sysfs attribute file (see
docs/vfio-ap.txt). The mediated matrix device will be named
after the UUID. Symbolic links to the $uuid are created in
many places, so the path to the mediated matrix device $uuid
can be specified in any of the following ways:

/sys/devices/vfio_ap/matrix/$uuid
/sys/devices/vfio_ap/matrix/mdev_supported_types/vfio_ap-passthrough/devices/$uuid
/sys/bus/mdev/devices/$uuid
/sys/bus/mdev/drivers/vfio_mdev/$uuid

When the vfio-ap device is realized, it acquires and opens the
VFIO iommu group to which the mediated matrix device is
bound. This causes a VFIO group notification event to be
signaled. The vfio_ap device driver's group notification
handler will get called at which time the device driver
will configure the the AP devices to which the guest will
be granted access.

Signed-off-by: Tony Krowiak 
---
  default-configs/s390x-softmmu.mak |1 +
  hw/vfio/Makefile.objs |1 +
  hw/vfio/ap.c  |  191 +
  include/hw/vfio/vfio-common.h |1 +
  4 files changed, 194 insertions(+), 0 deletions(-)
  create mode 100644 hw/vfio/ap.c

diff --git a/default-configs/s390x-softmmu.mak 
b/default-configs/s390x-softmmu.mak
index 2f4bfe7..0b784b6 100644
--- a/default-configs/s390x-softmmu.mak
+++ b/default-configs/s390x-softmmu.mak
@@ -9,3 +9,4 @@ CONFIG_S390_FLIC=y
  CONFIG_S390_FLIC_KVM=$(CONFIG_KVM)
  CONFIG_VFIO_CCW=$(CONFIG_LINUX)
  CONFIG_WDT_DIAG288=y
+CONFIG_VFIO_AP=$(CONFIG_LINUX)
diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs
index a2e7a0a..8b3f664 100644
--- a/hw/vfio/Makefile.objs
+++ b/hw/vfio/Makefile.objs
@@ -6,4 +6,5 @@ obj-$(CONFIG_SOFTMMU) += platform.o
  obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o
  obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o
  obj-$(CONFIG_SOFTMMU) += spapr.o
+obj-$(CONFIG_VFIO_AP) += ap.o
  endif
diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
new file mode 100644
index 000..7b48a3a
--- /dev/null
+++ b/hw/vfio/ap.c
@@ -0,0 +1,191 @@
+/*
+ * VFIO based AP matrix device assignment
+ *
+ * Copyright 2018 IBM Corp.
+ * Author(s): Tony Krowiak 
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or (at
+ * your option) any later version. See the COPYING file in the top-level
+ * directory.
+ */
+
+#include 
+#include 
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "hw/sysbus.h"
+#include "hw/vfio/vfio.h"
+#include "hw/vfio/vfio-common.h"
+#include "hw/s390x/ap-device.h"
+#include "qemu/error-report.h"
+#include "qemu/queue.h"
+#include "qemu/option.h"
+#include "qemu/config-file.h"
+#include "cpu.h"
+#include "kvm_s390x.h"
+#include "sysemu/sysemu.h"
+
+#define VFIO_AP_DEVICE_TYPE  "vfio-ap"
+
+typedef struct VFIOAPDevice {
+APDevice apdev;
+VFIODevice vdev;
+QTAILQ_ENTRY(VFIOAPDevice) sibling;
+} VFIOAPDevice;
+
+VFIOAPDevice *vfio_apdev;
+
+static void vfio_ap_compute_needs_reset(VFIODevice *vdev)
+{
+vdev->needs_reset = false;
+}
+
+/*
+ * We don't need vfio_hot_reset_multi and vfio_eoi operations for
+ * vfio-ap-matrix device now.
+ */
+struct VFIODeviceOps vfio_ap_ops = {
+.vfio_compute_needs_reset = vfio_ap_compute_needs_reset,
+};
+
+static void vfio_put_device(VFIOAPDevice *vapdev)
+{
+g_free(vapdev->vdev.name);
+vfio_put_base_device(>vdev);
+}
+
+static VFIOGroup *vfio_ap_get_group(VFIOAPDevice *vapdev, Error **errp)
+{
+char *tmp, group_path[PATH_MAX];
+ssize_t len;
+int groupid;
+
+tmp = g_strdup_printf("%s/iommu_group", vapdev->vdev.sysfsdev);
+len = readlink(tmp, group_path, sizeof(group_path));
+g_free(tmp);
+
+if (len <= 0 || len >= sizeof(group_path)) {
+error_setg(errp, "%s: no iommu_group found for %s",
+   VFIO_AP_DEVICE_TYPE, vapdev->vdev.sysfsdev);
+return NULL;
+}
+
+group_path[len] = 0;
+
+if (sscanf(basename(group_path), "%d", ) != 1) {
+error_setg(errp, "vfio: failed to read %s", group_path);
+return NULL;
+}
+
+return vfio_get_group(groupid, _space_memory, errp);
+}
+
+static void vfio_ap_realize(DeviceState *dev, Error **errp)
+{
+VFIODevice *vbasedev;
+VFIOGroup *vfio_group;
+APDevice *apdev = DO_UPCAST(APDevice, parent_obj, dev);
+char *mdevid;
+Error *local_err = NULL;
+int ret;
+
+/*
+ * Since a guest's matrix is configured in its entirety by the mediated
+ * matrix device and hot plug is not currently supported, there is no
+ * need to have more than one vfio-ap device. Check if a vfio-ap device
+ * has already been defined.
+ */
+if (vfio_apdev) {
+

[Qemu-devel] [PATCH v4 4/5] s390x/vfio: ap: Introduce VFIO AP device

2018-04-15 Thread Tony Krowiak 
Introduces a VFIO based AP device. The device is defined via
the QEMU command line by specifying:

-device vfio-ap,sysfsdev=

There may be only one vfio-ap device configured for a guest.

The mediated matrix device is created by the VFIO AP device
driver by writing a UUID to a sysfs attribute file (see
docs/vfio-ap.txt). The mediated matrix device will be named
after the UUID. Symbolic links to the $uuid are created in
many places, so the path to the mediated matrix device $uuid
can be specified in any of the following ways:

/sys/devices/vfio_ap/matrix/$uuid
/sys/devices/vfio_ap/matrix/mdev_supported_types/vfio_ap-passthrough/devices/$uuid
/sys/bus/mdev/devices/$uuid
/sys/bus/mdev/drivers/vfio_mdev/$uuid

When the vfio-ap device is realized, it acquires and opens the
VFIO iommu group to which the mediated matrix device is
bound. This causes a VFIO group notification event to be
signaled. The vfio_ap device driver's group notification
handler will get called at which time the device driver
will configure the the AP devices to which the guest will
be granted access.

Signed-off-by: Tony Krowiak 
---
 default-configs/s390x-softmmu.mak |1 +
 hw/vfio/Makefile.objs |1 +
 hw/vfio/ap.c  |  191 +
 include/hw/vfio/vfio-common.h |1 +
 4 files changed, 194 insertions(+), 0 deletions(-)
 create mode 100644 hw/vfio/ap.c

diff --git a/default-configs/s390x-softmmu.mak 
b/default-configs/s390x-softmmu.mak
index 2f4bfe7..0b784b6 100644
--- a/default-configs/s390x-softmmu.mak
+++ b/default-configs/s390x-softmmu.mak
@@ -9,3 +9,4 @@ CONFIG_S390_FLIC=y
 CONFIG_S390_FLIC_KVM=$(CONFIG_KVM)
 CONFIG_VFIO_CCW=$(CONFIG_LINUX)
 CONFIG_WDT_DIAG288=y
+CONFIG_VFIO_AP=$(CONFIG_LINUX)
diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs
index a2e7a0a..8b3f664 100644
--- a/hw/vfio/Makefile.objs
+++ b/hw/vfio/Makefile.objs
@@ -6,4 +6,5 @@ obj-$(CONFIG_SOFTMMU) += platform.o
 obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o
 obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o
 obj-$(CONFIG_SOFTMMU) += spapr.o
+obj-$(CONFIG_VFIO_AP) += ap.o
 endif
diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
new file mode 100644
index 000..7b48a3a
--- /dev/null
+++ b/hw/vfio/ap.c
@@ -0,0 +1,191 @@
+/*
+ * VFIO based AP matrix device assignment
+ *
+ * Copyright 2018 IBM Corp.
+ * Author(s): Tony Krowiak 
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or (at
+ * your option) any later version. See the COPYING file in the top-level
+ * directory.
+ */
+
+#include 
+#include 
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "hw/sysbus.h"
+#include "hw/vfio/vfio.h"
+#include "hw/vfio/vfio-common.h"
+#include "hw/s390x/ap-device.h"
+#include "qemu/error-report.h"
+#include "qemu/queue.h"
+#include "qemu/option.h"
+#include "qemu/config-file.h"
+#include "cpu.h"
+#include "kvm_s390x.h"
+#include "sysemu/sysemu.h"
+
+#define VFIO_AP_DEVICE_TYPE  "vfio-ap"
+
+typedef struct VFIOAPDevice {
+APDevice apdev;
+VFIODevice vdev;
+QTAILQ_ENTRY(VFIOAPDevice) sibling;
+} VFIOAPDevice;
+
+VFIOAPDevice *vfio_apdev;
+
+static void vfio_ap_compute_needs_reset(VFIODevice *vdev)
+{
+vdev->needs_reset = false;
+}
+
+/*
+ * We don't need vfio_hot_reset_multi and vfio_eoi operations for
+ * vfio-ap-matrix device now.
+ */
+struct VFIODeviceOps vfio_ap_ops = {
+.vfio_compute_needs_reset = vfio_ap_compute_needs_reset,
+};
+
+static void vfio_put_device(VFIOAPDevice *vapdev)
+{
+g_free(vapdev->vdev.name);
+vfio_put_base_device(>vdev);
+}
+
+static VFIOGroup *vfio_ap_get_group(VFIOAPDevice *vapdev, Error **errp)
+{
+char *tmp, group_path[PATH_MAX];
+ssize_t len;
+int groupid;
+
+tmp = g_strdup_printf("%s/iommu_group", vapdev->vdev.sysfsdev);
+len = readlink(tmp, group_path, sizeof(group_path));
+g_free(tmp);
+
+if (len <= 0 || len >= sizeof(group_path)) {
+error_setg(errp, "%s: no iommu_group found for %s",
+   VFIO_AP_DEVICE_TYPE, vapdev->vdev.sysfsdev);
+return NULL;
+}
+
+group_path[len] = 0;
+
+if (sscanf(basename(group_path), "%d", ) != 1) {
+error_setg(errp, "vfio: failed to read %s", group_path);
+return NULL;
+}
+
+return vfio_get_group(groupid, _space_memory, errp);
+}
+
+static void vfio_ap_realize(DeviceState *dev, Error **errp)
+{
+VFIODevice *vbasedev;
+VFIOGroup *vfio_group;
+APDevice *apdev = DO_UPCAST(APDevice, parent_obj, dev);
+char *mdevid;
+Error *local_err = NULL;
+int ret;
+
+/*
+ * Since a guest's matrix is configured in its entirety by the mediated
+ * matrix device and hot plug is not currently supported, there is no
+ * need to have more than one vfio-ap device. Check if a vfio-ap device
+ * has already been defined.
+ */
+if (vfio_apdev) {
+error_setg(_err, "Only one %s device is allowed",
+