[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v5 48/52] i386/xen: Reserve Xen special pages for console, xe
From: |
David Woodhouse |
Subject: |
[RFC PATCH v5 48/52] i386/xen: Reserve Xen special pages for console, xenstore rings |
Date: |
Fri, 30 Dec 2022 12:12:31 +0000 |
From: David Woodhouse <dwmw@amazon.co.uk>
Xen has eight frames at 0xfeff8000 for this; we only really need two for
now and KVM puts the identity map at 0xfeffc000, so limit ourselves to
four.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
include/sysemu/kvm_xen.h | 8 ++++++++
target/i386/kvm/xen-emu.c | 15 +++++++++++++++
2 files changed, 23 insertions(+)
diff --git a/include/sysemu/kvm_xen.h b/include/sysemu/kvm_xen.h
index 4999a0cff4..6e374a06ee 100644
--- a/include/sysemu/kvm_xen.h
+++ b/include/sysemu/kvm_xen.h
@@ -25,4 +25,12 @@ uint16_t kvm_xen_get_gnttab_max_frames(void);
#define kvm_xen_has_cap(cap) (!!(kvm_xen_get_caps() & \
KVM_XEN_HVM_CONFIG_ ## cap))
+#define XEN_SPECIAL_AREA_ADDR 0xfeff8000UL
+#define XEN_SPECIAL_AREA_SIZE 0x4000UL
+
+#define XEN_SPECIALPAGE_CONSOLE 0
+#define XEN_SPECIALPAGE_XENSTORE 1
+
+#define XEN_SPECIAL_PFN(x) ((XEN_SPECIAL_AREA_ADDR >> TARGET_PAGE_BITS) +
XEN_SPECIALPAGE_##x)
+
#endif /* QEMU_SYSEMU_KVM_XEN_H */
diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c
index 7f13ae6a8b..83ab96724e 100644
--- a/target/i386/kvm/xen-emu.c
+++ b/target/i386/kvm/xen-emu.c
@@ -24,6 +24,7 @@
#include "hw/pci/msi.h"
#include "hw/i386/apic-msidef.h"
+#include "hw/i386/e820_memory_layout.h"
#include "hw/i386/kvm/xen_overlay.h"
#include "hw/i386/kvm/xen_evtchn.h"
#include "hw/i386/kvm/xen_gnttab.h"
@@ -137,7 +138,21 @@ int kvm_xen_init(KVMState *s, uint32_t hypercall_msr)
return ret;
}
+ /* If called a second time, don't repeat the rest of the setup. */
+ if (s->xen_caps) {
+ return 0;
+ }
+
s->xen_caps = xen_caps;
+
+ /* Tell fw_cfg to notify the BIOS to reserve the range. */
+ ret = e820_add_entry(XEN_SPECIAL_AREA_ADDR, XEN_SPECIAL_AREA_SIZE,
+ E820_RESERVED);
+ if (ret < 0) {
+ fprintf(stderr, "e820_add_entry() table is full\n");
+ return ret;
+ }
+
return 0;
}
--
2.35.3
- [RFC PATCH v5 45/52] i386/xen: Implement HYPERVISOR_grant_table_op and GNTTABOP_[gs]et_verson, (continued)
- [RFC PATCH v5 45/52] i386/xen: Implement HYPERVISOR_grant_table_op and GNTTABOP_[gs]et_verson, David Woodhouse, 2022/12/30
- [RFC PATCH v5 33/52] hw/xen: Implement EVTCHNOP_bind_ipi, David Woodhouse, 2022/12/30
- [RFC PATCH v5 47/52] i386/xen: handle PV timer hypercalls, David Woodhouse, 2022/12/30
- [RFC PATCH v5 04/52] i386/kvm: Add xen-version KVM accelerator property and init KVM Xen support, David Woodhouse, 2022/12/30
- [RFC PATCH v5 39/52] i386/xen: add monitor commands to test event injection, David Woodhouse, 2022/12/30
- [RFC PATCH v5 44/52] hw/xen: Support mapping grant frames, David Woodhouse, 2022/12/30
- [RFC PATCH v5 52/52] hw/xen: Add basic ring handling to xenstore, David Woodhouse, 2022/12/30
- [RFC PATCH v5 25/52] i386/xen: implement HVMOP_set_evtchn_upcall_vector, David Woodhouse, 2022/12/30
- [RFC PATCH v5 02/52] xen: add CONFIG_XENFV_MACHINE and CONFIG_XEN_EMU options for Xen emulation, David Woodhouse, 2022/12/30
- [RFC PATCH v5 42/52] kvm/i386: Add xen-gnttab-max-frames property, David Woodhouse, 2022/12/30
- [RFC PATCH v5 48/52] i386/xen: Reserve Xen special pages for console, xenstore rings,
David Woodhouse <=
- [RFC PATCH v5 27/52] hw/xen: Add xen_evtchn device for event channel emulation, David Woodhouse, 2022/12/30
- [RFC PATCH v5 01/52] include: import Xen public headers to include/standard-headers/, David Woodhouse, 2022/12/30
- [RFC PATCH v5 06/52] i386/hvm: Set Xen vCPU ID in KVM, David Woodhouse, 2022/12/30
- [RFC PATCH v5 21/52] i386/xen: handle VCPUOP_register_vcpu_info, David Woodhouse, 2022/12/30
- [RFC PATCH v5 50/52] hw/xen: Add backend implementation of interdomain event channel support, David Woodhouse, 2022/12/30