Commit 7d3660e7 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* Miscellaneous fixes and feature enablement (many)
* SEV refactoring (David)
* Hyper-V initial support (Jon)
* i386 TCG fixes (x87 and SSE, Joseph)
* vmport cleanup and improvements (Philippe, Liran)
* Use-after-free with vCPU hot-unplug (Nengyuan)
* run-coverity-scan improvements (myself)
* Record/replay fixes (Pavel)
* -machine kernel_irqchip=split improvements for INTx (Peter)
* Code cleanups (Philippe)
* Crash and security fixes (PJP)
* HVF cleanups (Roman)

# gpg: Signature made Fri 12 Jun 2020 16:57:04 BST
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream: (116 commits)
  target/i386: Remove obsolete TODO file
  stubs: move Xen stubs to accel/
  replay: fix replay shutdown for console mode
  exec/cpu-common: Move MUSB specific typedefs to 'hw/usb/hcd-musb.h'
  hw/usb: Move device-specific declarations to new 'hcd-musb.h' header
  exec/memory: Remove unused MemoryRegionMmio type
  checkpatch: reversed logic with acpi test checks
  target/i386: sev: Unify SEVState and SevGuestState
  target/i386: sev: Remove redundant handle field
  target/i386: sev: Remove redundant policy field
  target/i386: sev: Remove redundant cbitpos and reduced_phys_bits fields
  target/i386: sev: Partial cleanup to sev_state global
  target/i386: sev: Embed SEVState in SevGuestState
  target/i386: sev: Rename QSevGuestInfo
  target/i386: sev: Move local structure definitions into .c file
  target/i386: sev: Remove unused QSevGuestInfoClass
  xen: fix build without pci passthrough
  i386: hvf: Drop HVFX86EmulatorState
  i386: hvf: Move mmio_buf into CPUX86State
  i386: hvf: Move lazy_flags into CPUX86State
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>

# Conflicts:
#	hw/i386/acpi-build.c
parents 9e390313 3575b0ae

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -440,6 +440,7 @@ M: Paul Durrant <paul@xen.org> 
L: xen-devel@lists.xenproject.org

S: Supported

F: */xen*

F: accel/xen/*

F: hw/9pfs/xen-9p*

F: hw/char/xen_console.c

F: hw/display/xenfb.c
@@ -453,6 +454,7 @@ F: hw/i386/xen/ 
F: hw/pci-host/xen_igd_pt.c

F: include/hw/block/dataplane/xen*

F: include/hw/xen/

F: include/sysemu/xen.h

F: include/sysemu/xen-mapcache.h



Guest CPU Cores (HAXM)

Makefile

+7 −2
Original line number Diff line number Diff line
@@ -336,9 +336,9 @@ $(call set-vpath, $(SRC_PATH)) 
LIBS+=-lz $(LIBS_TOOLS)



vhost-user-json-y =

HELPERS-y =

HELPERS-y = $(HELPERS)



HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF)

HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) += qemu-bridge-helper$(EXESUF)



ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy)

HELPERS-y += vhost-user-gpu$(EXESUF)
@@ -1258,6 +1258,11 @@ endif 
				$(call print-help-run,$(t)/fuzz,Build fuzzer for $(t)); \

		))) \

		echo '')

	@$(if $(HELPERS-y), \

		echo 'Helper targets:'; \

		$(foreach t, $(HELPERS-y), \

		$(call print-help-run,$(t),Build $(shell basename $(t)));) \

		echo '')

	@$(if $(TOOLS), \

		echo 'Tools targets:'; \

		$(foreach t, $(TOOLS), \

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ trace-events-subdirs += hw/block/dataplane 
trace-events-subdirs += hw/char

trace-events-subdirs += hw/dma

trace-events-subdirs += hw/hppa

trace-events-subdirs += hw/hyperv

trace-events-subdirs += hw/i2c

trace-events-subdirs += hw/i386

trace-events-subdirs += hw/i386/xen

accel/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ common-obj-$(CONFIG_SOFTMMU) += accel.o 
obj-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_POSIX)) += qtest.o

obj-$(CONFIG_KVM) += kvm/

obj-$(CONFIG_TCG) += tcg/

obj-$(CONFIG_XEN) += xen/

obj-y += stubs/

accel/kvm/kvm-all.c

+87 −8
Original line number Diff line number Diff line
@@ -160,9 +160,59 @@ static const KVMCapabilityInfo kvm_required_capabilites[] = { 
static NotifierList kvm_irqchip_change_notifiers =

    NOTIFIER_LIST_INITIALIZER(kvm_irqchip_change_notifiers);



struct KVMResampleFd {

    int gsi;

    EventNotifier *resample_event;

    QLIST_ENTRY(KVMResampleFd) node;

};

typedef struct KVMResampleFd KVMResampleFd;



/*

 * Only used with split irqchip where we need to do the resample fd

 * kick for the kernel from userspace.

 */

