From: Jan Beulich <jbeulich@suse.com> To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org> Cc: "Kevin Tian" <kevin.tian@intel.com>, "Suravee Suthikulpanit" <suravee.suthikulpanit@amd.com>, "Wei Liu" <wl@xen.org>, "Andrew Cooper" <andrew.cooper3@citrix.com>, "Jun Nakajima" <jun.nakajima@intel.com>, "Boris Ostrovsky" <boris.ostrovsky@oracle.com>, "Brian Woods" <brian.woods@amd.com>, "Roger Pau Monné" <roger.pau@citrix.com> Subject: [Xen-devel] [PATCH v2 1/2] x86: define a few selector values Date: Fri, 9 Aug 2019 12:38:55 +0200 Message-ID: <5c94e6ba-acd0-ac20-bbf0-187a2e3d0988@suse.com> (raw) In-Reply-To: <a9651ce7-bdd2-ac6d-6670-0abbe4442b14@suse.com> TSS, LDT, and per-CPU entries all can benefit a little from also having their selector values defined. Signed-off-by: Jan Beulich <jbeulich@suse.com> --- v2: New. --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -761,7 +761,7 @@ void load_system_tables(void) per_cpu(full_gdt_loaded, cpu) = false; lgdt(&gdtr); lidt(&idtr); - ltr(TSS_ENTRY << 3); + ltr(TSS_SELECTOR); lldt(0); enable_each_ist(idt_tables[cpu]); --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1572,7 +1572,7 @@ bool svm_load_segs(unsigned int ldt_ents _set_tssldt_desc(desc, ldt_base, ldt_ents * 8 - 1, SYS_DESC_ldt); - vmcb->ldtr.sel = LDT_ENTRY << 3; + vmcb->ldtr.sel = LDT_SELECTOR; vmcb->ldtr.attr = SYS_DESC_ldt | (_SEGMENT_P >> 8); vmcb->ldtr.limit = ldt_ents * 8 - 1; vmcb->ldtr.base = ldt_base; --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1128,7 +1128,7 @@ static int construct_vmcs(struct vcpu *v __vmwrite(HOST_GS_SELECTOR, 0); __vmwrite(HOST_FS_BASE, 0); __vmwrite(HOST_GS_BASE, 0); - __vmwrite(HOST_TR_SELECTOR, TSS_ENTRY << 3); + __vmwrite(HOST_TR_SELECTOR, TSS_SELECTOR); /* Host control registers. */ v->arch.hvm.vmx.host_cr0 = read_cr0() & ~X86_CR0_TS; --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1917,7 +1917,7 @@ void load_TR(void) /* Switch to non-compat GDT (which has B bit clear) to execute LTR. */ asm volatile ( "sgdt %0; lgdt %2; ltr %w1; lgdt %0" - : "=m" (old_gdt) : "rm" (TSS_ENTRY << 3), "m" (tss_gdt) : "memory" ); + : "=m" (old_gdt) : "rm" (TSS_SELECTOR), "m" (tss_gdt) : "memory" ); } static unsigned int calc_ler_msr(void) --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -251,7 +251,7 @@ void do_double_fault(struct cpu_user_reg console_force_unlock(); - asm ( "lsll %1, %0" : "=r" (cpu) : "rm" (PER_CPU_GDT_ENTRY << 3) ); + asm ( "lsll %1, %0" : "=r" (cpu) : "rm" (PER_CPU_GDT_SELECTOR) ); /* Find information saved during fault and dump it to the console. */ printk("*** DOUBLE FAULT ***\n"); --- a/xen/include/asm-x86/desc.h +++ b/xen/include/asm-x86/desc.h @@ -36,6 +36,10 @@ #define LDT_ENTRY (TSS_ENTRY + 2) #define PER_CPU_GDT_ENTRY (LDT_ENTRY + 2) +#define TSS_SELECTOR (TSS_ENTRY << 3) +#define LDT_SELECTOR (LDT_ENTRY << 3) +#define PER_CPU_GDT_SELECTOR (PER_CPU_GDT_ENTRY << 3) + #ifndef __ASSEMBLY__ #define GUEST_KERNEL_RPL(d) (is_pv_32bit_domain(d) ? 1 : 3) --- a/xen/include/asm-x86/ldt.h +++ b/xen/include/asm-x86/ldt.h @@ -16,7 +16,7 @@ static inline void load_LDT(struct vcpu desc = (!is_pv_32bit_vcpu(v) ? this_cpu(gdt) : this_cpu(compat_gdt)) + LDT_ENTRY - FIRST_RESERVED_GDT_ENTRY; _set_tssldt_desc(desc, LDT_VIRT_START(v), ents*8-1, SYS_DESC_ldt); - lldt(LDT_ENTRY << 3); + lldt(LDT_SELECTOR); } } _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply index Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-09 10:34 [Xen-devel] [PATCH v2 0/2] x86/boot: cleanup Jan Beulich 2019-08-09 10:38 ` Jan Beulich [this message] 2019-08-09 11:50 ` [Xen-devel] [PATCH v2 1/2] x86: define a few selector values Andrew Cooper 2019-08-09 12:35 ` Jan Beulich 2019-08-23 2:38 ` Tian, Kevin 2019-08-09 10:40 ` [Xen-devel] [PATCH v2 2/2] x86/desc: Build boot_{, compat_}gdt[] in C Jan Beulich 2019-08-09 12:19 ` Andrew Cooper 2019-08-09 12:43 ` Jan Beulich 2019-08-09 13:07 ` Andrew Cooper 2019-08-09 13:18 ` Jan Beulich 2019-08-09 15:25 ` Andrew Cooper 2019-08-12 7:32 ` Jan Beulich 2019-08-12 10:36 ` Andrew Cooper 2019-08-09 10:41 ` [Xen-devel] [PATCH v2 0/2] x86/boot: cleanup Jan Beulich 2019-08-09 12:39 ` [Xen-devel] [PATCH 3/2] x86/desc: Drop __HYPERVISOR_CS32 Andrew Cooper 2019-08-09 12:50 ` Jan Beulich 2019-08-09 15:36 ` Andrew Cooper 2019-08-09 15:52 ` Jan Beulich
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=5c94e6ba-acd0-ac20-bbf0-187a2e3d0988@suse.com \ --to=jbeulich@suse.com \ --cc=andrew.cooper3@citrix.com \ --cc=boris.ostrovsky@oracle.com \ --cc=brian.woods@amd.com \ --cc=jun.nakajima@intel.com \ --cc=kevin.tian@intel.com \ --cc=roger.pau@citrix.com \ --cc=suravee.suthikulpanit@amd.com \ --cc=wl@xen.org \ --cc=xen-devel@lists.xenproject.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
Xen-Devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/xen-devel/0 xen-devel/git/0.git git clone --mirror https://lore.kernel.org/xen-devel/1 xen-devel/git/1.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 xen-devel xen-devel/ https://lore.kernel.org/xen-devel \ xen-devel@lists.xenproject.org xen-devel@lists.xen.org public-inbox-index xen-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.xenproject.lists.xen-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git