Commit 0df4f266 authored by Julien Grall's avatar Julien Grall
Browse files

xen: Use correctly the Xen memory terminologies 

Based on include/xen/mm.h [1], Linux is mistakenly using MFN when GFN
is meant, I suspect this is because the first support for Xen was for
PV. This resulted in some misimplementation of helpers on ARM and
confused developers about the expected behavior.

For instance, with pfn_to_mfn, we expect to get an MFN based on the name.
Although, if we look at the implementation on x86, it's returning a GFN.

For clarity and avoid new confusion, replace any reference to mfn with
gfn in any helpers used by PV drivers. The x86 code will still keep some
reference of pfn_to_mfn which may be used by all kind of guests
No changes as been made in the hypercall field, even
though they may be invalid, in order to keep the same as the defintion
in xen repo.

Note that page_to_mfn has been renamed to xen_page_to_gfn to avoid a
name to close to the KVM function gfn_to_page.

Take also the opportunity to simplify simple construction such
as pfn_to_mfn(page_to_pfn(page)) into xen_page_to_gfn. More complex clean up
will come in follow-up patches.

[1] http://xenbits.xen.org/gitweb/?p=xen.git;a=commitdiff;h=e758ed14f390342513405dd766e874934573e6cb



Signed-off-by: default avatarJulien Grall <julien.grall@citrix.com>
Reviewed-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: default avatarWei Liu <wei.liu2@citrix.com>
Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
parent 5192b35d

arch/arm/include/asm/xen/page.h

+7 −6
Original line number Diff line number Diff line
@@ -34,14 +34,15 @@ typedef struct xpaddr { 
unsigned long __pfn_to_mfn(unsigned long pfn);

extern struct rb_root phys_to_mach;



static inline unsigned long pfn_to_mfn(unsigned long pfn)

/* Pseudo-physical <-> Guest conversion */

static inline unsigned long pfn_to_gfn(unsigned long pfn)

{

	return pfn;

}



static inline unsigned long mfn_to_pfn(unsigned long mfn)

static inline unsigned long gfn_to_pfn(unsigned long gfn)

{

	return mfn;

	return gfn;

}



/* Pseudo-physical <-> BUS conversion */
@@ -65,9 +66,9 @@ static inline unsigned long bfn_to_pfn(unsigned long bfn) 


#define bfn_to_local_pfn(bfn)	bfn_to_pfn(bfn)



/* VIRT <-> MACHINE conversion */

#define virt_to_mfn(v)		(pfn_to_mfn(virt_to_pfn(v)))

#define mfn_to_virt(m)		(__va(mfn_to_pfn(m) << PAGE_SHIFT))

/* VIRT <-> GUEST conversion */

#define virt_to_gfn(v)		(pfn_to_gfn(virt_to_pfn(v)))

#define gfn_to_virt(m)		(__va(gfn_to_pfn(m) << PAGE_SHIFT))



/* Only used in PV code. But ARM guests are always HVM. */

static inline xmaddr_t arbitrary_virt_to_machine(void *vaddr)

arch/x86/include/asm/xen/page.h

+33 −2
Original line number Diff line number Diff line
@@ -101,6 +101,11 @@ static inline unsigned long pfn_to_mfn(unsigned long pfn) 
{

	unsigned long mfn;



	/*

	 * Some x86 code are still using pfn_to_mfn instead of

	 * pfn_to_mfn. This will have to be removed when we figured

	 * out which call.

	 */

	if (xen_feature(XENFEAT_auto_translated_physmap))

		return pfn;
@@ -147,6 +152,11 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn) 
{

	unsigned long pfn;



	/*

	 * Some x86 code are still using mfn_to_pfn instead of

	 * gfn_to_pfn. This will have to be removed when we figure

	 * out which call.

	 */

	if (xen_feature(XENFEAT_auto_translated_physmap))

		return mfn;
@@ -176,9 +186,26 @@ static inline xpaddr_t machine_to_phys(xmaddr_t machine) 
	return XPADDR(PFN_PHYS(mfn_to_pfn(PFN_DOWN(machine.maddr))) | offset);

}



/* Pseudo-physical <-> Guest conversion */

static inline unsigned long pfn_to_gfn(unsigned long pfn)

{

	if (xen_feature(XENFEAT_auto_translated_physmap))

		return pfn;

	else

		return pfn_to_mfn(pfn);

}



static inline unsigned long gfn_to_pfn(unsigned long gfn)

{

	if (xen_feature(XENFEAT_auto_translated_physmap))

		return gfn;

	else

		return mfn_to_pfn(gfn);

}



/* Pseudo-physical <-> Bus conversion */

#define pfn_to_bfn(pfn)		pfn_to_mfn(pfn)

#define bfn_to_pfn(bfn)		mfn_to_pfn(bfn)

#define pfn_to_bfn(pfn)		pfn_to_gfn(pfn)

#define bfn_to_pfn(bfn)		gfn_to_pfn(bfn)



/*

 * We detect special mappings in one of two ways:
@@ -219,6 +246,10 @@ static inline unsigned long bfn_to_local_pfn(unsigned long mfn) 
#define virt_to_mfn(v)		(pfn_to_mfn(virt_to_pfn(v)))

#define mfn_to_virt(m)		(__va(mfn_to_pfn(m) << PAGE_SHIFT))



/* VIRT <-> GUEST conversion */

#define virt_to_gfn(v)		(pfn_to_gfn(virt_to_pfn(v)))

#define gfn_to_virt(g)		(__va(gfn_to_pfn(g) << PAGE_SHIFT))



static inline unsigned long pte_mfn(pte_t pte)

{

	return (pte.pte & PTE_PFN_MASK) >> PAGE_SHIFT;

arch/x86/xen/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) 
	}

