From: Sean Christopherson <sean.j.christopherson@intel.com> To: "Paolo Bonzini" <pbonzini@redhat.com>, "Radim Krčmář" <rkrcmar@redhat.com>, "Thomas Gleixner" <tglx@linutronix.de>, "Ingo Molnar" <mingo@redhat.com>, "Borislav Petkov" <bp@alien8.de>, x86@kernel.org, "Jarkko Sakkinen" <jarkko.sakkinen@linux.intel.com>, "Sean Christopherson" <sean.j.christopherson@intel.com>, "Joerg Roedel" <joro@8bytes.org> Cc: "H. Peter Anvin" <hpa@zytor.com>, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sgx@vger.kernel.org, Andy Lutomirski <luto@amacapital.net> Subject: [RFC PATCH 03/21] x86/sgx: Move provisioning device to common code Date: Fri, 26 Jul 2019 22:51:56 -0700 Message-ID: <20190727055214.9282-4-sean.j.christopherson@intel.com> (raw) In-Reply-To: <20190727055214.9282-1-sean.j.christopherson@intel.com> Move the provisioning device to common code in preparation for adding support for SGX virtualization. The provisioning device will need to be instantiated if the native SGX driver *or* the virtual EPC "driver" is loaded. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> --- arch/x86/kernel/cpu/sgx/driver/ioctl.c | 18 ++--------- arch/x86/kernel/cpu/sgx/driver/main.c | 24 +------------- arch/x86/kernel/cpu/sgx/main.c | 44 +++++++++++++++++++++++++- arch/x86/kernel/cpu/sgx/sgx.h | 1 + 4 files changed, 47 insertions(+), 40 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/driver/ioctl.c b/arch/x86/kernel/cpu/sgx/driver/ioctl.c index 89b3fb81c15b..b7aa06920d10 100644 --- a/arch/x86/kernel/cpu/sgx/driver/ioctl.c +++ b/arch/x86/kernel/cpu/sgx/driver/ioctl.c @@ -794,26 +794,12 @@ static long sgx_ioc_enclave_set_attribute(struct file *filep, void __user *arg) { struct sgx_encl *encl = filep->private_data; struct sgx_enclave_set_attribute params; - struct file *attribute_file; - int ret; if (copy_from_user(¶ms, arg, sizeof(params))) return -EFAULT; - attribute_file = fget(params.attribute_fd); - if (!attribute_file) - return -EINVAL; - - if (attribute_file->f_op != &sgx_provision_fops) { - ret = -EINVAL; - goto out; - } - - encl->allowed_attributes |= SGX_ATTR_PROVISIONKEY; - -out: - fput(attribute_file); - return ret; + return sgx_set_attribute(&encl->allowed_attributes, + params.attribute_fd); } long sgx_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) diff --git a/arch/x86/kernel/cpu/sgx/driver/main.c b/arch/x86/kernel/cpu/sgx/driver/main.c index d62bdc7ed4d9..1e107dd0d909 100644 --- a/arch/x86/kernel/cpu/sgx/driver/main.c +++ b/arch/x86/kernel/cpu/sgx/driver/main.c @@ -154,14 +154,8 @@ static const struct file_operations sgx_encl_fops = { .get_unmapped_area = sgx_get_unmapped_area, }; -const struct file_operations sgx_provision_fops = { - .owner = THIS_MODULE, -}; - static struct device sgx_encl_dev; static struct cdev sgx_encl_cdev; -static struct device sgx_provision_dev; -static struct cdev sgx_provision_cdev; int __init sgx_drv_init(void) { @@ -202,38 +196,22 @@ int __init sgx_drv_init(void) if (ret) return ret; - ret = sgx_dev_init("sgx/provision", &sgx_provision_dev, - &sgx_provision_cdev, &sgx_provision_fops, - SGX_PROV_DEV_MINOR); - if (ret) - goto err_encl_dev; - sgx_encl_wq = alloc_workqueue("sgx-encl-wq", WQ_UNBOUND | WQ_FREEZABLE, 1); if (!sgx_encl_wq) { ret = -ENOMEM; - goto err_provision_dev; + goto err_encl_dev; } ret = cdev_device_add(&sgx_encl_cdev, &sgx_encl_dev); if (ret) goto err_encl_wq; - ret = cdev_device_add(&sgx_provision_cdev, &sgx_provision_dev); - if (ret) - goto err_encl_cdev; - return 0; -err_encl_cdev: - cdev_device_del(&sgx_encl_cdev, &sgx_encl_dev); - err_encl_wq: destroy_workqueue(sgx_encl_wq); -err_provision_dev: - put_device(&sgx_provision_dev); - err_encl_dev: put_device(&sgx_encl_dev); diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c index edbd465083c7..9f4473597620 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -2,6 +2,7 @@ // Copyright(c) 2016-17 Intel Corporation. #include <linux/cdev.h> +#include <linux/file.h> #include <linux/freezer.h> #include <linux/highmem.h> #include <linux/kthread.h> @@ -335,6 +336,31 @@ static struct bus_type sgx_bus_type = { }; static dev_t sgx_devt; +const struct file_operations sgx_provision_fops = { + .owner = THIS_MODULE, +}; + +static struct device sgx_provision_dev; +static struct cdev sgx_provision_cdev; + +int sgx_set_attribute(u64 *allowed_attributes, unsigned int attribute_fd) +{ + struct file *attribute_file; + + attribute_file = fget(attribute_fd); + if (!attribute_file) + return -EINVAL; + + if (attribute_file->f_op != &sgx_provision_fops) { + fput(attribute_file); + return -EINVAL; + } + fput(attribute_file); + + *allowed_attributes |= SGX_ATTR_PROVISIONKEY; + return 0; +} + static void sgx_dev_release(struct device *dev) { @@ -386,12 +412,28 @@ static __init int sgx_init(void) if (ret < 0) goto err_bus; - ret = sgx_drv_init(); + ret = sgx_dev_init("sgx/provision", &sgx_provision_dev, + &sgx_provision_cdev, &sgx_provision_fops, + SGX_PROV_DEV_MINOR); if (ret) goto err_chrdev_region; + ret = cdev_device_add(&sgx_provision_cdev, &sgx_provision_dev); + if (ret) + goto err_provision_dev; + + ret = sgx_drv_init(); + if (ret) + goto err_provision_cdev; + return 0; +err_provision_cdev: + cdev_device_del(&sgx_provision_cdev, &sgx_provision_dev); + +err_provision_dev: + put_device(&sgx_provision_dev); + err_chrdev_region: unregister_chrdev_region(sgx_devt, SGX_MAX_NR_DEVICES); diff --git a/arch/x86/kernel/cpu/sgx/sgx.h b/arch/x86/kernel/cpu/sgx/sgx.h index 85b3674e1d43..a0af8849c7c3 100644 --- a/arch/x86/kernel/cpu/sgx/sgx.h +++ b/arch/x86/kernel/cpu/sgx/sgx.h @@ -96,5 +96,6 @@ int sgx_einit(struct sgx_sigstruct *sigstruct, struct sgx_einittoken *token, __init int sgx_dev_init(const char *name, struct device *dev, struct cdev *cdev, const struct file_operations *fops, int minor); +int sgx_set_attribute(u64 *allowed_attributes, unsigned int attribute_fd); #endif /* _X86_SGX_H */ -- 2.22.0
next prev parent reply index Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-27 5:51 [RFC PATCH 00/21] x86/sgx: KVM: Add SGX virtualization Sean Christopherson 2019-07-27 5:51 ` [RFC PATCH 01/21] x86/sgx: Add defines for SGX device minor numbers Sean Christopherson 2019-07-27 5:51 ` [RFC PATCH 02/21] x86/sgx: Move bus registration and device init to common code Sean Christopherson 2019-07-27 5:51 ` Sean Christopherson [this message] 2019-07-27 5:51 ` [RFC PATCH 04/21] x86/sgx: Add /dev/sgx/virt_epc device to allocate "raw" EPC for VMs Sean Christopherson 2019-07-27 17:44 ` Andy Lutomirski 2019-07-29 17:05 ` Sean Christopherson 2019-07-27 5:51 ` [RFC PATCH 05/21] x86/sgx: Expose SGX architectural definitions to the kernel Sean Christopherson 2019-07-27 5:51 ` [RFC PATCH 06/21] KVM: x86: Add SGX sub-features leaf to reverse CPUID table Sean Christopherson 2019-07-27 5:52 ` [RFC PATCH 07/21] KVM: x86: Add WARN_ON_ONCE(index!=0) in __do_cpuid_ent Sean Christopherson 2019-07-27 5:52 ` [RFC PATCH 08/21] KVM: x86: Add kvm_x86_ops hook to short circuit emulation Sean Christopherson 2019-07-27 17:38 ` Andy Lutomirski 2019-07-30 2:49 ` Sean Christopherson 2019-08-16 0:47 ` Andy Lutomirski 2019-08-19 22:01 ` Sean Christopherson 2019-08-20 1:34 ` Andy Lutomirski 2019-08-20 1:41 ` Sean Christopherson 2019-07-30 3:08 ` Sean Christopherson 2019-07-27 5:52 ` [RFC PATCH 09/21] KVM: VMX: Add basic handling of VM-Exit from SGX enclave Sean Christopherson 2019-07-27 5:52 ` [RFC PATCH 10/21] KVM: x86: Export kvm_mmu_gva_to_gpa_{read,write}() for VMX/SGX Sean Christopherson 2019-07-27 5:52 ` [RFC PATCH 11/21] KVM: x86: Export kvm_propagate_fault (as kvm_propagate_page_fault) Sean Christopherson 2019-07-27 5:52 ` [RFC PATCH 12/21] KVM: x86: Define new #PF SGX error code bit Sean Christopherson 2019-07-27 5:52 ` [RFC PATCH 13/21] x86/sgx: Move the intermediate EINIT helper into the driver Sean Christopherson 2019-07-27 5:52 ` [RFC PATCH 14/21] x86/sgx: Add helpers to expose ECREATE and EINIT to KVM Sean Christopherson 2019-07-27 5:52 ` [RFC PATCH 15/21] KVM: VMX: Add SGX ENCLS[ECREATE] handler to enforce CPUID restrictions Sean Christopherson 2019-07-27 5:52 ` [RFC PATCH 16/21] KVM: VMX: Edd emulation of SGX Launch Control LE hash MSRs Sean Christopherson 2019-07-27 5:52 ` [RFC PATCH 17/21] KVM: VMX: Add handler for ENCLS[EINIT] to support SGX Launch Control Sean Christopherson 2019-07-27 5:52 ` [RFC PATCH 18/21] KVM: x86: Invoke kvm_x86_ops->cpuid_update() after kvm_update_cpuid() Sean Christopherson 2019-07-27 5:52 ` [RFC PATCH 19/21] KVM: VMX: Enable SGX virtualization for SGX1, SGX2 and LC Sean Christopherson 2019-07-27 5:52 ` [RFC PATCH 20/21] x86/sgx: Export sgx_set_attribute() for use by KVM Sean Christopherson 2019-07-27 5:52 ` [RFC PATCH 21/21] KVM: x86: Add capability to grant VM access to privileged SGX attribute Sean Christopherson 2019-07-27 17:32 ` Andy Lutomirski
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=20190727055214.9282-4-sean.j.christopherson@intel.com \ --to=sean.j.christopherson@intel.com \ --cc=bp@alien8.de \ --cc=hpa@zytor.com \ --cc=jarkko.sakkinen@linux.intel.com \ --cc=joro@8bytes.org \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sgx@vger.kernel.org \ --cc=luto@amacapital.net \ --cc=mingo@redhat.com \ --cc=pbonzini@redhat.com \ --cc=rkrcmar@redhat.com \ --cc=tglx@linutronix.de \ --cc=x86@kernel.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: link
KVM Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/kvm/0 kvm/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 kvm kvm/ https://lore.kernel.org/kvm \ kvm@vger.kernel.org public-inbox-index kvm Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.kvm AGPL code for this site: git clone https://public-inbox.org/public-inbox.git