mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-27 12:23:53 -06:00

- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander) - Add '-d invalid_mem' logging option (Zoltan) - Create QOM containers explicitly (Peter) - Rename sysemu/ -> system/ (Philippe) - Re-orderning of include/exec/ headers (Philippe) Move a lot of declarations from these legacy mixed bag headers: . "exec/cpu-all.h" . "exec/cpu-common.h" . "exec/cpu-defs.h" . "exec/exec-all.h" . "exec/translate-all" to these more specific ones: . "exec/page-protection.h" . "exec/translation-block.h" . "user/cpu_loop.h" . "user/guest-host.h" . "user/page-protection.h" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe/// 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6 x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo= =cjz8 -----END PGP SIGNATURE----- Merge tag 'exec-20241220' of https://github.com/philmd/qemu into staging Accel & Exec patch queue - Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander) - Add '-d invalid_mem' logging option (Zoltan) - Create QOM containers explicitly (Peter) - Rename sysemu/ -> system/ (Philippe) - Re-orderning of include/exec/ headers (Philippe) Move a lot of declarations from these legacy mixed bag headers: . "exec/cpu-all.h" . "exec/cpu-common.h" . "exec/cpu-defs.h" . "exec/exec-all.h" . "exec/translate-all" to these more specific ones: . "exec/page-protection.h" . "exec/translation-block.h" . "user/cpu_loop.h" . "user/guest-host.h" . "user/page-protection.h" # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t # wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt # KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K # A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8 # 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe/// # 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r # xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl # VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay # ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP # 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd # +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6 # x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo= # =cjz8 # -----END PGP SIGNATURE----- # gpg: Signature made Fri 20 Dec 2024 11:45:20 EST # gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE * tag 'exec-20241220' of https://github.com/philmd/qemu: (59 commits) util/qemu-timer: fix indentation meson: Do not define CONFIG_DEVICES on user emulation system/accel-ops: Remove unnecessary 'exec/cpu-common.h' header system/numa: Remove unnecessary 'exec/cpu-common.h' header hw/xen: Remove unnecessary 'exec/cpu-common.h' header target/mips: Drop left-over comment about Jazz machine target/mips: Remove tswap() calls in semihosting uhi_fstat_cb() target/xtensa: Remove tswap() calls in semihosting simcall() helper accel/tcg: Un-inline translator_is_same_page() accel/tcg: Include missing 'exec/translation-block.h' header accel/tcg: Move tcg_cflags_has/set() to 'exec/translation-block.h' accel/tcg: Restrict curr_cflags() declaration to 'internal-common.h' qemu/coroutine: Include missing 'qemu/atomic.h' header exec/translation-block: Include missing 'qemu/atomic.h' header accel/tcg: Declare cpu_loop_exit_requested() in 'exec/cpu-common.h' exec/cpu-all: Include 'cpu.h' earlier so MMU_USER_IDX is always defined target/sparc: Move sparc_restore_state_to_opc() to cpu.c target/sparc: Uninline cpu_get_tb_cpu_state() target/loongarch: Declare loongarch_cpu_dump_state() locally user: Move various declarations out of 'exec/exec-all.h' ... Conflicts: hw/char/riscv_htif.c hw/intc/riscv_aplic.c target/s390x/cpu.c Apply sysemu header path changes to not in the pull request. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
322 lines
9.4 KiB
C
322 lines
9.4 KiB
C
/*
|
|
* KVM in-kernel PIT (i8254) support
|
|
*
|
|
* Copyright (c) 2003-2004 Fabrice Bellard
|
|
* Copyright (c) 2012 Jan Kiszka, Siemens AG
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include <linux/kvm.h>
|
|
#include "qapi/qapi-types-machine.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
#include "qemu/timer.h"
|
|
#include "system/runstate.h"
|
|
#include "hw/timer/i8254.h"
|
|
#include "hw/timer/i8254_internal.h"
|
|
#include "hw/qdev-properties-system.h"
|
|
#include "system/kvm.h"
|
|
#include "target/i386/kvm/kvm_i386.h"
|
|
#include "qom/object.h"
|
|
|
|
#define KVM_PIT_REINJECT_BIT 0
|
|
|
|
#define CALIBRATION_ROUNDS 3
|
|
|
|
typedef struct KVMPITClass KVMPITClass;
|
|
typedef struct KVMPITState KVMPITState;
|
|
DECLARE_OBJ_CHECKERS(KVMPITState, KVMPITClass,
|
|
KVM_PIT, TYPE_KVM_I8254)
|
|
|
|
struct KVMPITState {
|
|
PITCommonState parent_obj;
|
|
|
|
LostTickPolicy lost_tick_policy;
|
|
bool vm_stopped;
|
|
int64_t kernel_clock_offset;
|
|
};
|
|
|
|
struct KVMPITClass {
|
|
PITCommonClass parent_class;
|
|
|
|
DeviceRealize parent_realize;
|
|
};
|
|
|
|
static void kvm_pit_update_clock_offset(KVMPITState *s)
|
|
{
|
|
int64_t offset, clock_offset;
|
|
struct timespec ts;
|
|
int i;
|
|
|
|
/*
|
|
* Measure the delta between CLOCK_MONOTONIC, the base used for
|
|
* kvm_pit_channel_state::count_load_time, and QEMU_CLOCK_VIRTUAL. Take the
|
|
* minimum of several samples to filter out scheduling noise.
|
|
*/
|
|
clock_offset = INT64_MAX;
|
|
for (i = 0; i < CALIBRATION_ROUNDS; i++) {
|
|
offset = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
|
|
clock_gettime(CLOCK_MONOTONIC, &ts);
|
|
offset -= ts.tv_nsec;
|
|
offset -= (int64_t)ts.tv_sec * 1000000000;
|
|
if (uabs64(offset) < uabs64(clock_offset)) {
|
|
clock_offset = offset;
|
|
}
|
|
}
|
|
s->kernel_clock_offset = clock_offset;
|
|
}
|
|
|
|
static void kvm_pit_get(PITCommonState *pit)
|
|
{
|
|
KVMPITState *s = KVM_PIT(pit);
|
|
struct kvm_pit_state2 kpit;
|
|
struct kvm_pit_channel_state *kchan;
|
|
struct PITChannelState *sc;
|
|
int i, ret;
|
|
|
|
/* No need to re-read the state if VM is stopped. */
|
|
if (s->vm_stopped) {
|
|
return;
|
|
}
|
|
|
|
ret = kvm_vm_ioctl(kvm_state, KVM_GET_PIT2, &kpit);
|
|
if (ret < 0) {
|
|
fprintf(stderr, "KVM_GET_PIT2 failed: %s\n", strerror(-ret));
|
|
abort();
|
|
}
|
|
pit->channels[0].irq_disabled = kpit.flags & KVM_PIT_FLAGS_HPET_LEGACY;
|
|
for (i = 0; i < 3; i++) {
|
|
kchan = &kpit.channels[i];
|
|
sc = &pit->channels[i];
|
|
sc->count = kchan->count;
|
|
sc->latched_count = kchan->latched_count;
|
|
sc->count_latched = kchan->count_latched;
|
|
sc->status_latched = kchan->status_latched;
|
|
sc->status = kchan->status;
|
|
sc->read_state = kchan->read_state;
|
|
sc->write_state = kchan->write_state;
|
|
sc->write_latch = kchan->write_latch;
|
|
sc->rw_mode = kchan->rw_mode;
|
|
sc->mode = kchan->mode;
|
|
sc->bcd = kchan->bcd;
|
|
sc->gate = kchan->gate;
|
|
sc->count_load_time = kchan->count_load_time + s->kernel_clock_offset;
|
|
}
|
|
|
|
sc = &pit->channels[0];
|
|
sc->next_transition_time =
|
|
pit_get_next_transition_time(sc, sc->count_load_time);
|
|
}
|
|
|
|
static void kvm_pit_put(PITCommonState *pit)
|
|
{
|
|
KVMPITState *s = KVM_PIT(pit);
|
|
struct kvm_pit_state2 kpit = {};
|
|
struct kvm_pit_channel_state *kchan;
|
|
struct PITChannelState *sc;
|
|
int i, ret;
|
|
|
|
/* The offset keeps changing as long as the VM is stopped. */
|
|
if (s->vm_stopped) {
|
|
kvm_pit_update_clock_offset(s);
|
|
}
|
|
|
|
kpit.flags = pit->channels[0].irq_disabled ? KVM_PIT_FLAGS_HPET_LEGACY : 0;
|
|
for (i = 0; i < 3; i++) {
|
|
kchan = &kpit.channels[i];
|
|
sc = &pit->channels[i];
|
|
kchan->count = sc->count;
|
|
kchan->latched_count = sc->latched_count;
|
|
kchan->count_latched = sc->count_latched;
|
|
kchan->status_latched = sc->status_latched;
|
|
kchan->status = sc->status;
|
|
kchan->read_state = sc->read_state;
|
|
kchan->write_state = sc->write_state;
|
|
kchan->write_latch = sc->write_latch;
|
|
kchan->rw_mode = sc->rw_mode;
|
|
kchan->mode = sc->mode;
|
|
kchan->bcd = sc->bcd;
|
|
kchan->gate = sc->gate;
|
|
kchan->count_load_time = sc->count_load_time - s->kernel_clock_offset;
|
|
}
|
|
|
|
ret = kvm_vm_ioctl(kvm_state, KVM_SET_PIT2, &kpit);
|
|
if (ret < 0) {
|
|
fprintf(stderr, "KVM_SET_PIT2 failed: %s\n",
|
|
strerror(-ret));
|
|
abort();
|
|
}
|
|
}
|
|
|
|
static void kvm_pit_set_gate(PITCommonState *s, PITChannelState *sc, int val)
|
|
{
|
|
kvm_pit_get(s);
|
|
|
|
switch (sc->mode) {
|
|
default:
|
|
case 0:
|
|
case 4:
|
|
/* XXX: just disable/enable counting */
|
|
break;
|
|
case 1:
|
|
case 2:
|
|
case 3:
|
|
case 5:
|
|
if (sc->gate < val) {
|
|
/* restart counting on rising edge */
|
|
sc->count_load_time = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
|
|
}
|
|
break;
|
|
}
|
|
sc->gate = val;
|
|
|
|
kvm_pit_put(s);
|
|
}
|
|
|
|
static void kvm_pit_get_channel_info(PITCommonState *s, PITChannelState *sc,
|
|
PITChannelInfo *info)
|
|
{
|
|
kvm_pit_get(s);
|
|
|
|
pit_get_channel_info_common(s, sc, info);
|
|
}
|
|
|
|
static void kvm_pit_reset(DeviceState *dev)
|
|
{
|
|
PITCommonState *s = PIT_COMMON(dev);
|
|
|
|
pit_reset_common(s);
|
|
|
|
kvm_pit_put(s);
|
|
}
|
|
|
|
static void kvm_pit_irq_control(void *opaque, int n, int enable)
|
|
{
|
|
PITCommonState *pit = opaque;
|
|
PITChannelState *s = &pit->channels[0];
|
|
|
|
kvm_pit_get(pit);
|
|
|
|
s->irq_disabled = !enable;
|
|
|
|
kvm_pit_put(pit);
|
|
}
|
|
|
|
static void kvm_pit_vm_state_change(void *opaque, bool running,
|
|
RunState state)
|
|
{
|
|
KVMPITState *s = opaque;
|
|
|
|
if (running) {
|
|
kvm_pit_update_clock_offset(s);
|
|
kvm_pit_put(PIT_COMMON(s));
|
|
s->vm_stopped = false;
|
|
} else {
|
|
kvm_pit_update_clock_offset(s);
|
|
kvm_pit_get(PIT_COMMON(s));
|
|
s->vm_stopped = true;
|
|
}
|
|
}
|
|
|
|
static void kvm_pit_realizefn(DeviceState *dev, Error **errp)
|
|
{
|
|
PITCommonState *pit = PIT_COMMON(dev);
|
|
KVMPITClass *kpc = KVM_PIT_GET_CLASS(dev);
|
|
KVMPITState *s = KVM_PIT(pit);
|
|
struct kvm_pit_config config = {
|
|
.flags = 0,
|
|
};
|
|
int ret;
|
|
|
|
if (!kvm_check_extension(kvm_state, KVM_CAP_PIT_STATE2) ||
|
|
!kvm_check_extension(kvm_state, KVM_CAP_PIT2)) {
|
|
error_setg(errp, "In-kernel PIT not available");
|
|
}
|
|
|
|
ret = kvm_vm_ioctl(kvm_state, KVM_CREATE_PIT2, &config);
|
|
if (ret < 0) {
|
|
error_setg(errp, "Create kernel PIC irqchip failed: %s",
|
|
strerror(-ret));
|
|
return;
|
|
}
|
|
switch (s->lost_tick_policy) {
|
|
case LOST_TICK_POLICY_DELAY:
|
|
break; /* enabled by default */
|
|
case LOST_TICK_POLICY_DISCARD:
|
|
if (kvm_check_extension(kvm_state, KVM_CAP_REINJECT_CONTROL)) {
|
|
struct kvm_reinject_control control = { .pit_reinject = 0 };
|
|
|
|
ret = kvm_vm_ioctl(kvm_state, KVM_REINJECT_CONTROL, &control);
|
|
if (ret < 0) {
|
|
error_setg(errp,
|
|
"Can't disable in-kernel PIT reinjection: %s",
|
|
strerror(-ret));
|
|
return;
|
|
}
|
|
}
|
|
break;
|
|
default:
|
|
error_setg(errp, "Lost tick policy not supported.");
|
|
return;
|
|
}
|
|
|
|
memory_region_init_io(&pit->ioports, OBJECT(dev), NULL, NULL, "kvm-pit", 4);
|
|
|
|
qdev_init_gpio_in(dev, kvm_pit_irq_control, 1);
|
|
|
|
qemu_add_vm_change_state_handler(kvm_pit_vm_state_change, s);
|
|
|
|
kpc->parent_realize(dev, errp);
|
|
}
|
|
|
|
static const Property kvm_pit_properties[] = {
|
|
DEFINE_PROP_LOSTTICKPOLICY("lost_tick_policy", KVMPITState,
|
|
lost_tick_policy, LOST_TICK_POLICY_DELAY),
|
|
};
|
|
|
|
static void kvm_pit_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
KVMPITClass *kpc = KVM_PIT_CLASS(klass);
|
|
PITCommonClass *k = PIT_COMMON_CLASS(klass);
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
device_class_set_parent_realize(dc, kvm_pit_realizefn,
|
|
&kpc->parent_realize);
|
|
k->set_channel_gate = kvm_pit_set_gate;
|
|
k->get_channel_info = kvm_pit_get_channel_info;
|
|
device_class_set_legacy_reset(dc, kvm_pit_reset);
|
|
device_class_set_props(dc, kvm_pit_properties);
|
|
}
|
|
|
|
static const TypeInfo kvm_pit_info = {
|
|
.name = TYPE_KVM_I8254,
|
|
.parent = TYPE_PIT_COMMON,
|
|
.instance_size = sizeof(KVMPITState),
|
|
.class_init = kvm_pit_class_init,
|
|
.class_size = sizeof(KVMPITClass),
|
|
};
|
|
|
|
static void kvm_pit_register(void)
|
|
{
|
|
type_register_static(&kvm_pit_info);
|
|
}
|
|
|
|
type_init(kvm_pit_register)
|