[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v14 48/60] i386/xen: Reserve Xen special pages for console, xenst
From: |
David Woodhouse |
Subject: |
[PATCH v14 48/60] i386/xen: Reserve Xen special pages for console, xenstore rings |
Date: |
Mon, 27 Feb 2023 14:28:56 +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>
Reviewed-by: Paul Durrant <paul@xen.org>
---
include/sysemu/kvm_xen.h | 9 +++++++++
target/i386/kvm/xen-emu.c | 10 ++++++++++
2 files changed, 19 insertions(+)
diff --git a/include/sysemu/kvm_xen.h b/include/sysemu/kvm_xen.h
index 49afa0eb9e..b2aafaf7ab 100644
--- a/include/sysemu/kvm_xen.h
+++ b/include/sysemu/kvm_xen.h
@@ -30,4 +30,13 @@ 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 c210ff9d91..75bcf7b630 100644
--- a/target/i386/kvm/xen-emu.c
+++ b/target/i386/kvm/xen-emu.c
@@ -23,6 +23,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"
@@ -169,6 +170,15 @@ int kvm_xen_init(KVMState *s, uint32_t hypercall_msr)
}
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.39.0
- [PATCH v14 06/60] i386/kvm: Set Xen vCPU ID in KVM, (continued)
- [PATCH v14 06/60] i386/kvm: Set Xen vCPU ID in KVM, David Woodhouse, 2023/02/27
- [PATCH v14 58/60] kvm/i386: Add xen-evtchn-max-pirq property, David Woodhouse, 2023/02/27
- [PATCH v14 10/60] i386/xen: implement HYPERVISOR_xen_version, David Woodhouse, 2023/02/27
- [PATCH v14 22/60] i386/xen: handle VCPUOP_register_vcpu_time_info, David Woodhouse, 2023/02/27
- [PATCH v14 39/60] i386/xen: add monitor commands to test event injection, David Woodhouse, 2023/02/27
- [PATCH v14 57/60] hw/xen: Support MSI mapping to PIRQ, David Woodhouse, 2023/02/27
- [PATCH v14 26/60] i386/xen: implement HVMOP_set_param, David Woodhouse, 2023/02/27
- [PATCH v14 38/60] hw/xen: Implement EVTCHNOP_reset, David Woodhouse, 2023/02/27
- [PATCH v14 31/60] hw/xen: Implement EVTCHNOP_unmask, David Woodhouse, 2023/02/27
- [PATCH v14 25/60] i386/xen: implement HVMOP_set_evtchn_upcall_vector, David Woodhouse, 2023/02/27
- [PATCH v14 48/60] i386/xen: Reserve Xen special pages for console, xenstore rings,
David Woodhouse <=
- [PATCH v14 13/60] hw/xen: Add xen_overlay device for emulating shared xenheap pages, David Woodhouse, 2023/02/27
- [PATCH v14 27/60] hw/xen: Add xen_evtchn device for event channel emulation, David Woodhouse, 2023/02/27
- [PATCH v14 09/60] i386/xen: handle guest hypercalls, David Woodhouse, 2023/02/27
- [PATCH v14 32/60] hw/xen: Implement EVTCHNOP_bind_virq, David Woodhouse, 2023/02/27
- [PATCH v14 43/60] hw/xen: Add xen_gnttab device for grant table emulation, David Woodhouse, 2023/02/27
- [PATCH v14 47/60] i386/xen: handle PV timer hypercalls, David Woodhouse, 2023/02/27
- [PATCH v14 28/60] i386/xen: Add support for Xen event channel delivery to vCPU, David Woodhouse, 2023/02/27
- [PATCH v14 44/60] hw/xen: Support mapping grant frames, David Woodhouse, 2023/02/27
- [PATCH v14 41/60] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_PCI_INTX callback, David Woodhouse, 2023/02/27
- [PATCH v14 55/60] hw/xen: Implement emulated PIRQ hypercall support, David Woodhouse, 2023/02/27