Skip to content

Commit

Permalink
xen: use hypercall rather than clts
Browse files Browse the repository at this point in the history
Xen will trap and emulate clts, but its better to use a hypercall.
Also, xenner doesn't handle clts.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Jeremy Fitzhardinge authored and Thomas Gleixner committed May 27, 2008
1 parent 0922abd commit 7b1333a
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 2 deletions.
28 changes: 26 additions & 2 deletions arch/x86/xen/enlighten.c
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,30 @@ static void xen_flush_tlb_others(const cpumask_t *cpus, struct mm_struct *mm,
xen_mc_issue(PARAVIRT_LAZY_MMU);
}

static void xen_clts(void)
{
struct multicall_space mcs;

mcs = xen_mc_entry(0);

MULTI_fpu_taskswitch(mcs.mc, 0);

xen_mc_issue(PARAVIRT_LAZY_CPU);
}

static void xen_write_cr0(unsigned long cr0)
{
struct multicall_space mcs;

/* Only pay attention to cr0.TS; everything else is
ignored. */
mcs = xen_mc_entry(0);

MULTI_fpu_taskswitch(mcs.mc, (cr0 & X86_CR0_TS) != 0);

xen_mc_issue(PARAVIRT_LAZY_CPU);
}

static void xen_write_cr2(unsigned long cr2)
{
x86_read_percpu(xen_vcpu)->arch.cr2 = cr2;
Expand Down Expand Up @@ -978,10 +1002,10 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
.set_debugreg = xen_set_debugreg,
.get_debugreg = xen_get_debugreg,

.clts = native_clts,
.clts = xen_clts,

.read_cr0 = native_read_cr0,
.write_cr0 = native_write_cr0,
.write_cr0 = xen_write_cr0,

.read_cr4 = native_read_cr4,
.read_cr4_safe = native_read_cr4_safe,
Expand Down
7 changes: 7 additions & 0 deletions include/asm-x86/xen/hypercall.h
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,13 @@ HYPERVISOR_nmi_op(unsigned long op, unsigned long arg)
return _hypercall2(int, nmi_op, op, arg);
}

static inline void
MULTI_fpu_taskswitch(struct multicall_entry *mcl, int set)
{
mcl->op = __HYPERVISOR_fpu_taskswitch;
mcl->args[0] = set;
}

static inline void
MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va,
pte_t new_val, unsigned long flags)
Expand Down

0 comments on commit 7b1333a

Please sign in to comment.