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 02/21] x86/sgx: Move bus registration and device init to common code Date: Fri, 26 Jul 2019 22:51:55 -0700 Message-ID: <20190727055214.9282-3-sean.j.christopherson@intel.com> (raw) In-Reply-To: <20190727055214.9282-1-sean.j.christopherson@intel.com> Move the SGX bus registration and initialization into common code in preparation for adding a virtual EPC device, which will reside outside of the native SGX userspace driver. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> --- arch/x86/kernel/cpu/sgx/driver/main.c | 48 +------------------------ arch/x86/kernel/cpu/sgx/main.c | 50 ++++++++++++++++++++++++++- arch/x86/kernel/cpu/sgx/sgx.h | 4 +++ 3 files changed, 54 insertions(+), 48 deletions(-) diff --git a/arch/x86/kernel/cpu/sgx/driver/main.c b/arch/x86/kernel/cpu/sgx/driver/main.c index a2506a49c95a..d62bdc7ed4d9 100644 --- a/arch/x86/kernel/cpu/sgx/driver/main.c +++ b/arch/x86/kernel/cpu/sgx/driver/main.c @@ -158,42 +158,10 @@ const struct file_operations sgx_provision_fops = { .owner = THIS_MODULE, }; -static struct bus_type sgx_bus_type = { - .name = "sgx", -}; - static struct device sgx_encl_dev; static struct cdev sgx_encl_cdev; static struct device sgx_provision_dev; static struct cdev sgx_provision_cdev; -static dev_t sgx_devt; - -static void sgx_dev_release(struct device *dev) -{ -} - -static __init int sgx_dev_init(const char *name, struct device *dev, - struct cdev *cdev, - const struct file_operations *fops, int minor) -{ - int ret; - - device_initialize(dev); - - dev->bus = &sgx_bus_type; - dev->devt = MKDEV(MAJOR(sgx_devt), minor); - dev->release = sgx_dev_release; - - ret = dev_set_name(dev, name); - if (ret) { - put_device(dev); - return ret; - } - - cdev_init(cdev, fops); - cdev->owner = THIS_MODULE; - return 0; -} int __init sgx_drv_init(void) { @@ -207,14 +175,6 @@ int __init sgx_drv_init(void) return -ENODEV; } - ret = bus_register(&sgx_bus_type); - if (ret) - return ret; - - ret = alloc_chrdev_region(&sgx_devt, 0, SGX_MAX_NR_DEVICES, "sgx"); - if (ret < 0) - goto err_bus; - cpuid_count(SGX_CPUID, 0, &eax, &ebx, &ecx, &edx); sgx_misc_reserved_mask = ~ebx | SGX_MISC_RESERVED_MASK; sgx_encl_size_max_64 = 1ULL << ((edx >> 8) & 0xFF); @@ -240,7 +200,7 @@ int __init sgx_drv_init(void) ret = sgx_dev_init("sgx/enclave", &sgx_encl_dev, &sgx_encl_cdev, &sgx_encl_fops, SGX_ENCL_DEV_MINOR); if (ret) - goto err_chrdev_region; + return ret; ret = sgx_dev_init("sgx/provision", &sgx_provision_dev, &sgx_provision_cdev, &sgx_provision_fops, @@ -277,11 +237,5 @@ int __init sgx_drv_init(void) err_encl_dev: put_device(&sgx_encl_dev); -err_chrdev_region: - unregister_chrdev_region(sgx_devt, SGX_MAX_NR_DEVICES); - -err_bus: - bus_unregister(&sgx_bus_type); - return ret; } diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c index f790a03571c5..edbd465083c7 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) // Copyright(c) 2016-17 Intel Corporation. +#include <linux/cdev.h> #include <linux/freezer.h> #include <linux/highmem.h> #include <linux/kthread.h> @@ -329,6 +330,39 @@ static __init int sgx_page_cache_init(void) return 0; } +static struct bus_type sgx_bus_type = { + .name = "sgx", +}; +static dev_t sgx_devt; + +static void sgx_dev_release(struct device *dev) +{ + +} + +__init int sgx_dev_init(const char *name, struct device *dev, + struct cdev *cdev, const struct file_operations *fops, + int minor) +{ + int ret; + + device_initialize(dev); + + dev->bus = &sgx_bus_type; + dev->devt = MKDEV(MAJOR(sgx_devt), minor); + dev->release = sgx_dev_release; + + ret = dev_set_name(dev, name); + if (ret) { + put_device(dev); + return ret; + } + + cdev_init(cdev, fops); + cdev->owner = THIS_MODULE; + return 0; +} + static __init int sgx_init(void) { int ret; @@ -344,12 +378,26 @@ static __init int sgx_init(void) if (ret) goto err_page_cache; - ret = sgx_drv_init(); + ret = bus_register(&sgx_bus_type); if (ret) goto err_kthread; + ret = alloc_chrdev_region(&sgx_devt, 0, SGX_MAX_NR_DEVICES, "sgx"); + if (ret < 0) + goto err_bus; + + ret = sgx_drv_init(); + if (ret) + goto err_chrdev_region; + return 0; +err_chrdev_region: + unregister_chrdev_region(sgx_devt, SGX_MAX_NR_DEVICES); + +err_bus: + bus_unregister(&sgx_bus_type); + err_kthread: kthread_stop(ksgxswapd_tsk); diff --git a/arch/x86/kernel/cpu/sgx/sgx.h b/arch/x86/kernel/cpu/sgx/sgx.h index 4e2c3ce94f63..85b3674e1d43 100644 --- a/arch/x86/kernel/cpu/sgx/sgx.h +++ b/arch/x86/kernel/cpu/sgx/sgx.h @@ -93,4 +93,8 @@ int sgx_einit(struct sgx_sigstruct *sigstruct, struct sgx_einittoken *token, #define SGX_PROV_DEV_MINOR 1 #define SGX_MAX_NR_DEVICES 2 +__init int sgx_dev_init(const char *name, struct device *dev, + struct cdev *cdev, const struct file_operations *fops, + int minor); + #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 ` Sean Christopherson [this message] 2019-07-27 5:51 ` [RFC PATCH 03/21] x86/sgx: Move provisioning device to common code Sean Christopherson 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-3-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