Commit 41a0e547 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 



virtio, vhost, pc: fixes, features

beginnings of iotlb support for vhost
acpi hotplug rework
vhost net tx flush on link down
passing mtu to guests
hotplug for virtio crypto
fixes and cleanups all over the place

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Tue 10 Jan 2017 05:37:48 GMT
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream: (41 commits)
  acpi-test: update expected files
  memhp: move DIMM devices into dedicated scope with related common methods
  memhp: don't generate memory hotplug AML if it's not enabled/supported
  memhp: move memory hotplug only defines to memory_hotplug.c
  memhp: move GPE handler_E03 into build_memory_hotplug_aml()
  memhp: merge build_memory_devices() into build_memory_hotplug_aml()
  memhp: consolidate scattered MHPD device declaration
  memhp: move build_memory_devices() into memory_hotplug.c
  memhp: move build_memory_hotplug_aml() into memory_hotplug.c
  tests: pc: add memory hotplug acpi tables tests
  virtio-net: Add MTU feature support
  vhost-net: Notify the backend about the host MTU
  vhost-user: Add MTU protocol feature and op
  net: virtio-net discards TX data after link down
  virtio: Introduce virtqueue_drop_all procedure
  net: vhost stop updates virtio queue state
  net: Add virtio queue interface to update used index from vring state
  balloon: Don't balloon roms
  virtio: fix vq->inuse recalc after migr
  pcie_aer: support configurable AER capa version
  ...

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

backends/cryptodev-builtin.c

+4 −0
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ static void cryptodev_builtin_init( 
    backend->conf.max_size = LONG_MAX - sizeof(CryptoDevBackendSymOpInfo);

    backend->conf.max_cipher_key_len = CRYPTODEV_BUITLIN_MAX_CIPHER_KEY_LEN;

    backend->conf.max_auth_key_len = CRYPTODEV_BUITLIN_MAX_AUTH_KEY_LEN;



    cryptodev_backend_set_ready(backend, true);

}



static int
@@ -366,6 +368,8 @@ static void cryptodev_builtin_cleanup( 
            backend->conf.peers.ccs[i] = NULL;

        }

    }



    cryptodev_backend_set_ready(backend, false);

}



static void

backends/cryptodev.c

+30 −4
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ void cryptodev_backend_cleanup( 
    if (bc->cleanup) {

        bc->cleanup(backend, errp);

    }



    backend->ready = false;

}



int64_t cryptodev_backend_sym_create_session(
@@ -189,14 +187,39 @@ cryptodev_backend_complete(UserCreatable *uc, Error **errp) 
            goto out;

        }

    }

    backend->ready = true;



    return;



out:

    backend->ready = false;

    error_propagate(errp, local_err);

}



void cryptodev_backend_set_used(CryptoDevBackend *backend, bool used)

{

    backend->is_used = used;

}



bool cryptodev_backend_is_used(CryptoDevBackend *backend)

{

    return backend->is_used;

}



void cryptodev_backend_set_ready(CryptoDevBackend *backend, bool ready)

{

    backend->ready = ready;

}



bool cryptodev_backend_is_ready(CryptoDevBackend *backend)

{

    return backend->ready;

}



static bool

cryptodev_backend_can_be_deleted(UserCreatable *uc, Error **errp)

{

    return !cryptodev_backend_is_used(CRYPTODEV_BACKEND(uc));

}



static void cryptodev_backend_instance_init(Object *obj)

{

    object_property_add(obj, "queues", "int",
@@ -209,7 +232,9 @@ static void cryptodev_backend_instance_init(Object *obj) 


static void cryptodev_backend_finalize(Object *obj)

{

    CryptoDevBackend *backend = CRYPTODEV_BACKEND(obj);



    cryptodev_backend_cleanup(backend, NULL);

}



static void
@@ -218,6 +243,7 @@ cryptodev_backend_class_init(ObjectClass *oc, void *data) 
    UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);



    ucc->complete = cryptodev_backend_complete;

    ucc->can_be_deleted = cryptodev_backend_can_be_deleted;



    QTAILQ_INIT(&crypto_clients);

}

docs/pcie.txt

+6 −6
Original line number Diff line number Diff line
@@ -110,18 +110,18 @@ Plug only PCI Express devices into PCI Express Ports. 
          -device ioh3420,id=root_port1,chassis=x,slot=y[,bus=pcie.0][,addr=z]  \

          -device <dev>,bus=root_port1

