75a234904f
This change adds the necessary files for the qemu package to
be built for Debian. This review follows the same approach
used on the virt/libvirt [1].
The base version selected comes from the Debian archive [2] since the
salsa-debian [3] version was not fully compatible with stx build tools.
The full upstream build was quite long (time) and big (size) so we
patched the Debian files with debian_patches to drop unnecessary
packages, that is, packages that starlingx does not need.
The patches dir will contain source code patches required for
stx-qemu, that is, the code that was earlier added on top of 3.0.0
qemu release to add StarlingX required functionalities.
The work done on this change is simply porting the code changes,
copying it and doing the minimum required updates when it is needed.
The list of commits follow, where the "-" character indicates that the
commit was dropped now that we are based on 5.2:
d3400d STX: virtio-serial: don't touch virtqueue if vm is stopped
71dc08 STX: Modify live migration auto-converge threshold
9be81b STX: Suspend/Resume for VMs with PCIPT+Virtio
876a3c STX: realtime uses mlock instead of mlockall
007444 STX: qemu dpdk custom config
3f6344 STX: add libdl
dbda73 STX: qemu: add compile define for CONFIG_DPDK
626bfd STX: qemu: add -enable-dpdk runtime flag
79ea26 STX: qemu dpdk changes for openvswitch dpdk
9c83db STX: migration thread affinity and priority qmp
e7fbe5 STX: Add support statement to -help output
-48de9c STX: Changes for running on CentOS
-32b6f0 Upstream: Workaround: make sure vdev->vq[i].inuse never goes
below 0
-246b26 virtio: Return true from virtio_queue_empty if broken
[1] https://review.opendev.org/c/starlingx/integ/+/863561
[2] https://snapshot.debian.org/archive/debian/20221109T211529Z/pool/main/q/qemu/
[3] https://salsa.debian.org/qemu-team/qemu/-/tree/debian-bullseye
Test Plan:
PASS: Build the qemu packages
PASS: Build iso with qemu packages
PASS: Bootstrap Debian ISO on AIO-SX
PASS: Ensure qemu packages are installed (apt list --installed)
PASS: Lock/Unlock AIO-SX *
* Future tests regarding the libvirt/qemu runtime features will be done
once all the pieces are in place in the ISO.
Depends-On: https://review.opendev.org/c/starlingx/root/+/864942
Story: 2010317
Task: 46390
Signed-off-by: Rafael Falcao <rafael.vieirafalcao@windriver.com>
Co-Authored-by: Thales Elero Cervi <thaleselero.cervi@windriver.com>
Change-Id: I424debf7eb24c024ba82a490cda746dbd5af0019
103 lines
3.5 KiB
Diff
103 lines
3.5 KiB
Diff
From f06fb5c1bf146f661fdca218943018fcf25c5ca6 Mon Sep 17 00:00:00 2001
|
|
From: Jim Somerville <Jim.Somerville@windriver.com>
|
|
Date: Fri, 26 Apr 2019 17:41:04 -0300
|
|
Subject: [PATCH] STX: realtime uses mlock instead of mlockall
|
|
|
|
This enhances qemu to use mlock() instead of mlockall() when
|
|
'-realtime mlock=on' is specified, so that memory is engineerable.
|
|
|
|
mlockall() is not practically engineerable since it requires significant
|
|
4K reserved memory per process. It will lock pages of the code, data and
|
|
stack segment, shared libraries, user space kernel data, shared memory,
|
|
and memory-mapped files. This easily translates to >> 1GiB when you
|
|
consider [heap] segment of 225MiB and VmData near 500 MiB to 900 MiB.
|
|
|
|
Using mlock() only in ram_block_add(), we no longer lock stack / data,
|
|
shared libraries, and heap.
|
|
|
|
NOTE: This degrades the guarantee provided by '-realtime mlock=on'
|
|
since we may end up delaying the instance to fault in code pages from
|
|
disk or allocate memory, thus breaking any realtime guarantees.
|
|
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
Signed-off-by: Rafael Falcao <Rafael.VieiraFalcao@windriver.com>
|
|
---
|
|
softmmu/physmem.c | 13 ++++++++++++-
|
|
softmmu/vl.c | 8 ++++----
|
|
2 files changed, 16 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/softmmu/physmem.c b/softmmu/physmem.c
|
|
index 3027747c03..e63fad9b13 100644
|
|
--- a/softmmu/physmem.c
|
|
+++ b/softmmu/physmem.c
|
|
@@ -1464,6 +1464,7 @@ static void *file_ram_alloc(RAMBlock *block,
|
|
Error **errp)
|
|
{
|
|
void *area;
|
|
+ int flags;
|
|
|
|
block->page_size = qemu_fd_getpagesize(fd);
|
|
if (block->mr->align % block->page_size) {
|
|
@@ -1510,8 +1511,13 @@ static void *file_ram_alloc(RAMBlock *block,
|
|
perror("ftruncate");
|
|
}
|
|
|
|
+ /* WRS - enable mlock */
|
|
+ flags = block->flags & RAM_SHARED;
|
|
+ if (enable_mlock) {
|
|
+ flags |= MAP_LOCKED;
|
|
+ }
|
|
area = qemu_ram_mmap(fd, memory, block->mr->align,
|
|
- block->flags & RAM_SHARED, block->flags & RAM_PMEM);
|
|
+ flags, block->flags & RAM_PMEM);
|
|
if (area == MAP_FAILED) {
|
|
error_setg_errno(errp, errno,
|
|
"unable to map backing store for guest RAM");
|
|
@@ -1937,6 +1943,11 @@ static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared)
|
|
QEMU_MADV_DONTFORK);
|
|
}
|
|
ram_block_notify_add(new_block->host, new_block->max_length);
|
|
+ if (enable_mlock) {
|
|
+ if (mlock(new_block->host, new_block->max_length) < 0) {
|
|
+ perror("mlock");
|
|
+ }
|
|
+ }
|
|
}
|
|
}
|
|
|
|
diff --git a/softmmu/vl.c b/softmmu/vl.c
|
|
index a398697d0d..527fe4e961 100644
|
|
--- a/softmmu/vl.c
|
|
+++ b/softmmu/vl.c
|
|
@@ -2,6 +2,7 @@
|
|
* QEMU System Emulator
|
|
*
|
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
|
+ * Copyright (c) 2013-2016 Wind River Systems, Inc. All rights reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
@@ -38,6 +39,7 @@
|
|
#include "sysemu/tcg.h"
|
|
#include "sysemu/xen.h"
|
|
|
|
+#include "qemu-common.h"
|
|
#include "qemu/error-report.h"
|
|
#include "qemu/sockets.h"
|
|
#include "sysemu/accel.h"
|
|
@@ -1111,10 +1113,8 @@ static QemuOptsList qemu_smp_opts = {
|
|
static void realtime_init(void)
|
|
{
|
|
if (enable_mlock) {
|
|
- if (os_mlock() < 0) {
|
|
- error_report("locking memory failed");
|
|
- exit(1);
|
|
- }
|
|
+ /* WRS - do not call os_mlock(), prevent call to mlockall */
|
|
+ ;
|
|
}
|
|
}
|
|
|
|
--
|
|
2.25.1
|