| Message ID | 20190506065644.7415-37-jgross@suse.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xen: add core scheduling support | expand |
>>> On 06.05.19 at 08:56, <jgross@suse.com> wrote: > --- a/xen/arch/x86/domain.c > +++ b/xen/arch/x86/domain.c > @@ -1619,6 +1619,37 @@ static inline bool need_full_gdt(const struct domain *d) > return is_pv_domain(d) && !is_idle_domain(d); > } > > +static inline void write_full_gdt_ptes(seg_desc_t *gdt, struct vcpu *v) > +{ > + unsigned long mfn = virt_to_mfn(gdt); > + l1_pgentry_t *pl1e = pv_gdt_ptes(v); > + unsigned int i; > + > + for ( i = 0; i < NR_RESERVED_GDT_PAGES; i++ ) > + l1e_write(pl1e + FIRST_RESERVED_GDT_PAGE + i, > + l1e_from_pfn(mfn + i, __PAGE_HYPERVISOR_RW)); > +} > + > +static inline void load_full_gdt(struct vcpu *v, unsigned int cpu) > +{ > + struct desc_ptr gdt_desc; > + > + gdt_desc.limit = LAST_RESERVED_GDT_BYTE; > + gdt_desc.base = GDT_VIRT_START(v); Make this and ... > + lgdt(&gdt_desc); > +} > + > +static inline void load_default_gdt(seg_desc_t *gdt, unsigned int cpu) > +{ > + struct desc_ptr gdt_desc; > + > + gdt_desc.limit = LAST_RESERVED_GDT_BYTE; > + gdt_desc.base = (unsigned long)(gdt - FIRST_RESERVED_GDT_ENTRY); ... the variables' initializers? With this and with const suitably applied to all function parameters where this is possible Acked-by: Jan Beulich <jbeulich@suse.com> Jan
On 16/05/2019 14:30, Jan Beulich wrote: >>>> On 06.05.19 at 08:56, <jgross@suse.com> wrote: >> --- a/xen/arch/x86/domain.c >> +++ b/xen/arch/x86/domain.c >> @@ -1619,6 +1619,37 @@ static inline bool need_full_gdt(const struct domain *d) >> return is_pv_domain(d) && !is_idle_domain(d); >> } >> >> +static inline void write_full_gdt_ptes(seg_desc_t *gdt, struct vcpu *v) >> +{ >> + unsigned long mfn = virt_to_mfn(gdt); >> + l1_pgentry_t *pl1e = pv_gdt_ptes(v); >> + unsigned int i; >> + >> + for ( i = 0; i < NR_RESERVED_GDT_PAGES; i++ ) >> + l1e_write(pl1e + FIRST_RESERVED_GDT_PAGE + i, >> + l1e_from_pfn(mfn + i, __PAGE_HYPERVISOR_RW)); >> +} >> + >> +static inline void load_full_gdt(struct vcpu *v, unsigned int cpu) >> +{ >> + struct desc_ptr gdt_desc; >> + >> + gdt_desc.limit = LAST_RESERVED_GDT_BYTE; >> + gdt_desc.base = GDT_VIRT_START(v); > > Make this and ... > >> + lgdt(&gdt_desc); >> +} >> + >> +static inline void load_default_gdt(seg_desc_t *gdt, unsigned int cpu) >> +{ >> + struct desc_ptr gdt_desc; >> + >> + gdt_desc.limit = LAST_RESERVED_GDT_BYTE; >> + gdt_desc.base = (unsigned long)(gdt - FIRST_RESERVED_GDT_ENTRY); > > ... the variables' initializers? With this and with const suitably > applied to all function parameters where this is possible > Acked-by: Jan Beulich <jbeulich@suse.com> Thanks, will do. Juergen
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 1525ccd8e5..72a365ff6a 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1619,6 +1619,37 @@ static inline bool need_full_gdt(const struct domain *d) return is_pv_domain(d) && !is_idle_domain(d); } +static inline void write_full_gdt_ptes(seg_desc_t *gdt, struct vcpu *v) +{ + unsigned long mfn = virt_to_mfn(gdt); + l1_pgentry_t *pl1e = pv_gdt_ptes(v); + unsigned int i; + + for ( i = 0; i < NR_RESERVED_GDT_PAGES; i++ ) + l1e_write(pl1e + FIRST_RESERVED_GDT_PAGE + i, + l1e_from_pfn(mfn + i, __PAGE_HYPERVISOR_RW)); +} + +static inline void load_full_gdt(struct vcpu *v, unsigned int cpu) +{ + struct desc_ptr gdt_desc; + + gdt_desc.limit = LAST_RESERVED_GDT_BYTE; + gdt_desc.base = GDT_VIRT_START(v); + + lgdt(&gdt_desc); +} + +static inline void load_default_gdt(seg_desc_t *gdt, unsigned int cpu) +{ + struct desc_ptr gdt_desc; + + gdt_desc.limit = LAST_RESERVED_GDT_BYTE; + gdt_desc.base = (unsigned long)(gdt - FIRST_RESERVED_GDT_ENTRY); + + lgdt(&gdt_desc); +} + static void __context_switch(void) { struct cpu_user_regs *stack_regs = guest_cpu_user_regs(); @@ -1627,7 +1658,6 @@ static void __context_switch(void) struct vcpu *n = current; struct domain *pd = p->domain, *nd = n->domain; seg_desc_t *gdt; - struct desc_ptr gdt_desc; ASSERT(p != n); ASSERT(!vcpu_cpu_dirty(n)); @@ -1669,25 +1699,13 @@ static void __context_switch(void) gdt = !is_pv_32bit_domain(nd) ? per_cpu(gdt_table, cpu) : per_cpu(compat_gdt_table, cpu); - if ( need_full_gdt(nd) ) - { - unsigned long mfn = virt_to_mfn(gdt); - l1_pgentry_t *pl1e = pv_gdt_ptes(n); - unsigned int i; - for ( i = 0; i < NR_RESERVED_GDT_PAGES; i++ ) - l1e_write(pl1e + FIRST_RESERVED_GDT_PAGE + i, - l1e_from_pfn(mfn + i, __PAGE_HYPERVISOR_RW)); - } + if ( need_full_gdt(nd) ) + write_full_gdt_ptes(gdt, n); if ( need_full_gdt(pd) && ((p->vcpu_id != n->vcpu_id) || !need_full_gdt(nd)) ) - { - gdt_desc.limit = LAST_RESERVED_GDT_BYTE; - gdt_desc.base = (unsigned long)(gdt - FIRST_RESERVED_GDT_ENTRY); - - lgdt(&gdt_desc); - } + load_default_gdt(gdt, cpu); write_ptbase(n); @@ -1700,12 +1718,7 @@ static void __context_switch(void) if ( need_full_gdt(nd) && ((p->vcpu_id != n->vcpu_id) || !need_full_gdt(pd)) ) - { - gdt_desc.limit = LAST_RESERVED_GDT_BYTE; - gdt_desc.base = GDT_VIRT_START(n); - - lgdt(&gdt_desc); - } + load_full_gdt(n, cpu); if ( pd != nd ) cpumask_clear_cpu(cpu, pd->dirty_cpumask);
In preparation for core scheduling carve out the GDT related functionality (writing GDT related PTEs, loading default of full GDT) into sub-functions. Signed-off-by: Juergen Gross <jgross@suse.com> --- RFC V2: split off non-refactoring part --- xen/arch/x86/domain.c | 57 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 22 deletions(-)