Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751449AbbGaKzq (ORCPT ); Fri, 31 Jul 2015 06:55:46 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:12867 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750786AbbGaKzp (ORCPT ); Fri, 31 Jul 2015 06:55:45 -0400 X-IronPort-AV: E=Sophos;i="5.15,583,1432598400"; d="scan'208";a="289744446" Message-ID: <1438340142.30740.57.camel@citrix.com> Subject: Re: [PATCH 1/8] arm/xen: Remove helpers which are PV specific From: Ian Campbell To: Stefano Stabellini , Julien Grall CC: , , "Russell King" , Date: Fri, 31 Jul 2015 11:55:42 +0100 In-Reply-To: References: <1438095769-2560-1-git-send-email-julien.grall@citrix.com> <1438095769-2560-2-git-send-email-julien.grall@citrix.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.16.3-1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-DLP: MIA2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2616 Lines: 68 On Fri, 2015-07-31 at 11:44 +0100, Stefano Stabellini wrote: > On Tue, 28 Jul 2015, Julien Grall wrote: > > ARM guests are assimilated to HVM guest on ARM. The current > > implementation is assuming a 1:1 mapping which is only true for DOM0 > > and > > may not be at all in the future. > > > > Furthermore, all the helpers but arbitrary_virt_to_machine are used in > > x86 specific code (or only compiled for). > > > > The helper arbitrary_virt_to_machine is only used in PV specific code. > > Therefore we should never call the function. > > > > Add a BUG() in this helper and drop all the others. > > > > Signed-off-by: Julien Grall > > Cc: Stefano Stabellini > > Cc: Russell King > > Cc: linux-arm-kernel@lists.infradead.org > > --- > > arch/arm/include/asm/xen/page.h | 16 ++-------------- > > 1 file changed, 2 insertions(+), 14 deletions(-) > > > > diff --git a/arch/arm/include/asm/xen/page.h > > b/arch/arm/include/asm/xen/page.h > > index 1bee8ca..c2e9dcd 100644 > > --- a/arch/arm/include/asm/xen/page.h > > +++ b/arch/arm/include/asm/xen/page.h > > @@ -54,26 +54,14 @@ static inline unsigned long mfn_to_pfn(unsigned > > long mfn) > > > > #define mfn_to_local_pfn(mfn) mfn_to_pfn(mfn) > > > > -static inline xmaddr_t phys_to_machine(xpaddr_t phys) > > -{ > > - unsigned offset = phys.paddr & ~PAGE_MASK; > > - return XMADDR(PFN_PHYS(pfn_to_mfn(PFN_DOWN(phys.paddr))) | > > offset); > > -} > > - > > -static inline xpaddr_t machine_to_phys(xmaddr_t machine) > > -{ > > - unsigned offset = machine.maddr & ~PAGE_MASK; > > - return XPADDR(PFN_PHYS(mfn_to_pfn(PFN_DOWN(machine.maddr))) | > > offset); > > -} > > /* VIRT <-> MACHINE conversion */ > > -#define virt_to_machine(v) (phys_to_machine(XPADDR(__pa(v)))) > > #define virt_to_mfn(v) (pfn_to_mfn(virt_to_pfn(v))) > > #define mfn_to_virt(m) (__va(mfn_to_pfn(m) << PAGE_SHIFT)) > > > > +/* Only used in PV code. However ARM guest is always assimilated as > > HVM. */ > ^ "However" doesn't make sense here from an > english grammer point of view. "English grammar" :-P Sorry. What I really meant to say was that "assimilated" doesn't make sense in this context either. I think maybe what was meant is "ARM guests are always HVM". Ian. -- 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/