KVM: Get an fd before creating the VM
Allocate a VM's fd at the very beginning of kvm_dev_ioctl_create_vm() so that KVM can use the fd value to generate strigns, e.g. for debugfs, when creating and initializing the VM. Signed-off-by: Oliver Upton <oupton@google.com> Message-Id: <20220720092259.3491733-4-oliver.upton@linux.dev> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
58fc116645
commit
20020f4cf2
|
@ -4889,25 +4889,27 @@ EXPORT_SYMBOL_GPL(file_is_kvm);
|
||||||
|
|
||||||
static int kvm_dev_ioctl_create_vm(unsigned long type)
|
static int kvm_dev_ioctl_create_vm(unsigned long type)
|
||||||
{
|
{
|
||||||
int r;
|
int r, fd;
|
||||||
struct kvm *kvm;
|
struct kvm *kvm;
|
||||||
struct file *file;
|
struct file *file;
|
||||||
|
|
||||||
|
fd = get_unused_fd_flags(O_CLOEXEC);
|
||||||
|
if (fd < 0)
|
||||||
|
return fd;
|
||||||
|
|
||||||
kvm = kvm_create_vm(type);
|
kvm = kvm_create_vm(type);
|
||||||
if (IS_ERR(kvm))
|
if (IS_ERR(kvm)) {
|
||||||
return PTR_ERR(kvm);
|
r = PTR_ERR(kvm);
|
||||||
|
goto put_fd;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_KVM_MMIO
|
#ifdef CONFIG_KVM_MMIO
|
||||||
r = kvm_coalesced_mmio_init(kvm);
|
r = kvm_coalesced_mmio_init(kvm);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
goto put_kvm;
|
goto put_kvm;
|
||||||
#endif
|
#endif
|
||||||
r = get_unused_fd_flags(O_CLOEXEC);
|
|
||||||
if (r < 0)
|
|
||||||
goto put_kvm;
|
|
||||||
|
|
||||||
file = anon_inode_getfile("kvm-vm", &kvm_vm_fops, kvm, O_RDWR);
|
file = anon_inode_getfile("kvm-vm", &kvm_vm_fops, kvm, O_RDWR);
|
||||||
if (IS_ERR(file)) {
|
if (IS_ERR(file)) {
|
||||||
put_unused_fd(r);
|
|
||||||
r = PTR_ERR(file);
|
r = PTR_ERR(file);
|
||||||
goto put_kvm;
|
goto put_kvm;
|
||||||
}
|
}
|
||||||
|
@ -4918,18 +4920,20 @@ static int kvm_dev_ioctl_create_vm(unsigned long type)
|
||||||
* cases it will be called by the final fput(file) and will take
|
* cases it will be called by the final fput(file) and will take
|
||||||
* care of doing kvm_put_kvm(kvm).
|
* care of doing kvm_put_kvm(kvm).
|
||||||
*/
|
*/
|
||||||
if (kvm_create_vm_debugfs(kvm, r) < 0) {
|
if (kvm_create_vm_debugfs(kvm, fd) < 0) {
|
||||||
put_unused_fd(r);
|
|
||||||
fput(file);
|
fput(file);
|
||||||
return -ENOMEM;
|
r = -ENOMEM;
|
||||||
|
goto put_fd;
|
||||||
}
|
}
|
||||||
kvm_uevent_notify_change(KVM_EVENT_CREATE_VM, kvm);
|
kvm_uevent_notify_change(KVM_EVENT_CREATE_VM, kvm);
|
||||||
|
|
||||||
fd_install(r, file);
|
fd_install(fd, file);
|
||||||
return r;
|
return fd;
|
||||||
|
|
||||||
put_kvm:
|
put_kvm:
|
||||||
kvm_put_kvm(kvm);
|
kvm_put_kvm(kvm);
|
||||||
|
put_fd:
|
||||||
|
put_unused_fd(fd);
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue