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: Julien Grall <julien.grall@citrix.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/scsi/xen-scsifront.c b/drivers/scsi/xen-scsifront.c
index fad22caf0eff..9dc8687bf048 100644
--- a/drivers/scsi/xen-scsifront.c
+++ b/drivers/scsi/xen-scsifront.c
@@ -377,7 +377,6 @@ static int map_data_for_request(struct vscsifrnt_info *info,
         unsigned int data_len = scsi_bufflen(sc);
         unsigned int data_grants = 0, seg_grants = 0;
         struct scatterlist *sg;
-        unsigned long mfn;
         struct scsiif_request_segment *seg;
 
         ring_req->nr_segments = 0;
@@ -420,9 +419,9 @@ static int map_data_for_request(struct vscsifrnt_info *info,
                         ref = gnttab_claim_grant_reference(&gref_head);
                         BUG_ON(ref == -ENOSPC);
 
-                        mfn = pfn_to_mfn(page_to_pfn(page));
                         gnttab_grant_foreign_access_ref(ref,
-                                info->dev->otherend_id, mfn, 1);
+                                info->dev->otherend_id,
+                                xen_page_to_gfn(page), 1);
                         shadow->gref[ref_cnt] = ref;
                         ring_req->seg[ref_cnt].gref   = ref;
                         ring_req->seg[ref_cnt].offset = (uint16_t)off;
@@ -454,9 +453,10 @@ static int map_data_for_request(struct vscsifrnt_info *info,
                         ref = gnttab_claim_grant_reference(&gref_head);
                         BUG_ON(ref == -ENOSPC);
 
-                        mfn = pfn_to_mfn(page_to_pfn(page));
                         gnttab_grant_foreign_access_ref(ref,
-                                info->dev->otherend_id, mfn, grant_ro);
+                                info->dev->otherend_id,
+                                xen_page_to_gfn(page),
+                                grant_ro);
 
                         shadow->gref[ref_cnt] = ref;
                         seg->gref   = ref;