|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [for-4.15][PATCH v2 1/5] xen/x86: p2m: Don't map the special pages in the IOMMU page-tables
On 15.02.2021 13:54, Julien Grall wrote:
> On 15/02/2021 12:36, Jan Beulich wrote:
>> On 15.02.2021 12:38, Julien Grall wrote:
>>> Given this series needs to go in 4.15 (we would introduce a 0-day
>>> otherwise), could you clarify whether your patch [1] is intended to
>>> replace this one in 4.15?
>>
>> Yes, that or a cut down variant (simply moving the invocation of
>> set_mmio_p2m_entry()). The more that there the controversy
>> continued regarding the adjustment to p2m_get_iommu_flags(). I
>> did indicate there that I've dropped it for v2.
>
> Do you have a link to v2? I would like to try with my series.
I didn't post it yet, as I didn't consider the v1 discussion
settled so far. The intermediate version I have at present is
below.
Jan
VMX: use a single, global APIC access page
The address of this page is used by the CPU only to recognize when to
access the virtual APIC page instead. No accesses would ever go to this
page. It only needs to be present in the (CPU) page tables so that
address translation will produce its address as result for respective
accesses.
By making this page global, we also eliminate the need to refcount it,
or to assign it to any domain in the first place.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---
v2: Avoid insertion when !has_vlapic(). Split off change to
p2m_get_iommu_flags().
---
Hooking p2m insertion onto arch_domain_creation_finished() isn't very
nice, but I couldn't find any better hook (nor a good place where to
introduce a new one). In particular there look to be no hvm_funcs hooks
being used on a domain-wide basis (except for init/destroy of course).
I did consider connecting this to the setting of HVM_PARAM_IDENT_PT, but
considered this no better, the more that the tool stack could be smarter
and avoid setting that param when not needed.
I did further consider not allocating any real page at all, but just
using the address of some unpopulated space (which would require
announcing this page as reserved to Dom0, so it wouldn't put any PCI
MMIO BARs there). But I thought this would be too controversial, because
of the possible risks associated with this.
--- unstable.orig/xen/arch/x86/domain.c
+++ unstable/xen/arch/x86/domain.c
@@ -1005,6 +1005,8 @@ int arch_domain_soft_reset(struct domain
void arch_domain_creation_finished(struct domain *d)
{
+ if ( is_hvm_domain(d) )
+ hvm_domain_creation_finished(d);
}
#define xen_vcpu_guest_context vcpu_guest_context
--- unstable.orig/xen/arch/x86/hvm/vmx/vmx.c
+++ unstable/xen/arch/x86/hvm/vmx/vmx.c
@@ -66,8 +66,7 @@ boolean_param("force-ept", opt_force_ept
static void vmx_ctxt_switch_from(struct vcpu *v);
static void vmx_ctxt_switch_to(struct vcpu *v);
-static int vmx_alloc_vlapic_mapping(struct domain *d);
-static void vmx_free_vlapic_mapping(struct domain *d);
+static int alloc_vlapic_mapping(void);
static void vmx_install_vlapic_mapping(struct vcpu *v);
static void vmx_update_guest_cr(struct vcpu *v, unsigned int cr,
unsigned int flags);
@@ -78,6 +77,8 @@ static int vmx_msr_read_intercept(unsign
static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content);
static void vmx_invlpg(struct vcpu *v, unsigned long linear);
+static mfn_t __read_mostly apic_access_mfn;
+
/* Values for domain's ->arch.hvm_domain.pi_ops.flags. */
#define PI_CSW_FROM (1u << 0)
#define PI_CSW_TO (1u << 1)
@@ -401,7 +402,6 @@ static int vmx_domain_initialise(struct
.to = vmx_ctxt_switch_to,
.tail = vmx_do_resume,
};
- int rc;
d->arch.ctxt_switch = &csw;
@@ -411,21 +411,16 @@ static int vmx_domain_initialise(struct
*/
d->arch.hvm.vmx.exec_sp = is_hardware_domain(d) || opt_ept_exec_sp;
- if ( !has_vlapic(d) )
- return 0;
-
- if ( (rc = vmx_alloc_vlapic_mapping(d)) != 0 )
- return rc;
-
return 0;
}
-static void vmx_domain_relinquish_resources(struct domain *d)
+static void domain_creation_finished(struct domain *d)
{
- if ( !has_vlapic(d) )
- return;
- vmx_free_vlapic_mapping(d);
+ if ( has_vlapic(d) && !mfn_eq(apic_access_mfn, _mfn(0)) &&
+ set_mmio_p2m_entry(d, gaddr_to_gfn(APIC_DEFAULT_PHYS_BASE),
+ apic_access_mfn, PAGE_ORDER_4K) )
+ domain_crash(d);
}
static int vmx_vcpu_initialise(struct vcpu *v)
@@ -2264,7 +2259,7 @@ static struct hvm_function_table __initd
.cpu_up_prepare = vmx_cpu_up_prepare,
.cpu_dead = vmx_cpu_dead,
.domain_initialise = vmx_domain_initialise,
- .domain_relinquish_resources = vmx_domain_relinquish_resources,
+ .domain_creation_finished = domain_creation_finished,
.vcpu_initialise = vmx_vcpu_initialise,
.vcpu_destroy = vmx_vcpu_destroy,
.save_cpu_ctxt = vmx_save_vmcs_ctxt,
@@ -2503,7 +2498,7 @@ const struct hvm_function_table * __init
{
set_in_cr4(X86_CR4_VMXE);
- if ( vmx_vmcs_init() )
+ if ( vmx_vmcs_init() || alloc_vlapic_mapping() )
{
printk("VMX: failed to initialise.\n");
return NULL;
@@ -3064,7 +3059,7 @@ gp_fault:
return X86EMUL_EXCEPTION;
}
-static int vmx_alloc_vlapic_mapping(struct domain *d)
+static int __init alloc_vlapic_mapping(void)
{
struct page_info *pg;
mfn_t mfn;
@@ -3072,53 +3067,28 @@ static int vmx_alloc_vlapic_mapping(stru
if ( !cpu_has_vmx_virtualize_apic_accesses )
return 0;
- pg = alloc_domheap_page(d, MEMF_no_refcount);
+ pg = alloc_domheap_page(NULL, 0);
if ( !pg )
return -ENOMEM;
- if ( !get_page_and_type(pg, d, PGT_writable_page) )
- {
- /*
- * The domain can't possibly know about this page yet, so failure
- * here is a clear indication of something fishy going on.
- */
- domain_crash(d);
- return -ENODATA;
- }
-
mfn = page_to_mfn(pg);
clear_domain_page(mfn);
- d->arch.hvm.vmx.apic_access_mfn = mfn;
+ apic_access_mfn = mfn;
- return set_mmio_p2m_entry(d, gaddr_to_gfn(APIC_DEFAULT_PHYS_BASE), mfn,
- PAGE_ORDER_4K);
-}
-
-static void vmx_free_vlapic_mapping(struct domain *d)
-{
- mfn_t mfn = d->arch.hvm.vmx.apic_access_mfn;
-
- d->arch.hvm.vmx.apic_access_mfn = _mfn(0);
- if ( !mfn_eq(mfn, _mfn(0)) )
- {
- struct page_info *pg = mfn_to_page(mfn);
-
- put_page_alloc_ref(pg);
- put_page_and_type(pg);
- }
+ return 0;
}
static void vmx_install_vlapic_mapping(struct vcpu *v)
{
paddr_t virt_page_ma, apic_page_ma;
- if ( mfn_eq(v->domain->arch.hvm.vmx.apic_access_mfn, _mfn(0)) )
+ if ( !has_vlapic(v->domain) || mfn_eq(apic_access_mfn, _mfn(0)) )
return;
ASSERT(cpu_has_vmx_virtualize_apic_accesses);
virt_page_ma = page_to_maddr(vcpu_vlapic(v)->regs_page);
- apic_page_ma = mfn_to_maddr(v->domain->arch.hvm.vmx.apic_access_mfn);
+ apic_page_ma = mfn_to_maddr(apic_access_mfn);
vmx_vmcs_enter(v);
__vmwrite(VIRTUAL_APIC_PAGE_ADDR, virt_page_ma);
--- unstable.orig/xen/include/asm-x86/hvm/hvm.h
+++ unstable/xen/include/asm-x86/hvm/hvm.h
@@ -106,6 +106,7 @@ struct hvm_function_table {
* Initialise/destroy HVM domain/vcpu resources
*/
int (*domain_initialise)(struct domain *d);
+ void (*domain_creation_finished)(struct domain *d);
void (*domain_relinquish_resources)(struct domain *d);
void (*domain_destroy)(struct domain *d);
int (*vcpu_initialise)(struct vcpu *v);
@@ -383,6 +384,12 @@ static inline bool hvm_has_set_descripto
return hvm_funcs.set_descriptor_access_exiting;
}
+static inline void hvm_domain_creation_finished(struct domain *d)
+{
+ if ( hvm_funcs.domain_creation_finished )
+ alternative_vcall(hvm_funcs.domain_creation_finished, d);
+}
+
static inline int
hvm_guest_x86_mode(struct vcpu *v)
{
@@ -715,6 +722,11 @@ static inline void hvm_invlpg(const stru
{
ASSERT_UNREACHABLE();
}
+
+static inline void hvm_domain_creation_finished(struct domain *d)
+{
+ ASSERT_UNREACHABLE();
+}
/*
* Shadow code needs further cleanup to eliminate some HVM-only paths. For
--- unstable.orig/xen/include/asm-x86/hvm/vmx/vmcs.h
+++ unstable/xen/include/asm-x86/hvm/vmx/vmcs.h
@@ -58,7 +58,6 @@ struct ept_data {
#define _VMX_DOMAIN_PML_ENABLED 0
#define VMX_DOMAIN_PML_ENABLED (1ul << _VMX_DOMAIN_PML_ENABLED)
struct vmx_domain {
- mfn_t apic_access_mfn;
/* VMX_DOMAIN_* */
unsigned int status;
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |