| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <b7952a40-7bc9-b46a-d675-ea26685adf74@linux.ibm.com>
Date: Tue, 14 Dec 2021 17:30:45 +0100
From: Pierre Morel <pmorel@...ux.ibm.com>
To: Matthew Rosato <mjrosato@...ux.ibm.com>, linux-s390@...r.kernel.org
Cc: alex.williamson@...hat.com, cohuck@...hat.com,
schnelle@...ux.ibm.com, farman@...ux.ibm.com,
borntraeger@...ux.ibm.com, hca@...ux.ibm.com, gor@...ux.ibm.com,
gerald.schaefer@...ux.ibm.com, agordeev@...ux.ibm.com,
frankja@...ux.ibm.com, david@...hat.com, imbrenda@...ux.ibm.com,
vneethv@...ux.ibm.com, oberpar@...ux.ibm.com, freude@...ux.ibm.com,
thuth@...hat.com, pasic@...ux.ibm.com, kvm@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH 27/32] vfio-pci/zdev: wire up zPCI interpretive execution
support
On 12/7/21 21:57, Matthew Rosato wrote:
> Introduce support for VFIO_DEVICE_FEATURE_ZPCI_INTERP, which is a new
> VFIO_DEVICE_FEATURE ioctl. This interface is used to indicate that an
> s390x vfio-pci device wishes to enable/disable zPCI interpretive
> execution, which allows zPCI instructions to be executed directly by
> underlying firmware without KVM involvement.
>
> Signed-off-by: Matthew Rosato <mjrosato@...ux.ibm.com>
> ---
> arch/s390/include/asm/kvm_pci.h | 1 +
> drivers/vfio/pci/vfio_pci_core.c | 2 +
> drivers/vfio/pci/vfio_pci_zdev.c | 76 ++++++++++++++++++++++++++++++++
> include/linux/vfio_pci_core.h | 10 +++++
> include/uapi/linux/vfio.h | 7 +++
> include/uapi/linux/vfio_zdev.h | 15 +++++++
> 6 files changed, 111 insertions(+)
>
> diff --git a/arch/s390/include/asm/kvm_pci.h b/arch/s390/include/asm/kvm_pci.h
> index 6526908ac834..062bac720428 100644
> --- a/arch/s390/include/asm/kvm_pci.h
> +++ b/arch/s390/include/asm/kvm_pci.h
> @@ -35,6 +35,7 @@ struct kvm_zdev {
> struct kvm_zdev_ioat ioat;
> struct zpci_fib fib;
> struct notifier_block nb;
> + bool interp;
> };
>
> extern int kvm_s390_pci_dev_open(struct zpci_dev *zdev);
> diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c
> index fc57d4d0abbe..2b2d64a2190c 100644
> --- a/drivers/vfio/pci/vfio_pci_core.c
> +++ b/drivers/vfio/pci/vfio_pci_core.c
> @@ -1172,6 +1172,8 @@ long vfio_pci_core_ioctl(struct vfio_device *core_vdev, unsigned int cmd,
> mutex_unlock(&vdev->vf_token->lock);
>
> return 0;
> + case VFIO_DEVICE_FEATURE_ZPCI_INTERP:
> + return vfio_pci_zdev_feat_interp(vdev, feature, arg);
> default:
> return -ENOTTY;
> }
> diff --git a/drivers/vfio/pci/vfio_pci_zdev.c b/drivers/vfio/pci/vfio_pci_zdev.c
> index cfd7f44b06c1..b205e0ad1fd3 100644
> --- a/drivers/vfio/pci/vfio_pci_zdev.c
> +++ b/drivers/vfio/pci/vfio_pci_zdev.c
> @@ -54,6 +54,10 @@ static int zpci_group_cap(struct zpci_dev *zdev, struct vfio_info_cap *caps)
> .version = zdev->version
> };
>
> + /* Some values are different for interpreted devices */
> + if (zdev->kzdev && zdev->kzdev->interp)
> + cap.maxstbl = zdev->maxstbl;
right did not see that so my comment on patch 30 is not right.
> +
> return vfio_info_add_capability(caps, &cap.header, sizeof(cap));
> }
>
> @@ -138,6 +142,70 @@ int vfio_pci_info_zdev_add_caps(struct vfio_pci_core_device *vdev,
> return ret;
> }
>
> +int vfio_pci_zdev_feat_interp(struct vfio_pci_core_device *vdev,
> + struct vfio_device_feature feature,
> + unsigned long arg)
> +{
> + struct zpci_dev *zdev = to_zpci(vdev->pdev);
> + struct vfio_device_zpci_interp *data;
> + struct vfio_device_feature *feat;
> + unsigned long minsz;
> + int size, rc;
> +
> + if (!zdev || !zdev->kzdev)
> + return -EINVAL;
> +
> + /*
> + * If PROBE requested and feature not found, leave immediately.
> + * Otherwise, keep going as GET or SET may also be specified.
> + */
> + if (feature.flags & VFIO_DEVICE_FEATURE_PROBE) {
> + rc = kvm_s390_pci_interp_probe(zdev);
> + if (rc)
> + return rc;
> + }
> + if (!(feature.flags & (VFIO_DEVICE_FEATURE_GET +
> + VFIO_DEVICE_FEATURE_SET)))
> + return 0;
> +
> + size = sizeof(*feat) + sizeof(*data);
> + feat = kzalloc(size, GFP_KERNEL);
> + if (!feat)
> + return -ENOMEM;
> +
> + data = (struct vfio_device_zpci_interp *)&feat->data;
> + minsz = offsetofend(struct vfio_device_feature, flags);
> +
> + /* Get the rest of the payload for GET/SET */
> + rc = copy_from_user(data, (void __user *)(arg + minsz),
> + sizeof(*data));
Here as in patch 28, I think yo ushould take care of feature.argsz
> + if (rc)
> + rc = -EINVAL;
> +
> + if (feature.flags & VFIO_DEVICE_FEATURE_GET) {
> + if (zdev->gd != 0)
> + data->flags = VFIO_DEVICE_ZPCI_FLAG_INTERP;
> + else
> + data->flags = 0;
> + data->fh = zdev->fh;
> + /* userspace is using host fh, give interpreted clp values */
> + zdev->kzdev->interp = true;
> +
> + if (copy_to_user((void __user *)arg, feat, size))
> + rc = -EFAULT;
> + } else if (feature.flags & VFIO_DEVICE_FEATURE_SET) {
> + if (data->flags == VFIO_DEVICE_ZPCI_FLAG_INTERP)
> + rc = kvm_s390_pci_interp_enable(zdev);
> + else if (data->flags == 0)
> + rc = kvm_s390_pci_interp_disable(zdev);
> + else
> + rc = -EINVAL;
> + }
> +
> + kfree(feat);
> + return rc;
> +}
> +
> static int vfio_pci_zdev_group_notifier(struct notifier_block *nb,
> unsigned long action, void *data)
> {
> @@ -167,6 +235,7 @@ int vfio_pci_zdev_open(struct vfio_pci_core_device *vdev)
> return -ENODEV;
>
> zdev->kzdev->nb.notifier_call = vfio_pci_zdev_group_notifier;
> + zdev->kzdev->interp = false;
>
> ret = vfio_register_notifier(vdev->vdev.dev, VFIO_GROUP_NOTIFY,
> &events, &zdev->kzdev->nb);
> @@ -186,6 +255,13 @@ int vfio_pci_zdev_release(struct vfio_pci_core_device *vdev)
> vfio_unregister_notifier(vdev->vdev.dev, VFIO_GROUP_NOTIFY,
> &zdev->kzdev->nb);
>
> + /*
> + * If the device was using interpretation, don't trust that userspace
> + * did the appropriate cleanup
> + */
> + if (zdev->gd != 0)
> + kvm_s390_pci_interp_disable(zdev);
> +
> kvm_s390_pci_dev_release(zdev);
>
> return 0;
> diff --git a/include/linux/vfio_pci_core.h b/include/linux/vfio_pci_core.h
> index 14079da409f1..92dc43c827c9 100644
> --- a/include/linux/vfio_pci_core.h
> +++ b/include/linux/vfio_pci_core.h
> @@ -198,6 +198,9 @@ static inline int vfio_pci_igd_init(struct vfio_pci_core_device *vdev)
> #ifdef CONFIG_VFIO_PCI_ZDEV
> extern int vfio_pci_info_zdev_add_caps(struct vfio_pci_core_device *vdev,
> struct vfio_info_cap *caps);
> +int vfio_pci_zdev_feat_interp(struct vfio_pci_core_device *vdev,
> + struct vfio_device_feature feature,
> + unsigned long arg);
> int vfio_pci_zdev_open(struct vfio_pci_core_device *vdev);
> int vfio_pci_zdev_release(struct vfio_pci_core_device *vdev);
> #else
> @@ -207,6 +210,13 @@ static inline int vfio_pci_info_zdev_add_caps(struct vfio_pci_core_device *vdev,
> return -ENODEV;
> }
>
> +static inline int vfio_pci_zdev_feat_interp(struct vfio_pci_core_device *vdev,
> + struct vfio_device_feature feature,
> + unsigned long arg)
> +{
> + return -ENOTTY;
> +}
> +
> static inline int vfio_pci_zdev_open(struct vfio_pci_core_device *vdev)
> {
> return -ENODEV;
> diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
> index ef33ea002b0b..b9a75485b8e7 100644
> --- a/include/uapi/linux/vfio.h
> +++ b/include/uapi/linux/vfio.h
> @@ -1002,6 +1002,13 @@ struct vfio_device_feature {
> */
> #define VFIO_DEVICE_FEATURE_PCI_VF_TOKEN (0)
>
> +/*
> + * Provide support for enabling interpretation of zPCI instructions. This
> + * feature is only valid for s390x PCI devices. Data provided when setting
> + * and getting this feature is futher described in vfio_zdev.h
> + */
> +#define VFIO_DEVICE_FEATURE_ZPCI_INTERP (1)
> +
> /* -------- API for Type1 VFIO IOMMU -------- */
>
> /**
> diff --git a/include/uapi/linux/vfio_zdev.h b/include/uapi/linux/vfio_zdev.h
> index b4309397b6b2..575f0410dc66 100644
> --- a/include/uapi/linux/vfio_zdev.h
> +++ b/include/uapi/linux/vfio_zdev.h
> @@ -75,4 +75,19 @@ struct vfio_device_info_cap_zpci_pfip {
> __u8 pfip[];
> };
>
> +/**
> + * VFIO_DEVICE_FEATURE_ZPCI_INTERP
> + *
> + * This feature is used for enabling zPCI instruction interpretation for a
> + * device. No data is provided when setting this feature. When getting
> + * this feature, the following structure is provided which details whether
> + * or not interpretation is active and provides the guest with host device
> + * information necessary to enable interpretation.
> + */
> +struct vfio_device_zpci_interp {
> + __u64 flags;
> +#define VFIO_DEVICE_ZPCI_FLAG_INTERP 1
> + __u32 fh; /* Host device function handle */
> +};
> +
> #endif
>
--
Pierre Morel
IBM Lab Boeblingen
Powered by blists - more mailing lists