static QLIST_HEAD(, KVMResampleFd) kvm_resample_fd_list =

    QLIST_HEAD_INITIALIZER(kvm_resample_fd_list);



#define kvm_slots_lock(kml)      qemu_mutex_lock(&(kml)->slots_lock)

#define kvm_slots_unlock(kml)    qemu_mutex_unlock(&(kml)->slots_lock)



static inline void kvm_resample_fd_remove(int gsi)

{

    KVMResampleFd *rfd;



    QLIST_FOREACH(rfd, &kvm_resample_fd_list, node) {

        if (rfd->gsi == gsi) {

            QLIST_REMOVE(rfd, node);

            g_free(rfd);

            break;

        }

    }

}



static inline void kvm_resample_fd_insert(int gsi, EventNotifier *event)

{

    KVMResampleFd *rfd = g_new0(KVMResampleFd, 1);



    rfd->gsi = gsi;

    rfd->resample_event = event;



    QLIST_INSERT_HEAD(&kvm_resample_fd_list, rfd, node);

}



void kvm_resample_fd_notify(int gsi)

{

    KVMResampleFd *rfd;



    QLIST_FOREACH(rfd, &kvm_resample_fd_list, node) {

        if (rfd->gsi == gsi) {

            event_notifier_set(rfd->resample_event);

            trace_kvm_resample_fd_notify(gsi);

            return;

        }

    }

}



int kvm_get_max_memslots(void)

{

    KVMState *s = KVM_STATE(current_accel());
@@ -1662,9 +1712,13 @@ int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg, 
    return kvm_update_routing_entry(s, &kroute);

}



static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int rfd, int virq,

static int kvm_irqchip_assign_irqfd(KVMState *s, EventNotifier *event,

                                    EventNotifier *resample, int virq,

                                    bool assign)

{

    int fd = event_notifier_get_fd(event);

    int rfd = resample ? event_notifier_get_fd(resample) : -1;



    struct kvm_irqfd irqfd = {

        .fd = fd,

        .gsi = virq,
@@ -1672,9 +1726,34 @@ static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int rfd, int virq, 
    };



    if (rfd != -1) {

        assert(assign);

        if (kvm_irqchip_is_split()) {

            /*

             * When the slow irqchip (e.g. IOAPIC) is in the

             * userspace, KVM kernel resamplefd will not work because

             * the EOI of the interrupt will be delivered to userspace

             * instead, so the KVM kernel resamplefd kick will be

             * skipped.  The userspace here mimics what the kernel

             * provides with resamplefd, remember the resamplefd and

             * kick it when we receive EOI of this IRQ.

             *

             * This is hackery because IOAPIC is mostly bypassed

             * (except EOI broadcasts) when irqfd is used.  However

             * this can bring much performance back for split irqchip

             * with INTx IRQs (for VFIO, this gives 93% perf of the

             * full fast path, which is 46% perf boost comparing to

             * the INTx slow path).

             */

            kvm_resample_fd_insert(virq, resample);

        } else {

            irqfd.flags |= KVM_IRQFD_FLAG_RESAMPLE;

            irqfd.resamplefd = rfd;

        }

    } else if (!assign) {

        if (kvm_irqchip_is_split()) {

            kvm_resample_fd_remove(virq);

        }

    }



    if (!kvm_irqfds_enabled()) {

        return -ENOSYS;
@@ -1769,7 +1848,9 @@ int kvm_irqchip_add_hv_sint_route(KVMState *s, uint32_t vcpu, uint32_t sint) 
    return -ENOSYS;

}



static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int virq, bool assign)

static int kvm_irqchip_assign_irqfd(KVMState *s, EventNotifier *event,

                                    EventNotifier *resample, int virq,

                                    bool assign)

{

    abort();

}
@@ -1783,15 +1864,13 @@ int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg) 
int kvm_irqchip_add_irqfd_notifier_gsi(KVMState *s, EventNotifier *n,

                                       EventNotifier *rn, int virq)

{

    return kvm_irqchip_assign_irqfd(s, event_notifier_get_fd(n),

           rn ? event_notifier_get_fd(rn) : -1, virq, true);

    return kvm_irqchip_assign_irqfd(s, n, rn, virq, true);

}



int kvm_irqchip_remove_irqfd_notifier_gsi(KVMState *s, EventNotifier *n,

                                          int virq)

{

    return kvm_irqchip_assign_irqfd(s, event_notifier_get_fd(n), -1, virq,

           false);

    return kvm_irqchip_assign_irqfd(s, n, NULL, virq, false);

}



int kvm_irqchip_add_irqfd_notifier(KVMState *s, EventNotifier *n,