#endif

	ctxt->user_regs.esp = idle->thread.sp0 - sizeof(struct pt_regs);

	ctxt->ctrlreg[3] = xen_pfn_to_cr3(virt_to_mfn(swapper_pg_dir));

	ctxt->ctrlreg[3] = xen_pfn_to_cr3(virt_to_gfn(swapper_pg_dir));

	if (HYPERVISOR_vcpu_op(VCPUOP_initialise, cpu, ctxt))

		BUG();

drivers/block/xen-blkfront.c

+3 −3
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static struct grant *get_grant(grant_ref_t *gref_head, 
                               struct blkfront_info *info)

{

	struct grant *gnt_list_entry;

	unsigned long buffer_mfn;

	unsigned long buffer_gfn;



	BUG_ON(list_empty(&info->grants));

	gnt_list_entry = list_first_entry(&info->grants, struct grant,
@@ -269,10 +269,10 @@ static struct grant *get_grant(grant_ref_t *gref_head, 
		BUG_ON(!pfn);

		gnt_list_entry->pfn = pfn;

	}

	buffer_mfn = pfn_to_mfn(gnt_list_entry->pfn);

	buffer_gfn = pfn_to_gfn(gnt_list_entry->pfn);

	gnttab_grant_foreign_access_ref(gnt_list_entry->gref,

	                                info->xbdev->otherend_id,

	                                buffer_mfn, 0);

	                                buffer_gfn, 0);

	return gnt_list_entry;

}

drivers/input/misc/xen-kbdfront.c

+2 −2
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static int xenkbd_connect_backend(struct xenbus_device *dev, 
	struct xenbus_transaction xbt;



	ret = gnttab_grant_foreign_access(dev->otherend_id,

	                                  virt_to_mfn(info->page), 0);

	                                  virt_to_gfn(info->page), 0);

	if (ret < 0)

		return ret;

	info->gref = ret;
@@ -255,7 +255,7 @@ static int xenkbd_connect_backend(struct xenbus_device *dev, 
		goto error_irqh;

	}

	ret = xenbus_printf(xbt, dev->nodename, "page-ref", "%lu",

			    virt_to_mfn(info->page));

			    virt_to_gfn(info->page));

	if (ret)

		goto error_xenbus;

	ret = xenbus_printf(xbt, dev->nodename, "page-gref", "%u", info->gref);

CRA Git | Maintained and supported by SUSTech CRA and CCSE