* v25-rc1 @ 2020-01-13 3:59 Jarkko Sakkinen 2020-01-13 8:48 ` v25-rc1 Borislav Petkov 0 siblings, 1 reply; 8+ messages in thread From: Jarkko Sakkinen @ 2020-01-13 3:59 UTC (permalink / raw) To: linux-sgx; +Cc: Borislav Petkov, Andy Lutomirski, Sean Christopherson I tagged v25-rc1: * Fix a double-free issue when SGX_IOC_ENCLAVE_ADD_PAGES fails on executing ENCLS[EADD]. The rollback path executed radix_tree_delete() on the same address twice when this happened. * Return -EINTR instead of -ERESTARTSYS in SGX_IOC_ENCLAVE_ADD_PAGES when a signal is pending. * As requested by Borislav, move the CPUID 0x12 features to their own word in cpufeatures. * Sean fixed a bug from sgx_reclaimer_write() where sgx_encl_put_backing() was called with an uninitialized pointer when sgx_encl_get_backing() fails. * Migrated /dev/sgx/* to misc. This is future-proof as struct miscdevice has 'groups' for setting up sysfs attributes for the device. * Use device_initcall instead of subsys_initcall so that misc_class is initialized before SGX is initialized. Before final v25, this patch set needs to reach mainline: https://lore.kernel.org/kvm/20191221044513.21680-1-sean.j.christopherson@intel.com In the meanwhile I'll concentrate on going through with eyeglass all Borislav's feedback for v23 and v24. /Jarkko ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: v25-rc1 2020-01-13 3:59 v25-rc1 Jarkko Sakkinen @ 2020-01-13 8:48 ` Borislav Petkov 2020-01-13 14:00 ` v25-rc1 Paolo Bonzini 0 siblings, 1 reply; 8+ messages in thread From: Borislav Petkov @ 2020-01-13 8:48 UTC (permalink / raw) To: Jarkko Sakkinen, Paolo Bonzini Cc: linux-sgx, Andy Lutomirski, Sean Christopherson On Mon, Jan 13, 2020 at 05:59:18AM +0200, Jarkko Sakkinen wrote: > I tagged v25-rc1: > > * Fix a double-free issue when SGX_IOC_ENCLAVE_ADD_PAGES > fails on executing ENCLS[EADD]. The rollback path executed > radix_tree_delete() on the same address twice when this happened. > * Return -EINTR instead of -ERESTARTSYS in SGX_IOC_ENCLAVE_ADD_PAGES when > a signal is pending. > * As requested by Borislav, move the CPUID 0x12 features to their own word > in cpufeatures. > * Sean fixed a bug from sgx_reclaimer_write() where sgx_encl_put_backing() > was called with an uninitialized pointer when sgx_encl_get_backing() > fails. > * Migrated /dev/sgx/* to misc. This is future-proof as struct miscdevice > has 'groups' for setting up sysfs attributes for the device. > * Use device_initcall instead of subsys_initcall so that misc_class is > initialized before SGX is initialized. > > Before final v25, this patch set needs to reach mainline: > > https://lore.kernel.org/kvm/20191221044513.21680-1-sean.j.christopherson@intel.com ... and I'm still waiting for Paolo to agree on how to merge this. -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: v25-rc1 2020-01-13 8:48 ` v25-rc1 Borislav Petkov @ 2020-01-13 14:00 ` Paolo Bonzini 2020-01-13 14:04 ` v25-rc1 Borislav Petkov 0 siblings, 1 reply; 8+ messages in thread From: Paolo Bonzini @ 2020-01-13 14:00 UTC (permalink / raw) To: Borislav Petkov, Jarkko Sakkinen Cc: linux-sgx, Andy Lutomirski, Sean Christopherson On 13/01/20 09:48, Borislav Petkov wrote: >> Before final v25, this patch set needs to reach mainline: >> >> https://lore.kernel.org/kvm/20191221044513.21680-1-sean.j.christopherson@intel.com > ... and I'm still waiting for Paolo to agree on how to merge this. Sorry I missed that. What about sending me a topic branch, that will be merged into both tip and kvm-next? Thanks, Paolo ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: v25-rc1 2020-01-13 14:00 ` v25-rc1 Paolo Bonzini @ 2020-01-13 14:04 ` Borislav Petkov 2020-01-13 15:20 ` v25-rc1 Paolo Bonzini 0 siblings, 1 reply; 8+ messages in thread From: Borislav Petkov @ 2020-01-13 14:04 UTC (permalink / raw) To: Paolo Bonzini Cc: Jarkko Sakkinen, linux-sgx, Andy Lutomirski, Sean Christopherson On Mon, Jan 13, 2020 at 03:00:49PM +0100, Paolo Bonzini wrote: > Sorry I missed that. What about sending me a topic branch, that will be > merged into both tip and kvm-next? ... and I'll put all patches in it except the KVM ones: KVM: VMX: Drop initialization of IA32_FEAT_CTL MSR KVM: VMX: Use VMX feature flag to query BIOS enabling KVM: VMX: Check for full VMX support when verifying CPU compatibility KVM: VMX: Use VMX_FEATURE_* flags to define VMCS control bits KVM: VMX: Allow KVM_INTEL when building for Centaur and/or Zhaoxin CPUs which you can then take? Makes sense to me... -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: v25-rc1 2020-01-13 14:04 ` v25-rc1 Borislav Petkov @ 2020-01-13 15:20 ` Paolo Bonzini 2020-01-13 16:07 ` v25-rc1 Borislav Petkov 0 siblings, 1 reply; 8+ messages in thread From: Paolo Bonzini @ 2020-01-13 15:20 UTC (permalink / raw) To: Borislav Petkov Cc: Jarkko Sakkinen, linux-sgx, Andy Lutomirski, Sean Christopherson On 13/01/20 15:04, Borislav Petkov wrote: > ... and I'll put all patches in it except the KVM ones: > > KVM: VMX: Drop initialization of IA32_FEAT_CTL MSR > KVM: VMX: Use VMX feature flag to query BIOS enabling > KVM: VMX: Check for full VMX support when verifying CPU compatibility > KVM: VMX: Use VMX_FEATURE_* flags to define VMCS control bits > KVM: VMX: Allow KVM_INTEL when building for Centaur and/or Zhaoxin CPUs Put them in too, it's even simpler. Paolo ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: v25-rc1 2020-01-13 15:20 ` v25-rc1 Paolo Bonzini @ 2020-01-13 16:07 ` Borislav Petkov 2020-01-14 9:39 ` v25-rc1 Borislav Petkov 0 siblings, 1 reply; 8+ messages in thread From: Borislav Petkov @ 2020-01-13 16:07 UTC (permalink / raw) To: Paolo Bonzini Cc: Jarkko Sakkinen, linux-sgx, Andy Lutomirski, Sean Christopherson On Mon, Jan 13, 2020 at 04:20:35PM +0100, Paolo Bonzini wrote: > Put them in too, it's even simpler. /me brews a fresh coffee and gets crackin'. -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: v25-rc1 2020-01-13 16:07 ` v25-rc1 Borislav Petkov @ 2020-01-14 9:39 ` Borislav Petkov 2020-01-14 10:44 ` v25-rc1 Paolo Bonzini 0 siblings, 1 reply; 8+ messages in thread From: Borislav Petkov @ 2020-01-14 9:39 UTC (permalink / raw) To: Paolo Bonzini Cc: Jarkko Sakkinen, linux-sgx, Andy Lutomirski, Sean Christopherson On Mon, Jan 13, 2020 at 05:07:48PM +0100, Borislav Petkov wrote: > On Mon, Jan 13, 2020 at 04:20:35PM +0100, Paolo Bonzini wrote: > > Put them in too, it's even simpler. > > /me brews a fresh coffee and gets crackin'. JFYI: there'll be a merge conflict, below is me merging into linux-next from today. Also, don't forget to fixup CPU_BASED_USE_TSC_OFFSETTING with "TT" since you hav e 5e3d394fdd9e ("KVM: VMX: Fix the spelling of CPU_BASED_USE_TSC_OFFSETTING") in your tree but this tree still has: + #define CPU_BASED_USE_TSC_OFFSETING VMCS_CONTROL_BIT(TSC_OFFSETTING) Lemme know if there's something else I should do. Thx. --- diff --cc arch/x86/include/asm/vmx.h index d716fe938fc0,9fbba31be825..000000000000 --- a/arch/x86/include/asm/vmx.h +++ b/arch/x86/include/asm/vmx.h @@@ -19,27 -22,27 +22,73 @@@ /* * Definitions of Primary Processor-Based VM-Execution Controls. */ ++<<<<<<< HEAD +#define CPU_BASED_INTR_WINDOW_EXITING 0x00000004 +#define CPU_BASED_USE_TSC_OFFSETTING 0x00000008 +#define CPU_BASED_HLT_EXITING 0x00000080 +#define CPU_BASED_INVLPG_EXITING 0x00000200 +#define CPU_BASED_MWAIT_EXITING 0x00000400 +#define CPU_BASED_RDPMC_EXITING 0x00000800 +#define CPU_BASED_RDTSC_EXITING 0x00001000 +#define CPU_BASED_CR3_LOAD_EXITING 0x00008000 +#define CPU_BASED_CR3_STORE_EXITING 0x00010000 +#define CPU_BASED_CR8_LOAD_EXITING 0x00080000 +#define CPU_BASED_CR8_STORE_EXITING 0x00100000 +#define CPU_BASED_TPR_SHADOW 0x00200000 +#define CPU_BASED_NMI_WINDOW_EXITING 0x00400000 +#define CPU_BASED_MOV_DR_EXITING 0x00800000 +#define CPU_BASED_UNCOND_IO_EXITING 0x01000000 +#define CPU_BASED_USE_IO_BITMAPS 0x02000000 +#define CPU_BASED_MONITOR_TRAP_FLAG 0x08000000 +#define CPU_BASED_USE_MSR_BITMAPS 0x10000000 +#define CPU_BASED_MONITOR_EXITING 0x20000000 +#define CPU_BASED_PAUSE_EXITING 0x40000000 +#define CPU_BASED_ACTIVATE_SECONDARY_CONTROLS 0x80000000 ++||||||| merged common ancestors ++#define CPU_BASED_VIRTUAL_INTR_PENDING 0x00000004 ++#define CPU_BASED_USE_TSC_OFFSETING 0x00000008 ++#define CPU_BASED_HLT_EXITING 0x00000080 ++#define CPU_BASED_INVLPG_EXITING 0x00000200 ++#define CPU_BASED_MWAIT_EXITING 0x00000400 ++#define CPU_BASED_RDPMC_EXITING 0x00000800 ++#define CPU_BASED_RDTSC_EXITING 0x00001000 ++#define CPU_BASED_CR3_LOAD_EXITING 0x00008000 ++#define CPU_BASED_CR3_STORE_EXITING 0x00010000 ++#define CPU_BASED_CR8_LOAD_EXITING 0x00080000 ++#define CPU_BASED_CR8_STORE_EXITING 0x00100000 ++#define CPU_BASED_TPR_SHADOW 0x00200000 ++#define CPU_BASED_VIRTUAL_NMI_PENDING 0x00400000 ++#define CPU_BASED_MOV_DR_EXITING 0x00800000 ++#define CPU_BASED_UNCOND_IO_EXITING 0x01000000 ++#define CPU_BASED_USE_IO_BITMAPS 0x02000000 ++#define CPU_BASED_MONITOR_TRAP_FLAG 0x08000000 ++#define CPU_BASED_USE_MSR_BITMAPS 0x10000000 ++#define CPU_BASED_MONITOR_EXITING 0x20000000 ++#define CPU_BASED_PAUSE_EXITING 0x40000000 ++#define CPU_BASED_ACTIVATE_SECONDARY_CONTROLS 0x80000000 ++======= + #define CPU_BASED_VIRTUAL_INTR_PENDING VMCS_CONTROL_BIT(VIRTUAL_INTR_PENDING) + #define CPU_BASED_USE_TSC_OFFSETING VMCS_CONTROL_BIT(TSC_OFFSETTING) + #define CPU_BASED_HLT_EXITING VMCS_CONTROL_BIT(HLT_EXITING) + #define CPU_BASED_INVLPG_EXITING VMCS_CONTROL_BIT(INVLPG_EXITING) + #define CPU_BASED_MWAIT_EXITING VMCS_CONTROL_BIT(MWAIT_EXITING) + #define CPU_BASED_RDPMC_EXITING VMCS_CONTROL_BIT(RDPMC_EXITING) + #define CPU_BASED_RDTSC_EXITING VMCS_CONTROL_BIT(RDTSC_EXITING) + #define CPU_BASED_CR3_LOAD_EXITING VMCS_CONTROL_BIT(CR3_LOAD_EXITING) + #define CPU_BASED_CR3_STORE_EXITING VMCS_CONTROL_BIT(CR3_STORE_EXITING) + #define CPU_BASED_CR8_LOAD_EXITING VMCS_CONTROL_BIT(CR8_LOAD_EXITING) + #define CPU_BASED_CR8_STORE_EXITING VMCS_CONTROL_BIT(CR8_STORE_EXITING) + #define CPU_BASED_TPR_SHADOW VMCS_CONTROL_BIT(VIRTUAL_TPR) + #define CPU_BASED_VIRTUAL_NMI_PENDING VMCS_CONTROL_BIT(VIRTUAL_NMI_PENDING) + #define CPU_BASED_MOV_DR_EXITING VMCS_CONTROL_BIT(MOV_DR_EXITING) + #define CPU_BASED_UNCOND_IO_EXITING VMCS_CONTROL_BIT(UNCOND_IO_EXITING) + #define CPU_BASED_USE_IO_BITMAPS VMCS_CONTROL_BIT(USE_IO_BITMAPS) + #define CPU_BASED_MONITOR_TRAP_FLAG VMCS_CONTROL_BIT(MONITOR_TRAP_FLAG) + #define CPU_BASED_USE_MSR_BITMAPS VMCS_CONTROL_BIT(USE_MSR_BITMAPS) + #define CPU_BASED_MONITOR_EXITING VMCS_CONTROL_BIT(MONITOR_EXITING) + #define CPU_BASED_PAUSE_EXITING VMCS_CONTROL_BIT(PAUSE_EXITING) + #define CPU_BASED_ACTIVATE_SECONDARY_CONTROLS VMCS_CONTROL_BIT(SEC_CONTROLS) ++>>>>>>> tip-x86-cpu #define CPU_BASED_ALWAYSON_WITHOUT_TRUE_MSR 0x0401e172 -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: v25-rc1 2020-01-14 9:39 ` v25-rc1 Borislav Petkov @ 2020-01-14 10:44 ` Paolo Bonzini 0 siblings, 0 replies; 8+ messages in thread From: Paolo Bonzini @ 2020-01-14 10:44 UTC (permalink / raw) To: Borislav Petkov Cc: Jarkko Sakkinen, linux-sgx, Andy Lutomirski, Sean Christopherson On 14/01/20 10:39, Borislav Petkov wrote: > JFYI: there'll be a merge conflict, below is me merging into linux-next > from today. > > Also, don't forget to fixup CPU_BASED_USE_TSC_OFFSETTING with "TT" since > you hav e > > 5e3d394fdd9e ("KVM: VMX: Fix the spelling of CPU_BASED_USE_TSC_OFFSETTING") > > in your tree but this tree still has: > > + #define CPU_BASED_USE_TSC_OFFSETING VMCS_CONTROL_BIT(TSC_OFFSETTING) > > Lemme know if there's something else I should do. Nope, thanks for the heads up. The topic branch will remove the need for Linus to solve the conflict so it's definitely the way to go. Paolo ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-01-14 10:44 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-01-13 3:59 v25-rc1 Jarkko Sakkinen 2020-01-13 8:48 ` v25-rc1 Borislav Petkov 2020-01-13 14:00 ` v25-rc1 Paolo Bonzini 2020-01-13 14:04 ` v25-rc1 Borislav Petkov 2020-01-13 15:20 ` v25-rc1 Paolo Bonzini 2020-01-13 16:07 ` v25-rc1 Borislav Petkov 2020-01-14 9:39 ` v25-rc1 Borislav Petkov 2020-01-14 10:44 ` v25-rc1 Paolo Bonzini
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).