On 5/22/2026 7:16 AM, Lisa Wang wrote:

[...]

> +
> +static inline u64 kvm_get_default_cr4(void)
> +{
> +     u64 cr4 = X86_CR4_PAE | X86_CR4_OSFXSR;
> +
> +     if (kvm_cpu_has(X86_FEATURE_XSAVE))
> +             cr4 |= X86_CR4_OSXSAVE;
> +     return cr4;
> +}
> +

[...]

> @@ -647,16 +643,12 @@ static void vcpu_init_sregs(struct kvm_vm *vm, struct 
> kvm_vcpu *vcpu)
>       vcpu_sregs_get(vcpu, &sregs);
>  
>       sregs.idt.base = vm->arch.idt;
> -     sregs.idt.limit = NUM_INTERRUPTS * sizeof(struct idt_entry) - 1;
> +     sregs.idt.limit = kvm_get_default_idt_limit();
>       sregs.gdt.base = vm->arch.gdt;
> -     sregs.gdt.limit = getpagesize() - 1;
> -
> -     sregs.cr0 = X86_CR0_PE | X86_CR0_NE | X86_CR0_PG;
> -     sregs.cr4 |= X86_CR4_PAE | X86_CR4_OSFXSR;
> -     if (kvm_cpu_has(X86_FEATURE_XSAVE))
> -             sregs.cr4 |= X86_CR4_OSXSAVE;
> -     if (vm->mmu.pgtable_levels == 5)
> -             sregs.cr4 |= X86_CR4_LA57;

I guess the 5-level paging thing is dropped unexpectedly during rebase?


> +     sregs.gdt.limit = kvm_get_default_gdt_limit();
> 
> +     sregs.cr0 = kvm_get_default_cr0();
> +     sregs.cr4 |= kvm_get_default_cr4();
>       sregs.efer |= (EFER_LME | EFER_LMA | EFER_NX);
>  
>       kvm_seg_set_unusable(&sregs.ldt);
> 


Reply via email to