| Message ID | 20170830183258.14612-30-proskurin@sec.in.tum.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/30/2017 09:32 PM, Sergej Proskurin wrote: > diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c > index 42e6f09029..66f1d83d84 100644 > --- a/xen/common/vm_event.c > +++ b/xen/common/vm_event.c > @@ -29,6 +29,7 @@ > #include <asm/monitor.h> > #include <asm/vm_event.h> > #include <xsm/xsm.h> > +#include <asm/altp2m.h> Any reason why this include has not happened alphabetically (it belongs to the <asm/...> group)? Thanks, Razvan
Hi Razvan, On 08/30/2017 08:42 PM, Razvan Cojocaru wrote: > On 08/30/2017 09:32 PM, Sergej Proskurin wrote: >> diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c >> index 42e6f09029..66f1d83d84 100644 >> --- a/xen/common/vm_event.c >> +++ b/xen/common/vm_event.c >> @@ -29,6 +29,7 @@ >> #include <asm/monitor.h> >> #include <asm/vm_event.h> >> #include <xsm/xsm.h> >> +#include <asm/altp2m.h> > Any reason why this include has not happened alphabetically (it belongs > to the <asm/...> group)? I must have missed that, thank you. I am going to fix this in v5. Cheers, ~Sergej
diff --git a/xen/arch/x86/mm/altp2m.c b/xen/arch/x86/mm/altp2m.c index 930bdc2669..00abb5a5bb 100644 --- a/xen/arch/x86/mm/altp2m.c +++ b/xen/arch/x86/mm/altp2m.c @@ -65,6 +65,12 @@ altp2m_vcpu_destroy(struct vcpu *v) vcpu_unpause(v); } +void altp2m_check(struct vcpu *v, uint16_t idx) +{ + if ( altp2m_active(v->domain) ) + p2m_switch_vcpu_altp2m_by_id(v, idx); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index d5038ed66b..3feb6315c2 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1687,12 +1687,6 @@ void p2m_mem_paging_resume(struct domain *d, vm_event_response_t *rsp) } } -void altp2m_check(struct vcpu *v, uint16_t idx) -{ - if ( altp2m_active(v->domain) ) - p2m_switch_vcpu_altp2m_by_id(v, idx); -} - static struct p2m_domain * p2m_getlru_nestedp2m(struct domain *d, struct p2m_domain *p2m) { diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c index 42e6f09029..66f1d83d84 100644 --- a/xen/common/vm_event.c +++ b/xen/common/vm_event.c @@ -29,6 +29,7 @@ #include <asm/monitor.h> #include <asm/vm_event.h> #include <xsm/xsm.h> +#include <asm/altp2m.h> /* for public/io/ring.h macros */ #define xen_mb() smp_mb() diff --git a/xen/include/asm-x86/altp2m.h b/xen/include/asm-x86/altp2m.h index 64c761873e..67d0205612 100644 --- a/xen/include/asm-x86/altp2m.h +++ b/xen/include/asm-x86/altp2m.h @@ -38,4 +38,7 @@ static inline uint16_t altp2m_vcpu_idx(const struct vcpu *v) return vcpu_altp2m(v).p2midx; } +/* Check to see if vcpu should be switched to a different p2m. */ +void altp2m_check(struct vcpu *v, uint16_t idx); + #endif /* __ASM_X86_ALTP2M_H */ diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index d1cc65f86d..863d7559cb 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -803,9 +803,6 @@ static inline struct p2m_domain *p2m_get_altp2m(struct vcpu *v) /* Switch alternate p2m for a single vcpu */ bool_t p2m_switch_vcpu_altp2m_by_id(struct vcpu *v, unsigned int idx); -/* Check to see if vcpu should be switched to a different p2m. */ -void altp2m_check(struct vcpu *v, uint16_t idx); - /* Flush all the alternate p2m's for a domain */ void p2m_flush_altp2m(struct domain *d);
In this commit, we move the function "altp2m_check" from p2m.c to altp2m.c in order to group all altp2m-related functions in one point, namely in altp2m.{c|h}. This commit moves solely the x86 code. Signed-off-by: Sergej Proskurin <proskurin@sec.in.tum.de> --- Cc: George Dunlap <george.dunlap@eu.citrix.com> Cc: Jan Beulich <jbeulich@suse.com> Cc: Andrew Cooper <andrew.cooper3@citrix.com> Cc: Razvan Cojocaru <rcojocaru@bitdefender.com> Cc: Tamas K Lengyel <tamas@tklengyel.com> --- v4: This commit has been pulled out of the previous commit "altp2m: Introduce altp2m_switch_vcpu_altp2m_by_id". --- xen/arch/x86/mm/altp2m.c | 6 ++++++ xen/arch/x86/mm/p2m.c | 6 ------ xen/common/vm_event.c | 1 + xen/include/asm-x86/altp2m.h | 3 +++ xen/include/asm-x86/p2m.h | 3 --- 5 files changed, 10 insertions(+), 9 deletions(-)