From: David Gibson <david@gibson.dropbear.id.au> To: "Cédric Le Goater" <clg@kaod.org> Cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, Paul Mackerras <paulus@samba.org>, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v2 15/16] KVM: introduce a KVM_DESTROY_DEVICE ioctl Date: Mon, 25 Feb 2019 15:15:07 +1100 [thread overview] Message-ID: <20190225041507.GS7668@umbus.fritz.box> (raw) In-Reply-To: <20190222112840.25000-16-clg@kaod.org> [-- Attachment #1: Type: text/plain, Size: 4393 bytes --] On Fri, Feb 22, 2019 at 12:28:39PM +0100, Cédric Le Goater wrote: > The 'destroy' method is currently used to destroy all devices when the > VM is destroyed after the vCPUs have been freed. > > This new KVM ioctl exposes the same KVM device method. It acts as a > software reset of the VM to 'destroy' selected devices when necessary > and perform the required cleanups on the vCPUs. Called with the > kvm->lock. > > The 'destroy' method could be improved by returning an error code. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> Again, has this been discussed with Paolo and/or other KVM core people? > --- > include/uapi/linux/kvm.h | 7 ++++++ > virt/kvm/kvm_main.c | 38 +++++++++++++++++++++++++++++++ > Documentation/virtual/kvm/api.txt | 19 ++++++++++++++++ > 3 files changed, 64 insertions(+) > > diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h > index 52bf74a1616e..d78fafa54274 100644 > --- a/include/uapi/linux/kvm.h > +++ b/include/uapi/linux/kvm.h > @@ -1183,6 +1183,11 @@ struct kvm_create_device { > __u32 flags; /* in: KVM_CREATE_DEVICE_xxx */ > }; > > +struct kvm_destroy_device { > + __u32 fd; /* in: device handle */ > + __u32 flags; /* in: unused */ > +}; > + > struct kvm_device_attr { > __u32 flags; /* no flags currently defined */ > __u32 group; /* device-defined */ > @@ -1331,6 +1336,8 @@ struct kvm_s390_ucas_mapping { > #define KVM_GET_DEVICE_ATTR _IOW(KVMIO, 0xe2, struct kvm_device_attr) > #define KVM_HAS_DEVICE_ATTR _IOW(KVMIO, 0xe3, struct kvm_device_attr) > > +#define KVM_DESTROY_DEVICE _IOWR(KVMIO, 0xf0, struct kvm_destroy_device) > + > /* > * ioctls for vcpu fds > */ > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 84717d8cb5e4..983d5c37f710 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -3026,6 +3026,30 @@ static int kvm_ioctl_create_device(struct kvm *kvm, > return 0; > } > > +static int kvm_ioctl_destroy_device(struct kvm *kvm, > + struct kvm_destroy_device *dd) > +{ > + struct fd f; > + struct kvm_device *dev; > + > + f = fdget(dd->fd); > + if (!f.file) > + return -EBADF; > + > + dev = kvm_device_from_filp(f.file); > + fdput(f); > + > + if (!dev) > + return -ENODEV; Don't you need to verify that the device belongs to this KVM instance? > + mutex_lock(&kvm->lock); > + list_del(&dev->vm_node); > + dev->ops->destroy(dev); > + mutex_unlock(&kvm->lock); > + > + return 0; > +} > + > static long kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg) > { > switch (arg) { > @@ -3270,6 +3294,20 @@ static long kvm_vm_ioctl(struct file *filp, > r = 0; > break; > } > + case KVM_DESTROY_DEVICE: { > + struct kvm_destroy_device dd; > + > + r = -EFAULT; > + if (copy_from_user(&dd, argp, sizeof(dd))) > + goto out; > + > + r = kvm_ioctl_destroy_device(kvm, &dd); > + if (r) > + goto out; > + > + r = 0; > + break; > + } > case KVM_CHECK_EXTENSION: > r = kvm_vm_ioctl_check_extension_generic(kvm, arg); > break; > diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt > index 1db1435769b4..c2ba18279298 100644 > --- a/Documentation/virtual/kvm/api.txt > +++ b/Documentation/virtual/kvm/api.txt > @@ -3857,6 +3857,25 @@ number of valid entries in the 'entries' array, which is then filled. > 'index' and 'flags' fields in 'struct kvm_cpuid_entry2' are currently reserved, > userspace should not expect to get any particular value there. > > +4.119 KVM_DESTROY_DEVICE > + > +Capability: KVM_CAP_DEVICE_CTRL > +Type: vm ioctl > +Parameters: struct kvm_destroy_device (in) > +Returns: 0 on success, -1 on error > +Errors: > + ENODEV: The device type is unknown or unsupported > + > + Other error conditions may be defined by individual device types or > + have their standard meanings. > + > +Destroys an emulated device in the kernel. > + > +struct kvm_destroy_device { > + __u32 fd; /* in: device handle */ > + __u32 flags; /* unused */ > +}; > + > 5. The kvm_run structure > ------------------------ > -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: David Gibson <david@gibson.dropbear.id.au> To: "Cédric Le Goater" <clg@kaod.org> Cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, Paul Mackerras <paulus@samba.org>, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v2 15/16] KVM: introduce a KVM_DESTROY_DEVICE ioctl Date: Mon, 25 Feb 2019 04:15:07 +0000 [thread overview] Message-ID: <20190225041507.GS7668@umbus.fritz.box> (raw) In-Reply-To: <20190222112840.25000-16-clg@kaod.org> [-- Attachment #1: Type: text/plain, Size: 4393 bytes --] On Fri, Feb 22, 2019 at 12:28:39PM +0100, Cédric Le Goater wrote: > The 'destroy' method is currently used to destroy all devices when the > VM is destroyed after the vCPUs have been freed. > > This new KVM ioctl exposes the same KVM device method. It acts as a > software reset of the VM to 'destroy' selected devices when necessary > and perform the required cleanups on the vCPUs. Called with the > kvm->lock. > > The 'destroy' method could be improved by returning an error code. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> Again, has this been discussed with Paolo and/or other KVM core people? > --- > include/uapi/linux/kvm.h | 7 ++++++ > virt/kvm/kvm_main.c | 38 +++++++++++++++++++++++++++++++ > Documentation/virtual/kvm/api.txt | 19 ++++++++++++++++ > 3 files changed, 64 insertions(+) > > diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h > index 52bf74a1616e..d78fafa54274 100644 > --- a/include/uapi/linux/kvm.h > +++ b/include/uapi/linux/kvm.h > @@ -1183,6 +1183,11 @@ struct kvm_create_device { > __u32 flags; /* in: KVM_CREATE_DEVICE_xxx */ > }; > > +struct kvm_destroy_device { > + __u32 fd; /* in: device handle */ > + __u32 flags; /* in: unused */ > +}; > + > struct kvm_device_attr { > __u32 flags; /* no flags currently defined */ > __u32 group; /* device-defined */ > @@ -1331,6 +1336,8 @@ struct kvm_s390_ucas_mapping { > #define KVM_GET_DEVICE_ATTR _IOW(KVMIO, 0xe2, struct kvm_device_attr) > #define KVM_HAS_DEVICE_ATTR _IOW(KVMIO, 0xe3, struct kvm_device_attr) > > +#define KVM_DESTROY_DEVICE _IOWR(KVMIO, 0xf0, struct kvm_destroy_device) > + > /* > * ioctls for vcpu fds > */ > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 84717d8cb5e4..983d5c37f710 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -3026,6 +3026,30 @@ static int kvm_ioctl_create_device(struct kvm *kvm, > return 0; > } > > +static int kvm_ioctl_destroy_device(struct kvm *kvm, > + struct kvm_destroy_device *dd) > +{ > + struct fd f; > + struct kvm_device *dev; > + > + f = fdget(dd->fd); > + if (!f.file) > + return -EBADF; > + > + dev = kvm_device_from_filp(f.file); > + fdput(f); > + > + if (!dev) > + return -ENODEV; Don't you need to verify that the device belongs to this KVM instance? > + mutex_lock(&kvm->lock); > + list_del(&dev->vm_node); > + dev->ops->destroy(dev); > + mutex_unlock(&kvm->lock); > + > + return 0; > +} > + > static long kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg) > { > switch (arg) { > @@ -3270,6 +3294,20 @@ static long kvm_vm_ioctl(struct file *filp, > r = 0; > break; > } > + case KVM_DESTROY_DEVICE: { > + struct kvm_destroy_device dd; > + > + r = -EFAULT; > + if (copy_from_user(&dd, argp, sizeof(dd))) > + goto out; > + > + r = kvm_ioctl_destroy_device(kvm, &dd); > + if (r) > + goto out; > + > + r = 0; > + break; > + } > case KVM_CHECK_EXTENSION: > r = kvm_vm_ioctl_check_extension_generic(kvm, arg); > break; > diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt > index 1db1435769b4..c2ba18279298 100644 > --- a/Documentation/virtual/kvm/api.txt > +++ b/Documentation/virtual/kvm/api.txt > @@ -3857,6 +3857,25 @@ number of valid entries in the 'entries' array, which is then filled. > 'index' and 'flags' fields in 'struct kvm_cpuid_entry2' are currently reserved, > userspace should not expect to get any particular value there. > > +4.119 KVM_DESTROY_DEVICE > + > +Capability: KVM_CAP_DEVICE_CTRL > +Type: vm ioctl > +Parameters: struct kvm_destroy_device (in) > +Returns: 0 on success, -1 on error > +Errors: > + ENODEV: The device type is unknown or unsupported > + > + Other error conditions may be defined by individual device types or > + have their standard meanings. > + > +Destroys an emulated device in the kernel. > + > +struct kvm_destroy_device { > + __u32 fd; /* in: device handle */ > + __u32 flags; /* unused */ > +}; > + > 5. The kvm_run structure > ------------------------ > -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2019-02-25 4:15 UTC|newest] Thread overview: 142+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-22 11:28 [PATCH v2 00/16] KVM: PPC: Book3S HV: add XIVE native exploitation mode Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-22 11:28 ` [PATCH v2 01/16] powerpc/xive: add OPAL extensions for the XIVE native exploitation support Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-24 23:42 ` David Gibson 2019-02-24 23:42 ` David Gibson 2019-02-25 3:50 ` Michael Ellerman 2019-02-25 3:50 ` Michael Ellerman 2019-02-25 10:11 ` Cédric Le Goater 2019-02-25 10:11 ` Cédric Le Goater 2019-02-26 4:21 ` David Gibson 2019-02-26 4:21 ` David Gibson 2019-03-12 18:25 ` Cédric Le Goater 2019-03-12 18:25 ` Cédric Le Goater 2019-02-22 11:28 ` [PATCH v2 02/16] KVM: PPC: Book3S HV: add a new KVM device for the XIVE native exploitation mode Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-25 0:08 ` David Gibson 2019-02-25 0:08 ` David Gibson 2019-03-12 11:14 ` Cédric Le Goater 2019-03-12 11:14 ` Cédric Le Goater 2019-02-22 11:28 ` [PATCH v2 03/16] KVM: PPC: Book3S HV: XIVE: introduce a new capability KVM_CAP_PPC_IRQ_XIVE Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-25 0:35 ` David Gibson 2019-02-25 0:35 ` David Gibson 2019-02-25 4:59 ` Paul Mackerras 2019-02-25 4:59 ` Paul Mackerras 2019-03-12 14:10 ` Cédric Le Goater 2019-03-12 14:10 ` Cédric Le Goater 2019-03-12 14:03 ` Cédric Le Goater 2019-03-12 14:03 ` Cédric Le Goater 2019-03-13 4:05 ` David Gibson 2019-03-13 4:05 ` David Gibson 2019-02-25 4:35 ` Paul Mackerras 2019-02-25 4:35 ` Paul Mackerras 2019-03-13 8:34 ` Cédric Le Goater 2019-03-13 8:34 ` Cédric Le Goater 2019-03-14 2:29 ` David Gibson 2019-03-14 2:29 ` David Gibson 2019-02-22 11:28 ` [PATCH v2 04/16] KVM: PPC: Book3S HV: XIVE: add a control to initialize a source Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-25 2:10 ` David Gibson 2019-02-25 2:10 ` David Gibson 2019-02-26 4:25 ` Paul Mackerras 2019-02-26 4:25 ` Paul Mackerras 2019-02-26 23:20 ` David Gibson 2019-02-26 23:20 ` David Gibson 2019-03-12 15:19 ` Cédric Le Goater 2019-03-12 15:19 ` Cédric Le Goater 2019-03-14 2:15 ` David Gibson 2019-03-14 2:15 ` David Gibson 2019-02-25 5:30 ` Paul Mackerras 2019-02-25 5:30 ` Paul Mackerras 2019-02-22 11:28 ` [PATCH v2 05/16] KVM: PPC: Book3S HV: XIVE: add a control to configure " Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-25 2:21 ` David Gibson 2019-02-25 2:21 ` David Gibson 2019-02-22 11:28 ` [PATCH v2 06/16] KVM: PPC: Book3S HV: XIVE: add controls for the EQ configuration Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-25 2:39 ` David Gibson 2019-02-25 2:39 ` David Gibson 2019-03-12 17:00 ` Cédric Le Goater 2019-03-12 17:00 ` Cédric Le Goater 2019-03-13 4:03 ` David Gibson 2019-03-13 4:03 ` David Gibson 2019-03-13 8:46 ` Cédric Le Goater 2019-03-13 8:46 ` Cédric Le Goater 2019-03-14 3:29 ` David Gibson 2019-03-14 3:29 ` David Gibson 2019-02-26 5:24 ` Paul Mackerras 2019-02-26 5:24 ` Paul Mackerras 2019-03-13 9:40 ` Cédric Le Goater 2019-03-13 9:40 ` Cédric Le Goater 2019-03-14 2:32 ` David Gibson 2019-03-14 2:32 ` David Gibson 2019-03-14 7:11 ` Cédric Le Goater 2019-03-14 7:11 ` Cédric Le Goater 2019-03-15 0:29 ` David Gibson 2019-03-15 0:29 ` David Gibson 2019-02-22 11:28 ` [PATCH v2 07/16] KVM: PPC: Book3S HV: XIVE: add a global reset control Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-25 2:43 ` David Gibson 2019-02-25 2:43 ` David Gibson 2019-02-22 11:28 ` [PATCH v2 08/16] KVM: PPC: Book3S HV: XIVE: add a control to sync the sources Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-25 2:45 ` David Gibson 2019-02-25 2:45 ` David Gibson 2019-02-22 11:28 ` [PATCH v2 09/16] KVM: PPC: Book3S HV: XIVE: add a control to dirty the XIVE EQ pages Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-25 2:53 ` David Gibson 2019-02-25 2:53 ` David Gibson 2019-03-13 11:48 ` Cédric Le Goater 2019-03-13 11:48 ` Cédric Le Goater 2019-03-14 2:33 ` David Gibson 2019-03-14 2:33 ` David Gibson 2019-02-22 11:28 ` [PATCH v2 10/16] KVM: PPC: Book3S HV: XIVE: add get/set accessors for the VP XIVE state Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-25 3:31 ` David Gibson 2019-02-25 3:31 ` David Gibson 2019-03-13 13:19 ` Cédric Le Goater 2019-03-13 13:19 ` Cédric Le Goater 2019-03-14 3:09 ` David Gibson 2019-03-14 3:09 ` David Gibson 2019-03-14 7:08 ` Cédric Le Goater 2019-03-14 7:08 ` Cédric Le Goater 2019-02-22 11:28 ` [PATCH v2 11/16] KVM: introduce a 'mmap' method for KVM devices Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-25 3:33 ` David Gibson 2019-02-25 3:33 ` David Gibson 2019-02-25 10:57 ` Cédric Le Goater 2019-02-25 10:57 ` Cédric Le Goater 2019-02-26 12:52 ` Paolo Bonzini 2019-02-26 12:52 ` Paolo Bonzini 2019-02-26 23:22 ` David Gibson 2019-02-26 23:22 ` David Gibson 2019-02-22 11:28 ` [PATCH v2 12/16] KVM: PPC: Book3S HV: XIVE: add a TIMA mapping Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-25 3:42 ` David Gibson 2019-02-25 3:42 ` David Gibson 2019-02-22 11:28 ` [PATCH v2 13/16] KVM: PPC: Book3S HV: XIVE: add a mapping for the source ESB pages Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-25 3:47 ` David Gibson 2019-02-25 3:47 ` David Gibson 2019-02-22 11:28 ` [PATCH v2 14/16] KVM: PPC: Book3S HV: XIVE: add passthrough support Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-25 4:13 ` David Gibson 2019-02-25 4:13 ` David Gibson 2019-02-22 11:28 ` [PATCH v2 15/16] KVM: introduce a KVM_DESTROY_DEVICE ioctl Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-25 4:15 ` David Gibson [this message] 2019-02-25 4:15 ` David Gibson 2019-03-13 8:02 ` Cédric Le Goater 2019-03-13 8:02 ` Cédric Le Goater 2019-03-15 17:57 ` Paolo Bonzini 2019-03-15 17:57 ` Paolo Bonzini 2019-02-22 11:28 ` [PATCH v2 16/16] KVM: PPC: Book3S HV: XIVE: clear the vCPU interrupt presenters Cédric Le Goater 2019-02-22 11:28 ` Cédric Le Goater 2019-02-25 4:18 ` David Gibson 2019-02-25 4:18 ` David Gibson 2019-03-13 8:17 ` Cédric Le Goater 2019-03-13 8:17 ` Cédric Le Goater 2019-03-14 2:26 ` David Gibson 2019-03-14 2:26 ` David Gibson
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=20190225041507.GS7668@umbus.fritz.box \ --to=david@gibson.dropbear.id.au \ --cc=clg@kaod.org \ --cc=kvm-ppc@vger.kernel.org \ --cc=kvm@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=paulus@samba.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.