* [PATCH v2 1/9] viridian: move the code into its own sub-directory
2018-10-31 12:43 [PATCH v2 0/9] viridian cleanup Paul Durrant
@ 2018-10-31 12:43 ` Paul Durrant
2018-10-31 12:43 ` [PATCH v2 2/9] viridian: remove MSR perf counters Paul Durrant
` (7 subsequent siblings)
8 siblings, 0 replies; 26+ messages in thread
From: Paul Durrant @ 2018-10-31 12:43 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Paul Durrant, Wei Liu
Subsequent patches will introduce support for more viridian enlightenments
which will make a single source module quite lengthy.
This patch therefore creates a new arch/x86/hvm/viridian sub-directory and
moves viridian.c into that.
The patch also fixes some bad whitespace whilst moving the code and
adjusts the MAINTAINERS file.
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
v2:
- Adjust MAINTAINERS and add Jan's A-b
---
MAINTAINERS | 2 +-
xen/arch/x86/hvm/Makefile | 2 +-
xen/arch/x86/hvm/viridian/Makefile | 1 +
xen/arch/x86/hvm/{ => viridian}/viridian.c | 4 ++--
4 files changed, 5 insertions(+), 4 deletions(-)
create mode 100644 xen/arch/x86/hvm/viridian/Makefile
rename xen/arch/x86/hvm/{ => viridian}/viridian.c (99%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 1970100b37..c2ba74d0c9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -487,7 +487,7 @@ F: xen/arch/x86/mm/shadow/
X86 VIRIDIAN ENLIGHTENMENTS
M: Paul Durrant <paul.durrant@citrix.com>
S: Supported
-F: xen/arch/x86/hvm/viridian.c
+F: xen/arch/x86/hvm/viridian/
F: xen/include/asm-x86/hvm/viridian.h
XENTRACE
diff --git a/xen/arch/x86/hvm/Makefile b/xen/arch/x86/hvm/Makefile
index 5e04bc1429..86b106f8e7 100644
--- a/xen/arch/x86/hvm/Makefile
+++ b/xen/arch/x86/hvm/Makefile
@@ -1,5 +1,6 @@
subdir-y += svm
subdir-y += vmx
+subdir-y += viridian
obj-y += asid.o
obj-y += dm.o
@@ -23,7 +24,6 @@ obj-y += rtc.o
obj-y += save.o
obj-y += stdvga.o
obj-y += vioapic.o
-obj-y += viridian.o
obj-y += vlapic.o
obj-y += vm_event.o
obj-y += vmsi.o
diff --git a/xen/arch/x86/hvm/viridian/Makefile b/xen/arch/x86/hvm/viridian/Makefile
new file mode 100644
index 0000000000..09fd0a5f3c
--- /dev/null
+++ b/xen/arch/x86/hvm/viridian/Makefile
@@ -0,0 +1 @@
+obj-y += viridian.o
diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian/viridian.c
similarity index 99%
rename from xen/arch/x86/hvm/viridian.c
rename to xen/arch/x86/hvm/viridian/viridian.c
index f42b1f063e..3e9beda831 100644
--- a/xen/arch/x86/hvm/viridian.c
+++ b/xen/arch/x86/hvm/viridian/viridian.c
@@ -4,7 +4,7 @@
* An implementation of some Viridian enlightenments. See Microsoft's
* Hypervisor Top Level Functional Specification (v5.0a) at:
*
- * https://github.com/Microsoft/Virtualization-Documentation/raw/master/tlfs/Hypervisor%20Top%20Level%20Functional%20Specification%20v5.0.pdf
+ * https://github.com/Microsoft/Virtualization-Documentation/raw/master/tlfs/Hypervisor%20Top%20Level%20Functional%20Specification%20v5.0.pdf
*
* for more information.
*/
@@ -334,7 +334,7 @@ static void dump_reference_tsc(const struct domain *d)
const union viridian_reference_tsc *rt;
rt = &d->arch.hvm.viridian.reference_tsc;
-
+
printk(XENLOG_G_INFO "d%d: VIRIDIAN REFERENCE_TSC: enabled: %x pfn: %lx\n",
d->domain_id,
rt->fields.enabled, (unsigned long)rt->fields.pfn);
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v2 2/9] viridian: remove MSR perf counters
2018-10-31 12:43 [PATCH v2 0/9] viridian cleanup Paul Durrant
2018-10-31 12:43 ` [PATCH v2 1/9] viridian: move the code into its own sub-directory Paul Durrant
@ 2018-10-31 12:43 ` Paul Durrant
2018-10-31 12:43 ` [PATCH v2 3/9] viridian: remove comments referencing section number in the spec Paul Durrant
` (6 subsequent siblings)
8 siblings, 0 replies; 26+ messages in thread
From: Paul Durrant @ 2018-10-31 12:43 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Paul Durrant, Wei Liu, Jan Beulich
They're not really useful so maintaining them is pointless.
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Reviewed-by: Roger Pau Monne <roger.pau@citrix.com>
---
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
xen/arch/x86/hvm/viridian/viridian.c | 21 ---------------------
xen/include/asm-x86/perfc_defn.h | 26 --------------------------
2 files changed, 47 deletions(-)
diff --git a/xen/arch/x86/hvm/viridian/viridian.c b/xen/arch/x86/hvm/viridian/viridian.c
index 3e9beda831..c5722d6992 100644
--- a/xen/arch/x86/hvm/viridian/viridian.c
+++ b/xen/arch/x86/hvm/viridian/viridian.c
@@ -11,7 +11,6 @@
#include <xen/sched.h>
#include <xen/version.h>
-#include <xen/perfc.h>
#include <xen/hypercall.h>
#include <xen/domain_page.h>
#include <asm/guest_access.h>
@@ -560,13 +559,11 @@ int guest_wrmsr_viridian(struct vcpu *v, uint32_t idx, uint64_t val)
switch ( idx )
{
case HV_X64_MSR_GUEST_OS_ID:
- perfc_incr(mshv_wrmsr_osid);
d->arch.hvm.viridian.guest_os_id.raw = val;
dump_guest_os_id(d);
break;
case HV_X64_MSR_HYPERCALL:
- perfc_incr(mshv_wrmsr_hc_page);
d->arch.hvm.viridian.hypercall_gpa.raw = val;
dump_hypercall(d);
if ( d->arch.hvm.viridian.hypercall_gpa.fields.enabled )
@@ -574,18 +571,15 @@ int guest_wrmsr_viridian(struct vcpu *v, uint32_t idx, uint64_t val)
break;
case HV_X64_MSR_VP_INDEX:
- perfc_incr(mshv_wrmsr_vp_index);
break;
case HV_X64_MSR_EOI:
- perfc_incr(mshv_wrmsr_eoi);
vlapic_EOI_set(vcpu_vlapic(v));
break;
case HV_X64_MSR_ICR: {
u32 eax = (u32)val, edx = (u32)(val >> 32);
struct vlapic *vlapic = vcpu_vlapic(v);
- perfc_incr(mshv_wrmsr_icr);
eax &= ~(1 << 12);
edx &= 0xff000000;
vlapic_set_reg(vlapic, APIC_ICR2, edx);
@@ -595,12 +589,10 @@ int guest_wrmsr_viridian(struct vcpu *v, uint32_t idx, uint64_t val)
}
case HV_X64_MSR_TPR:
- perfc_incr(mshv_wrmsr_tpr);
vlapic_set_reg(vcpu_vlapic(v), APIC_TASKPRI, (uint8_t)val);
break;
case HV_X64_MSR_VP_ASSIST_PAGE:
- perfc_incr(mshv_wrmsr_apic_msr);
teardown_vp_assist(v); /* release any previous mapping */
v->arch.hvm.viridian.vp_assist.msr.raw = val;
dump_vp_assist(v);
@@ -612,7 +604,6 @@ int guest_wrmsr_viridian(struct vcpu *v, uint32_t idx, uint64_t val)
if ( !(viridian_feature_mask(d) & HVMPV_reference_tsc) )
return X86EMUL_EXCEPTION;
- perfc_incr(mshv_wrmsr_tsc_msr);
d->arch.hvm.viridian.reference_tsc.raw = val;
dump_reference_tsc(d);
if ( d->arch.hvm.viridian.reference_tsc.fields.enabled )
@@ -704,17 +695,14 @@ int guest_rdmsr_viridian(const struct vcpu *v, uint32_t idx, uint64_t *val)
switch ( idx )
{
case HV_X64_MSR_GUEST_OS_ID:
- perfc_incr(mshv_rdmsr_osid);
*val = d->arch.hvm.viridian.guest_os_id.raw;
break;
case HV_X64_MSR_HYPERCALL:
- perfc_incr(mshv_rdmsr_hc_page);
*val = d->arch.hvm.viridian.hypercall_gpa.raw;
break;
case HV_X64_MSR_VP_INDEX:
- perfc_incr(mshv_rdmsr_vp_index);
*val = v->vcpu_id;
break;
@@ -722,7 +710,6 @@ int guest_rdmsr_viridian(const struct vcpu *v, uint32_t idx, uint64_t *val)
if ( viridian_feature_mask(d) & HVMPV_no_freq )
return X86EMUL_EXCEPTION;
- perfc_incr(mshv_rdmsr_tsc_frequency);
*val = (uint64_t)d->arch.tsc_khz * 1000ull;
break;
@@ -730,23 +717,19 @@ int guest_rdmsr_viridian(const struct vcpu *v, uint32_t idx, uint64_t *val)
if ( viridian_feature_mask(d) & HVMPV_no_freq )
return X86EMUL_EXCEPTION;
- perfc_incr(mshv_rdmsr_apic_frequency);
*val = 1000000000ull / APIC_BUS_CYCLE_NS;
break;
case HV_X64_MSR_ICR:
- perfc_incr(mshv_rdmsr_icr);
*val = (((uint64_t)vlapic_get_reg(vcpu_vlapic(v), APIC_ICR2) << 32) |
vlapic_get_reg(vcpu_vlapic(v), APIC_ICR));
break;
case HV_X64_MSR_TPR:
- perfc_incr(mshv_rdmsr_tpr);
*val = vlapic_get_reg(vcpu_vlapic(v), APIC_TASKPRI);
break;
case HV_X64_MSR_VP_ASSIST_PAGE:
- perfc_incr(mshv_rdmsr_apic_msr);
*val = v->arch.hvm.viridian.vp_assist.msr.raw;
break;
@@ -754,7 +737,6 @@ int guest_rdmsr_viridian(const struct vcpu *v, uint32_t idx, uint64_t *val)
if ( !(viridian_feature_mask(d) & HVMPV_reference_tsc) )
return X86EMUL_EXCEPTION;
- perfc_incr(mshv_rdmsr_tsc_msr);
*val = d->arch.hvm.viridian.reference_tsc.raw;
break;
@@ -771,7 +753,6 @@ int guest_rdmsr_viridian(const struct vcpu *v, uint32_t idx, uint64_t *val)
printk(XENLOG_G_INFO "d%d: VIRIDIAN MSR_TIME_REF_COUNT: accessed\n",
d->domain_id);
- perfc_incr(mshv_rdmsr_time_ref_count);
*val = raw_trc_val(d) + trc->off;
break;
}
@@ -876,7 +857,6 @@ int viridian_hypercall(struct cpu_user_regs *regs)
/*
* See section 14.5.1 of the specification.
*/
- perfc_incr(mshv_call_long_wait);
do_sched_op(SCHEDOP_yield, guest_handle_from_ptr(NULL, void));
status = HV_STATUS_SUCCESS;
break;
@@ -895,7 +875,6 @@ int viridian_hypercall(struct cpu_user_regs *regs)
/*
* See sections 9.4.2 and 9.4.4 of the specification.
*/
- perfc_incr(mshv_call_flush);
/* These hypercalls should never use the fast-call convention. */
status = HV_STATUS_INVALID_PARAMETER;
diff --git a/xen/include/asm-x86/perfc_defn.h b/xen/include/asm-x86/perfc_defn.h
index 6db8746906..1a9ea3f89e 100644
--- a/xen/include/asm-x86/perfc_defn.h
+++ b/xen/include/asm-x86/perfc_defn.h
@@ -112,32 +112,6 @@ PERFCOUNTER(shadow_unsync, "shadow OOS unsyncs")
PERFCOUNTER(shadow_unsync_evict, "shadow OOS evictions")
PERFCOUNTER(shadow_resync, "shadow OOS resyncs")
-PERFCOUNTER(mshv_call_sw_addr_space, "MS Hv Switch Address Space")
-PERFCOUNTER(mshv_call_flush_tlb_list, "MS Hv Flush TLB list")
-PERFCOUNTER(mshv_call_flush_tlb_all, "MS Hv Flush TLB all")
-PERFCOUNTER(mshv_call_long_wait, "MS Hv Notify long wait")
-PERFCOUNTER(mshv_call_flush, "MS Hv Flush TLB")
-PERFCOUNTER(mshv_rdmsr_osid, "MS Hv rdmsr Guest OS ID")
-PERFCOUNTER(mshv_rdmsr_hc_page, "MS Hv rdmsr hypercall page")
-PERFCOUNTER(mshv_rdmsr_vp_index, "MS Hv rdmsr vp index")
-PERFCOUNTER(mshv_rdmsr_tsc_frequency, "MS Hv rdmsr TSC frequency")
-PERFCOUNTER(mshv_rdmsr_apic_frequency, "MS Hv rdmsr APIC frequency")
-PERFCOUNTER(mshv_rdmsr_time_ref_count, "MS Hv rdmsr time ref count")
-PERFCOUNTER(mshv_rdmsr_icr, "MS Hv rdmsr icr")
-PERFCOUNTER(mshv_rdmsr_tpr, "MS Hv rdmsr tpr")
-PERFCOUNTER(mshv_rdmsr_apic_assist, "MS Hv rdmsr APIC assist")
-PERFCOUNTER(mshv_rdmsr_apic_msr, "MS Hv rdmsr APIC msr")
-PERFCOUNTER(mshv_rdmsr_tsc_msr, "MS Hv rdmsr TSC msr")
-PERFCOUNTER(mshv_wrmsr_osid, "MS Hv wrmsr Guest OS ID")
-PERFCOUNTER(mshv_wrmsr_hc_page, "MS Hv wrmsr hypercall page")
-PERFCOUNTER(mshv_wrmsr_vp_index, "MS Hv wrmsr vp index")
-PERFCOUNTER(mshv_wrmsr_icr, "MS Hv wrmsr icr")
-PERFCOUNTER(mshv_wrmsr_tpr, "MS Hv wrmsr tpr")
-PERFCOUNTER(mshv_wrmsr_eoi, "MS Hv wrmsr eoi")
-PERFCOUNTER(mshv_wrmsr_apic_assist, "MS Hv wrmsr APIC assist")
-PERFCOUNTER(mshv_wrmsr_apic_msr, "MS Hv wrmsr APIC msr")
-PERFCOUNTER(mshv_wrmsr_tsc_msr, "MS Hv wrmsr TSC msr")
-
PERFCOUNTER(realmode_emulations, "realmode instructions emulated")
PERFCOUNTER(realmode_exits, "vmexits from realmode")
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v2 3/9] viridian: remove comments referencing section number in the spec.
2018-10-31 12:43 [PATCH v2 0/9] viridian cleanup Paul Durrant
2018-10-31 12:43 ` [PATCH v2 1/9] viridian: move the code into its own sub-directory Paul Durrant
2018-10-31 12:43 ` [PATCH v2 2/9] viridian: remove MSR perf counters Paul Durrant
@ 2018-10-31 12:43 ` Paul Durrant
2018-10-31 12:43 ` [PATCH v2 4/9] viridian: remove duplicate union types Paul Durrant
` (5 subsequent siblings)
8 siblings, 0 replies; 26+ messages in thread
From: Paul Durrant @ 2018-10-31 12:43 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Paul Durrant, Wei Liu, Jan Beulich
Microsoft has a habit of re-numbering sections in the spec. so avoid
referring to section numbers in comments. Also remove the URL for the
spec. from the boilerplate... Again, Microsoft has a habit of changing
these too.
This patch also cleans up some > 80 character lines.
Purely cosmetic. No functional change.
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Reviewed--by: Roger Pau Monne <roger.pau@citrix.com>
---
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
v2:
- Fix comment style
---
xen/arch/x86/hvm/viridian/viridian.c | 84 ++++++++++++++++--------------------
xen/include/asm-x86/hvm/viridian.h | 4 --
2 files changed, 36 insertions(+), 52 deletions(-)
diff --git a/xen/arch/x86/hvm/viridian/viridian.c b/xen/arch/x86/hvm/viridian/viridian.c
index c5722d6992..f5f5fbcdfe 100644
--- a/xen/arch/x86/hvm/viridian/viridian.c
+++ b/xen/arch/x86/hvm/viridian/viridian.c
@@ -1,12 +1,8 @@
-/******************************************************************************
+/**************************************************************************
* viridian.c
*
* An implementation of some Viridian enlightenments. See Microsoft's
- * Hypervisor Top Level Functional Specification (v5.0a) at:
- *
- * https://github.com/Microsoft/Virtualization-Documentation/raw/master/tlfs/Hypervisor%20Top%20Level%20Functional%20Specification%20v5.0.pdf
- *
- * for more information.
+ * Hypervisor Top Level Functional Specification for more information.
*/
#include <xen/sched.h>
@@ -102,12 +98,7 @@
/* Viridian Hypercall Flags. */
#define HV_FLUSH_ALL_PROCESSORS 1
-/*
- * Viridian Partition Privilege Flags.
- *
- * This is taken from section 4.2.2 of the specification, and fixed for
- * style and correctness.
- */
+/* Viridian Partition Privilege Flags */
typedef struct {
/* Access to virtual MSRs */
uint64_t AccessVpRunTimeReg:1;
@@ -168,7 +159,7 @@ typedef union _HV_CRASH_CTL_REG_CONTENTS
#define CPUID4A_MSR_BASED_APIC (1 << 3)
#define CPUID4A_RELAX_TIMER_INT (1 << 5)
-/* Viridian CPUID leaf 6: Implementation HW features detected and in use. */
+/* Viridian CPUID leaf 6: Implementation HW features detected and in use */
#define CPUID6A_APIC_OVERLAY (1 << 0)
#define CPUID6A_MSR_BITMAPS (1 << 1)
#define CPUID6A_NESTED_PAGING (1 << 3)
@@ -204,7 +195,6 @@ void cpuid_viridian_leaves(const struct vcpu *v, uint32_t leaf,
switch ( leaf )
{
case 0:
- /* See section 2.4.1 of the specification */
res->a = 0x40000006; /* Maximum leaf */
memcpy(&res->b, "Micr", 4);
memcpy(&res->c, "osof", 4);
@@ -212,13 +202,14 @@ void cpuid_viridian_leaves(const struct vcpu *v, uint32_t leaf,
break;
case 1:
- /* See section 2.4.2 of the specification */
memcpy(&res->a, "Hv#1", 4);
break;
case 2:
- /* Hypervisor information, but only if the guest has set its
- own version number. */
+ /*
+ * Hypervisor information, but only if the guest has set its
+ * own version number.
+ */
if ( d->arch.hvm.viridian.guest_os_id.raw == 0 )
break;
res->a = viridian_build;
@@ -230,9 +221,9 @@ void cpuid_viridian_leaves(const struct vcpu *v, uint32_t leaf,
case 3:
{
/*
- * Section 2.4.4 details this leaf and states that EAX and EBX
- * are defined to be the low and high parts of the partition
- * privilege mask respectively.
+ * The specification states that EAX and EBX are defined to be
+ * the low and high parts of the partition privilege mask
+ * respectively.
*/
HV_PARTITION_PRIVILEGE_MASK mask = {
.AccessIntrCtrlRegs = 1,
@@ -382,11 +373,6 @@ static void initialize_vp_assist(struct vcpu *v)
ASSERT(!v->arch.hvm.viridian.vp_assist.va);
- /*
- * See section 7.8.7 of the specification for details of this
- * enlightenment.
- */
-
if ( !page )
goto fail;
@@ -409,8 +395,8 @@ static void initialize_vp_assist(struct vcpu *v)
return;
fail:
- gdprintk(XENLOG_WARNING, "Bad GMFN %#"PRI_gfn" (MFN %#"PRI_mfn")\n", gmfn,
- mfn_x(page ? page_to_mfn(page) : INVALID_MFN));
+ gdprintk(XENLOG_WARNING, "Bad GMFN %#"PRI_gfn" (MFN %#"PRI_mfn")\n",
+ gmfn, mfn_x(page ? page_to_mfn(page) : INVALID_MFN));
}
static void teardown_vp_assist(struct vcpu *v)
@@ -498,14 +484,15 @@ static void update_reference_tsc(struct domain *d, bool_t initialize)
clear_page(p);
/*
- * This enlightenment must be disabled is the host TSC is not invariant.
- * However it is also disabled if vtsc is true (which means rdtsc is being
- * emulated). This generally happens when guest TSC freq and host TSC freq
- * don't match. The TscScale value could be adjusted to cope with this,
- * allowing vtsc to be turned off, but support for this is not yet present
- * in the hypervisor. Thus is it is possible that migrating a Windows VM
- * between hosts of differing TSC frequencies may result in large
- * differences in guest performance.
+ * This enlightenment must be disabled is the host TSC is not
+ * invariant. However it is also disabled if vtsc is true (which
+ * means rdtsc is being emulated). This generally happens when guest
+ * TSC freq and host TSC freq don't match. The TscScale value could be
+ * adjusted to cope with this, allowing vtsc to be turned off, but
+ * support for this is not yet present in the hypervisor. Thus is it
+ * is possible that migrating a Windows VM between hosts of differing
+ * TSC frequencies may result in large differences in guest
+ * performance.
*/
if ( !host_tsc_is_safe() || d->arch.vtsc )
{
@@ -515,10 +502,10 @@ static void update_reference_tsc(struct domain *d, bool_t initialize)
* this mechanism is no longer a reliable source of time and that
* the VM should fall back to a different source.
*
- * Server 2012 (6.2 kernel) and 2012 R2 (6.3 kernel) actually violate
- * the spec. and rely on a value of 0 to indicate that this
- * enlightenment should no longer be used. These two kernel
- * versions are currently the only ones to make use of this
+ * Server 2012 (6.2 kernel) and 2012 R2 (6.3 kernel) actually
+ * violate the specification and rely on a value of 0 to indicate
+ * that this enlightenment should no longer be used. These two
+ * kernel versions are currently the only ones to make use of this
* enlightenment, so just use 0 here.
*/
p->TscSequence = 0;
@@ -646,7 +633,8 @@ int guest_wrmsr_viridian(struct vcpu *v, uint32_t idx, uint64_t val)
default:
gdprintk(XENLOG_INFO,
- "Write %016"PRIx64" to unimplemented MSR %#x\n", val, idx);
+ "Write %016"PRIx64" to unimplemented MSR %#x\n", val,
+ idx);
return X86EMUL_EXCEPTION;
}
@@ -872,10 +860,6 @@ int viridian_hypercall(struct cpu_user_regs *regs)
uint64_t vcpu_mask;
} input_params;
- /*
- * See sections 9.4.2 and 9.4.4 of the specification.
- */
-
/* These hypercalls should never use the fast-call convention. */
status = HV_STATUS_INVALID_PARAMETER;
if ( input.fast )
@@ -883,7 +867,8 @@ int viridian_hypercall(struct cpu_user_regs *regs)
/* Get input parameters. */
if ( hvm_copy_from_guest_phys(&input_params, input_params_gpa,
- sizeof(input_params)) != HVMTRANS_okay )
+ sizeof(input_params)) !=
+ HVMTRANS_okay )
break;
/*
@@ -961,7 +946,8 @@ out:
return HVM_HCALL_completed;
}
-static int viridian_save_domain_ctxt(struct vcpu *v, hvm_domain_context_t *h)
+static int viridian_save_domain_ctxt(struct vcpu *v,
+ hvm_domain_context_t *h)
{
const struct domain *d = v->domain;
struct hvm_viridian_domain_context ctxt = {
@@ -977,7 +963,8 @@ static int viridian_save_domain_ctxt(struct vcpu *v, hvm_domain_context_t *h)
return (hvm_save_entry(VIRIDIAN_DOMAIN, 0, h, &ctxt) != 0);
}
-static int viridian_load_domain_ctxt(struct domain *d, hvm_domain_context_t *h)
+static int viridian_load_domain_ctxt(struct domain *d,
+ hvm_domain_context_t *h)
{
struct hvm_viridian_domain_context ctxt;
@@ -1011,7 +998,8 @@ static int viridian_save_vcpu_ctxt(struct vcpu *v, hvm_domain_context_t *h)
return hvm_save_entry(VIRIDIAN_VCPU, v->vcpu_id, h, &ctxt);
}
-static int viridian_load_vcpu_ctxt(struct domain *d, hvm_domain_context_t *h)
+static int viridian_load_vcpu_ctxt(struct domain *d,
+ hvm_domain_context_t *h)
{
unsigned int vcpuid = hvm_load_instance(h);
struct vcpu *v;
diff --git a/xen/include/asm-x86/hvm/viridian.h b/xen/include/asm-x86/hvm/viridian.h
index 071fb445bb..f6008f9bdb 100644
--- a/xen/include/asm-x86/hvm/viridian.h
+++ b/xen/include/asm-x86/hvm/viridian.h
@@ -77,10 +77,6 @@ union viridian_reference_tsc
} fields;
};
-/*
- * Type defintion as in Microsoft Hypervisor Top-Level Functional
- * Specification v4.0a, section 15.4.2.
- */
typedef struct _HV_REFERENCE_TSC_PAGE
{
uint32_t TscSequence;
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v2 4/9] viridian: remove duplicate union types
2018-10-31 12:43 [PATCH v2 0/9] viridian cleanup Paul Durrant
` (2 preceding siblings ...)
2018-10-31 12:43 ` [PATCH v2 3/9] viridian: remove comments referencing section number in the spec Paul Durrant
@ 2018-10-31 12:43 ` Paul Durrant
2018-10-31 12:43 ` [PATCH v2 5/9] viridian: separate interrupt related enlightenment implementations Paul Durrant
` (4 subsequent siblings)
8 siblings, 0 replies; 26+ messages in thread
From: Paul Durrant @ 2018-10-31 12:43 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Paul Durrant, Wei Liu, Jan Beulich
The 'viridian_vp_assist', 'viridian_hypercall_gpa' and
'viridian_reference_tsc' union types are identical in layout. The layout
is also common throughout the specification [1].
This patch declares a common 'viridian_page_msr' type and converts the rest
of the code to use that type for both the hypercall and VP assist pages.
Also, rename 'viridian_guest_os_id' to 'viridian_guest_os_id_msr' since it
also is a union representing an MSR value.
No functional change.
[1] https://github.com/MicrosoftDocs/Virtualization-Documentation/raw/live/tlfs/Hypervisor%20Top%20Level%20Functional%20Specification%20v5.0C.pdf
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Reviewed-by: Roger Pau Monne <roger.pau@citrix.com>
---
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
xen/arch/x86/hvm/viridian/viridian.c | 8 ++++----
xen/include/asm-x86/hvm/viridian.h | 36 ++++++++----------------------------
2 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/xen/arch/x86/hvm/viridian/viridian.c b/xen/arch/x86/hvm/viridian/viridian.c
index f5f5fbcdfe..2dc86dd0f3 100644
--- a/xen/arch/x86/hvm/viridian/viridian.c
+++ b/xen/arch/x86/hvm/viridian/viridian.c
@@ -286,7 +286,7 @@ void cpuid_viridian_leaves(const struct vcpu *v, uint32_t leaf,
static void dump_guest_os_id(const struct domain *d)
{
- const union viridian_guest_os_id *goi;
+ const union viridian_guest_os_id_msr *goi;
goi = &d->arch.hvm.viridian.guest_os_id;
@@ -300,7 +300,7 @@ static void dump_guest_os_id(const struct domain *d)
static void dump_hypercall(const struct domain *d)
{
- const union viridian_hypercall_gpa *hg;
+ const union viridian_page_msr *hg;
hg = &d->arch.hvm.viridian.hypercall_gpa;
@@ -311,7 +311,7 @@ static void dump_hypercall(const struct domain *d)
static void dump_vp_assist(const struct vcpu *v)
{
- const union viridian_vp_assist *va;
+ const union viridian_page_msr *va;
va = &v->arch.hvm.viridian.vp_assist.msr;
@@ -321,7 +321,7 @@ static void dump_vp_assist(const struct vcpu *v)
static void dump_reference_tsc(const struct domain *d)
{
- const union viridian_reference_tsc *rt;
+ const union viridian_page_msr *rt;
rt = &d->arch.hvm.viridian.reference_tsc;
diff --git a/xen/include/asm-x86/hvm/viridian.h b/xen/include/asm-x86/hvm/viridian.h
index f6008f9bdb..359fdf5a83 100644
--- a/xen/include/asm-x86/hvm/viridian.h
+++ b/xen/include/asm-x86/hvm/viridian.h
@@ -9,8 +9,9 @@
#ifndef __ASM_X86_HVM_VIRIDIAN_H__
#define __ASM_X86_HVM_VIRIDIAN_H__
-union viridian_vp_assist
-{ uint64_t raw;
+union viridian_page_msr
+{
+ uint64_t raw;
struct
{
uint64_t enabled:1;
@@ -22,14 +23,14 @@ union viridian_vp_assist
struct viridian_vcpu
{
struct {
- union viridian_vp_assist msr;
+ union viridian_page_msr msr;
void *va;
bool pending;
} vp_assist;
uint64_t crash_param[5];
};
-union viridian_guest_os_id
+union viridian_guest_os_id_msr
{
uint64_t raw;
struct
@@ -43,16 +44,6 @@ union viridian_guest_os_id
} fields;
};
-union viridian_hypercall_gpa
-{ uint64_t raw;
- struct
- {
- uint64_t enabled:1;
- uint64_t reserved_preserved:11;
- uint64_t pfn:48;
- } fields;
-};
-
struct viridian_time_ref_count
{
unsigned long flags;
@@ -66,17 +57,6 @@ struct viridian_time_ref_count
int64_t off;
};
-union viridian_reference_tsc
-{
- uint64_t raw;
- struct
- {
- uint64_t enabled:1;
- uint64_t reserved_preserved:11;
- uint64_t pfn:48;
- } fields;
-};
-
typedef struct _HV_REFERENCE_TSC_PAGE
{
uint32_t TscSequence;
@@ -88,10 +68,10 @@ typedef struct _HV_REFERENCE_TSC_PAGE
struct viridian_domain
{
- union viridian_guest_os_id guest_os_id;
- union viridian_hypercall_gpa hypercall_gpa;
+ union viridian_guest_os_id_msr guest_os_id;
+ union viridian_page_msr hypercall_gpa;
struct viridian_time_ref_count time_ref_count;
- union viridian_reference_tsc reference_tsc;
+ union viridian_page_msr reference_tsc;
};
void cpuid_viridian_leaves(const struct vcpu *v, uint32_t leaf,
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v2 5/9] viridian: separate interrupt related enlightenment implementations...
2018-10-31 12:43 [PATCH v2 0/9] viridian cleanup Paul Durrant
` (3 preceding siblings ...)
2018-10-31 12:43 ` [PATCH v2 4/9] viridian: remove duplicate union types Paul Durrant
@ 2018-10-31 12:43 ` Paul Durrant
2018-10-31 15:40 ` Wei Liu
2018-11-05 12:51 ` Jan Beulich
2018-10-31 12:43 ` [PATCH v2 6/9] viridian: separate time " Paul Durrant
` (3 subsequent siblings)
8 siblings, 2 replies; 26+ messages in thread
From: Paul Durrant @ 2018-10-31 12:43 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Paul Durrant, Wei Liu, Jan Beulich
...into new 'synic' module.
The SynIC (synthetic interrupt controller) is specified [1] to be a super-
set of a virtualized LAPIC, and its definition encompasses all
enlightenments related to virtual interrupt control.
This patch reduces the size of the main viridian source module by giving
these enlightenments their own module. This is done in anticipation of
implementation of more such enlightenments and a desire not to further
lengthen then main source module when this work is done.
Whilst moving the code:
- Fix various style issues.
- Move the MSR definitions into the header (since they are now needed in
more than one source module).
[1] https://github.com/MicrosoftDocs/Virtualization-Documentation/raw/live/tlfs/Hypervisor%20Top%20Level%20Functional%20Specification%20v5.0C.pdf
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
---
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
v2:
- Sort headers alphabetically and separate asm/ amd xen/ sections
- Constify vcpu context during load
---
xen/arch/x86/hvm/viridian/Makefile | 1 +
xen/arch/x86/hvm/viridian/synic.c | 225 ++++++++++++++++++++++++++++++++++
xen/arch/x86/hvm/viridian/viridian.c | 229 ++---------------------------------
xen/include/asm-x86/hvm/viridian.h | 76 ++++++++++++
4 files changed, 312 insertions(+), 219 deletions(-)
create mode 100644 xen/arch/x86/hvm/viridian/synic.c
diff --git a/xen/arch/x86/hvm/viridian/Makefile b/xen/arch/x86/hvm/viridian/Makefile
index 09fd0a5f3c..fca8e16e20 100644
--- a/xen/arch/x86/hvm/viridian/Makefile
+++ b/xen/arch/x86/hvm/viridian/Makefile
@@ -1 +1,2 @@
+obj-y += synic.o
obj-y += viridian.o
diff --git a/xen/arch/x86/hvm/viridian/synic.c b/xen/arch/x86/hvm/viridian/synic.c
new file mode 100644
index 0000000000..e01ac941ea
--- /dev/null
+++ b/xen/arch/x86/hvm/viridian/synic.c
@@ -0,0 +1,225 @@
+/***************************************************************************
+ * synic.c
+ *
+ * An implementation of some interrupt related Viridian enlightenments.
+ * See Microsoft's Hypervisor Top Level Functional Specification.
+ * for more information.
+ */
+
+#include <xen/domain_page.h>
+#include <xen/hypercall.h>
+#include <xen/sched.h>
+#include <xen/version.h>
+
+#include <asm/apic.h>
+#include <asm/hvm/support.h>
+
+static void dump_vp_assist(const struct vcpu *v)
+{
+ const union viridian_page_msr *va = &v->arch.hvm.viridian.vp_assist.msr;
+
+ if ( !va->fields.enabled )
+ return;
+
+ printk(XENLOG_G_INFO "%pv: VIRIDIAN VP_ASSIST_PAGE: pfn: %lx\n",
+ v, (unsigned long)va->fields.pfn);
+}
+
+static void initialize_vp_assist(struct vcpu *v)
+{
+ struct domain *d = v->domain;
+ unsigned long gmfn = v->arch.hvm.viridian.vp_assist.msr.fields.pfn;
+ struct page_info *page = get_page_from_gfn(d, gmfn, NULL, P2M_ALLOC);
+ void *va;
+
+ ASSERT(!v->arch.hvm.viridian.vp_assist.va);
+
+ if ( !page )
+ goto fail;
+
+ if ( !get_page_type(page, PGT_writable_page) )
+ {
+ put_page(page);
+ goto fail;
+ }
+
+ va = __map_domain_page_global(page);
+ if ( !va )
+ {
+ put_page_and_type(page);
+ goto fail;
+ }
+
+ clear_page(va);
+
+ v->arch.hvm.viridian.vp_assist.va = va;
+ return;
+
+ fail:
+ gdprintk(XENLOG_WARNING, "Bad GMFN %#"PRI_gfn" (MFN %#"PRI_mfn")\n",
+ gmfn, mfn_x(page ? page_to_mfn(page) : INVALID_MFN));
+}
+
+static void teardown_vp_assist(struct vcpu *v)
+{
+ void *va = v->arch.hvm.viridian.vp_assist.va;
+ struct page_info *page;
+
+ if ( !va )
+ return;
+
+ v->arch.hvm.viridian.vp_assist.va = NULL;
+
+ page = mfn_to_page(domain_page_map_to_mfn(va));
+
+ unmap_domain_page_global(va);
+ put_page_and_type(page);
+}
+
+void viridian_apic_assist_set(struct vcpu *v)
+{
+ uint32_t *va = v->arch.hvm.viridian.vp_assist.va;
+
+ if ( !va )
+ return;
+
+ /*
+ * If there is already an assist pending then something has gone
+ * wrong and the VM will most likely hang so force a crash now
+ * to make the problem clear.
+ */
+ if ( v->arch.hvm.viridian.vp_assist.pending )
+ domain_crash(v->domain);
+
+ v->arch.hvm.viridian.vp_assist.pending = true;
+ *va |= 1u;
+}
+
+bool viridian_apic_assist_completed(struct vcpu *v)
+{
+ uint32_t *va = v->arch.hvm.viridian.vp_assist.va;
+
+ if ( !va )
+ return false;
+
+ if ( v->arch.hvm.viridian.vp_assist.pending &&
+ !(*va & 1u) )
+ {
+ /* An EOI has been avoided */
+ v->arch.hvm.viridian.vp_assist.pending = false;
+ return true;
+ }
+
+ return false;
+}
+
+void viridian_apic_assist_clear(struct vcpu *v)
+{
+ uint32_t *va = v->arch.hvm.viridian.vp_assist.va;
+
+ if ( !va )
+ return;
+
+ *va &= ~1u;
+ v->arch.hvm.viridian.vp_assist.pending = false;
+}
+
+int viridian_synic_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val)
+{
+ switch ( idx )
+ {
+ case HV_X64_MSR_EOI:
+ vlapic_EOI_set(vcpu_vlapic(v));
+ break;
+
+ case HV_X64_MSR_ICR: {
+ u32 eax = (u32)val, edx = (u32)(val >> 32);
+ struct vlapic *vlapic = vcpu_vlapic(v);
+ eax &= ~(1 << 12);
+ edx &= 0xff000000;
+ vlapic_set_reg(vlapic, APIC_ICR2, edx);
+ vlapic_ipi(vlapic, eax, edx);
+ vlapic_set_reg(vlapic, APIC_ICR, eax);
+ break;
+ }
+ case HV_X64_MSR_TPR:
+ vlapic_set_reg(vcpu_vlapic(v), APIC_TASKPRI, (uint8_t)val);
+ break;
+
+ case HV_X64_MSR_VP_ASSIST_PAGE:
+ teardown_vp_assist(v); /* release any previous mapping */
+ v->arch.hvm.viridian.vp_assist.msr.raw = val;
+ dump_vp_assist(v);
+ if ( v->arch.hvm.viridian.vp_assist.msr.fields.enabled )
+ initialize_vp_assist(v);
+ break;
+
+ default:
+ gdprintk(XENLOG_INFO,
+ "%s: unimplemented MSR %#x (%016"PRIx64")\n",
+ __func__, idx, val);
+ return X86EMUL_EXCEPTION;
+ }
+
+ return X86EMUL_OKAY;
+}
+
+int viridian_synic_rdmsr(const struct vcpu *v, uint32_t idx, uint64_t *val)
+{
+ switch ( idx )
+ {
+ case HV_X64_MSR_EOI:
+ return X86EMUL_EXCEPTION;
+
+ case HV_X64_MSR_ICR:
+ {
+ uint32_t icr2 = vlapic_get_reg(vcpu_vlapic(v), APIC_ICR2);
+ uint32_t icr = vlapic_get_reg(vcpu_vlapic(v), APIC_ICR);
+
+ *val = ((uint64_t)icr2 << 32) | icr;
+ break;
+ }
+ case HV_X64_MSR_TPR:
+ *val = vlapic_get_reg(vcpu_vlapic(v), APIC_TASKPRI);
+ break;
+
+ case HV_X64_MSR_VP_ASSIST_PAGE:
+ *val = v->arch.hvm.viridian.vp_assist.msr.raw;
+ break;
+
+ default:
+ gdprintk(XENLOG_INFO,
+ "%s: unimplemented MSR %#x\n",
+ __func__, idx);
+ return X86EMUL_EXCEPTION;
+ }
+
+ return X86EMUL_OKAY;
+}
+
+void viridian_synic_save_vcpu_ctxt(const struct vcpu *v,
+ struct hvm_viridian_vcpu_context *ctxt)
+{
+ ctxt->vp_assist_pending = v->arch.hvm.viridian.vp_assist.pending;
+ ctxt->vp_assist_msr = v->arch.hvm.viridian.vp_assist.msr.raw;
+}
+
+void viridian_synic_load_vcpu_ctxt(
+ struct vcpu *v, const struct hvm_viridian_vcpu_context *ctxt)
+{
+ v->arch.hvm.viridian.vp_assist.msr.raw = ctxt->vp_assist_msr;
+ if ( v->arch.hvm.viridian.vp_assist.msr.fields.enabled )
+ initialize_vp_assist(v);
+
+ v->arch.hvm.viridian.vp_assist.pending = !!ctxt->vp_assist_pending;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/xen/arch/x86/hvm/viridian/viridian.c b/xen/arch/x86/hvm/viridian/viridian.c
index 2dc86dd0f3..cf2789e8ae 100644
--- a/xen/arch/x86/hvm/viridian/viridian.c
+++ b/xen/arch/x86/hvm/viridian/viridian.c
@@ -17,72 +17,6 @@
#include <public/sched.h>
#include <public/hvm/hvm_op.h>
-/* Viridian MSR numbers. */
-#define HV_X64_MSR_GUEST_OS_ID 0x40000000
-#define HV_X64_MSR_HYPERCALL 0x40000001
-#define HV_X64_MSR_VP_INDEX 0x40000002
-#define HV_X64_MSR_RESET 0x40000003
-#define HV_X64_MSR_VP_RUNTIME 0x40000010
-#define HV_X64_MSR_TIME_REF_COUNT 0x40000020
-#define HV_X64_MSR_REFERENCE_TSC 0x40000021
-#define HV_X64_MSR_TSC_FREQUENCY 0x40000022
-#define HV_X64_MSR_APIC_FREQUENCY 0x40000023
-#define HV_X64_MSR_EOI 0x40000070
-#define HV_X64_MSR_ICR 0x40000071
-#define HV_X64_MSR_TPR 0x40000072
-#define HV_X64_MSR_VP_ASSIST_PAGE 0x40000073
-#define HV_X64_MSR_SCONTROL 0x40000080
-#define HV_X64_MSR_SVERSION 0x40000081
-#define HV_X64_MSR_SIEFP 0x40000082
-#define HV_X64_MSR_SIMP 0x40000083
-#define HV_X64_MSR_EOM 0x40000084
-#define HV_X64_MSR_SINT0 0x40000090
-#define HV_X64_MSR_SINT1 0x40000091
-#define HV_X64_MSR_SINT2 0x40000092
-#define HV_X64_MSR_SINT3 0x40000093
-#define HV_X64_MSR_SINT4 0x40000094
-#define HV_X64_MSR_SINT5 0x40000095
-#define HV_X64_MSR_SINT6 0x40000096
-#define HV_X64_MSR_SINT7 0x40000097
-#define HV_X64_MSR_SINT8 0x40000098
-#define HV_X64_MSR_SINT9 0x40000099
-#define HV_X64_MSR_SINT10 0x4000009A
-#define HV_X64_MSR_SINT11 0x4000009B
-#define HV_X64_MSR_SINT12 0x4000009C
-#define HV_X64_MSR_SINT13 0x4000009D
-#define HV_X64_MSR_SINT14 0x4000009E
-#define HV_X64_MSR_SINT15 0x4000009F
-#define HV_X64_MSR_STIMER0_CONFIG 0x400000B0
-#define HV_X64_MSR_STIMER0_COUNT 0x400000B1
-#define HV_X64_MSR_STIMER1_CONFIG 0x400000B2
-#define HV_X64_MSR_STIMER1_COUNT 0x400000B3
-#define HV_X64_MSR_STIMER2_CONFIG 0x400000B4
-#define HV_X64_MSR_STIMER2_COUNT 0x400000B5
-#define HV_X64_MSR_STIMER3_CONFIG 0x400000B6
-#define HV_X64_MSR_STIMER3_COUNT 0x400000B7
-#define HV_X64_MSR_POWER_STATE_TRIGGER_C1 0x400000C1
-#define HV_X64_MSR_POWER_STATE_TRIGGER_C2 0x400000C2
-#define HV_X64_MSR_POWER_STATE_TRIGGER_C3 0x400000C3
-#define HV_X64_MSR_POWER_STATE_CONFIG_C1 0x400000D1
-#define HV_X64_MSR_POWER_STATE_CONFIG_C2 0x400000D2
-#define HV_X64_MSR_POWER_STATE_CONFIG_C3 0x400000D3
-#define HV_X64_MSR_STATS_PARTITION_RETAIL_PAGE 0x400000E0
-#define HV_X64_MSR_STATS_PARTITION_INTERNAL_PAGE 0x400000E1
-#define HV_X64_MSR_STATS_VP_RETAIL_PAGE 0x400000E2
-#define HV_X64_MSR_STATS_VP_INTERNAL_PAGE 0x400000E3
-#define HV_X64_MSR_GUEST_IDLE 0x400000F0
-#define HV_X64_MSR_SYNTH_DEBUG_CONTROL 0x400000F1
-#define HV_X64_MSR_SYNTH_DEBUG_STATUS 0x400000F2
-#define HV_X64_MSR_SYNTH_DEBUG_SEND_BUFFER 0x400000F3
-#define HV_X64_MSR_SYNTH_DEBUG_RECEIVE_BUFFER 0x400000F4
-#define HV_X64_MSR_SYNTH_DEBUG_PENDING_BUFFER 0x400000F5
-#define HV_X64_MSR_CRASH_P0 0x40000100
-#define HV_X64_MSR_CRASH_P1 0x40000101
-#define HV_X64_MSR_CRASH_P2 0x40000102
-#define HV_X64_MSR_CRASH_P3 0x40000103
-#define HV_X64_MSR_CRASH_P4 0x40000104
-#define HV_X64_MSR_CRASH_CTL 0x40000105
-
/* Viridian Hypercall Status Codes. */
#define HV_STATUS_SUCCESS 0x0000
#define HV_STATUS_INVALID_HYPERCALL_CODE 0x0002
@@ -309,16 +243,6 @@ static void dump_hypercall(const struct domain *d)
hg->fields.enabled, (unsigned long)hg->fields.pfn);
}
-static void dump_vp_assist(const struct vcpu *v)
-{
- const union viridian_page_msr *va;
-
- va = &v->arch.hvm.viridian.vp_assist.msr;
-
- printk(XENLOG_G_INFO "%pv: VIRIDIAN VP_ASSIST_PAGE: enabled: %x pfn: %lx\n",
- v, va->fields.enabled, (unsigned long)va->fields.pfn);
-}
-
static void dump_reference_tsc(const struct domain *d)
{
const union viridian_page_msr *rt;
@@ -364,105 +288,6 @@ static void enable_hypercall_page(struct domain *d)
put_page_and_type(page);
}
-static void initialize_vp_assist(struct vcpu *v)
-{
- struct domain *d = v->domain;
- unsigned long gmfn = v->arch.hvm.viridian.vp_assist.msr.fields.pfn;
- struct page_info *page = get_page_from_gfn(d, gmfn, NULL, P2M_ALLOC);
- void *va;
-
- ASSERT(!v->arch.hvm.viridian.vp_assist.va);
-
- if ( !page )
- goto fail;
-
- if ( !get_page_type(page, PGT_writable_page) )
- {
- put_page(page);
- goto fail;
- }
-
- va = __map_domain_page_global(page);
- if ( !va )
- {
- put_page_and_type(page);
- goto fail;
- }
-
- clear_page(va);
-
- v->arch.hvm.viridian.vp_assist.va = va;
- return;
-
- fail:
- gdprintk(XENLOG_WARNING, "Bad GMFN %#"PRI_gfn" (MFN %#"PRI_mfn")\n",
- gmfn, mfn_x(page ? page_to_mfn(page) : INVALID_MFN));
-}
-
-static void teardown_vp_assist(struct vcpu *v)
-{
- void *va = v->arch.hvm.viridian.vp_assist.va;
- struct page_info *page;
-
- if ( !va )
- return;
-
- v->arch.hvm.viridian.vp_assist.va = NULL;
-
- page = mfn_to_page(domain_page_map_to_mfn(va));
-
- unmap_domain_page_global(va);
- put_page_and_type(page);
-}
-
-void viridian_apic_assist_set(struct vcpu *v)
-{
- uint32_t *va = v->arch.hvm.viridian.vp_assist.va;
-
- if ( !va )
- return;
-
- /*
- * If there is already an assist pending then something has gone
- * wrong and the VM will most likely hang so force a crash now
- * to make the problem clear.
- */
- if ( v->arch.hvm.viridian.vp_assist.pending )
- domain_crash(v->domain);
-
- v->arch.hvm.viridian.vp_assist.pending = true;
- *va |= 1u;
-}
-
-bool viridian_apic_assist_completed(struct vcpu *v)
-{
- uint32_t *va = v->arch.hvm.viridian.vp_assist.va;
-
- if ( !va )
- return false;
-
- if ( v->arch.hvm.viridian.vp_assist.pending &&
- !(*va & 1u) )
- {
- /* An EOI has been avoided */
- v->arch.hvm.viridian.vp_assist.pending = false;
- return true;
- }
-
- return false;
-}
-
-void viridian_apic_assist_clear(struct vcpu *v)
-{
- uint32_t *va = v->arch.hvm.viridian.vp_assist.va;
-
- if ( !va )
- return;
-
- *va &= ~1u;
- v->arch.hvm.viridian.vp_assist.pending = false;
-}
-
static void update_reference_tsc(struct domain *d, bool_t initialize)
{
unsigned long gmfn = d->arch.hvm.viridian.reference_tsc.fields.pfn;
@@ -561,31 +386,10 @@ int guest_wrmsr_viridian(struct vcpu *v, uint32_t idx, uint64_t val)
break;
case HV_X64_MSR_EOI:
- vlapic_EOI_set(vcpu_vlapic(v));
- break;
-
- case HV_X64_MSR_ICR: {
- u32 eax = (u32)val, edx = (u32)(val >> 32);
- struct vlapic *vlapic = vcpu_vlapic(v);
- eax &= ~(1 << 12);
- edx &= 0xff000000;
- vlapic_set_reg(vlapic, APIC_ICR2, edx);
- vlapic_ipi(vlapic, eax, edx);
- vlapic_set_reg(vlapic, APIC_ICR, eax);
- break;
- }
-
+ case HV_X64_MSR_ICR:
case HV_X64_MSR_TPR:
- vlapic_set_reg(vcpu_vlapic(v), APIC_TASKPRI, (uint8_t)val);
- break;
-
case HV_X64_MSR_VP_ASSIST_PAGE:
- teardown_vp_assist(v); /* release any previous mapping */
- v->arch.hvm.viridian.vp_assist.msr.raw = val;
- dump_vp_assist(v);
- if ( v->arch.hvm.viridian.vp_assist.msr.fields.enabled )
- initialize_vp_assist(v);
- break;
+ return viridian_synic_wrmsr(v, idx, val);
case HV_X64_MSR_REFERENCE_TSC:
if ( !(viridian_feature_mask(d) & HVMPV_reference_tsc) )
@@ -708,18 +512,11 @@ int guest_rdmsr_viridian(const struct vcpu *v, uint32_t idx, uint64_t *val)
*val = 1000000000ull / APIC_BUS_CYCLE_NS;
break;
+ case HV_X64_MSR_EOI:
case HV_X64_MSR_ICR:
- *val = (((uint64_t)vlapic_get_reg(vcpu_vlapic(v), APIC_ICR2) << 32) |
- vlapic_get_reg(vcpu_vlapic(v), APIC_ICR));
- break;
-
case HV_X64_MSR_TPR:
- *val = vlapic_get_reg(vcpu_vlapic(v), APIC_TASKPRI);
- break;
-
case HV_X64_MSR_VP_ASSIST_PAGE:
- *val = v->arch.hvm.viridian.vp_assist.msr.raw;
- break;
+ return viridian_synic_rdmsr(v, idx, val);
case HV_X64_MSR_REFERENCE_TSC:
if ( !(viridian_feature_mask(d) & HVMPV_reference_tsc) )
@@ -777,7 +574,7 @@ int guest_rdmsr_viridian(const struct vcpu *v, uint32_t idx, uint64_t *val)
void viridian_vcpu_deinit(struct vcpu *v)
{
- teardown_vp_assist(v);
+ viridian_synic_wrmsr(v, HV_X64_MSR_VP_ASSIST_PAGE, 0);
}
void viridian_domain_deinit(struct domain *d)
@@ -785,7 +582,7 @@ void viridian_domain_deinit(struct domain *d)
struct vcpu *v;
for_each_vcpu ( d, v )
- teardown_vp_assist(v);
+ viridian_vcpu_deinit(v);
}
static DEFINE_PER_CPU(cpumask_t, ipi_cpumask);
@@ -987,14 +784,13 @@ HVM_REGISTER_SAVE_RESTORE(VIRIDIAN_DOMAIN, viridian_save_domain_ctxt,
static int viridian_save_vcpu_ctxt(struct vcpu *v, hvm_domain_context_t *h)
{
- struct hvm_viridian_vcpu_context ctxt = {
- .vp_assist_msr = v->arch.hvm.viridian.vp_assist.msr.raw,
- .vp_assist_pending = v->arch.hvm.viridian.vp_assist.pending,
- };
+ struct hvm_viridian_vcpu_context ctxt = {};
if ( !is_viridian_domain(v->domain) )
return 0;
+ viridian_synic_save_vcpu_ctxt(v, &ctxt);
+
return hvm_save_entry(VIRIDIAN_VCPU, v->vcpu_id, h, &ctxt);
}
@@ -1018,12 +814,7 @@ static int viridian_load_vcpu_ctxt(struct domain *d,
if ( memcmp(&ctxt._pad, zero_page, sizeof(ctxt._pad)) )
return -EINVAL;
- v->arch.hvm.viridian.vp_assist.msr.raw = ctxt.vp_assist_msr;
- if ( v->arch.hvm.viridian.vp_assist.msr.fields.enabled &&
- !v->arch.hvm.viridian.vp_assist.va )
- initialize_vp_assist(v);
-
- v->arch.hvm.viridian.vp_assist.pending = !!ctxt.vp_assist_pending;
+ viridian_synic_load_vcpu_ctxt(v, &ctxt);
return 0;
}
diff --git a/xen/include/asm-x86/hvm/viridian.h b/xen/include/asm-x86/hvm/viridian.h
index 359fdf5a83..7e21ca5537 100644
--- a/xen/include/asm-x86/hvm/viridian.h
+++ b/xen/include/asm-x86/hvm/viridian.h
@@ -9,6 +9,74 @@
#ifndef __ASM_X86_HVM_VIRIDIAN_H__
#define __ASM_X86_HVM_VIRIDIAN_H__
+#include <asm/hvm/save.h>
+
+/* Viridian MSR numbers. */
+#define HV_X64_MSR_GUEST_OS_ID 0x40000000
+#define HV_X64_MSR_HYPERCALL 0x40000001
+#define HV_X64_MSR_VP_INDEX 0x40000002
+#define HV_X64_MSR_RESET 0x40000003
+#define HV_X64_MSR_VP_RUNTIME 0x40000010
+#define HV_X64_MSR_TIME_REF_COUNT 0x40000020
+#define HV_X64_MSR_REFERENCE_TSC 0x40000021
+#define HV_X64_MSR_TSC_FREQUENCY 0x40000022
+#define HV_X64_MSR_APIC_FREQUENCY 0x40000023
+#define HV_X64_MSR_EOI 0x40000070
+#define HV_X64_MSR_ICR 0x40000071
+#define HV_X64_MSR_TPR 0x40000072
+#define HV_X64_MSR_VP_ASSIST_PAGE 0x40000073
+#define HV_X64_MSR_SCONTROL 0x40000080
+#define HV_X64_MSR_SVERSION 0x40000081
+#define HV_X64_MSR_SIEFP 0x40000082
+#define HV_X64_MSR_SIMP 0x40000083
+#define HV_X64_MSR_EOM 0x40000084
+#define HV_X64_MSR_SINT0 0x40000090
+#define HV_X64_MSR_SINT1 0x40000091
+#define HV_X64_MSR_SINT2 0x40000092
+#define HV_X64_MSR_SINT3 0x40000093
+#define HV_X64_MSR_SINT4 0x40000094
+#define HV_X64_MSR_SINT5 0x40000095
+#define HV_X64_MSR_SINT6 0x40000096
+#define HV_X64_MSR_SINT7 0x40000097
+#define HV_X64_MSR_SINT8 0x40000098
+#define HV_X64_MSR_SINT9 0x40000099
+#define HV_X64_MSR_SINT10 0x4000009A
+#define HV_X64_MSR_SINT11 0x4000009B
+#define HV_X64_MSR_SINT12 0x4000009C
+#define HV_X64_MSR_SINT13 0x4000009D
+#define HV_X64_MSR_SINT14 0x4000009E
+#define HV_X64_MSR_SINT15 0x4000009F
+#define HV_X64_MSR_STIMER0_CONFIG 0x400000B0
+#define HV_X64_MSR_STIMER0_COUNT 0x400000B1
+#define HV_X64_MSR_STIMER1_CONFIG 0x400000B2
+#define HV_X64_MSR_STIMER1_COUNT 0x400000B3
+#define HV_X64_MSR_STIMER2_CONFIG 0x400000B4
+#define HV_X64_MSR_STIMER2_COUNT 0x400000B5
+#define HV_X64_MSR_STIMER3_CONFIG 0x400000B6
+#define HV_X64_MSR_STIMER3_COUNT 0x400000B7
+#define HV_X64_MSR_POWER_STATE_TRIGGER_C1 0x400000C1
+#define HV_X64_MSR_POWER_STATE_TRIGGER_C2 0x400000C2
+#define HV_X64_MSR_POWER_STATE_TRIGGER_C3 0x400000C3
+#define HV_X64_MSR_POWER_STATE_CONFIG_C1 0x400000D1
+#define HV_X64_MSR_POWER_STATE_CONFIG_C2 0x400000D2
+#define HV_X64_MSR_POWER_STATE_CONFIG_C3 0x400000D3
+#define HV_X64_MSR_STATS_PARTITION_RETAIL_PAGE 0x400000E0
+#define HV_X64_MSR_STATS_PARTITION_INTERNAL_PAGE 0x400000E1
+#define HV_X64_MSR_STATS_VP_RETAIL_PAGE 0x400000E2
+#define HV_X64_MSR_STATS_VP_INTERNAL_PAGE 0x400000E3
+#define HV_X64_MSR_GUEST_IDLE 0x400000F0
+#define HV_X64_MSR_SYNTH_DEBUG_CONTROL 0x400000F1
+#define HV_X64_MSR_SYNTH_DEBUG_STATUS 0x400000F2
+#define HV_X64_MSR_SYNTH_DEBUG_SEND_BUFFER 0x400000F3
+#define HV_X64_MSR_SYNTH_DEBUG_RECEIVE_BUFFER 0x400000F4
+#define HV_X64_MSR_SYNTH_DEBUG_PENDING_BUFFER 0x400000F5
+#define HV_X64_MSR_CRASH_P0 0x40000100
+#define HV_X64_MSR_CRASH_P1 0x40000101
+#define HV_X64_MSR_CRASH_P2 0x40000102
+#define HV_X64_MSR_CRASH_P3 0x40000103
+#define HV_X64_MSR_CRASH_P4 0x40000104
+#define HV_X64_MSR_CRASH_CTL 0x40000105
+
union viridian_page_msr
{
uint64_t raw;
@@ -93,6 +161,14 @@ void viridian_apic_assist_set(struct vcpu *v);
bool viridian_apic_assist_completed(struct vcpu *v);
void viridian_apic_assist_clear(struct vcpu *v);
+int viridian_synic_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val);
+int viridian_synic_rdmsr(const struct vcpu *v, uint32_t idx, uint64_t *val);
+
+void viridian_synic_save_vcpu_ctxt(const struct vcpu *v,
+ struct hvm_viridian_vcpu_context *ctxt);
+void viridian_synic_load_vcpu_ctxt(
+ struct vcpu *v, const struct hvm_viridian_vcpu_context *ctxt);
+
#endif /* __ASM_X86_HVM_VIRIDIAN_H__ */
/*
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v2 5/9] viridian: separate interrupt related enlightenment implementations...
2018-10-31 12:43 ` [PATCH v2 5/9] viridian: separate interrupt related enlightenment implementations Paul Durrant
@ 2018-10-31 15:40 ` Wei Liu
2018-11-05 12:51 ` Jan Beulich
1 sibling, 0 replies; 26+ messages in thread
From: Wei Liu @ 2018-10-31 15:40 UTC (permalink / raw)
To: Paul Durrant; +Cc: xen-devel, Wei Liu, Jan Beulich, Andrew Cooper
On Wed, Oct 31, 2018 at 12:43:31PM +0000, Paul Durrant wrote:
> ...into new 'synic' module.
>
> The SynIC (synthetic interrupt controller) is specified [1] to be a super-
> set of a virtualized LAPIC, and its definition encompasses all
> enlightenments related to virtual interrupt control.
>
> This patch reduces the size of the main viridian source module by giving
> these enlightenments their own module. This is done in anticipation of
> implementation of more such enlightenments and a desire not to further
> lengthen then main source module when this work is done.
>
> Whilst moving the code:
>
> - Fix various style issues.
> - Move the MSR definitions into the header (since they are now needed in
> more than one source module).
>
> [1] https://github.com/MicrosoftDocs/Virtualization-Documentation/raw/live/tlfs/Hypervisor%20Top%20Level%20Functional%20Specification%20v5.0C.pdf
>
> Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v2 5/9] viridian: separate interrupt related enlightenment implementations...
2018-10-31 12:43 ` [PATCH v2 5/9] viridian: separate interrupt related enlightenment implementations Paul Durrant
2018-10-31 15:40 ` Wei Liu
@ 2018-11-05 12:51 ` Jan Beulich
2018-11-05 13:22 ` Paul Durrant
1 sibling, 1 reply; 26+ messages in thread
From: Jan Beulich @ 2018-11-05 12:51 UTC (permalink / raw)
To: Paul Durrant; +Cc: Andrew Cooper, Wei Liu, xen-devel
>>> On 31.10.18 at 13:43, <paul.durrant@citrix.com> wrote:
> --- /dev/null
> +++ b/xen/arch/x86/hvm/viridian/synic.c
> @@ -0,0 +1,225 @@
> +/**************************************************************************
> *
> + * synic.c
> + *
> + * An implementation of some interrupt related Viridian enlightenments.
> + * See Microsoft's Hypervisor Top Level Functional Specification.
> + * for more information.
> + */
> +
> +#include <xen/domain_page.h>
> +#include <xen/hypercall.h>
> +#include <xen/sched.h>
> +#include <xen/version.h>
> +
> +#include <asm/apic.h>
> +#include <asm/hvm/support.h>
> +
> +static void dump_vp_assist(const struct vcpu *v)
With the name change to synic, is the _vp_ infix here and in a few
other places retained intentionally?
> --- a/xen/include/asm-x86/hvm/viridian.h
> +++ b/xen/include/asm-x86/hvm/viridian.h
> @@ -9,6 +9,74 @@
> #ifndef __ASM_X86_HVM_VIRIDIAN_H__
> #define __ASM_X86_HVM_VIRIDIAN_H__
>
> +#include <asm/hvm/save.h>
> +
> +/* Viridian MSR numbers. */
> +#define HV_X64_MSR_GUEST_OS_ID 0x40000000
Are these needed outside of xen/arch/x86/hvm/viridian/ ? If not,
please introduce a local header there rather than polluting
every CU's name space. Other definitions and declaration local
to the Viridian implementation should then go there too, rather
than here.
Jan
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v2 5/9] viridian: separate interrupt related enlightenment implementations...
2018-11-05 12:51 ` Jan Beulich
@ 2018-11-05 13:22 ` Paul Durrant
0 siblings, 0 replies; 26+ messages in thread
From: Paul Durrant @ 2018-11-05 13:22 UTC (permalink / raw)
To: 'Jan Beulich'; +Cc: Andrew Cooper, Wei Liu, xen-devel
> -----Original Message-----
> From: Jan Beulich [mailto:JBeulich@suse.com]
> Sent: 05 November 2018 12:51
> To: Paul Durrant <Paul.Durrant@citrix.com>
> Cc: Andrew Cooper <Andrew.Cooper3@citrix.com>; Wei Liu
> <wei.liu2@citrix.com>; xen-devel <xen-devel@lists.xenproject.org>
> Subject: Re: [PATCH v2 5/9] viridian: separate interrupt related
> enlightenment implementations...
>
> >>> On 31.10.18 at 13:43, <paul.durrant@citrix.com> wrote:
> > --- /dev/null
> > +++ b/xen/arch/x86/hvm/viridian/synic.c
> > @@ -0,0 +1,225 @@
> >
> +/************************************************************************
> **
> > *
> > + * synic.c
> > + *
> > + * An implementation of some interrupt related Viridian enlightenments.
> > + * See Microsoft's Hypervisor Top Level Functional Specification.
> > + * for more information.
> > + */
> > +
> > +#include <xen/domain_page.h>
> > +#include <xen/hypercall.h>
> > +#include <xen/sched.h>
> > +#include <xen/version.h>
> > +
> > +#include <asm/apic.h>
> > +#include <asm/hvm/support.h>
> > +
> > +static void dump_vp_assist(const struct vcpu *v)
>
> With the name change to synic, is the _vp_ infix here and in a few
> other places retained intentionally?
Yes, it's meant to dump after programming the VP assist MSR, so I think the name is still correct.
>
> > --- a/xen/include/asm-x86/hvm/viridian.h
> > +++ b/xen/include/asm-x86/hvm/viridian.h
> > @@ -9,6 +9,74 @@
> > #ifndef __ASM_X86_HVM_VIRIDIAN_H__
> > #define __ASM_X86_HVM_VIRIDIAN_H__
> >
> > +#include <asm/hvm/save.h>
> > +
> > +/* Viridian MSR numbers. */
> > +#define HV_X64_MSR_GUEST_OS_ID 0x40000000
>
> Are these needed outside of xen/arch/x86/hvm/viridian/ ? If not,
> please introduce a local header there rather than polluting
> every CU's name space. Other definitions and declaration local
> to the Viridian implementation should then go there too, rather
> than here.
Ok. They are only needed under that sub-dir so I'll add the extra header.
Paul
>
> Jan
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v2 6/9] viridian: separate time related enlightenment implementations...
2018-10-31 12:43 [PATCH v2 0/9] viridian cleanup Paul Durrant
` (4 preceding siblings ...)
2018-10-31 12:43 ` [PATCH v2 5/9] viridian: separate interrupt related enlightenment implementations Paul Durrant
@ 2018-10-31 12:43 ` Paul Durrant
2018-10-31 15:43 ` Wei Liu
2018-11-05 12:56 ` Jan Beulich
2018-10-31 12:43 ` [PATCH v2 7/9] viridian: define type for the 'virtual VP assist page' Paul Durrant
` (2 subsequent siblings)
8 siblings, 2 replies; 26+ messages in thread
From: Paul Durrant @ 2018-10-31 12:43 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Paul Durrant, Wei Liu, Jan Beulich
...into new 'time' module.
This patch reduces the size of the main viridian source module by
moving time related enlightenments into their own source module. This is
done in anticipation of implementation of more such enightenments and
a desire to not further lengthen the main source module when this work
is done.
While moving the code:
- Move the declaration of HV_REFERENCE_TSC_PAGE from the header file into
the new source module, since it is only used there.
- Clean up a bool_t.
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
---
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
v2:
- Sort headers alphabetically and separate asm/ amd xen/ sections
- Constify domain context during load
---
xen/arch/x86/hvm/viridian/Makefile | 1 +
xen/arch/x86/hvm/viridian/time.c | 245 +++++++++++++++++++++++++++++++++++
xen/arch/x86/hvm/viridian/viridian.c | 174 +------------------------
xen/include/asm-x86/hvm/viridian.h | 17 ++-
4 files changed, 261 insertions(+), 176 deletions(-)
create mode 100644 xen/arch/x86/hvm/viridian/time.c
diff --git a/xen/arch/x86/hvm/viridian/Makefile b/xen/arch/x86/hvm/viridian/Makefile
index fca8e16e20..3ecdffe2f6 100644
--- a/xen/arch/x86/hvm/viridian/Makefile
+++ b/xen/arch/x86/hvm/viridian/Makefile
@@ -1,2 +1,3 @@
obj-y += synic.o
+obj-y += time.o
obj-y += viridian.o
diff --git a/xen/arch/x86/hvm/viridian/time.c b/xen/arch/x86/hvm/viridian/time.c
new file mode 100644
index 0000000000..88fcd76495
--- /dev/null
+++ b/xen/arch/x86/hvm/viridian/time.c
@@ -0,0 +1,245 @@
+/***************************************************************************
+ * time.c
+ *
+ * An implementation of some time related Viridian enlightenments.
+ * See Microsoft's Hypervisor Top Level Functional Specification.
+ * for more information.
+ */
+
+#include <xen/domain_page.h>
+#include <xen/hypercall.h>
+#include <xen/sched.h>
+#include <xen/version.h>
+
+#include <asm/apic.h>
+#include <asm/hvm/support.h>
+
+typedef struct _HV_REFERENCE_TSC_PAGE
+{
+ uint32_t TscSequence;
+ uint32_t Reserved1;
+ uint64_t TscScale;
+ int64_t TscOffset;
+ uint64_t Reserved2[509];
+} HV_REFERENCE_TSC_PAGE, *PHV_REFERENCE_TSC_PAGE;
+
+static void dump_reference_tsc(const struct domain *d)
+{
+ const union viridian_page_msr *rt = &d->arch.hvm.viridian.reference_tsc;
+
+ if ( !rt->fields.enabled )
+ return;
+
+ printk(XENLOG_G_INFO "d%d: VIRIDIAN REFERENCE_TSC: pfn: %lx\n",
+ d->domain_id, (unsigned long)rt->fields.pfn);
+}
+
+static void update_reference_tsc(struct domain *d, bool initialize)
+{
+ unsigned long gmfn = d->arch.hvm.viridian.reference_tsc.fields.pfn;
+ struct page_info *page = get_page_from_gfn(d, gmfn, NULL, P2M_ALLOC);
+ HV_REFERENCE_TSC_PAGE *p;
+
+ if ( !page || !get_page_type(page, PGT_writable_page) )
+ {
+ if ( page )
+ put_page(page);
+ gdprintk(XENLOG_WARNING, "Bad GMFN %#"PRI_gfn" (MFN %#"PRI_mfn")\n",
+ gmfn, mfn_x(page ? page_to_mfn(page) : INVALID_MFN));
+ return;
+ }
+
+ p = __map_domain_page(page);
+
+ if ( initialize )
+ clear_page(p);
+
+ /*
+ * This enlightenment must be disabled is the host TSC is not invariant.
+ * However it is also disabled if vtsc is true (which means rdtsc is
+ * being emulated). This generally happens when guest TSC freq and host
+ * TSC freq don't match. The TscScale value could be adjusted to cope
+ * with this, allowing vtsc to be turned off, but support for this is
+ * not yet present in the hypervisor. Thus is it is possible that
+ * migrating a Windows VM between hosts of differing TSC frequencies
+ * may result in large differences in guest performance.
+ */
+ if ( !host_tsc_is_safe() || d->arch.vtsc )
+ {
+ /*
+ * The specification states that valid values of TscSequence range
+ * from 0 to 0xFFFFFFFE. The value 0xFFFFFFFF is used to indicate
+ * this mechanism is no longer a reliable source of time and that
+ * the VM should fall back to a different source.
+ *
+ * Server 2012 (6.2 kernel) and 2012 R2 (6.3 kernel) actually
+ * violate the spec. and rely on a value of 0 to indicate that this
+ * enlightenment should no longer be used.
+ */
+ p->TscSequence = 0;
+
+ printk(XENLOG_G_INFO "d%d: VIRIDIAN REFERENCE_TSC: invalidated\n",
+ d->domain_id);
+ goto out;
+ }
+
+ /*
+ * The guest will calculate reference time according to the following
+ * formula:
+ *
+ * ReferenceTime = ((RDTSC() * TscScale) >> 64) + TscOffset
+ *
+ * Windows uses a 100ns tick, so we need a scale which is cpu
+ * ticks per 100ns shifted left by 64.
+ */
+ p->TscScale = ((10000ul << 32) / d->arch.tsc_khz) << 32;
+
+ p->TscSequence++;
+ if ( p->TscSequence == 0xFFFFFFFF ||
+ p->TscSequence == 0 ) /* Avoid both 'invalid' values */
+ p->TscSequence = 1;
+
+ out:
+ unmap_domain_page(p);
+
+ put_page_and_type(page);
+}
+
+static int64_t raw_trc_val(struct domain *d)
+{
+ uint64_t tsc;
+ struct time_scale tsc_to_ns;
+
+ tsc = hvm_get_guest_tsc(pt_global_vcpu_target(d));
+
+ /* convert tsc to count of 100ns periods */
+ set_time_scale(&tsc_to_ns, d->arch.tsc_khz * 1000ul);
+ return scale_delta(tsc, &tsc_to_ns) / 100ul;
+}
+
+void viridian_time_ref_count_freeze(struct domain *d)
+{
+ struct viridian_time_ref_count *trc;
+
+ trc = &d->arch.hvm.viridian.time_ref_count;
+
+ if ( test_and_clear_bit(_TRC_running, &trc->flags) )
+ trc->val = raw_trc_val(d) + trc->off;
+}
+
+void viridian_time_ref_count_thaw(struct domain *d)
+{
+ struct viridian_time_ref_count *trc;
+
+ trc = &d->arch.hvm.viridian.time_ref_count;
+
+ if ( !d->is_shutting_down &&
+ !test_and_set_bit(_TRC_running, &trc->flags) )
+ trc->off = (int64_t)trc->val - raw_trc_val(d);
+}
+
+int viridian_time_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val)
+{
+ struct domain *d = v->domain;
+
+ switch ( idx )
+ {
+ case HV_X64_MSR_REFERENCE_TSC:
+ if ( !(viridian_feature_mask(d) & HVMPV_reference_tsc) )
+ return X86EMUL_EXCEPTION;
+
+ d->arch.hvm.viridian.reference_tsc.raw = val;
+ dump_reference_tsc(d);
+ if ( d->arch.hvm.viridian.reference_tsc.fields.enabled )
+ update_reference_tsc(d, true);
+ break;
+
+ default:
+ gdprintk(XENLOG_INFO,
+ "%s: unimplemented MSR %#x (%016"PRIx64")\n",
+ __func__, idx, val);
+ return X86EMUL_EXCEPTION;
+ }
+
+ return X86EMUL_OKAY;
+}
+
+int viridian_time_rdmsr(const struct vcpu *v, uint32_t idx, uint64_t *val)
+{
+ struct domain *d = v->domain;
+
+ switch ( idx )
+ {
+ case HV_X64_MSR_TSC_FREQUENCY:
+ if ( viridian_feature_mask(d) & HVMPV_no_freq )
+ return X86EMUL_EXCEPTION;
+
+ *val = (uint64_t)d->arch.tsc_khz * 1000ull;
+ break;
+
+ case HV_X64_MSR_APIC_FREQUENCY:
+ if ( viridian_feature_mask(d) & HVMPV_no_freq )
+ return X86EMUL_EXCEPTION;
+
+ *val = 1000000000ull / APIC_BUS_CYCLE_NS;
+ break;
+
+ case HV_X64_MSR_REFERENCE_TSC:
+ if ( !(viridian_feature_mask(d) & HVMPV_reference_tsc) )
+ return X86EMUL_EXCEPTION;
+
+ *val = d->arch.hvm.viridian.reference_tsc.raw;
+ break;
+
+ case HV_X64_MSR_TIME_REF_COUNT:
+ {
+ struct viridian_time_ref_count *trc =
+ &d->arch.hvm.viridian.time_ref_count;
+
+ if ( !(viridian_feature_mask(d) & HVMPV_time_ref_count) )
+ return X86EMUL_EXCEPTION;
+
+ if ( !test_and_set_bit(_TRC_accessed, &trc->flags) )
+ printk(XENLOG_G_INFO "d%d: VIRIDIAN MSR_TIME_REF_COUNT: accessed\n",
+ d->domain_id);
+
+ *val = raw_trc_val(d) + trc->off;
+ break;
+ }
+
+ default:
+ gdprintk(XENLOG_INFO,
+ "%s: unimplemented MSR %#x\n",
+ __func__, idx);
+ return X86EMUL_EXCEPTION;
+ }
+
+ return X86EMUL_OKAY;
+}
+
+void viridian_time_save_domain_ctxt(
+ const struct domain *d, struct hvm_viridian_domain_context *ctxt)
+{
+ ctxt->time_ref_count = d->arch.hvm.viridian.time_ref_count.val;
+ ctxt->reference_tsc = d->arch.hvm.viridian.reference_tsc.raw;
+}
+
+void viridian_time_load_domain_ctxt(
+ struct domain *d, const struct hvm_viridian_domain_context *ctxt)
+{
+ d->arch.hvm.viridian.time_ref_count.val = ctxt->time_ref_count;
+ d->arch.hvm.viridian.reference_tsc.raw = ctxt->reference_tsc;
+
+ if ( d->arch.hvm.viridian.reference_tsc.fields.enabled )
+ update_reference_tsc(d, false);
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/xen/arch/x86/hvm/viridian/viridian.c b/xen/arch/x86/hvm/viridian/viridian.c
index cf2789e8ae..73661b0aef 100644
--- a/xen/arch/x86/hvm/viridian/viridian.c
+++ b/xen/arch/x86/hvm/viridian/viridian.c
@@ -243,17 +243,6 @@ static void dump_hypercall(const struct domain *d)
hg->fields.enabled, (unsigned long)hg->fields.pfn);
}
-static void dump_reference_tsc(const struct domain *d)
-{
- const union viridian_page_msr *rt;
-
- rt = &d->arch.hvm.viridian.reference_tsc;
-
- printk(XENLOG_G_INFO "d%d: VIRIDIAN REFERENCE_TSC: enabled: %x pfn: %lx\n",
- d->domain_id,
- rt->fields.enabled, (unsigned long)rt->fields.pfn);
-}
-
static void enable_hypercall_page(struct domain *d)
{
unsigned long gmfn = d->arch.hvm.viridian.hypercall_gpa.fields.pfn;
@@ -288,80 +277,6 @@ static void enable_hypercall_page(struct domain *d)
put_page_and_type(page);
}
-static void update_reference_tsc(struct domain *d, bool_t initialize)
-{
- unsigned long gmfn = d->arch.hvm.viridian.reference_tsc.fields.pfn;
- struct page_info *page = get_page_from_gfn(d, gmfn, NULL, P2M_ALLOC);
- HV_REFERENCE_TSC_PAGE *p;
-
- if ( !page || !get_page_type(page, PGT_writable_page) )
- {
- if ( page )
- put_page(page);
- gdprintk(XENLOG_WARNING, "Bad GMFN %#"PRI_gfn" (MFN %#"PRI_mfn")\n",
- gmfn, mfn_x(page ? page_to_mfn(page) : INVALID_MFN));
- return;
- }
-
- p = __map_domain_page(page);
-
- if ( initialize )
- clear_page(p);
-
- /*
- * This enlightenment must be disabled is the host TSC is not
- * invariant. However it is also disabled if vtsc is true (which
- * means rdtsc is being emulated). This generally happens when guest
- * TSC freq and host TSC freq don't match. The TscScale value could be
- * adjusted to cope with this, allowing vtsc to be turned off, but
- * support for this is not yet present in the hypervisor. Thus is it
- * is possible that migrating a Windows VM between hosts of differing
- * TSC frequencies may result in large differences in guest
- * performance.
- */
- if ( !host_tsc_is_safe() || d->arch.vtsc )
- {
- /*
- * The specification states that valid values of TscSequence range
- * from 0 to 0xFFFFFFFE. The value 0xFFFFFFFF is used to indicate
- * this mechanism is no longer a reliable source of time and that
- * the VM should fall back to a different source.
- *
- * Server 2012 (6.2 kernel) and 2012 R2 (6.3 kernel) actually
- * violate the specification and rely on a value of 0 to indicate
- * that this enlightenment should no longer be used. These two
- * kernel versions are currently the only ones to make use of this
- * enlightenment, so just use 0 here.
- */
- p->TscSequence = 0;
-
- printk(XENLOG_G_INFO "d%d: VIRIDIAN REFERENCE_TSC: invalidated\n",
- d->domain_id);
- goto out;
- }
-
- /*
- * The guest will calculate reference time according to the following
- * formula:
- *
- * ReferenceTime = ((RDTSC() * TscScale) >> 64) + TscOffset
- *
- * Windows uses a 100ns tick, so we need a scale which is cpu
- * ticks per 100ns shifted left by 64.
- */
- p->TscScale = ((10000ul << 32) / d->arch.tsc_khz) << 32;
-
- p->TscSequence++;
- if ( p->TscSequence == 0xFFFFFFFF ||
- p->TscSequence == 0 ) /* Avoid both 'invalid' values */
- p->TscSequence = 1;
-
- out:
- unmap_domain_page(p);
-
- put_page_and_type(page);
-}
-
int guest_wrmsr_viridian(struct vcpu *v, uint32_t idx, uint64_t val)
{
struct domain *d = v->domain;
@@ -392,14 +307,7 @@ int guest_wrmsr_viridian(struct vcpu *v, uint32_t idx, uint64_t val)
return viridian_synic_wrmsr(v, idx, val);
case HV_X64_MSR_REFERENCE_TSC:
- if ( !(viridian_feature_mask(d) & HVMPV_reference_tsc) )
- return X86EMUL_EXCEPTION;
-
- d->arch.hvm.viridian.reference_tsc.raw = val;
- dump_reference_tsc(d);
- if ( d->arch.hvm.viridian.reference_tsc.fields.enabled )
- update_reference_tsc(d, 1);
- break;
+ return viridian_time_wrmsr(v, idx, val);
case HV_X64_MSR_CRASH_P0:
case HV_X64_MSR_CRASH_P1:
@@ -445,39 +353,6 @@ int guest_wrmsr_viridian(struct vcpu *v, uint32_t idx, uint64_t val)
return X86EMUL_OKAY;
}
-static int64_t raw_trc_val(struct domain *d)
-{
- uint64_t tsc;
- struct time_scale tsc_to_ns;
-
- tsc = hvm_get_guest_tsc(pt_global_vcpu_target(d));
-
- /* convert tsc to count of 100ns periods */
- set_time_scale(&tsc_to_ns, d->arch.tsc_khz * 1000ul);
- return scale_delta(tsc, &tsc_to_ns) / 100ul;
-}
-
-void viridian_time_ref_count_freeze(struct domain *d)
-{
- struct viridian_time_ref_count *trc;
-
- trc = &d->arch.hvm.viridian.time_ref_count;
-
- if ( test_and_clear_bit(_TRC_running, &trc->flags) )
- trc->val = raw_trc_val(d) + trc->off;
-}
-
-void viridian_time_ref_count_thaw(struct domain *d)
-{
- struct viridian_time_ref_count *trc;
-
- trc = &d->arch.hvm.viridian.time_ref_count;
-
- if ( !d->is_shutting_down &&
- !test_and_set_bit(_TRC_running, &trc->flags) )
- trc->off = (int64_t)trc->val - raw_trc_val(d);
-}
-
int guest_rdmsr_viridian(const struct vcpu *v, uint32_t idx, uint64_t *val)
{
struct domain *d = v->domain;
@@ -498,49 +373,17 @@ int guest_rdmsr_viridian(const struct vcpu *v, uint32_t idx, uint64_t *val)
*val = v->vcpu_id;
break;
- case HV_X64_MSR_TSC_FREQUENCY:
- if ( viridian_feature_mask(d) & HVMPV_no_freq )
- return X86EMUL_EXCEPTION;
-
- *val = (uint64_t)d->arch.tsc_khz * 1000ull;
- break;
-
- case HV_X64_MSR_APIC_FREQUENCY:
- if ( viridian_feature_mask(d) & HVMPV_no_freq )
- return X86EMUL_EXCEPTION;
-
- *val = 1000000000ull / APIC_BUS_CYCLE_NS;
- break;
-
case HV_X64_MSR_EOI:
case HV_X64_MSR_ICR:
case HV_X64_MSR_TPR:
case HV_X64_MSR_VP_ASSIST_PAGE:
return viridian_synic_rdmsr(v, idx, val);
+ case HV_X64_MSR_TSC_FREQUENCY:
+ case HV_X64_MSR_APIC_FREQUENCY:
case HV_X64_MSR_REFERENCE_TSC:
- if ( !(viridian_feature_mask(d) & HVMPV_reference_tsc) )
- return X86EMUL_EXCEPTION;
-
- *val = d->arch.hvm.viridian.reference_tsc.raw;
- break;
-
case HV_X64_MSR_TIME_REF_COUNT:
- {
- struct viridian_time_ref_count *trc;
-
- trc = &d->arch.hvm.viridian.time_ref_count;
-
- if ( !(viridian_feature_mask(d) & HVMPV_time_ref_count) )
- return X86EMUL_EXCEPTION;
-
- if ( !test_and_set_bit(_TRC_accessed, &trc->flags) )
- printk(XENLOG_G_INFO "d%d: VIRIDIAN MSR_TIME_REF_COUNT: accessed\n",
- d->domain_id);
-
- *val = raw_trc_val(d) + trc->off;
- break;
- }
+ return viridian_time_rdmsr(v, idx, val);
case HV_X64_MSR_CRASH_P0:
case HV_X64_MSR_CRASH_P1:
@@ -748,15 +591,15 @@ static int viridian_save_domain_ctxt(struct vcpu *v,
{
const struct domain *d = v->domain;
struct hvm_viridian_domain_context ctxt = {
- .time_ref_count = d->arch.hvm.viridian.time_ref_count.val,
.hypercall_gpa = d->arch.hvm.viridian.hypercall_gpa.raw,
.guest_os_id = d->arch.hvm.viridian.guest_os_id.raw,
- .reference_tsc = d->arch.hvm.viridian.reference_tsc.raw,
};
if ( !is_viridian_domain(d) )
return 0;
+ viridian_time_save_domain_ctxt(d, &ctxt);
+
return (hvm_save_entry(VIRIDIAN_DOMAIN, 0, h, &ctxt) != 0);
}
@@ -768,13 +611,10 @@ static int viridian_load_domain_ctxt(struct domain *d,
if ( hvm_load_entry_zeroextend(VIRIDIAN_DOMAIN, h, &ctxt) != 0 )
return -EINVAL;
- d->arch.hvm.viridian.time_ref_count.val = ctxt.time_ref_count;
d->arch.hvm.viridian.hypercall_gpa.raw = ctxt.hypercall_gpa;
d->arch.hvm.viridian.guest_os_id.raw = ctxt.guest_os_id;
- d->arch.hvm.viridian.reference_tsc.raw = ctxt.reference_tsc;
- if ( d->arch.hvm.viridian.reference_tsc.fields.enabled )
- update_reference_tsc(d, 0);
+ viridian_time_load_domain_ctxt(d, &ctxt);
return 0;
}
diff --git a/xen/include/asm-x86/hvm/viridian.h b/xen/include/asm-x86/hvm/viridian.h
index 7e21ca5537..9a26f6bed0 100644
--- a/xen/include/asm-x86/hvm/viridian.h
+++ b/xen/include/asm-x86/hvm/viridian.h
@@ -125,15 +125,6 @@ struct viridian_time_ref_count
int64_t off;
};
-typedef struct _HV_REFERENCE_TSC_PAGE
-{
- uint32_t TscSequence;
- uint32_t Reserved1;
- uint64_t TscScale;
- int64_t TscOffset;
- uint64_t Reserved2[509];
-} HV_REFERENCE_TSC_PAGE, *PHV_REFERENCE_TSC_PAGE;
-
struct viridian_domain
{
union viridian_guest_os_id_msr guest_os_id;
@@ -154,6 +145,14 @@ viridian_hypercall(struct cpu_user_regs *regs);
void viridian_time_ref_count_freeze(struct domain *d);
void viridian_time_ref_count_thaw(struct domain *d);
+int viridian_time_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val);
+int viridian_time_rdmsr(const struct vcpu *v, uint32_t idx, uint64_t *val);
+
+void viridian_time_save_domain_ctxt(
+ const struct domain *d, struct hvm_viridian_domain_context *ctxt);
+void viridian_time_load_domain_ctxt(
+ struct domain *d, const struct hvm_viridian_domain_context *ctxt);
+
void viridian_vcpu_deinit(struct vcpu *v);
void viridian_domain_deinit(struct domain *d);
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v2 6/9] viridian: separate time related enlightenment implementations...
2018-10-31 12:43 ` [PATCH v2 6/9] viridian: separate time " Paul Durrant
@ 2018-10-31 15:43 ` Wei Liu
2018-11-05 12:56 ` Jan Beulich
1 sibling, 0 replies; 26+ messages in thread
From: Wei Liu @ 2018-10-31 15:43 UTC (permalink / raw)
To: Paul Durrant; +Cc: xen-devel, Wei Liu, Jan Beulich, Andrew Cooper
On Wed, Oct 31, 2018 at 12:43:32PM +0000, Paul Durrant wrote:
> ...into new 'time' module.
>
> This patch reduces the size of the main viridian source module by
> moving time related enlightenments into their own source module. This is
> done in anticipation of implementation of more such enightenments and
> a desire to not further lengthen the main source module when this work
> is done.
>
> While moving the code:
>
> - Move the declaration of HV_REFERENCE_TSC_PAGE from the header file into
> the new source module, since it is only used there.
> - Clean up a bool_t.
>
> Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
[...]
> +int viridian_time_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val)
> +{
> + struct domain *d = v->domain;
> +
> + switch ( idx )
> + {
> + case HV_X64_MSR_REFERENCE_TSC:
> + if ( !(viridian_feature_mask(d) & HVMPV_reference_tsc) )
> + return X86EMUL_EXCEPTION;
> +
> + d->arch.hvm.viridian.reference_tsc.raw = val;
> + dump_reference_tsc(d);
> + if ( d->arch.hvm.viridian.reference_tsc.fields.enabled )
> + update_reference_tsc(d, true);
> + break;
> +
> + default:
> + gdprintk(XENLOG_INFO,
> + "%s: unimplemented MSR %#x (%016"PRIx64")\n",
I believe this can fit into previous line just fine.
Anyway, don't let this minor block this patch.
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v2 6/9] viridian: separate time related enlightenment implementations...
2018-10-31 12:43 ` [PATCH v2 6/9] viridian: separate time " Paul Durrant
2018-10-31 15:43 ` Wei Liu
@ 2018-11-05 12:56 ` Jan Beulich
2018-11-05 13:26 ` Paul Durrant
1 sibling, 1 reply; 26+ messages in thread
From: Jan Beulich @ 2018-11-05 12:56 UTC (permalink / raw)
To: Paul Durrant; +Cc: Andrew Cooper, Wei Liu, xen-devel
>>> On 31.10.18 at 13:43, <paul.durrant@citrix.com> wrote:
> --- /dev/null
> +++ b/xen/arch/x86/hvm/viridian/time.c
> @@ -0,0 +1,245 @@
> +/**************************************************************************
> *
> + * time.c
> + *
> + * An implementation of some time related Viridian enlightenments.
> + * See Microsoft's Hypervisor Top Level Functional Specification.
> + * for more information.
> + */
> +
> +#include <xen/domain_page.h>
> +#include <xen/hypercall.h>
> +#include <xen/sched.h>
> +#include <xen/version.h>
> +
> +#include <asm/apic.h>
> +#include <asm/hvm/support.h>
> +
> +typedef struct _HV_REFERENCE_TSC_PAGE
> +{
> + uint32_t TscSequence;
> + uint32_t Reserved1;
> + uint64_t TscScale;
> + int64_t TscOffset;
> + uint64_t Reserved2[509];
> +} HV_REFERENCE_TSC_PAGE, *PHV_REFERENCE_TSC_PAGE;
And you want to continue to have it all upper case, despite us normally
using such identifiers for #define-s only?
Apart from that same remark regarding the placement of the function
declarations as for the previous patch.
Jan
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v2 6/9] viridian: separate time related enlightenment implementations...
2018-11-05 12:56 ` Jan Beulich
@ 2018-11-05 13:26 ` Paul Durrant
2018-11-05 13:36 ` Jan Beulich
0 siblings, 1 reply; 26+ messages in thread
From: Paul Durrant @ 2018-11-05 13:26 UTC (permalink / raw)
To: 'Jan Beulich'; +Cc: Andrew Cooper, Wei Liu, xen-devel
> -----Original Message-----
> From: Jan Beulich [mailto:JBeulich@suse.com]
> Sent: 05 November 2018 12:57
> To: Paul Durrant <Paul.Durrant@citrix.com>
> Cc: Andrew Cooper <Andrew.Cooper3@citrix.com>; Wei Liu
> <wei.liu2@citrix.com>; xen-devel <xen-devel@lists.xenproject.org>
> Subject: Re: [PATCH v2 6/9] viridian: separate time related enlightenment
> implementations...
>
> >>> On 31.10.18 at 13:43, <paul.durrant@citrix.com> wrote:
> > --- /dev/null
> > +++ b/xen/arch/x86/hvm/viridian/time.c
> > @@ -0,0 +1,245 @@
> >
> +/************************************************************************
> **
> > *
> > + * time.c
> > + *
> > + * An implementation of some time related Viridian enlightenments.
> > + * See Microsoft's Hypervisor Top Level Functional Specification.
> > + * for more information.
> > + */
> > +
> > +#include <xen/domain_page.h>
> > +#include <xen/hypercall.h>
> > +#include <xen/sched.h>
> > +#include <xen/version.h>
> > +
> > +#include <asm/apic.h>
> > +#include <asm/hvm/support.h>
> > +
> > +typedef struct _HV_REFERENCE_TSC_PAGE
> > +{
> > + uint32_t TscSequence;
> > + uint32_t Reserved1;
> > + uint64_t TscScale;
> > + int64_t TscOffset;
> > + uint64_t Reserved2[509];
> > +} HV_REFERENCE_TSC_PAGE, *PHV_REFERENCE_TSC_PAGE;
>
> And you want to continue to have it all upper case, despite us normally
> using such identifiers for #define-s only?
>
It's a definition lifted from the spec. so it's usual Microsoft style... i.e. upper case types and camel-case names. I didn't define UINT32, INT64 and UINT64 types - as used by the spec - but I could do so if you'd prefer the consistency.
> Apart from that same remark regarding the placement of the function
> declarations as for the previous patch.
>
I assume you mean in the proposed new header, which is fine.
Paul
> Jan
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v2 6/9] viridian: separate time related enlightenment implementations...
2018-11-05 13:26 ` Paul Durrant
@ 2018-11-05 13:36 ` Jan Beulich
2018-11-05 13:54 ` Paul Durrant
0 siblings, 1 reply; 26+ messages in thread
From: Jan Beulich @ 2018-11-05 13:36 UTC (permalink / raw)
To: Paul Durrant; +Cc: Andrew Cooper, Wei Liu, xen-devel
>>> On 05.11.18 at 14:26, <Paul.Durrant@citrix.com> wrote:
>> From: Jan Beulich [mailto:JBeulich@suse.com]
>> Sent: 05 November 2018 12:57
>>
>> >>> On 31.10.18 at 13:43, <paul.durrant@citrix.com> wrote:
>> > --- /dev/null
>> > +++ b/xen/arch/x86/hvm/viridian/time.c
>> > @@ -0,0 +1,245 @@
>> >
>> +/************************************************************************
>> **
>> > *
>> > + * time.c
>> > + *
>> > + * An implementation of some time related Viridian enlightenments.
>> > + * See Microsoft's Hypervisor Top Level Functional Specification.
>> > + * for more information.
>> > + */
>> > +
>> > +#include <xen/domain_page.h>
>> > +#include <xen/hypercall.h>
>> > +#include <xen/sched.h>
>> > +#include <xen/version.h>
>> > +
>> > +#include <asm/apic.h>
>> > +#include <asm/hvm/support.h>
>> > +
>> > +typedef struct _HV_REFERENCE_TSC_PAGE
>> > +{
>> > + uint32_t TscSequence;
>> > + uint32_t Reserved1;
>> > + uint64_t TscScale;
>> > + int64_t TscOffset;
>> > + uint64_t Reserved2[509];
>> > +} HV_REFERENCE_TSC_PAGE, *PHV_REFERENCE_TSC_PAGE;
>>
>> And you want to continue to have it all upper case, despite us normally
>> using such identifiers for #define-s only?
>>
>
> It's a definition lifted from the spec. so it's usual Microsoft style...
> i.e. upper case types and camel-case names. I didn't define UINT32, INT64 and
> UINT64 types - as used by the spec - but I could do so if you'd prefer the
> consistency.
Oh, no, I'm not looking forward to see UINT<n> appear. I
was rather asking whether the odd all-upper-case naming
could be changed, to be in line with our style rather than
Microsoft's.
>> Apart from that same remark regarding the placement of the function
>> declarations as for the previous patch.
>
> I assume you mean in the proposed new header, which is fine.
Yes, that's what I mean.
Jan
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v2 6/9] viridian: separate time related enlightenment implementations...
2018-11-05 13:36 ` Jan Beulich
@ 2018-11-05 13:54 ` Paul Durrant
2018-11-05 14:56 ` Jan Beulich
0 siblings, 1 reply; 26+ messages in thread
From: Paul Durrant @ 2018-11-05 13:54 UTC (permalink / raw)
To: 'Jan Beulich'; +Cc: Andrew Cooper, Wei Liu, xen-devel
> -----Original Message-----
> From: Jan Beulich [mailto:JBeulich@suse.com]
> Sent: 05 November 2018 13:37
> To: Paul Durrant <Paul.Durrant@citrix.com>
> Cc: Andrew Cooper <Andrew.Cooper3@citrix.com>; Wei Liu
> <wei.liu2@citrix.com>; xen-devel <xen-devel@lists.xenproject.org>
> Subject: RE: [PATCH v2 6/9] viridian: separate time related enlightenment
> implementations...
>
> >>> On 05.11.18 at 14:26, <Paul.Durrant@citrix.com> wrote:
> >> From: Jan Beulich [mailto:JBeulich@suse.com]
> >> Sent: 05 November 2018 12:57
> >>
> >> >>> On 31.10.18 at 13:43, <paul.durrant@citrix.com> wrote:
> >> > --- /dev/null
> >> > +++ b/xen/arch/x86/hvm/viridian/time.c
> >> > @@ -0,0 +1,245 @@
> >> >
> >>
> +/************************************************************************
> >> **
> >> > *
> >> > + * time.c
> >> > + *
> >> > + * An implementation of some time related Viridian enlightenments.
> >> > + * See Microsoft's Hypervisor Top Level Functional Specification.
> >> > + * for more information.
> >> > + */
> >> > +
> >> > +#include <xen/domain_page.h>
> >> > +#include <xen/hypercall.h>
> >> > +#include <xen/sched.h>
> >> > +#include <xen/version.h>
> >> > +
> >> > +#include <asm/apic.h>
> >> > +#include <asm/hvm/support.h>
> >> > +
> >> > +typedef struct _HV_REFERENCE_TSC_PAGE
> >> > +{
> >> > + uint32_t TscSequence;
> >> > + uint32_t Reserved1;
> >> > + uint64_t TscScale;
> >> > + int64_t TscOffset;
> >> > + uint64_t Reserved2[509];
> >> > +} HV_REFERENCE_TSC_PAGE, *PHV_REFERENCE_TSC_PAGE;
> >>
> >> And you want to continue to have it all upper case, despite us normally
> >> using such identifiers for #define-s only?
> >>
> >
> > It's a definition lifted from the spec. so it's usual Microsoft style...
> > i.e. upper case types and camel-case names. I didn't define UINT32,
> INT64 and
> > UINT64 types - as used by the spec - but I could do so if you'd prefer
> the
> > consistency.
>
> Oh, no, I'm not looking forward to see UINT<n> appear. I
> was rather asking whether the odd all-upper-case naming
> could be changed, to be in line with our style rather than
> Microsoft's.
>
Where typedefs are actually given in the spec I prefer to lift them, even though they do not adhere to our coding style. I could but a document in the viridian subdirectory stating this if you'd like.
> >> Apart from that same remark regarding the placement of the function
> >> declarations as for the previous patch.
> >
> > I assume you mean in the proposed new header, which is fine.
>
> Yes, that's what I mean.
>
Ok.
Paul
> Jan
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v2 7/9] viridian: define type for the 'virtual VP assist page'
2018-10-31 12:43 [PATCH v2 0/9] viridian cleanup Paul Durrant
` (5 preceding siblings ...)
2018-10-31 12:43 ` [PATCH v2 6/9] viridian: separate time " Paul Durrant
@ 2018-10-31 12:43 ` Paul Durrant
2018-10-31 15:45 ` Wei Liu
2018-11-05 12:59 ` Jan Beulich
2018-10-31 12:43 ` [PATCH v2 8/9] tools/misc: fix hard tabs in xen-hvmctx.c Paul Durrant
2018-10-31 12:43 ` [PATCH v2 9/9] viridian: introduce struct viridian_page Paul Durrant
8 siblings, 2 replies; 26+ messages in thread
From: Paul Durrant @ 2018-10-31 12:43 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Paul Durrant, Wei Liu, Jan Beulich
The specification [1] defines a type so we should use it, rather than just
OR-ing and AND-ing magic bits.
No functional change.
NOTE: The type defined in the specification does include an anonymous
sub-struct in the page type but, as we currently use only the first
element, the struct declaration has been omitted.
[1] https://github.com/MicrosoftDocs/Virtualization-Documentation/raw/live/tlfs/Hypervisor%20Top%20Level%20Functional%20Specification%20v5.0C.pdf
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
---
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
xen/arch/x86/hvm/viridian/synic.c | 52 +++++++++++++++++++++++---------------
xen/include/asm-x86/hvm/viridian.h | 2 +-
2 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/xen/arch/x86/hvm/viridian/synic.c b/xen/arch/x86/hvm/viridian/synic.c
index e01ac941ea..5500d44186 100644
--- a/xen/arch/x86/hvm/viridian/synic.c
+++ b/xen/arch/x86/hvm/viridian/synic.c
@@ -14,6 +14,18 @@
#include <asm/apic.h>
#include <asm/hvm/support.h>
+typedef struct _HV_VIRTUAL_APIC_ASSIST
+{
+ uint32_t no_eoi:1;
+ uint32_t reserved_zero:31;
+} HV_VIRTUAL_APIC_ASSIST;
+
+typedef union _HV_VP_ASSIST_PAGE
+{
+ HV_VIRTUAL_APIC_ASSIST ApicAssist;
+ uint8_t ReservedZBytePadding[PAGE_SIZE];
+} HV_VP_ASSIST_PAGE;
+
static void dump_vp_assist(const struct vcpu *v)
{
const union viridian_page_msr *va = &v->arch.hvm.viridian.vp_assist.msr;
@@ -30,9 +42,9 @@ static void initialize_vp_assist(struct vcpu *v)
struct domain *d = v->domain;
unsigned long gmfn = v->arch.hvm.viridian.vp_assist.msr.fields.pfn;
struct page_info *page = get_page_from_gfn(d, gmfn, NULL, P2M_ALLOC);
- void *va;
+ HV_VP_ASSIST_PAGE *ptr;
- ASSERT(!v->arch.hvm.viridian.vp_assist.va);
+ ASSERT(!v->arch.hvm.viridian.vp_assist.ptr);
if ( !page )
goto fail;
@@ -43,16 +55,16 @@ static void initialize_vp_assist(struct vcpu *v)
goto fail;
}
- va = __map_domain_page_global(page);
- if ( !va )
+ ptr = __map_domain_page_global(page);
+ if ( !ptr )
{
put_page_and_type(page);
goto fail;
}
- clear_page(va);
+ clear_page(ptr);
- v->arch.hvm.viridian.vp_assist.va = va;
+ v->arch.hvm.viridian.vp_assist.ptr = ptr;
return;
fail:
@@ -62,25 +74,25 @@ static void initialize_vp_assist(struct vcpu *v)
static void teardown_vp_assist(struct vcpu *v)
{
- void *va = v->arch.hvm.viridian.vp_assist.va;
+ HV_VP_ASSIST_PAGE *ptr = v->arch.hvm.viridian.vp_assist.ptr;
struct page_info *page;
- if ( !va )
+ if ( !ptr )
return;
- v->arch.hvm.viridian.vp_assist.va = NULL;
+ v->arch.hvm.viridian.vp_assist.ptr = NULL;
- page = mfn_to_page(domain_page_map_to_mfn(va));
+ page = mfn_to_page(domain_page_map_to_mfn(ptr));
- unmap_domain_page_global(va);
+ unmap_domain_page_global(ptr);
put_page_and_type(page);
}
void viridian_apic_assist_set(struct vcpu *v)
{
- uint32_t *va = v->arch.hvm.viridian.vp_assist.va;
+ HV_VP_ASSIST_PAGE *ptr = v->arch.hvm.viridian.vp_assist.ptr;
- if ( !va )
+ if ( !ptr )
return;
/*
@@ -92,18 +104,18 @@ void viridian_apic_assist_set(struct vcpu *v)
domain_crash(v->domain);
v->arch.hvm.viridian.vp_assist.pending = true;
- *va |= 1u;
+ ptr->ApicAssist.no_eoi = 1;
}
bool viridian_apic_assist_completed(struct vcpu *v)
{
- uint32_t *va = v->arch.hvm.viridian.vp_assist.va;
+ HV_VP_ASSIST_PAGE *ptr = v->arch.hvm.viridian.vp_assist.ptr;
- if ( !va )
+ if ( !ptr )
return false;
if ( v->arch.hvm.viridian.vp_assist.pending &&
- !(*va & 1u) )
+ !ptr->ApicAssist.no_eoi )
{
/* An EOI has been avoided */
v->arch.hvm.viridian.vp_assist.pending = false;
@@ -115,12 +127,12 @@ bool viridian_apic_assist_completed(struct vcpu *v)
void viridian_apic_assist_clear(struct vcpu *v)
{
- uint32_t *va = v->arch.hvm.viridian.vp_assist.va;
+ HV_VP_ASSIST_PAGE *ptr = v->arch.hvm.viridian.vp_assist.ptr;
- if ( !va )
+ if ( !ptr )
return;
- *va &= ~1u;
+ ptr->ApicAssist.no_eoi = 0;
v->arch.hvm.viridian.vp_assist.pending = false;
}
diff --git a/xen/include/asm-x86/hvm/viridian.h b/xen/include/asm-x86/hvm/viridian.h
index 9a26f6bed0..11abf77198 100644
--- a/xen/include/asm-x86/hvm/viridian.h
+++ b/xen/include/asm-x86/hvm/viridian.h
@@ -92,7 +92,7 @@ struct viridian_vcpu
{
struct {
union viridian_page_msr msr;
- void *va;
+ void *ptr;
bool pending;
} vp_assist;
uint64_t crash_param[5];
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v2 7/9] viridian: define type for the 'virtual VP assist page'
2018-10-31 12:43 ` [PATCH v2 7/9] viridian: define type for the 'virtual VP assist page' Paul Durrant
@ 2018-10-31 15:45 ` Wei Liu
2018-11-05 12:59 ` Jan Beulich
1 sibling, 0 replies; 26+ messages in thread
From: Wei Liu @ 2018-10-31 15:45 UTC (permalink / raw)
To: Paul Durrant; +Cc: xen-devel, Wei Liu, Jan Beulich, Andrew Cooper
On Wed, Oct 31, 2018 at 12:43:33PM +0000, Paul Durrant wrote:
> The specification [1] defines a type so we should use it, rather than just
> OR-ing and AND-ing magic bits.
>
> No functional change.
>
> NOTE: The type defined in the specification does include an anonymous
> sub-struct in the page type but, as we currently use only the first
> element, the struct declaration has been omitted.
>
> [1] https://github.com/MicrosoftDocs/Virtualization-Documentation/raw/live/tlfs/Hypervisor%20Top%20Level%20Functional%20Specification%20v5.0C.pdf
>
> Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v2 7/9] viridian: define type for the 'virtual VP assist page'
2018-10-31 12:43 ` [PATCH v2 7/9] viridian: define type for the 'virtual VP assist page' Paul Durrant
2018-10-31 15:45 ` Wei Liu
@ 2018-11-05 12:59 ` Jan Beulich
2018-11-05 13:19 ` Paul Durrant
1 sibling, 1 reply; 26+ messages in thread
From: Jan Beulich @ 2018-11-05 12:59 UTC (permalink / raw)
To: Paul Durrant; +Cc: Andrew Cooper, Wei Liu, xen-devel
>>> On 31.10.18 at 13:43, <paul.durrant@citrix.com> wrote:
> --- a/xen/include/asm-x86/hvm/viridian.h
> +++ b/xen/include/asm-x86/hvm/viridian.h
> @@ -92,7 +92,7 @@ struct viridian_vcpu
> {
> struct {
> union viridian_page_msr msr;
> - void *va;
> + void *ptr;
Why void rather than the actual type? You can't use the typedef
(for it being local to the .c file), but you can use the union tag
here in a forward declaring manner.
Jan
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v2 7/9] viridian: define type for the 'virtual VP assist page'
2018-11-05 12:59 ` Jan Beulich
@ 2018-11-05 13:19 ` Paul Durrant
0 siblings, 0 replies; 26+ messages in thread
From: Paul Durrant @ 2018-11-05 13:19 UTC (permalink / raw)
To: 'Jan Beulich'; +Cc: Andrew Cooper, Wei Liu, xen-devel
> -----Original Message-----
> From: Jan Beulich [mailto:JBeulich@suse.com]
> Sent: 05 November 2018 13:00
> To: Paul Durrant <Paul.Durrant@citrix.com>
> Cc: Andrew Cooper <Andrew.Cooper3@citrix.com>; Wei Liu
> <wei.liu2@citrix.com>; xen-devel <xen-devel@lists.xenproject.org>
> Subject: Re: [PATCH v2 7/9] viridian: define type for the 'virtual VP
> assist page'
>
> >>> On 31.10.18 at 13:43, <paul.durrant@citrix.com> wrote:
> > --- a/xen/include/asm-x86/hvm/viridian.h
> > +++ b/xen/include/asm-x86/hvm/viridian.h
> > @@ -92,7 +92,7 @@ struct viridian_vcpu
> > {
> > struct {
> > union viridian_page_msr msr;
> > - void *va;
> > + void *ptr;
>
> Why void rather than the actual type? You can't use the typedef
> (for it being local to the .c file), but you can use the union tag
> here in a forward declaring manner.
>
Ok. I'll have a look at that.
Paul
> Jan
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v2 8/9] tools/misc: fix hard tabs in xen-hvmctx.c
2018-10-31 12:43 [PATCH v2 0/9] viridian cleanup Paul Durrant
` (6 preceding siblings ...)
2018-10-31 12:43 ` [PATCH v2 7/9] viridian: define type for the 'virtual VP assist page' Paul Durrant
@ 2018-10-31 12:43 ` Paul Durrant
2018-10-31 14:00 ` Wei Liu
2018-10-31 12:43 ` [PATCH v2 9/9] viridian: introduce struct viridian_page Paul Durrant
8 siblings, 1 reply; 26+ messages in thread
From: Paul Durrant @ 2018-10-31 12:43 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Paul Durrant, Ian Jackson
Also add emacs boilerplate to avoid future problems.
Purely cosmetic. No functional change.
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
v2:
- New in v2
---
tools/misc/xen-hvmctx.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/tools/misc/xen-hvmctx.c b/tools/misc/xen-hvmctx.c
index 40e77851be..823aa7d736 100644
--- a/tools/misc/xen-hvmctx.c
+++ b/tools/misc/xen-hvmctx.c
@@ -371,8 +371,8 @@ static void dump_viridian_vcpu(void)
HVM_SAVE_TYPE(VIRIDIAN_VCPU) p;
READ(p);
printf(" VIRIDIAN_VCPU: vp_assist_msr 0x%llx, vp_assist_pending %s\n",
- (unsigned long long) p.vp_assist_msr,
- p.vp_assist_pending ? "true" : "false");
+ (unsigned long long) p.vp_assist_msr,
+ p.vp_assist_pending ? "true" : "false");
}
static void dump_vmce_vcpu(void)
@@ -468,4 +468,14 @@ int main(int argc, char **argv)
} while ( desc.typecode != HVM_SAVE_CODE(END) && off < len );
return 0;
-}
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v2 9/9] viridian: introduce struct viridian_page
2018-10-31 12:43 [PATCH v2 0/9] viridian cleanup Paul Durrant
` (7 preceding siblings ...)
2018-10-31 12:43 ` [PATCH v2 8/9] tools/misc: fix hard tabs in xen-hvmctx.c Paul Durrant
@ 2018-10-31 12:43 ` Paul Durrant
2018-10-31 15:50 ` Wei Liu
2018-11-05 13:05 ` Jan Beulich
8 siblings, 2 replies; 26+ messages in thread
From: Paul Durrant @ 2018-10-31 12:43 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Paul Durrant, Ian Jackson, Jan Beulich, Andrew Cooper
The 'vp_assist' page is currently an example of a guest page which needs to
be kept mapped throughout the life-time of a guest, but there are other
such examples in the specifiction [1]. This patch therefore introduces a
generic 'viridian_page' type and converts the current vp_assist/apic_assist
related code to use it. Subsequent patches implementing other enlightments
can then also make use of it.
This patch also renames the 'vp_assist_pending' field in struct
hvm_viridian_vcpu_context to 'apic_assist_pending' to more accurately
reflect its meaning. The term 'vp_assist' applies to the whole page rather
than just the EOI-avoidance enlightenment. New versons of the specification
have defined data structures for other enlightenments within the same page.
No functional change.
[1] https://github.com/MicrosoftDocs/Virtualization-Documentation/raw/live/tlfs/Hypervisor%20Top%20Level%20Functional%20Specification%20v5.0C.pdf
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Reviewed-by: Roger Pau Monne <roger.pau@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
---
tools/misc/xen-hvmctx.c | 4 +--
xen/arch/x86/hvm/viridian/synic.c | 47 ++++++++++++++++------------------
xen/include/asm-x86/hvm/viridian.h | 13 ++++++----
xen/include/public/arch-x86/hvm/save.h | 2 +-
4 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/tools/misc/xen-hvmctx.c b/tools/misc/xen-hvmctx.c
index 823aa7d736..4f336a6cea 100644
--- a/tools/misc/xen-hvmctx.c
+++ b/tools/misc/xen-hvmctx.c
@@ -370,9 +370,9 @@ static void dump_viridian_vcpu(void)
{
HVM_SAVE_TYPE(VIRIDIAN_VCPU) p;
READ(p);
- printf(" VIRIDIAN_VCPU: vp_assist_msr 0x%llx, vp_assist_pending %s\n",
+ printf(" VIRIDIAN_VCPU: vp_assist_msr 0x%llx, apic_assist_pending %s\n",
(unsigned long long) p.vp_assist_msr,
- p.vp_assist_pending ? "true" : "false");
+ p.apic_assist_pending ? "true" : "false");
}
static void dump_vmce_vcpu(void)
diff --git a/xen/arch/x86/hvm/viridian/synic.c b/xen/arch/x86/hvm/viridian/synic.c
index 5500d44186..6a7887a4c4 100644
--- a/xen/arch/x86/hvm/viridian/synic.c
+++ b/xen/arch/x86/hvm/viridian/synic.c
@@ -37,14 +37,13 @@ static void dump_vp_assist(const struct vcpu *v)
v, (unsigned long)va->fields.pfn);
}
-static void initialize_vp_assist(struct vcpu *v)
+static void initialize_guest_page(struct vcpu *v, struct viridian_page *vp)
{
struct domain *d = v->domain;
- unsigned long gmfn = v->arch.hvm.viridian.vp_assist.msr.fields.pfn;
+ unsigned long gmfn = vp->msr.fields.pfn;
struct page_info *page = get_page_from_gfn(d, gmfn, NULL, P2M_ALLOC);
- HV_VP_ASSIST_PAGE *ptr;
- ASSERT(!v->arch.hvm.viridian.vp_assist.ptr);
+ ASSERT(!vp->ptr);
if ( !page )
goto fail;
@@ -55,16 +54,14 @@ static void initialize_vp_assist(struct vcpu *v)
goto fail;
}
- ptr = __map_domain_page_global(page);
- if ( !ptr )
+ vp->ptr = __map_domain_page_global(page);
+ if ( !vp->ptr )
{
put_page_and_type(page);
goto fail;
}
- clear_page(ptr);
-
- v->arch.hvm.viridian.vp_assist.ptr = ptr;
+ clear_page(vp->ptr);
return;
fail:
@@ -72,19 +69,18 @@ static void initialize_vp_assist(struct vcpu *v)
gmfn, mfn_x(page ? page_to_mfn(page) : INVALID_MFN));
}
-static void teardown_vp_assist(struct vcpu *v)
+static void teardown_guest_page(struct viridian_page *vp)
{
- HV_VP_ASSIST_PAGE *ptr = v->arch.hvm.viridian.vp_assist.ptr;
struct page_info *page;
- if ( !ptr )
+ if ( !vp->ptr )
return;
- v->arch.hvm.viridian.vp_assist.ptr = NULL;
+ page = mfn_to_page(domain_page_map_to_mfn(vp->ptr));
- page = mfn_to_page(domain_page_map_to_mfn(ptr));
+ unmap_domain_page_global(vp->ptr);
+ vp->ptr = NULL;
- unmap_domain_page_global(ptr);
put_page_and_type(page);
}
@@ -100,10 +96,10 @@ void viridian_apic_assist_set(struct vcpu *v)
* wrong and the VM will most likely hang so force a crash now
* to make the problem clear.
*/
- if ( v->arch.hvm.viridian.vp_assist.pending )
+ if ( v->arch.hvm.viridian.apic_assist_pending )
domain_crash(v->domain);
- v->arch.hvm.viridian.vp_assist.pending = true;
+ v->arch.hvm.viridian.apic_assist_pending = true;
ptr->ApicAssist.no_eoi = 1;
}
@@ -114,11 +110,11 @@ bool viridian_apic_assist_completed(struct vcpu *v)
if ( !ptr )
return false;
- if ( v->arch.hvm.viridian.vp_assist.pending &&
+ if ( v->arch.hvm.viridian.apic_assist_pending &&
!ptr->ApicAssist.no_eoi )
{
/* An EOI has been avoided */
- v->arch.hvm.viridian.vp_assist.pending = false;
+ v->arch.hvm.viridian.apic_assist_pending = false;
return true;
}
@@ -133,7 +129,7 @@ void viridian_apic_assist_clear(struct vcpu *v)
return;
ptr->ApicAssist.no_eoi = 0;
- v->arch.hvm.viridian.vp_assist.pending = false;
+ v->arch.hvm.viridian.apic_assist_pending = false;
}
int viridian_synic_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val)
@@ -159,11 +155,12 @@ int viridian_synic_wrmsr(struct vcpu *v, uint32_t idx, uint64_t val)
break;
case HV_X64_MSR_VP_ASSIST_PAGE:
- teardown_vp_assist(v); /* release any previous mapping */
+ /* release any previous mapping */
+ teardown_guest_page(&v->arch.hvm.viridian.vp_assist);
v->arch.hvm.viridian.vp_assist.msr.raw = val;
dump_vp_assist(v);
if ( v->arch.hvm.viridian.vp_assist.msr.fields.enabled )
- initialize_vp_assist(v);
+ initialize_guest_page(v, &v->arch.hvm.viridian.vp_assist);
break;
default:
@@ -212,7 +209,7 @@ int viridian_synic_rdmsr(const struct vcpu *v, uint32_t idx, uint64_t *val)
void viridian_synic_save_vcpu_ctxt(const struct vcpu *v,
struct hvm_viridian_vcpu_context *ctxt)
{
- ctxt->vp_assist_pending = v->arch.hvm.viridian.vp_assist.pending;
+ ctxt->apic_assist_pending = v->arch.hvm.viridian.apic_assist_pending;
ctxt->vp_assist_msr = v->arch.hvm.viridian.vp_assist.msr.raw;
}
@@ -221,9 +218,9 @@ void viridian_synic_load_vcpu_ctxt(
{
v->arch.hvm.viridian.vp_assist.msr.raw = ctxt->vp_assist_msr;
if ( v->arch.hvm.viridian.vp_assist.msr.fields.enabled )
- initialize_vp_assist(v);
+ initialize_guest_page(v, &v->arch.hvm.viridian.vp_assist);
- v->arch.hvm.viridian.vp_assist.pending = !!ctxt->vp_assist_pending;
+ v->arch.hvm.viridian.apic_assist_pending = !!ctxt->apic_assist_pending;
}
/*
diff --git a/xen/include/asm-x86/hvm/viridian.h b/xen/include/asm-x86/hvm/viridian.h
index 11abf77198..378959920d 100644
--- a/xen/include/asm-x86/hvm/viridian.h
+++ b/xen/include/asm-x86/hvm/viridian.h
@@ -88,13 +88,16 @@ union viridian_page_msr
} fields;
};
+struct viridian_page
+{
+ union viridian_page_msr msr;
+ void *ptr;
+};
+
struct viridian_vcpu
{
- struct {
- union viridian_page_msr msr;
- void *ptr;
- bool pending;
- } vp_assist;
+ struct viridian_page vp_assist;
+ bool apic_assist_pending;
uint64_t crash_param[5];
};
diff --git a/xen/include/public/arch-x86/hvm/save.h b/xen/include/public/arch-x86/hvm/save.h
index 4691d4d4aa..80e762c335 100644
--- a/xen/include/public/arch-x86/hvm/save.h
+++ b/xen/include/public/arch-x86/hvm/save.h
@@ -600,7 +600,7 @@ DECLARE_HVM_SAVE_TYPE(VIRIDIAN_DOMAIN, 15, struct hvm_viridian_domain_context);
struct hvm_viridian_vcpu_context {
uint64_t vp_assist_msr;
- uint8_t vp_assist_pending;
+ uint8_t apic_assist_pending;
uint8_t _pad[7];
};
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v2 9/9] viridian: introduce struct viridian_page
2018-10-31 12:43 ` [PATCH v2 9/9] viridian: introduce struct viridian_page Paul Durrant
@ 2018-10-31 15:50 ` Wei Liu
2018-11-05 13:05 ` Jan Beulich
1 sibling, 0 replies; 26+ messages in thread
From: Wei Liu @ 2018-10-31 15:50 UTC (permalink / raw)
To: Paul Durrant; +Cc: xen-devel, Ian Jackson, Wei Liu, Jan Beulich, Andrew Cooper
On Wed, Oct 31, 2018 at 12:43:35PM +0000, Paul Durrant wrote:
> The 'vp_assist' page is currently an example of a guest page which needs to
> be kept mapped throughout the life-time of a guest, but there are other
> such examples in the specifiction [1]. This patch therefore introduces a
> generic 'viridian_page' type and converts the current vp_assist/apic_assist
> related code to use it. Subsequent patches implementing other enlightments
> can then also make use of it.
>
> This patch also renames the 'vp_assist_pending' field in struct
> hvm_viridian_vcpu_context to 'apic_assist_pending' to more accurately
> reflect its meaning. The term 'vp_assist' applies to the whole page rather
> than just the EOI-avoidance enlightenment. New versons of the specification
> have defined data structures for other enlightenments within the same page.
>
> No functional change.
>
> [1] https://github.com/MicrosoftDocs/Virtualization-Documentation/raw/live/tlfs/Hypervisor%20Top%20Level%20Functional%20Specification%20v5.0C.pdf
>
> Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> Reviewed-by: Roger Pau Monne <roger.pau@citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
> diff --git a/xen/include/public/arch-x86/hvm/save.h b/xen/include/public/arch-x86/hvm/save.h
> index 4691d4d4aa..80e762c335 100644
> --- a/xen/include/public/arch-x86/hvm/save.h
> +++ b/xen/include/public/arch-x86/hvm/save.h
> @@ -600,7 +600,7 @@ DECLARE_HVM_SAVE_TYPE(VIRIDIAN_DOMAIN, 15, struct hvm_viridian_domain_context);
>
> struct hvm_viridian_vcpu_context {
> uint64_t vp_assist_msr;
> - uint8_t vp_assist_pending;
> + uint8_t apic_assist_pending;
FTR I believe it is safe to do so because this is (eventually) used by
domctl interfaces.
Wei.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v2 9/9] viridian: introduce struct viridian_page
2018-10-31 12:43 ` [PATCH v2 9/9] viridian: introduce struct viridian_page Paul Durrant
2018-10-31 15:50 ` Wei Liu
@ 2018-11-05 13:05 ` Jan Beulich
2018-11-05 13:18 ` Paul Durrant
1 sibling, 1 reply; 26+ messages in thread
From: Jan Beulich @ 2018-11-05 13:05 UTC (permalink / raw)
To: Paul Durrant; +Cc: Andrew Cooper, Wei Liu, Ian Jackson, xen-devel
>>> On 31.10.18 at 13:43, <paul.durrant@citrix.com> wrote:
> The 'vp_assist' page is currently an example of a guest page which needs to
> be kept mapped throughout the life-time of a guest, but there are other
> such examples in the specifiction [1]. This patch therefore introduces a
> generic 'viridian_page' type and converts the current vp_assist/apic_assist
> related code to use it. Subsequent patches implementing other enlightments
> can then also make use of it.
This sounds generic (as in "not synic specific), yet ...
> --- a/xen/arch/x86/hvm/viridian/synic.c
> +++ b/xen/arch/x86/hvm/viridian/synic.c
> @@ -37,14 +37,13 @@ static void dump_vp_assist(const struct vcpu *v)
> v, (unsigned long)va->fields.pfn);
> }
>
> -static void initialize_vp_assist(struct vcpu *v)
> +static void initialize_guest_page(struct vcpu *v, struct viridian_page *vp)
> {
> struct domain *d = v->domain;
> - unsigned long gmfn = v->arch.hvm.viridian.vp_assist.msr.fields.pfn;
> + unsigned long gmfn = vp->msr.fields.pfn;
> struct page_info *page = get_page_from_gfn(d, gmfn, NULL, P2M_ALLOC);
> - HV_VP_ASSIST_PAGE *ptr;
>
> - ASSERT(!v->arch.hvm.viridian.vp_assist.ptr);
> + ASSERT(!vp->ptr);
>
> if ( !page )
> goto fail;
... you retain the implementation here, when it would now perhaps
more logically live in viridian.c (again). Is this intentional?
> @@ -221,9 +218,9 @@ void viridian_synic_load_vcpu_ctxt(
> {
> v->arch.hvm.viridian.vp_assist.msr.raw = ctxt->vp_assist_msr;
> if ( v->arch.hvm.viridian.vp_assist.msr.fields.enabled )
> - initialize_vp_assist(v);
> + initialize_guest_page(v, &v->arch.hvm.viridian.vp_assist);
>
> - v->arch.hvm.viridian.vp_assist.pending = !!ctxt->vp_assist_pending;
> + v->arch.hvm.viridian.apic_assist_pending = !!ctxt->apic_assist_pending;
No need for !! anymore with ...
> --- a/xen/include/asm-x86/hvm/viridian.h
> +++ b/xen/include/asm-x86/hvm/viridian.h
> @@ -88,13 +88,16 @@ union viridian_page_msr
> } fields;
> };
>
> +struct viridian_page
> +{
> + union viridian_page_msr msr;
> + void *ptr;
> +};
> +
> struct viridian_vcpu
> {
> - struct {
> - union viridian_page_msr msr;
> - void *ptr;
> - bool pending;
> - } vp_assist;
> + struct viridian_page vp_assist;
> + bool apic_assist_pending;
... this being (and having been) bool.
Jan
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v2 9/9] viridian: introduce struct viridian_page
2018-11-05 13:05 ` Jan Beulich
@ 2018-11-05 13:18 ` Paul Durrant
0 siblings, 0 replies; 26+ messages in thread
From: Paul Durrant @ 2018-11-05 13:18 UTC (permalink / raw)
To: 'Jan Beulich'; +Cc: Andrew Cooper, Wei Liu, xen-devel, Ian Jackson
> -----Original Message-----
> From: Jan Beulich [mailto:JBeulich@suse.com]
> Sent: 05 November 2018 13:06
> To: Paul Durrant <Paul.Durrant@citrix.com>
> Cc: Andrew Cooper <Andrew.Cooper3@citrix.com>; Wei Liu
> <wei.liu2@citrix.com>; Ian Jackson <Ian.Jackson@citrix.com>; xen-devel
> <xen-devel@lists.xenproject.org>
> Subject: Re: [PATCH v2 9/9] viridian: introduce struct viridian_page
>
> >>> On 31.10.18 at 13:43, <paul.durrant@citrix.com> wrote:
> > The 'vp_assist' page is currently an example of a guest page which needs
> to
> > be kept mapped throughout the life-time of a guest, but there are other
> > such examples in the specifiction [1]. This patch therefore introduces a
> > generic 'viridian_page' type and converts the current
> vp_assist/apic_assist
> > related code to use it. Subsequent patches implementing other
> enlightments
> > can then also make use of it.
>
> This sounds generic (as in "not synic specific), yet ...
>
Actually Microsoft lump pretty much all the interrupt enlightenments under the synic section in the spec. so I thought it better to put them all together.
> > --- a/xen/arch/x86/hvm/viridian/synic.c
> > +++ b/xen/arch/x86/hvm/viridian/synic.c
> > @@ -37,14 +37,13 @@ static void dump_vp_assist(const struct vcpu *v)
> > v, (unsigned long)va->fields.pfn);
> > }
> >
> > -static void initialize_vp_assist(struct vcpu *v)
> > +static void initialize_guest_page(struct vcpu *v, struct viridian_page
> *vp)
> > {
> > struct domain *d = v->domain;
> > - unsigned long gmfn = v->arch.hvm.viridian.vp_assist.msr.fields.pfn;
> > + unsigned long gmfn = vp->msr.fields.pfn;
> > struct page_info *page = get_page_from_gfn(d, gmfn, NULL,
> P2M_ALLOC);
> > - HV_VP_ASSIST_PAGE *ptr;
> >
> > - ASSERT(!v->arch.hvm.viridian.vp_assist.ptr);
> > + ASSERT(!vp->ptr);
> >
> > if ( !page )
> > goto fail;
>
> ... you retain the implementation here, when it would now perhaps
> more logically live in viridian.c (again). Is this intentional?
>
Not really, it's down the patch ordering. I agree it makes more sense to put it under viridian.c now. I'll move it.
> > @@ -221,9 +218,9 @@ void viridian_synic_load_vcpu_ctxt(
> > {
> > v->arch.hvm.viridian.vp_assist.msr.raw = ctxt->vp_assist_msr;
> > if ( v->arch.hvm.viridian.vp_assist.msr.fields.enabled )
> > - initialize_vp_assist(v);
> > + initialize_guest_page(v, &v->arch.hvm.viridian.vp_assist);
> >
> > - v->arch.hvm.viridian.vp_assist.pending = !!ctxt->vp_assist_pending;
> > + v->arch.hvm.viridian.apic_assist_pending = !!ctxt-
> >apic_assist_pending;
>
> No need for !! anymore with ...
>
> > --- a/xen/include/asm-x86/hvm/viridian.h
> > +++ b/xen/include/asm-x86/hvm/viridian.h
> > @@ -88,13 +88,16 @@ union viridian_page_msr
> > } fields;
> > };
> >
> > +struct viridian_page
> > +{
> > + union viridian_page_msr msr;
> > + void *ptr;
> > +};
> > +
> > struct viridian_vcpu
> > {
> > - struct {
> > - union viridian_page_msr msr;
> > - void *ptr;
> > - bool pending;
> > - } vp_assist;
> > + struct viridian_page vp_assist;
> > + bool apic_assist_pending;
>
> ... this being (and having been) bool.
>
True, I'll get rid of that.
Paul
> Jan
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread