Hi all,
this patch series implement guest SMP support for ARM, using the ARM
PSCI interface for secondary cpu bringup.
See each patch for a detailed changelog.
Ian Campbell (1):
xen/arm: trap SMC instructions and inject an UND exception
Stefano Stabellini (14):
xen/arm: basic PSCI support, implement cpu_on and cpu_off
xen/arm: allocate secondaries dom0 vcpus
xen: move for_each_set_bit to xen/bitops.h
xen/arm: support for guest SGI
xen/arm: implement arch_vmap_virt_end
xen/arm: compile and initialize vmap
xen/arm: implement map_domain_page_global and unmap_domain_page_global
xen: move VCPUOP_register_vcpu_info to common code
xen/arm: support VCPUOP_register_vcpu_info.
xen/arm: send IPIs to inject irqs into guest vcpus running on different
pcpus
xen/arm: run the vtimer Xen timers on the pcpu the vcpu is running on
xen/arm: initialize virt_timer and phys_timer with the same values on all
vcpus
xen/arm: clear pending irq queues on do_psci_cpu_on
xen/arm: initialize vtimer offset to CNTPCT
xen/arch/arm/Makefile | 1 +
xen/arch/arm/domain.c | 16 ++++
xen/arch/arm/domain_build.c | 14 +++-
xen/arch/arm/gic.c | 12 +++
xen/arch/arm/mm.c | 132 ++++++++++++++++++++++++++++++--
xen/arch/arm/psci.c | 79 ++++++++++++++++++++
xen/arch/arm/setup.c | 3 +
xen/arch/arm/traps.c | 107 ++++++++++++++++++++++++++-
xen/arch/arm/vgic.c | 93 ++++++++++++++++++++++--
xen/arch/arm/vtimer.c | 29 +++++---
xen/arch/arm/vtimer.h | 1 +
xen/arch/x86/domain.c | 113 ----------------------------
xen/arch/x86/i8259.c | 2 +-
xen/arch/x86/mpparse.c | 2 +-
xen/arch/x86/setup.c | 2 +-
xen/arch/x86/traps.c | 2 +-
xen/common/domain.c | 111 +++++++++++++++++++++++++++
xen/include/asm-arm/arm32/processor.h | 4 +-
xen/include/asm-arm/config.h | 4 +-
xen/include/asm-arm/domain.h | 24 ++++--
xen/include/asm-arm/gic.h | 17 +++--
xen/include/asm-arm/hypercall.h | 2 +
xen/include/asm-arm/page.h | 3 +
xen/include/asm-arm/processor.h | 8 ++
xen/include/asm-arm/psci.h | 24 ++++++
xen/include/asm-x86/bitops.h | 11 ---
xen/include/asm-x86/domain.h | 3 -
xen/include/asm-x86/page.h | 8 --
xen/include/asm-x86/smp.h | 2 +-
xen/include/asm-x86/system.h | 2 +-
xen/include/public/arch-arm.h | 3 +
xen/include/xen/bitops.h | 11 +++
xen/include/xen/domain.h | 3 +
xen/include/xen/event.h | 2 +-
xen/include/xen/mm.h | 7 ++
xen/include/xen/sched.h | 3 +
xen/include/xen/softirq.h | 2 +-
xen/xsm/xsm_policy.c | 2 +-
38 files changed, 674 insertions(+), 190 deletions(-)
create mode 100644 xen/arch/arm/psci.c
create mode 100644 xen/include/asm-arm/psci.h
Cheers,
Stefano
Hi all,
this patch series implement guest SMP support for ARM, using the ARM
PSCI interface for secondary cpu bringup.
See each patch for a detailed changelog.
Ian Campbell (1):
xen/arm: trap SMC instructions and inject an UND exception
Stefano Stabellini (14):
xen/arm: basic PSCI support, implement cpu_on and cpu_off
xen/arm: allocate secondaries dom0 vcpus
xen: move for_each_set_bit to xen/bitops.h
xen/arm: support for guest SGI
xen/arm: implement arch_vmap_virt_end
xen/arm: compile and initialize vmap
xen/arm: implement map_domain_page_global and unmap_domain_page_global
xen: move VCPUOP_register_vcpu_info to common code
xen/arm: support VCPUOP_register_vcpu_info.
xen/arm: send IPIs to inject irqs into guest vcpus running on different
pcpus
xen/arm: run the vtimer Xen timers on the pcpu the vcpu is running on
xen/arm: initialize virt_timer and phys_timer with the same values on all
vcpus
xen/arm: clear pending irq queues on do_psci_cpu_on
xen/arm: initialize vtimer offset to CNTPCT
xen/arch/arm/Makefile | 1 +
xen/arch/arm/domain.c | 16 ++++
xen/arch/arm/domain_build.c | 14 +++-
xen/arch/arm/gic.c | 12 +++
xen/arch/arm/mm.c | 132 ++++++++++++++++++++++++++++++--
xen/arch/arm/psci.c | 79 ++++++++++++++++++++
xen/arch/arm/setup.c | 3 +
xen/arch/arm/traps.c | 107 ++++++++++++++++++++++++++-
xen/arch/arm/vgic.c | 93 ++++++++++++++++++++++--
xen/arch/arm/vtimer.c | 29 +++++---
xen/arch/arm/vtimer.h | 1 +
xen/arch/x86/domain.c | 113 ----------------------------
xen/arch/x86/i8259.c | 2 +-
xen/arch/x86/mpparse.c | 2 +-
xen/arch/x86/setup.c | 2 +-
xen/arch/x86/traps.c | 2 +-
xen/common/domain.c | 111 +++++++++++++++++++++++++++
xen/include/asm-arm/arm32/processor.h | 4 +-
xen/include/asm-arm/config.h | 4 +-
xen/include/asm-arm/domain.h | 24 ++++--
xen/include/asm-arm/gic.h | 17 +++--
xen/include/asm-arm/hypercall.h | 2 +
xen/include/asm-arm/page.h | 3 +
xen/include/asm-arm/processor.h | 8 ++
xen/include/asm-arm/psci.h | 24 ++++++
xen/include/asm-x86/bitops.h | 11 ---
xen/include/asm-x86/domain.h | 3 -
xen/include/asm-x86/page.h | 8 --
xen/include/asm-x86/smp.h | 2 +-
xen/include/asm-x86/system.h | 2 +-
xen/include/public/arch-arm.h | 3 +
xen/include/xen/bitops.h | 11 +++
xen/include/xen/domain.h | 3 +
xen/include/xen/event.h | 2 +-
xen/include/xen/mm.h | 7 ++
xen/include/xen/sched.h | 3 +
xen/include/xen/softirq.h | 2 +-
xen/xsm/xsm_policy.c | 2 +-
38 files changed, 674 insertions(+), 190 deletions(-)
create mode 100644 xen/arch/arm/psci.c
create mode 100644 xen/include/asm-arm/psci.h
Cheers,
Stefano
Stefano Stabellini
2013-May-07 14:12 UTC
[PATCH v7 01/15] xen/arm: trap SMC instructions and inject an UND exception
From: Ian Campbell <ian.campbell@citrix.com>
Currently only handles 32 bit guests. The 64-bit exception model is
considerably different.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
xen/arch/arm/traps.c | 56 ++++++++++++++++++++++++++++++++-
xen/include/asm-arm/arm32/processor.h | 4 ++-
xen/include/asm-arm/processor.h | 8 +++++
xen/include/public/arch-arm.h | 1 +
4 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index da53675..55cbb90 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -61,7 +61,7 @@ void __cpuinit init_traps(void)
WRITE_SYSREG((vaddr_t)hyp_traps_vector, VBAR_EL2);
/* Setup hypervisor traps */
- WRITE_SYSREG(HCR_PTW|HCR_BSU_OUTER|HCR_AMO|HCR_IMO|HCR_VM|HCR_TWI,
HCR_EL2);
+ WRITE_SYSREG(HCR_PTW|HCR_BSU_OUTER|HCR_AMO|HCR_IMO|HCR_VM|HCR_TWI|HCR_TSC,
HCR_EL2);
isb();
}
@@ -241,6 +241,54 @@ void panic_PAR(uint64_t par)
panic("Error during Hypervisor-to-physical address
translation\n");
}
+static void cpsr_switch_mode(struct cpu_user_regs *regs, int mode)
+{
+ uint32_t sctlr = READ_SYSREG32(SCTLR_EL1);
+
+ regs->cpsr &=
~(PSR_MODE_MASK|PSR_IT_MASK|PSR_JAZELLE|PSR_BIG_ENDIAN|PSR_THUMB);
+
+ regs->cpsr |= mode;
+ regs->cpsr |= PSR_IRQ_MASK;
+ if (sctlr & SCTLR_TE)
+ regs->cpsr |= PSR_THUMB;
+ if (sctlr & SCTLR_EE)
+ regs->cpsr |= PSR_BIG_ENDIAN;
+}
+
+static vaddr_t exception_handler(vaddr_t offset)
+{
+ uint32_t sctlr = READ_SYSREG32(SCTLR_EL1);
+
+ if (sctlr & SCTLR_V)
+ return 0xffff0000 + offset;
+ else /* always have security exceptions */
+ return READ_SYSREG(VBAR_EL1) + offset;
+}
+
+/* Injects an Undefined Instruction exception into the current vcpu,
+ * PC is the exact address of the faulting instruction (without
+ * pipeline adjustments). See TakeUndefInstrException pseudocode in
+ * ARM.
+ */
+static void inject_undef_exception(struct cpu_user_regs *regs,
+ register_t preferred_return)
+{
+ uint32_t spsr = regs->cpsr;
+ int is_thumb = (regs->cpsr & PSR_THUMB);
+ /* Saved PC points to the instruction past the faulting instruction. */
+ uint32_t return_offset = is_thumb ? 2 : 4;
+
+ /* Update processor mode */
+ cpsr_switch_mode(regs, PSR_MODE_UND);
+
+ /* Update banked registers */
+ regs->spsr_und = spsr;
+ regs->lr_und = preferred_return + return_offset;
+
+ /* Branch to exception vector */
+ regs->pc32 = exception_handler(VECTOR32_UND);
+}
+
struct reg_ctxt {
uint32_t sctlr, tcr;
uint64_t ttbr0, ttbr1;
@@ -956,6 +1004,12 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs
*regs)
goto bad_trap;
do_cp15_64(regs, hsr);
break;
+ case HSR_EC_SMC:
+ /* PC32 already contains the preferred exception return
+ * address, so no need to adjust here.
+ */
+ inject_undef_exception(regs, regs->pc32);
+ break;
case HSR_EC_HVC:
if ( (hsr.iss & 0xff00) == 0xff00 )
return do_debug_trap(regs, hsr.iss & 0x00ff);
diff --git a/xen/include/asm-arm/arm32/processor.h
b/xen/include/asm-arm/arm32/processor.h
index cd79170..d26fc85 100644
--- a/xen/include/asm-arm/arm32/processor.h
+++ b/xen/include/asm-arm/arm32/processor.h
@@ -31,7 +31,9 @@ struct cpu_user_regs
uint32_t lr_usr;
};
- uint32_t pc; /* Return IP */
+ union { /* Return IP, pc32 is used to allow code to be common with 64-bit
*/
+ uint32_t pc, pc32;
+ };
uint32_t cpsr; /* Return mode */
uint32_t pad0; /* Doubleword-align the kernel half of the frame */
diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h
index 1681ebf..1c9d793 100644
--- a/xen/include/asm-arm/processor.h
+++ b/xen/include/asm-arm/processor.h
@@ -85,6 +85,7 @@
#define HSR_EC_CP14_64 0x0c
#define HSR_EC_SVC 0x11
#define HSR_EC_HVC 0x12
+#define HSR_EC_SMC 0x13
#define HSR_EC_INSTR_ABORT_GUEST 0x20
#define HSR_EC_INSTR_ABORT_HYP 0x21
#define HSR_EC_DATA_ABORT_GUEST 0x24
@@ -342,6 +343,13 @@ union hsr {
#define CNTx_CTL_MASK (1u<<1) /* Mask IRQ */
#define CNTx_CTL_PENDING (1u<<2) /* IRQ pending */
+/* Exception Vector offsets */
+#define VECTOR32_RST 0
+#define VECTOR32_UND 4
+#define VECTOR32_SVC 8
+#define VECTOR32_PABT 12
+#define VECTOR32_DABT 16
+
#if defined(CONFIG_ARM_32)
# include <asm/arm32/processor.h>
#elif defined(CONFIG_ARM_64)
diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h
index 2f5ce18..cea12b2 100644
--- a/xen/include/public/arch-arm.h
+++ b/xen/include/public/arch-arm.h
@@ -234,6 +234,7 @@ typedef uint64_t xen_callback_t;
#define PSR_IRQ_MASK (1<<7) /* Interrupt mask */
#define PSR_ABT_MASK (1<<8) /* Asynchronous Abort mask */
#define PSR_BIG_ENDIAN (1<<9) /* Big Endian Mode */
+#define PSR_IT_MASK (0x0600fc00) /* Thumb If-Then Mask */
#define PSR_JAZELLE (1<<24) /* Jazelle Mode */
#endif /* __XEN_PUBLIC_ARCH_ARM_H__ */
--
1.7.2.5
Stefano Stabellini
2013-May-07 14:12 UTC
[PATCH v7 02/15] xen/arm: basic PSCI support, implement cpu_on and cpu_off
Implement support for ARM Power State Coordination Interface, PSCI in
short. Support only HVC calls.
Changes in v7:
- replace hard tabs;
- uint32_t/register_t in psci.h function prototypes.
Changes in v6:
- do not trap SMC after all.
Changes in v5:
- remove duplicate is_initialised = 1 from arch_set_info_guest.
Changes in v3:
- move do_psci_* to psci.c;
- trap SMC;
- return PSCI error codes;
- remove Linux boot procotol from secondary cpus;
- implement cpu_off;
- use register_t as second parameter for arm_psci_fn_t;
- unconditionally reset the guest vcpu context on cpu_on.
Changes in v2:
- set is_initialised in arch_set_info_guest;
- zero vcpu_guest_context before using it.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/arch/arm/Makefile | 1 +
xen/arch/arm/domain_build.c | 2 +-
xen/arch/arm/psci.c | 76 +++++++++++++++++++++++++++++++++++++++++
xen/arch/arm/traps.c | 45 ++++++++++++++++++++++++
xen/include/asm-arm/psci.h | 24 +++++++++++++
xen/include/public/arch-arm.h | 2 +
6 files changed, 149 insertions(+), 1 deletions(-)
create mode 100644 xen/arch/arm/psci.c
create mode 100644 xen/include/asm-arm/psci.h
diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index 2106a4f..8f75044 100644
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -5,6 +5,7 @@ subdir-y += platforms
obj-y += early_printk.o
obj-y += cpu.o
obj-y += domain.o
+obj-y += psci.o
obj-y += domctl.o
obj-y += sysctl.o
obj-y += domain_build.o
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 17aadcf..1b2a4fa 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -419,7 +419,7 @@ int construct_dom0(struct domain *d)
regs->pc = (uint32_t)kinfo.entry;
- regs->cpsr = PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_SVC;
+ regs->cpsr = PSR_GUEST_INIT;
#ifdef CONFIG_ARM_64
d->arch.type = kinfo.type;
diff --git a/xen/arch/arm/psci.c b/xen/arch/arm/psci.c
new file mode 100644
index 0000000..1761791
--- /dev/null
+++ b/xen/arch/arm/psci.c
@@ -0,0 +1,76 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <xen/errno.h>
+#include <xen/sched.h>
+#include <xen/types.h>
+
+#include <asm/current.h>
+#include <asm/psci.h>
+
+int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point)
+{
+ struct vcpu *v;
+ struct domain *d = current->domain;
+ struct vcpu_guest_context *ctxt;
+ int rc;
+
+ if ( (vcpuid < 0) || (vcpuid >= MAX_VIRT_CPUS) )
+ return PSCI_EINVAL;
+
+ if ( vcpuid >= d->max_vcpus || (v = d->vcpu[vcpuid]) == NULL )
+ return PSCI_EINVAL;
+
+ if ( (ctxt = alloc_vcpu_guest_context()) == NULL )
+ return PSCI_DENIED;
+
+ memset(ctxt, 0, sizeof(*ctxt));
+ ctxt->user_regs.pc64 = (u64) entry_point;
+ ctxt->sctlr = SCTLR_BASE;
+ ctxt->ttbr0 = 0;
+ ctxt->ttbr1 = 0;
+ ctxt->ttbcr = 0; /* Defined Reset Value */
+ ctxt->user_regs.cpsr = PSR_GUEST_INIT;
+ ctxt->flags = VGCF_online;
+
+ domain_lock(d);
+ rc = arch_set_info_guest(v, ctxt);
+ free_vcpu_guest_context(ctxt);
+
+ if ( rc < 0 )
+ {
+ domain_unlock(d);
+ return PSCI_DENIED;
+ }
+ domain_unlock(d);
+
+ vcpu_wake(v);
+
+ return PSCI_SUCCESS;
+}
+
+int do_psci_cpu_off(uint32_t power_state)
+{
+ struct vcpu *v = current;
+ if ( !test_and_set_bit(_VPF_down, &v->pause_flags) )
+ vcpu_sleep_nosync(v);
+ return PSCI_SUCCESS;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index 55cbb90..c743f2c 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -34,6 +34,7 @@
#include <asm/event.h>
#include <asm/regs.h>
#include <asm/cpregs.h>
+#include <asm/psci.h>
#include "io.h"
#include "vtimer.h"
@@ -666,6 +667,29 @@ static arm_hypercall_t arm_hypercall_table[] = {
HYPERCALL(grant_table_op, 3),
};
+#define __PSCI_cpu_suspend 0
+#define __PSCI_cpu_off 1
+#define __PSCI_cpu_on 2
+#define __PSCI_migrate 3
+
+typedef int (*arm_psci_fn_t)(uint32_t, register_t);
+
+typedef struct {
+ arm_psci_fn_t fn;
+ int nr_args;
+} arm_psci_t;
+
+#define PSCI(_name, _nr_args) \
+ [ __PSCI_ ## _name ] = { \
+ .fn = (arm_psci_fn_t) &do_psci_ ## _name, \
+ .nr_args = _nr_args, \
+ }
+
+static arm_psci_t arm_psci_table[] = {
+ PSCI(cpu_off, 1),
+ PSCI(cpu_on, 2),
+};
+
static void do_debug_trap(struct cpu_user_regs *regs, unsigned int code)
{
register_t *r;
@@ -695,6 +719,25 @@ static void do_debug_trap(struct cpu_user_regs *regs,
unsigned int code)
}
}
+static void do_trap_psci(struct cpu_user_regs *regs)
+{
+ arm_psci_fn_t psci_call = NULL;
+
+ if ( regs->r0 >= ARRAY_SIZE(arm_psci_table) )
+ {
+ domain_crash_synchronous();
+ return;
+ }
+
+ psci_call = arm_psci_table[regs->r0].fn;
+ if ( psci_call == NULL )
+ {
+ domain_crash_synchronous();
+ return;
+ }
+ regs->r0 = psci_call(regs->r1, regs->r2);
+}
+
static void do_trap_hypercall(struct cpu_user_regs *regs, unsigned long iss)
{
arm_hypercall_fn_t call = NULL;
@@ -1013,6 +1056,8 @@ asmlinkage void do_trap_hypervisor(struct cpu_user_regs
*regs)
case HSR_EC_HVC:
if ( (hsr.iss & 0xff00) == 0xff00 )
return do_debug_trap(regs, hsr.iss & 0x00ff);
+ if ( hsr.iss == 0 )
+ return do_trap_psci(regs);
do_trap_hypercall(regs, hsr.iss);
break;
case HSR_EC_DATA_ABORT_GUEST:
diff --git a/xen/include/asm-arm/psci.h b/xen/include/asm-arm/psci.h
new file mode 100644
index 0000000..67d4c35
--- /dev/null
+++ b/xen/include/asm-arm/psci.h
@@ -0,0 +1,24 @@
+#ifndef __ASM_PSCI_H__
+#define __ASM_PSCI_H__
+
+#define PSCI_SUCCESS 0
+#define PSCI_ENOSYS -1
+#define PSCI_EINVAL -2
+#define PSCI_DENIED -3
+
+int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point);
+int do_psci_cpu_off(uint32_t power_state);
+int do_psci_cpu_suspend(uint32_t power_state, register_t entry_point);
+int do_psci_migrate(uint32_t vcpuid);
+
+#endif /* __ASM_PSCI_H__ */
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h
index cea12b2..8aa62d3 100644
--- a/xen/include/public/arch-arm.h
+++ b/xen/include/public/arch-arm.h
@@ -237,6 +237,8 @@ typedef uint64_t xen_callback_t;
#define PSR_IT_MASK (0x0600fc00) /* Thumb If-Then Mask */
#define PSR_JAZELLE (1<<24) /* Jazelle Mode */
+#define PSR_GUEST_INIT (PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_SVC)
+
#endif /* __XEN_PUBLIC_ARCH_ARM_H__ */
/*
--
1.7.2.5
Stefano Stabellini
2013-May-07 14:12 UTC
[PATCH v7 03/15] xen/arm: allocate secondaries dom0 vcpus
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Changes in v4:
- check for alloc_vcpu errors.
---
xen/arch/arm/domain_build.c | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 1b2a4fa..8748272 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -363,7 +363,7 @@ static void dtb_load(struct kernel_info *kinfo)
int construct_dom0(struct domain *d)
{
struct kernel_info kinfo = {};
- int rc;
+ int rc, i, cpu;
struct vcpu *v = d->vcpu[0];
struct cpu_user_regs *regs =
&v->arch.cpu_info->guest_cpu_user_regs;
@@ -452,6 +452,16 @@ int construct_dom0(struct domain *d)
}
#endif
+ for ( i = 1, cpu = 0; i < d->max_vcpus; i++ )
+ {
+ cpu = cpumask_cycle(cpu, &cpu_online_map);
+ if ( alloc_vcpu(d, i, cpu) == NULL )
+ {
+ printk("Failed to allocate dom0 vcpu %d on pcpu %d\n", i,
cpu);
+ break;
+ }
+ }
+
local_abort_enable();
return 0;
--
1.7.2.5
Stefano Stabellini
2013-May-07 14:12 UTC
[PATCH v7 04/15] xen: move for_each_set_bit to xen/bitops.h
Move for_each_set_bit from asm-x86/bitops.h to xen/bitops.h.
Replace #include <asm/bitops.h> with #include <xen/bitops.h>
everywhere.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
CC: keir@xen.org
CC: JBeulich@suse.com
---
xen/arch/x86/i8259.c | 2 +-
xen/arch/x86/mpparse.c | 2 +-
xen/arch/x86/setup.c | 2 +-
xen/arch/x86/traps.c | 2 +-
xen/include/asm-x86/bitops.h | 11 -----------
xen/include/asm-x86/smp.h | 2 +-
xen/include/asm-x86/system.h | 2 +-
xen/include/xen/bitops.h | 11 +++++++++++
xen/include/xen/event.h | 2 +-
xen/include/xen/softirq.h | 2 +-
xen/xsm/xsm_policy.c | 2 +-
11 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c
index b537c5f..6fdcce8 100644
--- a/xen/arch/x86/i8259.c
+++ b/xen/arch/x86/i8259.c
@@ -16,7 +16,7 @@
#include <asm/system.h>
#include <asm/io.h>
#include <asm/desc.h>
-#include <asm/bitops.h>
+#include <xen/bitops.h>
#include <xen/delay.h>
#include <asm/apic.h>
#include <asm/asm_defns.h>
diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c
index 97ab5d3..97d34bc 100644
--- a/xen/arch/x86/mpparse.c
+++ b/xen/arch/x86/mpparse.c
@@ -22,7 +22,7 @@
#include <xen/efi.h>
#include <xen/sched.h>
-#include <asm/bitops.h>
+#include <xen/bitops.h>
#include <asm/smp.h>
#include <asm/acpi.h>
#include <asm/mtrr.h>
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 43301a5..744335d 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -29,7 +29,7 @@
#include <public/version.h>
#include <compat/platform.h>
#include <compat/xen.h>
-#include <asm/bitops.h>
+#include <xen/bitops.h>
#include <asm/smp.h>
#include <asm/processor.h>
#include <asm/mpspec.h>
diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index d36eddd..5200940 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -52,7 +52,7 @@
#include <asm/system.h>
#include <asm/io.h>
#include <asm/atomic.h>
-#include <asm/bitops.h>
+#include <xen/bitops.h>
#include <asm/desc.h>
#include <asm/debugreg.h>
#include <asm/smp.h>
diff --git a/xen/include/asm-x86/bitops.h b/xen/include/asm-x86/bitops.h
index c3cbd26..f5a84ef 100644
--- a/xen/include/asm-x86/bitops.h
+++ b/xen/include/asm-x86/bitops.h
@@ -368,17 +368,6 @@ static inline unsigned int __scanbit(unsigned long val,
unsigned long max)
__find_next_zero_bit(addr,size,off)))
/**
- * for_each_set_bit - iterate over every set bit in a memory region
- * @bit: The integer iterator
- * @addr: The address to base the search on
- * @size: The maximum size to search
- */
-#define for_each_set_bit(bit, addr, size) \
- for ( (bit) = find_first_bit(addr, size); \
- (bit) < (size); \
- (bit) = find_next_bit(addr, size, (bit) + 1) )
-
-/**
* find_first_set_bit - find the first set bit in @word
* @word: the word to search
*
diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h
index 301f8c7..81f8610 100644
--- a/xen/include/asm-x86/smp.h
+++ b/xen/include/asm-x86/smp.h
@@ -12,7 +12,7 @@
#endif
#ifndef __ASSEMBLY__
-#include <asm/bitops.h>
+#include <xen/bitops.h>
#include <asm/mpspec.h>
#endif
diff --git a/xen/include/asm-x86/system.h b/xen/include/asm-x86/system.h
index b0876d6..6ab7d56 100644
--- a/xen/include/asm-x86/system.h
+++ b/xen/include/asm-x86/system.h
@@ -2,7 +2,7 @@
#define __ASM_SYSTEM_H
#include <xen/lib.h>
-#include <asm/bitops.h>
+#include <xen/bitops.h>
#define read_segment_register(name) \
({ u16 __sel; \
diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h
index c6a78b6..6054155 100644
--- a/xen/include/xen/bitops.h
+++ b/xen/include/xen/bitops.h
@@ -182,4 +182,15 @@ static inline __u32 ror32(__u32 word, unsigned int shift)
#define __L16(_x) (((_x) & 0x0000ff00) ? ( 8 + __L8( (_x)>> 8)) :
__L8( _x))
#define LOG_2(_x) (((_x) & 0xffff0000) ? (16 + __L16((_x)>>16)) :
__L16(_x))
+/**
+ * for_each_set_bit - iterate over every set bit in a memory region
+ * @bit: The integer iterator
+ * @addr: The address to base the search on
+ * @size: The maximum size to search
+ */
+#define for_each_set_bit(bit, addr, size) \
+ for ( (bit) = find_first_bit(addr, size); \
+ (bit) < (size); \
+ (bit) = find_next_bit(addr, size, (bit) + 1) )
+
#endif
diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h
index 71c3e92..4ac39ad 100644
--- a/xen/include/xen/event.h
+++ b/xen/include/xen/event.h
@@ -12,7 +12,7 @@
#include <xen/sched.h>
#include <xen/smp.h>
#include <xen/softirq.h>
-#include <asm/bitops.h>
+#include <xen/bitops.h>
#include <asm/event.h>
/*
diff --git a/xen/include/xen/softirq.h b/xen/include/xen/softirq.h
index 193351d..0c0d481 100644
--- a/xen/include/xen/softirq.h
+++ b/xen/include/xen/softirq.h
@@ -13,7 +13,7 @@ enum {
#include <xen/lib.h>
#include <xen/smp.h>
-#include <asm/bitops.h>
+#include <xen/bitops.h>
#include <asm/current.h>
#include <asm/hardirq.h>
#include <asm/softirq.h>
diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c
index 65be61d..cad7964 100644
--- a/xen/xsm/xsm_policy.c
+++ b/xen/xsm/xsm_policy.c
@@ -20,7 +20,7 @@
#include <xsm/xsm.h>
#include <xen/multiboot.h>
-#include <asm/bitops.h>
+#include <xen/bitops.h>
char *__initdata policy_buffer = NULL;
u32 __initdata policy_size = 0;
--
1.7.2.5
Trap writes to GICD_SGIR, parse the requests, inject SGIs into the right
guest vcpu.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Changes in v6:
- added missing break.
Changes in v5:
- assert virtual_irq < 16;
- align GICD defines;
- test for _VPF_down in pause_flags before adding a vcpu to the mask.
Changes in v4:
- move the code to a separate function;
- use gdprintk for debugging output;
- make use of PRIregister;
- replace the cpumask with a bitmask;
- move the virtual_irq check outside the loop;
- ignore non-existent target vcpus.
Changes in v3:
- make use of cpumask_from_bitmap.
---
xen/arch/arm/vgic.c | 73 ++++++++++++++++++++++++++++++++++++++++++--
xen/include/asm-arm/gic.h | 15 +++++----
2 files changed, 78 insertions(+), 10 deletions(-)
diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index 99e7280..5d242c8 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -17,6 +17,7 @@
* GNU General Public License for more details.
*/
+#include <xen/bitops.h>
#include <xen/config.h>
#include <xen/lib.h>
#include <xen/init.h>
@@ -368,6 +369,71 @@ static void vgic_enable_irqs(struct vcpu *v, uint32_t r,
int n)
}
}
+static inline int is_vcpu_running(struct domain *d, int vcpuid)
+{
+ struct vcpu *v;
+
+ if ( vcpuid >= d->max_vcpus )
+ return 0;
+
+ v = d->vcpu[vcpuid];
+ if ( v == NULL )
+ return 0;
+ if (test_bit(_VPF_down, &v->pause_flags) )
+ return 0;
+
+ return 1;
+}
+
+static int vgic_to_sgi(struct vcpu *v, register_t sgir)
+{
+ struct domain *d = v->domain;
+ int virtual_irq;
+ int filter;
+ int vcpuid;
+ int i;
+ unsigned long vcpu_mask = 0;
+
+ ASSERT(d->max_vcpus < 8*sizeof(vcpu_mask));
+
+ filter = (sgir & GICD_SGI_TARGET_LIST_MASK);
+ virtual_irq = (sgir & GICD_SGI_INTID_MASK);
+ ASSERT( virtual_irq < 16 );
+
+ switch ( filter )
+ {
+ case GICD_SGI_TARGET_LIST:
+ vcpu_mask = (sgir & GICD_SGI_TARGET_MASK) >>
GICD_SGI_TARGET_SHIFT;
+ break;
+ case GICD_SGI_TARGET_OTHERS:
+ for ( i = 0; i < d->max_vcpus; i++ )
+ {
+ if ( i != current->vcpu_id && is_vcpu_running(d, i)
)
+ set_bit(i, &vcpu_mask);
+ }
+ break;
+ case GICD_SGI_TARGET_SELF:
+ set_bit(current->vcpu_id, &vcpu_mask);
+ break;
+ default:
+ gdprintk(XENLOG_WARNING, "vGICD: unhandled GICD_SGIR write
%"PRIregister" with wrong TargetListFilter field\n",
+ sgir);
+ return 0;
+ }
+
+ for_each_set_bit( vcpuid, &vcpu_mask, d->max_vcpus )
+ {
+ if ( !is_vcpu_running(d, vcpuid) )
+ {
+ gdprintk(XENLOG_WARNING, "vGICD: GICD_SGIR write
r=%"PRIregister" vcpu_mask=%lx, wrong CPUTargetList\n",
+ sgir, vcpu_mask);
+ continue;
+ }
+ vgic_vcpu_inject_irq(d->vcpu[vcpuid], virtual_irq, 1);
+ }
+ return 1;
+}
+
static int vgic_distr_mmio_write(struct vcpu *v, mmio_info_t *info)
{
struct hsr_dabt dabt = info->dabt;
@@ -498,10 +564,9 @@ static int vgic_distr_mmio_write(struct vcpu *v,
mmio_info_t *info)
goto write_ignore;
case GICD_SGIR:
- if ( dabt.size != 2 ) goto bad_width;
- printk("vGICD: unhandled write %#"PRIregister" to
ICFGR%d\n",
- *r, gicd_reg - GICD_ICFGR);
- return 0;
+ if ( dabt.size != 2 )
+ goto bad_width;
+ return vgic_to_sgi(v, *r);
case GICD_CPENDSGIR ... GICD_CPENDSGIRN:
if ( dabt.size != 0 && dabt.size != 2 ) goto bad_width;
diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
index 92711d5..bf2d0a0 100644
--- a/xen/include/asm-arm/gic.h
+++ b/xen/include/asm-arm/gic.h
@@ -51,12 +51,15 @@
#define GICD_SPENDSGIRN (0xF2C/4)
#define GICD_ICPIDR2 (0xFE8/4)
-#define GICD_SGI_TARGET_LIST (0UL<<24)
-#define GICD_SGI_TARGET_OTHERS (1UL<<24)
-#define GICD_SGI_TARGET_SELF (2UL<<24)
-#define GICD_SGI_TARGET_SHIFT (16)
-#define GICD_SGI_TARGET_MASK (0xFFUL<<GICD_SGI_TARGET_SHIFT)
-#define GICD_SGI_GROUP1 (1UL<<15)
+#define GICD_SGI_TARGET_LIST_SHIFT (24)
+#define GICD_SGI_TARGET_LIST_MASK (0x3UL <<
GICD_SGI_TARGET_LIST_SHIFT)
+#define GICD_SGI_TARGET_LIST (0UL<<GICD_SGI_TARGET_LIST_SHIFT)
+#define GICD_SGI_TARGET_OTHERS (1UL<<GICD_SGI_TARGET_LIST_SHIFT)
+#define GICD_SGI_TARGET_SELF (2UL<<GICD_SGI_TARGET_LIST_SHIFT)
+#define GICD_SGI_TARGET_SHIFT (16)
+#define GICD_SGI_TARGET_MASK (0xFFUL<<GICD_SGI_TARGET_SHIFT)
+#define GICD_SGI_GROUP1 (1UL<<15)
+#define GICD_SGI_INTID_MASK (0xFUL)
#define GICC_CTLR (0x0000/4)
#define GICC_PMR (0x0004/4)
--
1.7.2.5
Stefano Stabellini
2013-May-07 14:12 UTC
[PATCH v7 06/15] xen/arm: implement arch_vmap_virt_end
Move virt_start out of ioremap and rename it to early_vmap_start.
Implement arch_vmap_virt_end by returning early_vmap_start.
Allocate virtual addresses in early_ioremap from top to bottom so that
later on when we initialize vmap, we can return the end of the vmap
address space (the last address allocated by early_ioremap).
Changes in v4:
- merge with "early_ioremap: allocate virtual addresses from top to
bottom" patch;
- better commit message;
- declare early_vmap_start __initdata;
- use "& ~SECOND_MASK" instead of shifts.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/arch/arm/mm.c | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index 03492df..5c2fadc 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -560,31 +560,40 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t
pe)
* start has to be 2MB aligned.
* len has to be < EARLY_VMAP_VIRT_END - EARLY_VMAP_VIRT_START.
*/
+static __initdata unsigned long early_vmap_start = EARLY_VMAP_VIRT_END;
void* __init early_ioremap(paddr_t start, size_t len, unsigned attributes)
{
- static unsigned long virt_start = EARLY_VMAP_VIRT_START;
- unsigned long ret_addr = virt_start;
paddr_t end = start + len;
+ unsigned long map_start;
+
+ len = (len + SECOND_SIZE - 1) & ~SECOND_MASK;
+ early_vmap_start -= len;
ASSERT(!(start & (~SECOND_MASK)));
- ASSERT(!(virt_start & (~SECOND_MASK)));
+ ASSERT(!(early_vmap_start & (~SECOND_MASK)));
/* The range we need to map is too big */
- if ( virt_start + len >= EARLY_VMAP_VIRT_END )
+ if ( early_vmap_start >= EARLY_VMAP_VIRT_START )
return NULL;
+ map_start = early_vmap_start;
while ( start < end )
{
lpae_t e = mfn_to_xen_entry(start >> PAGE_SHIFT);
e.pt.ai = attributes;
- write_pte(xen_second + second_table_offset(virt_start), e);
+ write_pte(xen_second + second_table_offset(map_start), e);
start += SECOND_SIZE;
- virt_start += SECOND_SIZE;
+ map_start += SECOND_SIZE;
}
- flush_xen_data_tlb_range_va(ret_addr, len);
+ flush_xen_data_tlb_range_va(early_vmap_start, len);
+
+ return (void*)early_vmap_start;
+}
- return (void*)ret_addr;
+void *__init arch_vmap_virt_end(void)
+{
+ return (void *)early_vmap_start;
}
enum mg { mg_clear, mg_ro, mg_rw, mg_rx };
--
1.7.2.5
Stefano Stabellini
2013-May-07 14:12 UTC
[PATCH v7 07/15] xen/arm: compile and initialize vmap
Rename EARLY_VMAP_VIRT_END and EARLY_VMAP_VIRT_START to
VMAP_VIRT_END and VMAP_VIRT_START.
Defining VMAP_VIRT_START triggers the compilation of common/vmap.c.
Define PAGE_HYPERVISOR and MAP_SMALL_PAGES (unused on ARM, because we
only support 4K pages so as a matter of fact it is always set).
Implement map_pages_to_xen and destroy_xen_mappings.
Call vm_init from start_xen.
Changes in v5:
- use alloc_xenheap_page;
- use pfn_to_paddr.
Changes in v4:
- remove flush_tlb_local() from create_xen_entries;
- return error if a mapping is already present.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/arch/arm/mm.c | 100 ++++++++++++++++++++++++++++++++++++++++-
xen/arch/arm/setup.c | 3 +
xen/include/asm-arm/config.h | 4 +-
xen/include/asm-arm/page.h | 3 +
xen/include/asm-x86/page.h | 8 ---
xen/include/xen/mm.h | 7 +++
6 files changed, 112 insertions(+), 13 deletions(-)
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index 5c2fadc..e40798f 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -33,6 +33,7 @@
#include <xen/err.h>
#include <asm/page.h>
#include <asm/current.h>
+#include <asm/flushtlb.h>
#include <public/memory.h>
#include <xen/sched.h>
#include <xsm/xsm.h>
@@ -558,9 +559,9 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t
pe)
/* Map the physical memory range start - start + len into virtual
* memory and return the virtual address of the mapping.
* start has to be 2MB aligned.
- * len has to be < EARLY_VMAP_VIRT_END - EARLY_VMAP_VIRT_START.
+ * len has to be < VMAP_VIRT_END - VMAP_VIRT_START.
*/
-static __initdata unsigned long early_vmap_start = EARLY_VMAP_VIRT_END;
+static __initdata unsigned long early_vmap_start = VMAP_VIRT_END;
void* __init early_ioremap(paddr_t start, size_t len, unsigned attributes)
{
paddr_t end = start + len;
@@ -573,7 +574,7 @@ void* __init early_ioremap(paddr_t start, size_t len,
unsigned attributes)
ASSERT(!(early_vmap_start & (~SECOND_MASK)));
/* The range we need to map is too big */
- if ( early_vmap_start >= EARLY_VMAP_VIRT_START )
+ if ( early_vmap_start >= VMAP_VIRT_START )
return NULL;
map_start = early_vmap_start;
@@ -596,6 +597,99 @@ void *__init arch_vmap_virt_end(void)
return (void *)early_vmap_start;
}
+static int create_xen_table(lpae_t *entry)
+{
+ void *p;
+ lpae_t pte;
+
+ p = alloc_xenheap_page();
+ if ( p == NULL )
+ return -ENOMEM;
+ clear_page(p);
+ pte = mfn_to_xen_entry(virt_to_mfn(p));
+ pte.pt.table = 1;
+ write_pte(entry, pte);
+ return 0;
+}
+
+enum xenmap_operation {
+ INSERT,
+ REMOVE
+};
+
+static int create_xen_entries(enum xenmap_operation op,
+ unsigned long virt,
+ unsigned long mfn,
+ unsigned long nr_mfns)
+{
+ int rc;
+ unsigned long addr = virt, addr_end = addr + nr_mfns * PAGE_SIZE;
+ lpae_t pte;
+ lpae_t *third = NULL;
+
+ for(; addr < addr_end; addr += PAGE_SIZE, mfn++)
+ {
+ if ( !xen_second[second_linear_offset(addr)].pt.valid ||
+ !xen_second[second_linear_offset(addr)].pt.table )
+ {
+ rc = create_xen_table(&xen_second[second_linear_offset(addr)]);
+ if ( rc < 0 ) {
+ printk("create_xen_entries: L2 failed\n");
+ goto out;
+ }
+ }
+
+ BUG_ON(!xen_second[second_linear_offset(addr)].pt.valid);
+
+ third =
__va(pfn_to_paddr(xen_second[second_linear_offset(addr)].pt.base));
+
+ switch ( op ) {
+ case INSERT:
+ if ( third[third_table_offset(addr)].pt.valid )
+ {
+ printk("create_xen_entries: trying to replace an
existing mapping addr=%lx mfn=%lx\n",
+ addr, mfn);
+ return -EINVAL;
+ }
+ pte = mfn_to_xen_entry(mfn);
+ pte.pt.table = 1;
+ write_pte(&third[third_table_offset(addr)], pte);
+ break;
+ case REMOVE:
+ if ( !third[third_table_offset(addr)].pt.valid )
+ {
+ printk("create_xen_entries: trying to remove a
non-existing mapping addr=%lx\n",
+ addr);
+ return -EINVAL;
+ }
+ pte.bits = 0;
+ write_pte(&third[third_table_offset(addr)], pte);
+ break;
+ default:
+ BUG();
+ }
+ }
+ flush_xen_data_tlb_range_va(virt, PAGE_SIZE * nr_mfns);
+
+ rc = 0;
+
+out:
+ return rc;
+}
+
+int map_pages_to_xen(unsigned long virt,
+ unsigned long mfn,
+ unsigned long nr_mfns,
+ unsigned int flags)
+{
+ ASSERT(flags == PAGE_HYPERVISOR);
+ return create_xen_entries(INSERT, virt, mfn, nr_mfns);
+}
+void destroy_xen_mappings(unsigned long v, unsigned long e)
+{
+ create_xen_entries(REMOVE, v, 0, (e - v) >> PAGE_SHIFT);
+}
+
enum mg { mg_clear, mg_ro, mg_rw, mg_rx };
static void set_pte_flags_on_range(const char *p, unsigned long l, enum mg mg)
{
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index cfe3d94..59646d6 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -34,6 +34,7 @@
#include <xen/keyhandler.h>
#include <xen/cpu.h>
#include <xen/pfn.h>
+#include <xen/vmap.h>
#include <asm/page.h>
#include <asm/current.h>
#include <asm/setup.h>
@@ -480,6 +481,8 @@ void __init start_xen(unsigned long boot_phys_offset,
console_init_postirq();
+ vm_init();
+
do_presmp_initcalls();
for_each_present_cpu ( i )
diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h
index e49aac1..98a3a43 100644
--- a/xen/include/asm-arm/config.h
+++ b/xen/include/asm-arm/config.h
@@ -95,12 +95,12 @@
#define FIXMAP_ADDR(n) (mk_unsigned_long(0x00400000) + (n) * PAGE_SIZE)
#define BOOT_MISC_VIRT_START mk_unsigned_long(0x00600000)
#define FRAMETABLE_VIRT_START mk_unsigned_long(0x02000000)
-#define EARLY_VMAP_VIRT_START mk_unsigned_long(0x10000000)
+#define VMAP_VIRT_START mk_unsigned_long(0x10000000)
#define XENHEAP_VIRT_START mk_unsigned_long(0x40000000)
#define DOMHEAP_VIRT_START mk_unsigned_long(0x80000000)
#define DOMHEAP_VIRT_END mk_unsigned_long(0xffffffff)
-#define EARLY_VMAP_VIRT_END XENHEAP_VIRT_START
+#define VMAP_VIRT_END XENHEAP_VIRT_START
#define HYPERVISOR_VIRT_START XEN_VIRT_START
#define DOMHEAP_ENTRIES 1024 /* 1024 2MB mapping slots */
diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h
index a6a312f..fd6946e 100644
--- a/xen/include/asm-arm/page.h
+++ b/xen/include/asm-arm/page.h
@@ -58,6 +58,9 @@
#define DEV_WC BUFFERABLE
#define DEV_CACHED WRITEBACK
+#define PAGE_HYPERVISOR (MATTR_MEM)
+#define MAP_SMALL_PAGES PAGE_HYPERVISOR
+
/*
* Stage 2 Memory Type.
*
diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h
index b2f3859..e53e1e5 100644
--- a/xen/include/asm-x86/page.h
+++ b/xen/include/asm-x86/page.h
@@ -338,14 +338,6 @@ l3_pgentry_t *virt_to_xen_l3e(unsigned long v);
extern void set_pdx_range(unsigned long smfn, unsigned long emfn);
-/* Map machine page range in Xen virtual address space. */
-int map_pages_to_xen(
- unsigned long virt,
- unsigned long mfn,
- unsigned long nr_mfns,
- unsigned int flags);
-void destroy_xen_mappings(unsigned long v, unsigned long e);
-
/* Convert between PAT/PCD/PWT embedded in PTE flags and 3-bit cacheattr. */
static inline uint32_t pte_flags_to_cacheattr(uint32_t flags)
{
diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h
index 28512fb..efc45c7 100644
--- a/xen/include/xen/mm.h
+++ b/xen/include/xen/mm.h
@@ -48,6 +48,13 @@ void *alloc_xenheap_pages(unsigned int order, unsigned int
memflags);
void free_xenheap_pages(void *v, unsigned int order);
#define alloc_xenheap_page() (alloc_xenheap_pages(0,0))
#define free_xenheap_page(v) (free_xenheap_pages(v,0))
+/* Map machine page range in Xen virtual address space. */
+int map_pages_to_xen(
+ unsigned long virt,
+ unsigned long mfn,
+ unsigned long nr_mfns,
+ unsigned int flags);
+void destroy_xen_mappings(unsigned long v, unsigned long e);
/* Claim handling */
unsigned long domain_adjust_tot_pages(struct domain *d, long pages);
--
1.7.2.5
Stefano Stabellini
2013-May-07 14:12 UTC
[PATCH v7 08/15] xen/arm: implement map_domain_page_global and unmap_domain_page_global
The implementation uses vmap and vunmap.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Changes in v3:
- use vmap/vunmap to implement un/map_domain_page_global.
---
xen/arch/arm/mm.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index e40798f..5c47355 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -36,6 +36,7 @@
#include <asm/flushtlb.h>
#include <public/memory.h>
#include <xen/sched.h>
+#include <xen/vmap.h>
#include <xsm/xsm.h>
struct domain *dom_xen, *dom_io, *dom_cow;
@@ -177,6 +178,16 @@ void clear_fixmap(unsigned map)
flush_xen_data_tlb_range_va(FIXMAP_ADDR(map), PAGE_SIZE);
}
+void *map_domain_page_global(unsigned long mfn)
+{
+ return vmap(&mfn, 1);
+}
+
+void unmap_domain_page_global(const void *va)
+{
+ vunmap(va);
+}
+
/* Map a page of domheap memory */
void *map_domain_page(unsigned long mfn)
{
--
1.7.2.5
Stefano Stabellini
2013-May-07 14:12 UTC
[PATCH v7 09/15] xen: move VCPUOP_register_vcpu_info to common code
Move the implementation of VCPUOP_register_vcpu_info from x86 specific
to commmon code.
Move vcpu_info_mfn from an arch specific vcpu sub-field to the common
vcpu struct.
Move the initialization of vcpu_info_mfn to common code.
Move unmap_vcpu_info and the call to unmap_vcpu_info at domain
destruction time to common code.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
CC: keir@xen.org
CC: JBeulich@suse.com
---
xen/arch/x86/domain.c | 113 ------------------------------------------
xen/common/domain.c | 111 +++++++++++++++++++++++++++++++++++++++++
xen/include/asm-x86/domain.h | 3 -
xen/include/xen/domain.h | 3 +
xen/include/xen/sched.h | 3 +
5 files changed, 117 insertions(+), 116 deletions(-)
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index 14b6d13..d1b6c64 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -387,8 +387,6 @@ int vcpu_initialise(struct vcpu *v)
vmce_init_vcpu(v);
- v->arch.vcpu_info_mfn = INVALID_MFN;
-
if ( is_hvm_domain(d) )
{
rc = hvm_vcpu_initialise(v);
@@ -954,99 +952,6 @@ void arch_vcpu_reset(struct vcpu *v)
}
}
-/*
- * Unmap the vcpu info page if the guest decided to place it somewhere
- * else. This is only used from arch_domain_destroy, so there''s no
- * need to do anything clever.
- */
-static void
-unmap_vcpu_info(struct vcpu *v)
-{
- unsigned long mfn;
-
- if ( v->arch.vcpu_info_mfn == INVALID_MFN )
- return;
-
- mfn = v->arch.vcpu_info_mfn;
- unmap_domain_page_global(v->vcpu_info);
-
- v->vcpu_info = &dummy_vcpu_info;
- v->arch.vcpu_info_mfn = INVALID_MFN;
-
- put_page_and_type(mfn_to_page(mfn));
-}
-
-/*
- * Map a guest page in and point the vcpu_info pointer at it. This
- * makes sure that the vcpu_info is always pointing at a valid piece
- * of memory, and it sets a pending event to make sure that a pending
- * event doesn''t get missed.
- */
-static int
-map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned offset)
-{
- struct domain *d = v->domain;
- void *mapping;
- vcpu_info_t *new_info;
- struct page_info *page;
- int i;
-
- if ( offset > (PAGE_SIZE - sizeof(vcpu_info_t)) )
- return -EINVAL;
-
- if ( v->arch.vcpu_info_mfn != INVALID_MFN )
- return -EINVAL;
-
- /* Run this command on yourself or on other offline VCPUS. */
- if ( (v != current) && !test_bit(_VPF_down, &v->pause_flags)
)
- return -EINVAL;
-
- page = get_page_from_gfn(d, gfn, NULL, P2M_ALLOC);
- if ( !page )
- return -EINVAL;
-
- if ( !get_page_type(page, PGT_writable_page) )
- {
- put_page(page);
- return -EINVAL;
- }
-
- mapping = __map_domain_page_global(page);
- if ( mapping == NULL )
- {
- put_page_and_type(page);
- return -ENOMEM;
- }
-
- new_info = (vcpu_info_t *)(mapping + offset);
-
- if ( v->vcpu_info == &dummy_vcpu_info )
- {
- memset(new_info, 0, sizeof(*new_info));
- __vcpu_info(v, new_info, evtchn_upcall_mask) = 1;
- }
- else
- {
- memcpy(new_info, v->vcpu_info, sizeof(*new_info));
- }
-
- v->vcpu_info = new_info;
- v->arch.vcpu_info_mfn = page_to_mfn(page);
-
- /* Set new vcpu_info pointer /before/ setting pending flags. */
- wmb();
-
- /*
- * Mark everything as being pending just to make sure nothing gets
- * lost. The domain will get a spurious event, but it can cope.
- */
- vcpu_info(v, evtchn_upcall_pending) = 1;
- for ( i = 0; i < BITS_PER_EVTCHN_WORD(d); i++ )
- set_bit(i, &vcpu_info(v, evtchn_pending_sel));
-
- return 0;
-}
-
long
arch_do_vcpu_op(
int cmd, struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg)
@@ -1083,22 +988,6 @@ arch_do_vcpu_op(
break;
}
- case VCPUOP_register_vcpu_info:
- {
- struct domain *d = v->domain;
- struct vcpu_register_vcpu_info info;
-
- rc = -EFAULT;
- if ( copy_from_guest(&info, arg, 1) )
- break;
-
- domain_lock(d);
- rc = map_vcpu_info(v, info.mfn, info.offset);
- domain_unlock(d);
-
- break;
- }
-
/*
* XXX Disable for 4.0.0: __update_vcpu_system_time() writes to the given
* virtual address even when running in another domain''s address
space.
@@ -2025,8 +1914,6 @@ int domain_relinquish_resources(struct domain *d)
* mappings.
*/
destroy_gdt(v);
-
- unmap_vcpu_info(v);
}
if ( d->arch.pv_domain.pirq_eoi_map != NULL )
diff --git a/xen/common/domain.c b/xen/common/domain.c
index ce45d66..d21909f 100644
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -33,6 +33,7 @@
#include <xen/xenoprof.h>
#include <xen/irq.h>
#include <asm/debugger.h>
+#include <asm/p2m.h>
#include <asm/processor.h>
#include <public/sched.h>
#include <public/sysctl.h>
@@ -142,6 +143,7 @@ struct vcpu *alloc_vcpu(
v->vcpu_info = ((vcpu_id < XEN_LEGACY_MAX_VCPUS)
? (vcpu_info_t *)&shared_info(d,
vcpu_info[vcpu_id])
: &dummy_vcpu_info);
+ v->vcpu_info_mfn = INVALID_MFN;
init_waitqueue_vcpu(v);
}
@@ -547,6 +549,7 @@ int rcu_lock_live_remote_domain_by_id(domid_t dom, struct
domain **d)
int domain_kill(struct domain *d)
{
int rc = 0;
+ struct vcpu *v;
if ( d == current->domain )
return -EINVAL;
@@ -571,6 +574,8 @@ int domain_kill(struct domain *d)
BUG_ON(rc != -EAGAIN);
break;
}
+ for_each_vcpu ( d, v )
+ unmap_vcpu_info(v);
d->is_dying = DOMDYING_dead;
/* Mem event cleanup has to go here because the rings
* have to be put before we call put_domain. */
@@ -896,6 +901,96 @@ void vcpu_reset(struct vcpu *v)
vcpu_unpause(v);
}
+/*
+ * Map a guest page in and point the vcpu_info pointer at it. This
+ * makes sure that the vcpu_info is always pointing at a valid piece
+ * of memory, and it sets a pending event to make sure that a pending
+ * event doesn''t get missed.
+ */
+int map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned offset)
+{
+ struct domain *d = v->domain;
+ void *mapping;
+ vcpu_info_t *new_info;
+ struct page_info *page;
+ int i;
+
+ if ( offset > (PAGE_SIZE - sizeof(vcpu_info_t)) )
+ return -EINVAL;
+
+ if ( v->vcpu_info_mfn != INVALID_MFN )
+ return -EINVAL;
+
+ /* Run this command on yourself or on other offline VCPUS. */
+ if ( (v != current) && !test_bit(_VPF_down, &v->pause_flags)
)
+ return -EINVAL;
+
+ page = get_page_from_gfn(d, gfn, NULL, P2M_ALLOC);
+ if ( !page )
+ return -EINVAL;
+
+ if ( !get_page_type(page, PGT_writable_page) )
+ {
+ put_page(page);
+ return -EINVAL;
+ }
+
+ mapping = __map_domain_page_global(page);
+ if ( mapping == NULL )
+ {
+ put_page_and_type(page);
+ return -ENOMEM;
+ }
+
+ new_info = (vcpu_info_t *)(mapping + offset);
+
+ if ( v->vcpu_info == &dummy_vcpu_info )
+ {
+ memset(new_info, 0, sizeof(*new_info));
+ __vcpu_info(v, new_info, evtchn_upcall_mask) = 1;
+ }
+ else
+ {
+ memcpy(new_info, v->vcpu_info, sizeof(*new_info));
+ }
+
+ v->vcpu_info = new_info;
+ v->vcpu_info_mfn = page_to_mfn(page);
+
+ /* Set new vcpu_info pointer /before/ setting pending flags. */
+ wmb();
+
+ /*
+ * Mark everything as being pending just to make sure nothing gets
+ * lost. The domain will get a spurious event, but it can cope.
+ */
+ vcpu_info(v, evtchn_upcall_pending) = 1;
+ for ( i = 0; i < BITS_PER_EVTCHN_WORD(d); i++ )
+ set_bit(i, &vcpu_info(v, evtchn_pending_sel));
+
+ return 0;
+}
+
+/*
+ * Unmap the vcpu info page if the guest decided to place it somewhere
+ * else. This is only used from arch_domain_destroy, so there''s no
+ * need to do anything clever.
+ */
+void unmap_vcpu_info(struct vcpu *v)
+{
+ unsigned long mfn;
+
+ if ( v->vcpu_info_mfn == INVALID_MFN )
+ return;
+
+ mfn = v->vcpu_info_mfn;
+ unmap_domain_page_global(v->vcpu_info);
+
+ v->vcpu_info = &dummy_vcpu_info;
+ v->vcpu_info_mfn = INVALID_MFN;
+
+ put_page_and_type(mfn_to_page(mfn));
+}
long do_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg)
{
@@ -1015,6 +1110,22 @@ long do_vcpu_op(int cmd, int vcpuid,
XEN_GUEST_HANDLE_PARAM(void) arg)
break;
+ case VCPUOP_register_vcpu_info:
+ {
+ struct domain *d = v->domain;
+ struct vcpu_register_vcpu_info info;
+
+ rc = -EFAULT;
+ if ( copy_from_guest(&info, arg, 1) )
+ break;
+
+ domain_lock(d);
+ rc = map_vcpu_info(v, info.mfn, info.offset);
+ domain_unlock(d);
+
+ break;
+ }
+
#ifdef VCPU_TRAP_NMI
case VCPUOP_send_nmi:
if ( !guest_handle_is_null(arg) )
diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h
index bdaf714..e7ed7c3 100644
--- a/xen/include/asm-x86/domain.h
+++ b/xen/include/asm-x86/domain.h
@@ -435,9 +435,6 @@ struct arch_vcpu
struct paging_vcpu paging;
- /* Guest-specified relocation of vcpu_info. */
- unsigned long vcpu_info_mfn;
-
uint32_t gdbsx_vcpu_event;
/* A secondary copy of the vcpu time info. */
diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h
index d4ac50f..d0263a9 100644
--- a/xen/include/xen/domain.h
+++ b/xen/include/xen/domain.h
@@ -52,6 +52,9 @@ void free_pirq_struct(void *);
int vcpu_initialise(struct vcpu *v);
void vcpu_destroy(struct vcpu *v);
+int map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned offset);
+void unmap_vcpu_info(struct vcpu *v);
+
int arch_domain_create(struct domain *d, unsigned int domcr_flags);
void arch_domain_destroy(struct domain *d);
diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index beadc42..7e129d9 100644
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -192,6 +192,9 @@ struct vcpu
struct waitqueue_vcpu *waitqueue_vcpu;
+ /* Guest-specified relocation of vcpu_info. */
+ unsigned long vcpu_info_mfn;
+
struct arch_vcpu arch;
};
--
1.7.2.5
Stefano Stabellini
2013-May-07 14:12 UTC
[PATCH v7 10/15] xen/arm: support VCPUOP_register_vcpu_info.
We don''t want to support the full vcpu_op hypercall interface, just
VCPUOP_register_vcpu_info: introduce an internal ARM-only
do_arm_vcpu_op function to filter out the vcpu_op hypercalls that
we don''t want to support.
Call do_arm_vcpu_op instead of do_vcpu_op from traps.c.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
CC: keir@xen.org
CC: JBeulich@suse.com
Changes in v4:
- introduce an HYPERCALL_ARM macro and use it for do_arm_vcpu_op.
Changes in v3:
- do not export all the vcpu_op hypercalls to ARM guests, only
VCPUOP_register_vcpu_info.
---
xen/arch/arm/domain.c | 13 +++++++++++++
xen/arch/arm/traps.c | 6 ++++++
xen/include/asm-arm/hypercall.h | 2 ++
3 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index 2af40a1..15dde1a 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -10,6 +10,7 @@
* GNU General Public License for more details.
*/
#include <xen/config.h>
+#include <xen/hypercall.h>
#include <xen/init.h>
#include <xen/lib.h>
#include <xen/sched.h>
@@ -628,6 +629,18 @@ void arch_dump_domain_info(struct domain *d)
}
}
+
+long do_arm_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg)
+{
+ switch ( cmd )
+ {
+ case VCPUOP_register_vcpu_info:
+ return do_vcpu_op(cmd, vcpuid, arg);
+ default:
+ return -EINVAL;
+ }
+}
+
long arch_do_vcpu_op(int cmd, struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg)
{
return -ENOSYS;
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index c743f2c..83a7fbc 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -653,6 +653,11 @@ typedef struct {
.nr_args = _nr_args, \
}
+#define HYPERCALL_ARM(_name, _nr_args) \
+ [ __HYPERVISOR_ ## _name ] = { \
+ .fn = (arm_hypercall_fn_t) &do_arm_ ## _name, \
+ .nr_args = _nr_args, \
+ }
static arm_hypercall_t arm_hypercall_table[] = {
HYPERCALL(memory_op, 2),
HYPERCALL(domctl, 1),
@@ -665,6 +670,7 @@ static arm_hypercall_t arm_hypercall_table[] = {
HYPERCALL(sysctl, 2),
HYPERCALL(hvm_op, 2),
HYPERCALL(grant_table_op, 3),
+ HYPERCALL_ARM(vcpu_op, 3),
};
#define __PSCI_cpu_suspend 0
diff --git a/xen/include/asm-arm/hypercall.h b/xen/include/asm-arm/hypercall.h
index 0833ec4..3327a96 100644
--- a/xen/include/asm-arm/hypercall.h
+++ b/xen/include/asm-arm/hypercall.h
@@ -4,6 +4,8 @@
#include <public/domctl.h> /* for arch_do_domctl */
int do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg);
+long do_arm_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg);
+
#endif /* __ASM_ARM_HYPERCALL_H__ */
/*
* Local variables:
--
1.7.2.5
Stefano Stabellini
2013-May-07 14:12 UTC
[PATCH v7 11/15] xen/arm: send IPIs to inject irqs into guest vcpus running on different pcpus
If we need to inject an irq into a VCPU that is running on a different
processor, we shouldn''t just enqueue the irq into the lr_pending and
inflight lists and wait for something to interrupt the guest execution.
Send an IPI to the target pcpu so that Xen can inject the new interrupt
returning to guest.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Changes in v4:
- check for is_running before vcpu_unblock;
- use smp_send_event_check_cpu instead of smp_send_event_check_mask.
---
xen/arch/arm/vgic.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index 5d242c8..0e9cc4a 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -648,6 +648,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,
int virtual)
struct vgic_irq_rank *rank = vgic_irq_rank(v, 8, idx);
struct pending_irq *iter, *n = irq_to_pending(v, irq);
unsigned long flags;
+ bool_t running;
spin_lock_irqsave(&v->arch.vgic.lock, flags);
@@ -683,7 +684,10 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,
int virtual)
out:
spin_unlock_irqrestore(&v->arch.vgic.lock, flags);
/* we have a new higher priority irq, inject it into the guest */
+ running = v->is_running;
vcpu_unblock(v);
+ if ( running && v != current )
+ smp_send_event_check_mask(cpumask_of(v->processor));
}
/*
--
1.7.2.5
Stefano Stabellini
2013-May-07 14:12 UTC
[PATCH v7 12/15] xen/arm: run the vtimer Xen timers on the pcpu the vcpu is running on
The Xen physical timer emulator and virtual timer driver use two
internal Xen timers: initialize them on the pcpu the vcpu is running on,
rather than the processor that it''s creating the vcpu.
On vcpu restore migrate the phys_timer and the virt_timer to the
pcpu the vcpu is running on.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Changes in v4:
- migrate Xen timers on virt_timer_restore.
---
xen/arch/arm/vtimer.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c
index 1cb365e..393aac3 100644
--- a/xen/arch/arm/vtimer.c
+++ b/xen/arch/arm/vtimer.c
@@ -48,7 +48,7 @@ int vcpu_vtimer_init(struct vcpu *v)
{
struct vtimer *t = &v->arch.phys_timer;
- init_timer(&t->timer, phys_timer_expired, t, smp_processor_id());
+ init_timer(&t->timer, phys_timer_expired, t, v->processor);
t->ctl = 0;
t->offset = NOW();
t->cval = NOW();
@@ -56,7 +56,7 @@ int vcpu_vtimer_init(struct vcpu *v)
t->v = v;
t = &v->arch.virt_timer;
- init_timer(&t->timer, virt_timer_expired, t, smp_processor_id());
+ init_timer(&t->timer, virt_timer_expired, t, v->processor);
t->ctl = 0;
t->offset = READ_SYSREG64(CNTVCT_EL0) + READ_SYSREG64(CNTVOFF_EL2);
t->cval = 0;
@@ -95,6 +95,8 @@ int virt_timer_restore(struct vcpu *v)
return 0;
stop_timer(&v->arch.virt_timer.timer);
+ migrate_timer(&v->arch.virt_timer.timer, v->processor);
+ migrate_timer(&v->arch.phys_timer.timer, v->processor);
WRITE_SYSREG64(v->arch.virt_timer.offset, CNTVOFF_EL2);
WRITE_SYSREG64(v->arch.virt_timer.cval, CNTV_CVAL_EL0);
--
1.7.2.5
Stefano Stabellini
2013-May-07 14:12 UTC
[PATCH v7 13/15] xen/arm: initialize virt_timer and phys_timer with the same values on all vcpus
Introduce a domain wide vtimer initialization function to initialize
the phys_timer and the virt_timer offsets.
Use the domain phys_timer and virt_timer offsets throughout the vtimer
code instead of the per-vcpu offsets.
Remove the per-vcpu offsets from struct vtimer altogether.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Changes in v5:
- don''t change the init value of phys_timer''s cval.
Changes in v4:
- introduce vcpu_domain_init;
- inline phys_timer_base and virt_timer_base in arch_domain;
- use phys_timer_base.offset and virt_timer_base.offset directly in
vtimer code (remove offset field from struct vtimer).
---
xen/arch/arm/domain.c | 3 +++
xen/arch/arm/vtimer.c | 24 ++++++++++++++++--------
xen/arch/arm/vtimer.h | 1 +
xen/include/asm-arm/domain.h | 24 +++++++++++++++---------
4 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index 15dde1a..aa525af 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -485,6 +485,9 @@ int arch_domain_create(struct domain *d, unsigned int
domcr_flags)
if ( (rc = domain_vgic_init(d)) != 0 )
goto fail;
+ if ( (rc = vcpu_domain_init(d)) != 0 )
+ goto fail;
+
/* Domain 0 gets a real UART not an emulated one */
if ( d->domain_id && (rc = domain_uart0_init(d)) != 0 )
goto fail;
diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c
index 393aac3..97fe8ce 100644
--- a/xen/arch/arm/vtimer.c
+++ b/xen/arch/arm/vtimer.c
@@ -44,13 +44,20 @@ static void virt_timer_expired(void *data)
vgic_vcpu_inject_irq(t->v, 27, 1);
}
+int vcpu_domain_init(struct domain *d)
+{
+ d->arch.phys_timer_base.offset = NOW();
+ d->arch.virt_timer_base.offset = READ_SYSREG64(CNTVCT_EL0) +
+ READ_SYSREG64(CNTVOFF_EL2);
+ return 0;
+}
+
int vcpu_vtimer_init(struct vcpu *v)
{
struct vtimer *t = &v->arch.phys_timer;
init_timer(&t->timer, phys_timer_expired, t, v->processor);
t->ctl = 0;
- t->offset = NOW();
t->cval = NOW();
t->irq = 30;
t->v = v;
@@ -58,7 +65,6 @@ int vcpu_vtimer_init(struct vcpu *v)
t = &v->arch.virt_timer;
init_timer(&t->timer, virt_timer_expired, t, v->processor);
t->ctl = 0;
- t->offset = READ_SYSREG64(CNTVCT_EL0) + READ_SYSREG64(CNTVOFF_EL2);
t->cval = 0;
t->irq = 27;
t->v = v;
@@ -84,7 +90,7 @@ int virt_timer_save(struct vcpu *v)
!(v->arch.virt_timer.ctl & CNTx_CTL_MASK))
{
set_timer(&v->arch.virt_timer.timer,
ticks_to_ns(v->arch.virt_timer.cval +
- v->arch.virt_timer.offset - boot_count));
+ v->domain->arch.virt_timer_base.offset - boot_count));
}
return 0;
}
@@ -98,7 +104,7 @@ int virt_timer_restore(struct vcpu *v)
migrate_timer(&v->arch.virt_timer.timer, v->processor);
migrate_timer(&v->arch.phys_timer.timer, v->processor);
- WRITE_SYSREG64(v->arch.virt_timer.offset, CNTVOFF_EL2);
+ WRITE_SYSREG64(v->domain->arch.virt_timer_base.offset, CNTVOFF_EL2);
WRITE_SYSREG64(v->arch.virt_timer.cval, CNTV_CVAL_EL0);
WRITE_SYSREG32(v->arch.virt_timer.ctl, CNTV_CTL_EL0);
return 0;
@@ -128,7 +134,8 @@ static int vtimer_emulate_32(struct cpu_user_regs *regs,
union hsr hsr)
if ( v->arch.phys_timer.ctl & CNTx_CTL_ENABLE )
{
set_timer(&v->arch.phys_timer.timer,
- v->arch.phys_timer.cval +
v->arch.phys_timer.offset);
+ v->arch.phys_timer.cval +
+ v->domain->arch.phys_timer_base.offset);
}
else
stop_timer(&v->arch.phys_timer.timer);
@@ -137,7 +144,7 @@ static int vtimer_emulate_32(struct cpu_user_regs *regs,
union hsr hsr)
return 1;
case HSR_CPREG32(CNTP_TVAL):
- now = NOW() - v->arch.phys_timer.offset;
+ now = NOW() - v->domain->arch.phys_timer_base.offset;
if ( cp32.read )
{
*r = (uint32_t)(ns_to_ticks(v->arch.phys_timer.cval - now) &
0xffffffffull);
@@ -149,7 +156,8 @@ static int vtimer_emulate_32(struct cpu_user_regs *regs,
union hsr hsr)
{
v->arch.phys_timer.ctl &= ~CNTx_CTL_PENDING;
set_timer(&v->arch.phys_timer.timer,
- v->arch.phys_timer.cval +
v->arch.phys_timer.offset);
+ v->arch.phys_timer.cval +
+ v->domain->arch.phys_timer_base.offset);
}
}
@@ -174,7 +182,7 @@ static int vtimer_emulate_64(struct cpu_user_regs *regs,
union hsr hsr)
case HSR_CPREG64(CNTPCT):
if ( cp64.read )
{
- now = NOW() - v->arch.phys_timer.offset;
+ now = NOW() - v->domain->arch.phys_timer_base.offset;
ticks = ns_to_ticks(now);
*r1 = (uint32_t)(ticks & 0xffffffff);
*r2 = (uint32_t)(ticks >> 32);
diff --git a/xen/arch/arm/vtimer.h b/xen/arch/arm/vtimer.h
index 690231d..bcf910e 100644
--- a/xen/arch/arm/vtimer.h
+++ b/xen/arch/arm/vtimer.h
@@ -20,6 +20,7 @@
#ifndef __ARCH_ARM_VTIMER_H__
#define __ARCH_ARM_VTIMER_H__
+extern int vcpu_domain_init(struct domain *d);
extern int vcpu_vtimer_init(struct vcpu *v);
extern int vtimer_emulate(struct cpu_user_regs *regs, union hsr hsr);
extern int virt_timer_save(struct vcpu *v);
diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h
index 3fa266c2..cca7416 100644
--- a/xen/include/asm-arm/domain.h
+++ b/xen/include/asm-arm/domain.h
@@ -47,6 +47,14 @@ enum domain_type {
#define is_pv64_domain(d) (0)
#endif
+struct vtimer {
+ struct vcpu *v;
+ int irq;
+ struct timer timer;
+ uint32_t ctl;
+ uint64_t cval;
+};
+
struct arch_domain
{
#ifdef CONFIG_ARM_64
@@ -62,6 +70,13 @@ struct arch_domain
register_t vmpidr;
struct {
+ uint64_t offset;
+ } phys_timer_base;
+ struct {
+ uint64_t offset;
+ } virt_timer_base;
+
+ struct {
/*
* Covers access to other members of this struct _except_ for
* shared_irqs where each member contains its own locking.
@@ -91,15 +106,6 @@ struct arch_domain
} __cacheline_aligned;
-struct vtimer {
- struct vcpu *v;
- int irq;
- struct timer timer;
- uint32_t ctl;
- uint64_t offset;
- uint64_t cval;
-};
-
struct arch_vcpu
{
struct {
--
1.7.2.5
Stefano Stabellini
2013-May-07 14:12 UTC
[PATCH v7 14/15] xen/arm: clear pending irq queues on do_psci_cpu_on
Don''t inject irqs to vcpus that are down.
Also when (re)activating a vcpu, clear the vgic and gic irq queues: we
don''t want to inject any irqs that couldn''t be handled by the
vcpu right
before going offline.
Changes in v7:
- call gic_clear_pending_irqs before clearing VPF_down on
do_psci_cpu_on.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
xen/arch/arm/gic.c | 12 ++++++++++++
xen/arch/arm/psci.c | 3 +++
xen/arch/arm/vgic.c | 16 ++++++++++++++--
xen/include/asm-arm/gic.h | 2 ++
4 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index 8a49e12..a213da5 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -576,6 +576,18 @@ static void gic_restore_pending_irqs(struct vcpu *v)
}
+void gic_clear_pending_irqs(struct vcpu *v)
+{
+ struct pending_irq *p, *t;
+ unsigned long flags;
+
+ spin_lock_irqsave(&gic.lock, flags);
+ v->arch.lr_mask = 0;
+ list_for_each_entry_safe ( p, t, &v->arch.vgic.lr_pending, lr_queue
)
+ list_del_init(&p->lr_queue);
+ spin_unlock_irqrestore(&gic.lock, flags);
+}
+
static void gic_inject_irq_start(void)
{
register_t hcr = READ_SYSREG(HCR_EL2);
diff --git a/xen/arch/arm/psci.c b/xen/arch/arm/psci.c
index 1761791..18feead 100644
--- a/xen/arch/arm/psci.c
+++ b/xen/arch/arm/psci.c
@@ -15,6 +15,7 @@
#include <xen/types.h>
#include <asm/current.h>
+#include <asm/gic.h>
#include <asm/psci.h>
int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point)
@@ -33,6 +34,8 @@ int do_psci_cpu_on(uint32_t vcpuid, register_t entry_point)
if ( (ctxt = alloc_vcpu_guest_context()) == NULL )
return PSCI_DENIED;
+ vgic_clear_pending_irqs(v);
+
memset(ctxt, 0, sizeof(*ctxt));
ctxt->user_regs.pc64 = (u64) entry_point;
ctxt->sctlr = SCTLR_BASE;
diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index 0e9cc4a..f9c1a6b 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -641,6 +641,18 @@ struct pending_irq *irq_to_pending(struct vcpu *v, unsigned
int irq)
return n;
}
+void vgic_clear_pending_irqs(struct vcpu *v)
+{
+ struct pending_irq *p, *t;
+ unsigned long flags;
+
+ spin_lock_irqsave(&v->arch.vgic.lock, flags);
+ list_for_each_entry_safe ( p, t, &v->arch.vgic.inflight_irqs,
inflight )
+ list_del_init(&p->inflight);
+ gic_clear_pending_irqs(v);
+ spin_unlock_irqrestore(&v->arch.vgic.lock, flags);
+}
+
void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq, int virtual)
{
int idx = irq >> 2, byte = irq & 0x3;
@@ -652,8 +664,8 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,
int virtual)
spin_lock_irqsave(&v->arch.vgic.lock, flags);
- /* irq already pending */
- if (!list_empty(&n->inflight))
+ /* vcpu offline or irq already pending */
+ if (test_bit(_VPF_down, &v->pause_flags) ||
!list_empty(&n->inflight))
{
spin_unlock_irqrestore(&v->arch.vgic.lock, flags);
return;
diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
index bf2d0a0..8611885 100644
--- a/xen/include/asm-arm/gic.h
+++ b/xen/include/asm-arm/gic.h
@@ -140,12 +140,14 @@ extern void domain_vgic_free(struct domain *d);
extern int vcpu_vgic_init(struct vcpu *v);
extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,int virtual);
+extern void vgic_clear_pending_irqs(struct vcpu *v);
extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq);
extern void gic_route_ppis(void);
extern void gic_route_spis(void);
extern void gic_inject(void);
+extern void gic_clear_pending_irqs(struct vcpu *v);
extern int gic_events_need_delivery(void);
extern void __cpuinit init_maintenance_interrupt(void);
--
1.7.2.5
Stefano Stabellini
2013-May-07 14:12 UTC
[PATCH v7 15/15] xen/arm: initialize vtimer offset to CNTPCT
Currently we initialize the vtimer offset to
CNTVCT + CNTVOFF = CNTPCT - CNTVOFF + CNTVOFF = CNTPCT
Simply initialize vtimer offset to CNTPCT.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
xen/arch/arm/vtimer.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c
index 97fe8ce..6993425 100644
--- a/xen/arch/arm/vtimer.c
+++ b/xen/arch/arm/vtimer.c
@@ -47,8 +47,7 @@ static void virt_timer_expired(void *data)
int vcpu_domain_init(struct domain *d)
{
d->arch.phys_timer_base.offset = NOW();
- d->arch.virt_timer_base.offset = READ_SYSREG64(CNTVCT_EL0) +
- READ_SYSREG64(CNTVOFF_EL2);
+ d->arch.virt_timer_base.offset = READ_SYSREG64(CNTPCT_EL0);
return 0;
}
--
1.7.2.5
Ian Campbell
2013-May-08 09:48 UTC
Re: [PATCH v7 14/15] xen/arm: clear pending irq queues on do_psci_cpu_on
On Tue, 2013-05-07 at 15:12 +0100, Stefano Stabellini wrote:> Don''t inject irqs to vcpus that are down. > > Also when (re)activating a vcpu, clear the vgic and gic irq queues: we > don''t want to inject any irqs that couldn''t be handled by the vcpu right > before going offline. > > Changes in v7: > - call gic_clear_pending_irqs before clearing VPF_down on > do_psci_cpu_on. > > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>Acked-by: Ian Campbell <ian.campbell@citrix.com>
Ian Campbell
2013-May-08 09:56 UTC
Re: [PATCH v7 09/15] xen: move VCPUOP_register_vcpu_info to common code
On Tue, 2013-05-07 at 15:12 +0100, Stefano Stabellini wrote:> Move the implementation of VCPUOP_register_vcpu_info from x86 specific > to commmon code. > > Move vcpu_info_mfn from an arch specific vcpu sub-field to the common > vcpu struct. > Move the initialization of vcpu_info_mfn to common code. > > Move unmap_vcpu_info and the call to unmap_vcpu_info at domain > destruction time to common code. > > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > Acked-by: Ian Campbell <ian.campbell@citrix.com> > Acked-by: Keir Fraser <keir@xen.org> > CC: keir@xen.org > CC: JBeulich@suse.comI''m afraid I get conflicts when trying to apply this patch. Mostly they were just context changes which I could deal with but there was one conflict in x86''s domain_relinquish_resources which I wasn''t too sure about. Can you rebase please? I don''t think the code which is moved has changed but if you could confim my conclusion that you aren''t accidentally reverting something that would be useful I think. These two commits seem to be the source of the conflicts, with the top one seeming to contain the conflict I wasn''t sure about. commit 9626d1c1fafe2da5af6e59478c9e9db6d03144df Author: Jan Beulich <jbeulich@suse.com> Date: Thu May 2 09:29:36 2013 +0200 x86: call unmap_vcpu_info() regardless of guest type This fixes a regression from 63753b3e ("x86: allow VCPUOP_register_vcpu_info to work again on PVHVM guests"). Signed-off-by: Jan Beulich <jbeulich@suse.com> Tested-by: Sander Eikelenboom <linux@eikelenboom.it> commit 4939f9a6dee4280f38730fd3066e5dce353112f6 Author: Jan Beulich <jbeulich@suse.com> Date: Thu May 2 16:37:24 2013 +0200 x86: make vcpu_reset() preemptible ... as dropping the old page tables may take significant amounts of time. This is part of CVE-2013-1918 / XSA-45. Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Tim Deegan <tim@xen.org> Ian.
On Tue, 2013-05-07 at 15:09 +0100, Stefano Stabellini wrote:> Hi all, > this patch series implement guest SMP support for ARM, using the ARM > PSCI interface for secondary cpu bringup. > > See each patch for a detailed changelog.I applied the first 8 of these (up to "xen/arm: implement map_domain_page_global and unmap_domain_page_global") and then hit a conflict on the ninth "xen: move VCPUOP_register_vcpu_info to common code". "xen/arm: compile and initialize vmap" touches common and x86 code to move the prototypes for map_pages_to_xen and destroy_xen_mappings which strictly speak need acks from Keir and/or Jan. While Jan didn''t explicitly ack he did say "That''s fine with me of course." so I have gone ahead and applied. Also, did you see <1366982471.3142.94.camel@zakaz.uk.xensource.com> ? Ian.
On Wed, 8 May 2013, Ian Campbell wrote:> On Tue, 2013-05-07 at 15:09 +0100, Stefano Stabellini wrote: > > Hi all, > > this patch series implement guest SMP support for ARM, using the ARM > > PSCI interface for secondary cpu bringup. > > > > See each patch for a detailed changelog. > > I applied the first 8 of these (up to "xen/arm: implement > map_domain_page_global and unmap_domain_page_global") and then hit a > conflict on the ninth "xen: move VCPUOP_register_vcpu_info to common > code".I''ll resend the last 7 patches> "xen/arm: compile and initialize vmap" touches common and x86 code to > move the prototypes for map_pages_to_xen and destroy_xen_mappings which > strictly speak need acks from Keir and/or Jan. While Jan didn''t > explicitly ack he did say "That''s fine with me of course." so I have > gone ahead and applied. > > Also, did you see > <1366982471.3142.94.camel@zakaz.uk.xensource.com> ?I was wrong about the vmap replacing mappings
On Wed, 2013-05-08 at 12:25 +0100, Stefano Stabellini wrote:> On Wed, 8 May 2013, Ian Campbell wrote: > > On Tue, 2013-05-07 at 15:09 +0100, Stefano Stabellini wrote: > > > Hi all, > > > this patch series implement guest SMP support for ARM, using the ARM > > > PSCI interface for secondary cpu bringup. > > > > > > See each patch for a detailed changelog. > > > > I applied the first 8 of these (up to "xen/arm: implement > > map_domain_page_global and unmap_domain_page_global") and then hit a > > conflict on the ninth "xen: move VCPUOP_register_vcpu_info to common > > code". > > I''ll resend the last 7 patchesThanks.> > "xen/arm: compile and initialize vmap" touches common and x86 code to > > move the prototypes for map_pages_to_xen and destroy_xen_mappings which > > strictly speak need acks from Keir and/or Jan. While Jan didn''t > > explicitly ack he did say "That''s fine with me of course." so I have > > gone ahead and applied. > > > > Also, did you see > > <1366982471.3142.94.camel@zakaz.uk.xensource.com> ? > > I was wrong about the vmap replacing mappingsand I see the version which was applied has a BUG_ON, good, thanks. Ian.