* [PATCH] arm/p2m: Cleanup access to the host's p2m
@ 2017-07-04 12:53 Sergej Proskurin
2017-07-17 14:03 ` Julien Grall
0 siblings, 1 reply; 2+ messages in thread
From: Sergej Proskurin @ 2017-07-04 12:53 UTC (permalink / raw)
To: xen-devel; +Cc: Sergej Proskurin
This commit substitutes the direct access of the host's p2m
(&d->arch.p2m) for the macro "p2m_get_hostp2m". This macro simplifies
readability and also the differentiation between the host's p2m and
alternative p2m's, i.e., as part of the altp2m subsystem that will be
submitted in the future.
Signed-off-by: Sergej Proskurin <proskurin@sec.in.tum.de>
---
Razvan Cojocaru <rcojocaru@bitdefender.com>
Tamas K Lengyel <tamas@tklengyel.com>
Stefano Stabellini <sstabellini@kernel.org>
Julien Grall <julien.grall@arm.com>
---
v1:
This commit has been already acknowledged in the altp2m patch
series, however not yet applied to mainline. I have removed the
Acked-by: Julien Grall <julien.grall@arm.com> to resubmit this patch
individually.
---
xen/arch/arm/mem_access.c | 2 +-
xen/arch/arm/p2m.c | 28 ++++++++++++++--------------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/xen/arch/arm/mem_access.c b/xen/arch/arm/mem_access.c
index bcf49f5c15..e0888bbad2 100644
--- a/xen/arch/arm/mem_access.c
+++ b/xen/arch/arm/mem_access.c
@@ -107,7 +107,7 @@ p2m_mem_access_check_and_get_page(vaddr_t gva, unsigned long flag,
xenmem_access_t xma;
p2m_type_t t;
struct page_info *page = NULL;
- struct p2m_domain *p2m = &v->domain->arch.p2m;
+ struct p2m_domain *p2m = p2m_get_hostp2m(v->domain);
rc = gva_to_ipa(gva, &ipa, flag);
if ( rc < 0 )
diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index 9b7a580a87..7b2aac4c90 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -73,7 +73,7 @@ void p2m_write_unlock(struct p2m_domain *p2m)
void p2m_dump_info(struct domain *d)
{
- struct p2m_domain *p2m = &d->arch.p2m;
+ struct p2m_domain *p2m = p2m_get_hostp2m(d);
p2m_read_lock(p2m);
printk("p2m mappings for domain %d (vmid %d):\n",
@@ -93,7 +93,7 @@ void memory_type_changed(struct domain *d)
void dump_p2m_lookup(struct domain *d, paddr_t addr)
{
- struct p2m_domain *p2m = &d->arch.p2m;
+ struct p2m_domain *p2m = p2m_get_hostp2m(d);
printk("dom%d IPA 0x%"PRIpaddr"\n", d->domain_id, addr);
@@ -111,7 +111,7 @@ void p2m_save_state(struct vcpu *p)
void p2m_restore_state(struct vcpu *n)
{
- struct p2m_domain *p2m = &n->domain->arch.p2m;
+ struct p2m_domain *p2m = p2m_get_hostp2m(n->domain);
uint8_t *last_vcpu_ran;
if ( is_idle_vcpu(n) )
@@ -377,7 +377,7 @@ out:
mfn_t p2m_lookup(struct domain *d, gfn_t gfn, p2m_type_t *t)
{
mfn_t ret;
- struct p2m_domain *p2m = &d->arch.p2m;
+ struct p2m_domain *p2m = p2m_get_hostp2m(d);
p2m_read_lock(p2m);
ret = p2m_get_entry(p2m, gfn, t, NULL, NULL);
@@ -1032,7 +1032,7 @@ static inline int p2m_insert_mapping(struct domain *d,
mfn_t mfn,
p2m_type_t t)
{
- struct p2m_domain *p2m = &d->arch.p2m;
+ struct p2m_domain *p2m = p2m_get_hostp2m(d);
int rc;
p2m_write_lock(p2m);
@@ -1047,7 +1047,7 @@ static inline int p2m_remove_mapping(struct domain *d,
unsigned long nr,
mfn_t mfn)
{
- struct p2m_domain *p2m = &d->arch.p2m;
+ struct p2m_domain *p2m = p2m_get_hostp2m(d);
int rc;
p2m_write_lock(p2m);
@@ -1129,7 +1129,7 @@ int guest_physmap_remove_page(struct domain *d, gfn_t gfn, mfn_t mfn,
static int p2m_alloc_table(struct domain *d)
{
- struct p2m_domain *p2m = &d->arch.p2m;
+ struct p2m_domain *p2m = p2m_get_hostp2m(d);
struct page_info *page;
unsigned int i;
@@ -1180,7 +1180,7 @@ static void p2m_vmid_allocator_init(void)
static int p2m_alloc_vmid(struct domain *d)
{
- struct p2m_domain *p2m = &d->arch.p2m;
+ struct p2m_domain *p2m = p2m_get_hostp2m(d);
int rc, nr;
@@ -1210,7 +1210,7 @@ out:
static void p2m_free_vmid(struct domain *d)
{
- struct p2m_domain *p2m = &d->arch.p2m;
+ struct p2m_domain *p2m = p2m_get_hostp2m(d);
spin_lock(&vmid_alloc_lock);
if ( p2m->vmid != INVALID_VMID )
clear_bit(p2m->vmid, vmid_mask);
@@ -1220,7 +1220,7 @@ static void p2m_free_vmid(struct domain *d)
void p2m_teardown(struct domain *d)
{
- struct p2m_domain *p2m = &d->arch.p2m;
+ struct p2m_domain *p2m = p2m_get_hostp2m(d);
struct page_info *pg;
while ( (pg = page_list_remove_head(&p2m->pages)) )
@@ -1238,7 +1238,7 @@ void p2m_teardown(struct domain *d)
int p2m_init(struct domain *d)
{
- struct p2m_domain *p2m = &d->arch.p2m;
+ struct p2m_domain *p2m = p2m_get_hostp2m(d);
int rc = 0;
unsigned int cpu;
@@ -1291,7 +1291,7 @@ int p2m_init(struct domain *d)
*/
int relinquish_p2m_mapping(struct domain *d)
{
- struct p2m_domain *p2m = &d->arch.p2m;
+ struct p2m_domain *p2m = p2m_get_hostp2m(d);
unsigned long count = 0;
p2m_type_t t;
int rc = 0;
@@ -1351,7 +1351,7 @@ int relinquish_p2m_mapping(struct domain *d)
int p2m_cache_flush(struct domain *d, gfn_t start, unsigned long nr)
{
- struct p2m_domain *p2m = &d->arch.p2m;
+ struct p2m_domain *p2m = p2m_get_hostp2m(d);
gfn_t end = gfn_add(start, nr);
gfn_t next_gfn;
p2m_type_t t;
@@ -1404,7 +1404,7 @@ struct page_info *get_page_from_gva(struct vcpu *v, vaddr_t va,
unsigned long flags)
{
struct domain *d = v->domain;
- struct p2m_domain *p2m = &d->arch.p2m;
+ struct p2m_domain *p2m = p2m_get_hostp2m(d);
struct page_info *page = NULL;
paddr_t maddr = 0;
int rc;
--
2.13.2
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] arm/p2m: Cleanup access to the host's p2m
2017-07-04 12:53 [PATCH] arm/p2m: Cleanup access to the host's p2m Sergej Proskurin
@ 2017-07-17 14:03 ` Julien Grall
0 siblings, 0 replies; 2+ messages in thread
From: Julien Grall @ 2017-07-17 14:03 UTC (permalink / raw)
To: Sergej Proskurin, xen-devel, Tamas K Lengyel, Razvan Cojocaru,
Stefano Stabellini
Hello,
Please CC the respective maintainers when sending a patch on xen-devel.
On 04/07/17 13:53, Sergej Proskurin wrote:
> This commit substitutes the direct access of the host's p2m
> (&d->arch.p2m) for the macro "p2m_get_hostp2m". This macro simplifies
> readability and also the differentiation between the host's p2m and
> alternative p2m's, i.e., as part of the altp2m subsystem that will be
> submitted in the future.
>
> Signed-off-by: Sergej Proskurin <proskurin@sec.in.tum.de>
Acked-by: Julien Grall <julien.grall@arm.com>
> ---
> Razvan Cojocaru <rcojocaru@bitdefender.com>
> Tamas K Lengyel <tamas@tklengyel.com>
> Stefano Stabellini <sstabellini@kernel.org>
> Julien Grall <julien.grall@arm.com>
git send-email will do it for you if you add Cc: on each of the 4 lines
above.
Cheers,
--
Julien Grall
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-07-17 14:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-04 12:53 [PATCH] arm/p2m: Cleanup access to the host's p2m Sergej Proskurin
2017-07-17 14:03 ` Julien Grall
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.