2.2.2 Using multi-function PCI Express Root Ports:

      -device ioh3420,id=root_port1,multifunction=on,chassis=x,slot=y[,bus=pcie.0][,addr=z.0] \

      -device ioh3420,id=root_port2,chassis=x1,slot=y1[,bus=pcie.0][,addr=z.1] \

      -device ioh3420,id=root_port3,chassis=x2,slot=y2[,bus=pcie.0][,addr=z.2] \

2.2.2 Plugging a PCI Express device into a Switch:

      -device ioh3420,id=root_port1,multifunction=on,chassis=x,addr=z.0[,slot=y][,bus=pcie.0] \

      -device ioh3420,id=root_port2,chassis=x1,addr=z.1[,slot=y1][,bus=pcie.0] \

      -device ioh3420,id=root_port3,chassis=x2,addr=z.2[,slot=y2][,bus=pcie.0] \

2.2.3 Plugging a PCI Express device into a Switch:

      -device ioh3420,id=root_port1,chassis=x,slot=y[,bus=pcie.0][,addr=z]  \

      -device x3130-upstream,id=upstream_port1,bus=root_port1[,addr=x]          \

      -device xio3130-downstream,id=downstream_port1,bus=upstream_port1,chassis=x1,slot=y1[,addr=z1]] \

      -device <dev>,bus=downstream_port1



Notes:

  - (slot, chassis) pair is mandatory and must be

     unique for each PCI Express Root Port.

  - (slot, chassis) pair is mandatory and must be unique for each

    PCI Express Root Port. slot defaults to 0 when not specified.

  - 'addr' parameter can be 0 for all the examples above.

docs/specs/vhost-user.txt

+16 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ Protocol features 
#define VHOST_USER_PROTOCOL_F_LOG_SHMFD      1

#define VHOST_USER_PROTOCOL_F_RARP           2

#define VHOST_USER_PROTOCOL_F_REPLY_ACK      3

#define VHOST_USER_PROTOCOL_F_MTU            4



Message types

-------------
@@ -470,6 +471,21 @@ Message types 
      The first 6 bytes of the payload contain the mac address of the guest to

      allow the vhost user backend to construct and broadcast the fake RARP.



 * VHOST_USER_NET_SET_MTU



      Id: 20

      Equivalent ioctl: N/A

      Master payload: u64



      Set host MTU value exposed to the guest.

      This request should be sent only when VIRTIO_NET_F_MTU feature has been

      successfully negotiated, VHOST_USER_F_PROTOCOL_FEATURES is present in

      VHOST_USER_GET_FEATURES and protocol feature bit

      VHOST_USER_PROTOCOL_F_NET_MTU is present in

      VHOST_USER_GET_PROTOCOL_FEATURES.

      If VHOST_USER_PROTOCOL_F_REPLY_ACK is negotiated, slave must respond

      with zero in case the specified MTU is valid, or non-zero otherwise.



VHOST_USER_PROTOCOL_F_REPLY_ACK:

-------------------------------

The original vhost-user specification only demands replies for certain

exec.c

+33 −0
Original line number Diff line number Diff line
@@ -448,6 +448,39 @@ address_space_translate_internal(AddressSpaceDispatch *d, hwaddr addr, hwaddr *x 
    return section;

}



/* Called from RCU critical section */

IOMMUTLBEntry address_space_get_iotlb_entry(AddressSpace *as, hwaddr addr,

                                            bool is_write)

{

    IOMMUTLBEntry iotlb = {0};

    MemoryRegionSection *section;

    MemoryRegion *mr;



    for (;;) {

        AddressSpaceDispatch *d = atomic_rcu_read(&as->dispatch);

        section = address_space_lookup_region(d, addr, false);

        addr = addr - section->offset_within_address_space

               + section->offset_within_region;

        mr = section->mr;



        if (!mr->iommu_ops) {

            break;

        }



        iotlb = mr->iommu_ops->translate(mr, addr, is_write);

        if (!(iotlb.perm & (1 << is_write))) {

            iotlb.target_as = NULL;

            break;

        }



        addr = ((iotlb.translated_addr & ~iotlb.addr_mask)

                | (addr & iotlb.addr_mask));

        as = iotlb.target_as;

    }



    return iotlb;

}



/* Called from RCU critical section */

MemoryRegion *address_space_translate(AddressSpace *as, hwaddr addr,

                                      hwaddr *xlat, hwaddr *plen,