c608e23838
Turn off building the KMPs now that we are using the pvops kernel xen.spec - Upstream patches from Jan 561bbc8b-VT-d-don-t-suppress-invalidation-address-write-when-it-is-zero.patch 561d20a0-x86-hide-MWAITX-from-PV-domains.patch 561e3283-x86-NUMA-fix-SRAT-table-processor-entry-parsing-and-consumption.patch 5632118e-arm-Support-hypercall_create_continuation-for-multicall.patch 56321222-arm-rate-limit-logging-from-unimplemented-PHYSDEVOP-and-HVMOP.patch 56321249-arm-handle-races-between-relinquish_memory-and-free_domheap_pages.patch 5632127b-x86-guard-against-undue-super-page-PTE-creation.patch 5632129c-free-domain-s-vcpu-array.patch (Replaces CVE-2015-7969-xsa149.patch) 563212c9-x86-PoD-Eager-sweep-for-zeroed-pages.patch 563212e4-xenoprof-free-domain-s-vcpu-array.patch 563212ff-x86-rate-limit-logging-in-do_xen-oprof-pmu-_op.patch 56323737-libxl-adjust-PoD-target-by-memory-fudge-too.patch 56377442-x86-PoD-Make-p2m_pod_empty_cache-restartable.patch 5641ceec-x86-HVM-always-intercept-AC-and-DB.patch (Replaces CVE-2015-5307-xsa156.patch) 5644b756-x86-HVM-don-t-inject-DB-with-error-code.patch - Dropped 55b0a2db-x86-MSI-track-guest-masking.patch - Use upstream variants of block-iscsi and block-nbd - Remove xenalyze.hg, its part of xen-4.6 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=389
78 lines
3.0 KiB
Diff
78 lines
3.0 KiB
Diff
# Commit e294a0c3af9f4443dc692b180fb1771b1cb075e8
|
|
# Date 2015-10-29 15:11:51 +0000
|
|
# Author Ian Jackson <ian.jackson@eu.citrix.com>
|
|
# Committer Ian Jackson <Ian.Jackson@eu.citrix.com>
|
|
libxl: adjust PoD target by memory fudge, too
|
|
|
|
PoD guests need to balloon at least as far as required by PoD, or risk
|
|
crashing. Currently they don't necessarily know what the right value
|
|
is, because our memory accounting is (at the very least) confusing.
|
|
|
|
Apply the memory limit fudge factor to the in-hypervisor PoD memory
|
|
target, too. This will increase the size of the guest's PoD cache by
|
|
the fudge factor LIBXL_MAXMEM_CONSTANT (currently 1Mby). This ensures
|
|
that even with a slightly-off balloon driver, the guest will be
|
|
stable even under memory pressure.
|
|
|
|
There are two call sites of xc_domain_set_pod_target that need fixing:
|
|
|
|
The one in libxl_set_memory_target is straightforward.
|
|
|
|
The one in xc_hvm_build_x86.c:setup_guest is more awkward. Simply
|
|
setting the PoD target differently does not work because the various
|
|
amounts of memory during domain construction no longer match up.
|
|
Instead, we adjust the guest memory target in xenstore (but only for
|
|
PoD guests).
|
|
|
|
This introduces a 1Mby discrepancy between the balloon target of a PoD
|
|
guest at boot, and the target set by an apparently-equivalent `xl
|
|
mem-set' (or similar) later. This approach is low-risk for a security
|
|
fix but we need to fix this up properly in xen.git#staging and
|
|
probably also in stable trees.
|
|
|
|
This is XSA-153.
|
|
|
|
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
|
|
(cherry picked from commit 56fb5fd62320eb40a7517206f9706aa9188d6f7b)
|
|
|
|
--- a/tools/libxl/libxl.c
|
|
+++ b/tools/libxl/libxl.c
|
|
@@ -4815,7 +4815,7 @@ retry_transaction:
|
|
}
|
|
|
|
rc = xc_domain_set_pod_target(ctx->xch, domid,
|
|
- new_target_memkb / 4, NULL, NULL, NULL);
|
|
+ (new_target_memkb + LIBXL_MAXMEM_CONSTANT) / 4, NULL, NULL, NULL);
|
|
if (rc != 0) {
|
|
LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
|
|
"xc_domain_set_pod_target domid=%d, memkb=%d "
|
|
--- a/tools/libxl/libxl_dom.c
|
|
+++ b/tools/libxl/libxl_dom.c
|
|
@@ -486,6 +486,7 @@ int libxl__build_post(libxl__gc *gc, uin
|
|
xs_transaction_t t;
|
|
char **ents;
|
|
int i, rc;
|
|
+ int64_t mem_target_fudge;
|
|
|
|
if (info->num_vnuma_nodes && !info->num_vcpu_soft_affinity) {
|
|
rc = set_vnuma_affinity(gc, domid, info);
|
|
@@ -518,11 +519,17 @@ int libxl__build_post(libxl__gc *gc, uin
|
|
}
|
|
}
|
|
|
|
+ mem_target_fudge =
|
|
+ (info->type == LIBXL_DOMAIN_TYPE_HVM &&
|
|
+ info->max_memkb > info->target_memkb)
|
|
+ ? LIBXL_MAXMEM_CONSTANT : 0;
|
|
+
|
|
ents = libxl__calloc(gc, 12 + (info->max_vcpus * 2) + 2, sizeof(char *));
|
|
ents[0] = "memory/static-max";
|
|
ents[1] = GCSPRINTF("%"PRId64, info->max_memkb);
|
|
ents[2] = "memory/target";
|
|
- ents[3] = GCSPRINTF("%"PRId64, info->target_memkb - info->video_memkb);
|
|
+ ents[3] = GCSPRINTF("%"PRId64, info->target_memkb - info->video_memkb
|
|
+ - mem_target_fudge);
|
|
ents[4] = "memory/videoram";
|
|
ents[5] = GCSPRINTF("%"PRId64, info->video_memkb);
|
|
ents[6] = "domid";
|