Commit 3e4be9c2 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'qemu-kvm/uq/master' into staging 

# By Alexey Kardashevskiy (3) and others
# Via Paolo Bonzini
* qemu-kvm/uq/master:
  target-i386: add feature kvm_pv_unhalt
  linux-headers: update to 3.12-rc1
  target-i386: forward CPUID cache leaves when -cpu host is used
  linux-headers: update to 3.11
  kvm: fix traces to use %x instead of %d
  kvmvapic: Clear also physical ROM address when entering INACTIVE state
  kvmvapic: Enter inactive state on hardware reset
  kvmvapic: Catch invalid ROM size
  kvm irqfd: support direct msimessage to irq translation
  fix steal time MSR vmsd callback to proper opaque type
  kvm: warn if num cpus is greater than num recommended
  cpu: Move cpu state syncs up into cpu_dump_state()
  exec: always use MADV_DONTFORK

Message-id: 1379694292-1601-1-git-send-email-pbonzini@redhat.com
parents f3ca508f f010bc64

exec.c

+1 −0
Original line number Diff line number Diff line
@@ -1184,6 +1184,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, 


    qemu_ram_setup_dump(new_block->host, size);

    qemu_madvise(new_block->host, size, QEMU_MADV_HUGEPAGE);

    qemu_madvise(new_block->host, size, QEMU_MADV_DONTFORK);



    if (kvm_enabled())

        kvm_setup_guest_memory(new_block->host, size);

hw/i386/kvmvapic.c

+12 −5
Original line number Diff line number Diff line
@@ -510,9 +510,8 @@ static void vapic_reset(DeviceState *dev) 
{

    VAPICROMState *s = VAPIC(dev);



    if (s->state == VAPIC_ACTIVE) {

        s->state = VAPIC_STANDBY;

    }

    s->state = VAPIC_INACTIVE;

    s->rom_state_paddr = 0;

    vapic_enable_tpr_reporting(false);

}
@@ -578,7 +577,7 @@ static int patch_hypercalls(VAPICROMState *s) 
 * enable write access to the option ROM so that variables can be updated by

 * the guest.

 */

static void vapic_map_rom_writable(VAPICROMState *s)

static int vapic_map_rom_writable(VAPICROMState *s)

