From: Ian Campbell <ian.campbell@citrix.com>
To: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Stefano Stabellini <stefano.stabellini@citrix.com>,
xen-devel <xen-devel@lists.xen.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH 1/5] xen: balloon: allow PVMMU interfaces to be compiled out
Date: Wed, 24 Oct 2012 14:19:33 +0100 [thread overview]
Message-ID: <1351084777-28898-1-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1351084756.18035.28.camel@zakaz.uk.xensource.com>
The ARM platform has no concept of PVMMU and therefor no
HYPERVISOR_update_va_mapping et al. Allow this code to be compiled out
when not required.
In some similar situations (e.g. P2M) we have defined dummy functions
to avoid this, however I think we can/should draw the line at dummying
out actual hypercalls.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
arch/x86/xen/Kconfig | 1 +
drivers/xen/Kconfig | 3 +++
drivers/xen/balloon.c | 4 ++++
3 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index c9660bf..7e938ba 100644
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -6,6 +6,7 @@ config XEN
bool "Xen guest support"
select PARAVIRT
select PARAVIRT_CLOCK
+ select XEN_HAVE_PVMMU
depends on X86_64 || (X86_32 && X86_PAE && !X86_VISWS)
depends on X86_CMPXCHG && X86_TSC
help
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index d4dffcd..9c00652 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -204,4 +204,7 @@ config XEN_MCE_LOG
Allow kernel fetching MCE error from Xen platform and
converting it into Linux mcelog format for mcelog tools
+config XEN_HAVE_PVMMU
+ bool
+
endmenu
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 66fad33..d42da3b 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -359,6 +359,7 @@ static enum bp_state increase_reservation(unsigned long nr_pages)
set_phys_to_machine(pfn, frame_list[i]);
+#ifdef CONFIG_XEN_HAVE_PVMMU
/* Link back into the page tables if not highmem. */
if (xen_pv_domain() && !PageHighMem(page) &&
!xen_feature(XENFEAT_auto_translated_physmap)) {
@@ -370,6 +371,7 @@ static enum bp_state increase_reservation(unsigned long nr_pages)
0);
BUG_ON(ret);
}
+#endif
/* Relinquish the page back to the allocator. */
ClearPageReserved(page);
@@ -418,6 +420,7 @@ static enum bp_state decrease_reservation(unsigned long nr_pages, gfp_t gfp)
scrub_page(page);
+#ifdef CONFIG_XEN_HAVE_PVMMU
if (xen_pv_domain() && !PageHighMem(page)) {
if (!xen_feature(XENFEAT_auto_translated_physmap)) {
ret = HYPERVISOR_update_va_mapping(
@@ -426,6 +429,7 @@ static enum bp_state decrease_reservation(unsigned long nr_pages, gfp_t gfp)
BUG_ON(ret);
}
}
+#endif
}
/* Ensure that ballooned highmem pages don't have kmaps. */
--
1.7.2.5
next prev parent reply other threads:[~2012-10-24 13:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-24 13:19 [PATCH+GIT V3 0/5] arm: implement ballooning and privcmd foreign mappings based on x86 PVH Ian Campbell
2012-10-24 13:19 ` Ian Campbell [this message]
2012-10-24 13:19 ` [PATCH 2/5] xen: arm: enable balloon driver Ian Campbell
2012-10-24 13:19 ` [PATCH 3/5] xen: correctly use xen_pfn_t in remap_domain_mfn_range Ian Campbell
2012-10-24 13:19 ` [PATCH 4/5] xen: arm: implement remap interfaces needed for privcmd mappings Ian Campbell
2012-10-24 13:43 ` Stefano Stabellini
2012-10-24 23:44 ` [Xen-devel] " Mukesh Rathor
2012-10-25 0:07 ` Mukesh Rathor
2012-10-25 0:14 ` Mukesh Rathor
2012-10-25 7:46 ` Ian Campbell
2012-10-26 1:39 ` Mukesh Rathor
2012-10-26 7:58 ` Ian Campbell
2012-10-24 13:19 ` [PATCH 5/5] xen: x86 pvh: use XENMEM_add_to_physmap_range for foreign gmfn mappings Ian Campbell
2012-10-26 1:38 ` [Xen-devel] " Mukesh Rathor
2012-10-29 14:20 ` [PATCH+GIT V3 0/5] arm: implement ballooning and privcmd foreign mappings based on x86 PVH Konrad Rzeszutek Wilk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351084777-28898-1-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stefano.stabellini@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).