Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755692AbbGPPh2 (ORCPT ); Thu, 16 Jul 2015 11:37:28 -0400 Received: from smtp.citrix.com ([66.165.176.89]:56715 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752320AbbGPPh1 (ORCPT ); Thu, 16 Jul 2015 11:37:27 -0400 X-IronPort-AV: E=Sophos;i="5.15,488,1432598400"; d="scan'208";a="281646145" Date: Thu, 16 Jul 2015 16:35:56 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Julien Grall CC: , , , , , Konrad Rzeszutek Wilk , Boris Ostrovsky , "David Vrabel" Subject: Re: [PATCH v2 10/20] xen/xenbus: Use Xen page definition In-Reply-To: <1436474552-31789-11-git-send-email-julien.grall@citrix.com> Message-ID: References: <1436474552-31789-1-git-send-email-julien.grall@citrix.com> <1436474552-31789-11-git-send-email-julien.grall@citrix.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" X-DLP: MIA1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2877 Lines: 80 On Thu, 9 Jul 2015, Julien Grall wrote: > All the ring (xenstore, and PV rings) are always based on the page > granularity of Xen. > > Signed-off-by: Julien Grall > Cc: Konrad Rzeszutek Wilk > Cc: Boris Ostrovsky > Cc: David Vrabel Reviewed-by: Stefano Stabellini > Changes in v2: > - Also update the ring mapping function > --- > drivers/xen/xenbus/xenbus_client.c | 6 +++--- > drivers/xen/xenbus/xenbus_probe.c | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c > index 9ad3272..80272f6 100644 > --- a/drivers/xen/xenbus/xenbus_client.c > +++ b/drivers/xen/xenbus/xenbus_client.c > @@ -388,7 +388,7 @@ int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr, > } > grefs[i] = err; > > - vaddr = vaddr + PAGE_SIZE; > + vaddr = vaddr + XEN_PAGE_SIZE; > } > > return 0; > @@ -555,7 +555,7 @@ static int xenbus_map_ring_valloc_pv(struct xenbus_device *dev, > if (!node) > return -ENOMEM; > > - area = alloc_vm_area(PAGE_SIZE * nr_grefs, ptes); > + area = alloc_vm_area(XEN_PAGE_SIZE * nr_grefs, ptes); > if (!area) { > kfree(node); > return -ENOMEM; > @@ -750,7 +750,7 @@ static int xenbus_unmap_ring_vfree_pv(struct xenbus_device *dev, void *vaddr) > unsigned long addr; > > memset(&unmap[i], 0, sizeof(unmap[i])); > - addr = (unsigned long)vaddr + (PAGE_SIZE * i); > + addr = (unsigned long)vaddr + (XEN_PAGE_SIZE * i); > unmap[i].host_addr = arbitrary_virt_to_machine( > lookup_address(addr, &level)).maddr; > unmap[i].dev_bus_addr = 0; > diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c > index 4308fb3..c67e5ba 100644 > --- a/drivers/xen/xenbus/xenbus_probe.c > +++ b/drivers/xen/xenbus/xenbus_probe.c > @@ -713,7 +713,7 @@ static int __init xenstored_local_init(void) > > xen_store_mfn = xen_start_info->store_mfn = > pfn_to_mfn(virt_to_phys((void *)page) >> > - PAGE_SHIFT); > + XEN_PAGE_SHIFT); > > /* Next allocate a local port which xenstored can bind to */ > alloc_unbound.dom = DOMID_SELF; > @@ -804,7 +804,7 @@ static int __init xenbus_init(void) > goto out_error; > xen_store_mfn = (unsigned long)v; > xen_store_interface = > - xen_remap(xen_store_mfn << PAGE_SHIFT, PAGE_SIZE); > + xen_remap(xen_store_mfn << XEN_PAGE_SHIFT, XEN_PAGE_SIZE); > break; > default: > pr_warn("Xenstore state unknown\n"); > -- > 2.1.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/