{

    hwaddr rom_paddr = s->rom_state_paddr & ROM_BLOCK_MASK;

    MemoryRegionSection section;
@@ -599,6 +598,9 @@ static void vapic_map_rom_writable(VAPICROMState *s) 
    /* read ROM size from RAM region */

    ram = memory_region_get_ram_ptr(section.mr);

    rom_size = ram[rom_paddr + 2] * ROM_BLOCK_SIZE;

    if (rom_size == 0) {

        return -1;

    }

    s->rom_size = rom_size;



    /* We need to round to avoid creating subpages
@@ -612,11 +614,15 @@ static void vapic_map_rom_writable(VAPICROMState *s) 
    memory_region_add_subregion_overlap(as, rom_paddr, &s->rom, 1000);

    s->rom_mapped_writable = true;

    memory_region_unref(section.mr);



    return 0;

}



static int vapic_prepare(VAPICROMState *s)

{

    vapic_map_rom_writable(s);

    if (vapic_map_rom_writable(s) < 0) {

        return -1;

    }



    if (patch_hypercalls(s) < 0) {

        return -1;
@@ -659,6 +665,7 @@ static void vapic_write(void *opaque, hwaddr addr, uint64_t data, 
        }

        if (vapic_prepare(s) < 0) {

            s->state = VAPIC_INACTIVE;

            s->rom_state_paddr = 0;

            break;

        }

        break;

include/sysemu/kvm.h

+19 −10
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ extern bool kvm_halt_in_kernel_allowed; 
extern bool kvm_irqfds_allowed;

extern bool kvm_msi_via_irqfd_allowed;

extern bool kvm_gsi_routing_allowed;

extern bool kvm_gsi_direct_mapping;

extern bool kvm_readonly_mem_allowed;



#if defined CONFIG_KVM || !defined NEED_CPU_H
@@ -107,6 +108,13 @@ extern bool kvm_readonly_mem_allowed; 
 */

#define kvm_gsi_routing_enabled() (kvm_gsi_routing_allowed)



/**

 * kvm_gsi_direct_mapping:

 *

 * Returns: true if GSI direct mapping is enabled.

 */

#define kvm_gsi_direct_mapping() (kvm_gsi_direct_mapping)



/**

 * kvm_readonly_mem_enabled:

 *
@@ -123,6 +131,7 @@ extern bool kvm_readonly_mem_allowed; 
#define kvm_irqfds_enabled() (false)

#define kvm_msi_via_irqfd_enabled() (false)

#define kvm_gsi_routing_allowed() (false)

#define kvm_gsi_direct_mapping() (false)

#define kvm_readonly_mem_enabled() (false)

#endif
@@ -265,16 +274,6 @@ int kvm_check_extension(KVMState *s, unsigned int extension); 


uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function,

                                      uint32_t index, int reg);

void kvm_cpu_synchronize_state(CPUState *cpu);



/* generic hooks - to be moved/refactored once there are more users */



static inline void cpu_synchronize_state(CPUState *cpu)

{

    if (kvm_enabled()) {

        kvm_cpu_synchronize_state(cpu);

    }

}



#if !defined(CONFIG_USER_ONLY)

int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr,
@@ -283,9 +282,19 @@ int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr, 


#endif /* NEED_CPU_H */



void kvm_cpu_synchronize_state(CPUState *cpu);

void kvm_cpu_synchronize_post_reset(CPUState *cpu);

void kvm_cpu_synchronize_post_init(CPUState *cpu);



/* generic hooks - to be moved/refactored once there are more users */



static inline void cpu_synchronize_state(CPUState *cpu)

{

    if (kvm_enabled()) {

        kvm_cpu_synchronize_state(cpu);

    }

}



static inline void cpu_synchronize_post_reset(CPUState *cpu)

{

    if (kvm_enabled()) {

kvm-all.c

+53 −29
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ bool kvm_halt_in_kernel_allowed; 
bool kvm_irqfds_allowed;

bool kvm_msi_via_irqfd_allowed;

bool kvm_gsi_routing_allowed;

bool kvm_gsi_direct_mapping;

bool kvm_allowed;

bool kvm_readonly_mem_allowed;
@@ -1069,6 +1070,10 @@ void kvm_irqchip_release_virq(KVMState *s, int virq) 
    struct kvm_irq_routing_entry *e;

    int i;



    if (kvm_gsi_direct_mapping()) {

        return;

    }



    for (i = 0; i < s->irq_routes->nr; i++) {

        e = &s->irq_routes->entries[i];

        if (e->gsi == virq) {
@@ -1190,6 +1195,10 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg) 
    struct kvm_irq_routing_entry kroute = {};

    int virq;



    if (kvm_gsi_direct_mapping()) {

        return msg.data & 0xffff;

    }



    if (!kvm_gsi_routing_enabled()) {

        return -ENOSYS;

    }
@@ -1216,6 +1225,10 @@ int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg) 
{

    struct kvm_irq_routing_entry kroute = {};



    if (kvm_gsi_direct_mapping()) {

        return 0;

    }



    if (!kvm_irqchip_in_kernel()) {

        return -ENOSYS;

    }
@@ -1322,24 +1335,20 @@ static int kvm_irqchip_create(KVMState *s) 
    return 0;

}



static int kvm_max_vcpus(KVMState *s)

{

    int ret;



/* Find number of supported CPUs using the recommended

 * procedure from the kernel API documentation to cope with

 * older kernels that may be missing capabilities.

 */

    ret = kvm_check_extension(s, KVM_CAP_MAX_VCPUS);

    if (ret) {

        return ret;

    }

    ret = kvm_check_extension(s, KVM_CAP_NR_VCPUS);

    if (ret) {

        return ret;

static int kvm_recommended_vcpus(KVMState *s)

{

    int ret = kvm_check_extension(s, KVM_CAP_NR_VCPUS);

    return (ret) ? ret : 4;

}



    return 4;

static int kvm_max_vcpus(KVMState *s)

{

    int ret = kvm_check_extension(s, KVM_CAP_MAX_VCPUS);

    return (ret) ? ret : kvm_recommended_vcpus(s);

}



int kvm_init(void)
@@ -1347,11 +1356,19 @@ int kvm_init(void) 
    static const char upgrade_note[] =

        "Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\n"

        "(see http://sourceforge.net/projects/kvm).\n";

    struct {

        const char *name;

        int num;

    } num_cpus[] = {

        { "SMP",          smp_cpus },

        { "hotpluggable", max_cpus },

        { NULL, }

    }, *nc = num_cpus;

    int soft_vcpus_limit, hard_vcpus_limit;

    KVMState *s;

    const KVMCapabilityInfo *missing_cap;

    int ret;

    int i;

    int max_vcpus;



    s = g_malloc0(sizeof(KVMState));
@@ -1392,20 +1409,27 @@ int kvm_init(void) 
        goto err;

    }



    max_vcpus = kvm_max_vcpus(s);

    if (smp_cpus > max_vcpus) {

        ret = -EINVAL;

        fprintf(stderr, "Number of SMP cpus requested (%d) exceeds max cpus "

                "supported by KVM (%d)\n", smp_cpus, max_vcpus);

        goto err;

    }

    /* check the vcpu limits */

    soft_vcpus_limit = kvm_recommended_vcpus(s);

    hard_vcpus_limit = kvm_max_vcpus(s);



    while (nc->name) {

        if (nc->num > soft_vcpus_limit) {

            fprintf(stderr,

                    "Warning: Number of %s cpus requested (%d) exceeds "

                    "the recommended cpus supported by KVM (%d)\n",

                    nc->name, nc->num, soft_vcpus_limit);



    if (max_cpus > max_vcpus) {

            if (nc->num > hard_vcpus_limit) {

                ret = -EINVAL;

        fprintf(stderr, "Number of hotpluggable cpus requested (%d) exceeds max cpus "

                "supported by KVM (%d)\n", max_cpus, max_vcpus);

                fprintf(stderr, "Number of %s cpus requested (%d) exceeds "

                        "the maximum cpus supported by KVM (%d)\n",

                        nc->name, nc->num, hard_vcpus_limit);

                goto err;

            }

        }

        nc++;

    }



    s->vmfd = kvm_ioctl(s, KVM_CREATE_VM, 0);

    if (s->vmfd < 0) {

kvm-stub.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ bool kvm_async_interrupts_allowed; 
bool kvm_irqfds_allowed;

bool kvm_msi_via_irqfd_allowed;

bool kvm_gsi_routing_allowed;

bool kvm_gsi_direct_mapping;

bool kvm_allowed;

bool kvm_readonly_mem_allowed;