Commit cdf98182 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



virtio,pc features, fixes

New features:
    vhost-user multiqueue support
    virtio-ccw virtio 1 support

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

# gpg: Signature made Fri 25 Sep 2015 07:40:35 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream:
  MAINTAINERS: add more devices to the PCI section
  MAINTAINERS: add more devices to the PC section
  vhost-user: add a new message to disable/enable a specific virt queue.
  vhost-user: add multiple queue support
  vhost: introduce vhost_backend_get_vq_index method
  vhost-user: add VHOST_USER_GET_QUEUE_NUM message
  vhost: rename VHOST_RESET_OWNER to VHOST_RESET_DEVICE
  vhost-user: add protocol feature negotiation
  vhost-user: use VHOST_USER_XXX macro for switch statement
  virtio-ccw: enable virtio-1
  virtio-ccw: feature bits > 31 handling
  virtio-ccw: support ring size changes
  virtio: ring sizes vs. reset
  pc: Introduce pc-*-2.5 machine classes
  q35: Move options common to all classes to pc_i440fx_machine_options()
  q35: Move options common to all classes to pc_q35_machine_options()
  virtio-net: unbreak self announcement and guest offloads after migration
  virtio: right size for virtio_queue_get_avail_size

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

MAINTAINERS

+21 −0
Original line number Diff line number Diff line
@@ -601,6 +601,25 @@ F: hw/acpi/piix4.c 
F: hw/acpi/ich9.c

F: include/hw/acpi/ich9.h

F: include/hw/acpi/piix.h

F: hw/misc/sga.c



PC Chipset

M: Michael S. Tsirkin <mst@redhat.com>

M: Paolo Bonzini <pbonzini@redhat.com>

S: Support

F: hw/char/debugcon.c

F: hw/char/parallel.c

F: hw/char/serial*

F: hw/dma/i8257*

F: hw/i2c/pm_smbus.c

F: hw/intc/apic*

F: hw/intc/ioapic*

F: hw/intc/i8259*

F: hw/misc/debugexit.c

F: hw/misc/pc-testdev.c

F: hw/timer/hpet*

F: hw/timer/i8254*

F: hw/timer/mc146818rtc*





Xtensa Machines
@@ -653,7 +672,9 @@ PCI 
M: Michael S. Tsirkin <mst@redhat.com>

S: Supported

F: include/hw/pci/*

F: hw/misc/pci-testdev.c

F: hw/pci/*

F: hw/pci-bridge/*



ACPI/SMBIOS

M: Michael S. Tsirkin <mst@redhat.com>

docs/specs/vhost-user.txt

+75 −2
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ message replies. Most of the requests don't require replies. Here is a list of 
the ones that do:



 * VHOST_GET_FEATURES

 * VHOST_GET_PROTOCOL_FEATURES

 * VHOST_GET_VRING_BASE



There are several messages that the master sends with file descriptors passed
@@ -127,6 +128,30 @@ in the ancillary data: 
If Master is unable to send the full message or receives a wrong reply it will

close the connection. An optional reconnection mechanism can be implemented.



Any protocol extensions are gated by protocol feature bits,

which allows full backwards compatibility on both master

and slave.

As older slaves don't support negotiating protocol features,

a feature bit was dedicated for this purpose:

#define VHOST_USER_F_PROTOCOL_FEATURES 30



Multiple queue support

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



Multiple queue is treated as a protocol extension, hence the slave has to

implement protocol features first. The multiple queues feature is supported

only when the protocol feature VHOST_USER_PROTOCOL_F_MQ (bit 0) is set:

#define VHOST_USER_PROTOCOL_F_MQ    0



The max number of queues the slave supports can be queried with message

VHOST_USER_GET_PROTOCOL_FEATURES. Master should stop when the number of

requested queues is bigger than that.



As all queues share one connection, the master uses a unique index for each

queue in the sent message to identify a specified queue. One queue pair

is enabled initially. More queues are enabled dynamically, by sending

message VHOST_USER_SET_VRING_ENABLE.



Message types

-------------
@@ -138,6 +163,8 @@ Message types 
      Slave payload: u64



      Get from the underlying vhost implementation the features bitmask.

      Feature bit VHOST_USER_F_PROTOCOL_FEATURES signals slave support for

      VHOST_USER_GET_PROTOCOL_FEATURES and VHOST_USER_SET_PROTOCOL_FEATURES.



 * VHOST_USER_SET_FEATURES
@@ -146,6 +173,33 @@ Message types 
      Master payload: u64



      Enable features in the underlying vhost implementation using a bitmask.

      Feature bit VHOST_USER_F_PROTOCOL_FEATURES signals slave support for

      VHOST_USER_GET_PROTOCOL_FEATURES and VHOST_USER_SET_PROTOCOL_FEATURES.



 * VHOST_USER_GET_PROTOCOL_FEATURES



      Id: 15

      Equivalent ioctl: VHOST_GET_FEATURES

      Master payload: N/A

      Slave payload: u64



      Get the protocol feature bitmask from the underlying vhost implementation.

      Only legal if feature bit VHOST_USER_F_PROTOCOL_FEATURES is present in

      VHOST_USER_GET_FEATURES.

      Note: slave that reported VHOST_USER_F_PROTOCOL_FEATURES must support

      this message even before VHOST_USER_SET_FEATURES was called.



 * VHOST_USER_SET_PROTOCOL_FEATURES



      Id: 16

      Ioctl: VHOST_SET_FEATURES

      Master payload: u64



      Enable protocol features in the underlying vhost implementation.

      Only legal if feature bit VHOST_USER_F_PROTOCOL_FEATURES is present in

      VHOST_USER_GET_FEATURES.

      Note: slave that reported VHOST_USER_F_PROTOCOL_FEATURES must support

      this message even before VHOST_USER_SET_FEATURES was called.



 * VHOST_USER_SET_OWNER
@@ -157,10 +211,10 @@ Message types 
      as an owner of the session. This can be used on the Slave as a

      "session start" flag.



 * VHOST_USER_RESET_OWNER

 * VHOST_USER_RESET_DEVICE



      Id: 4

      Equivalent ioctl: VHOST_RESET_OWNER

      Equivalent ioctl: VHOST_RESET_DEVICE

      Master payload: N/A



      Issued when a new connection is about to be closed. The Master will no
@@ -264,3 +318,22 @@ Message types 
      Bits (0-7) of the payload contain the vring index. Bit 8 is the

      invalid FD flag. This flag is set when there is no file descriptor

      in the ancillary data.



 * VHOST_USER_GET_QUEUE_NUM



      Id: 17

      Equivalent ioctl: N/A

      Master payload: N/A

      Slave payload: u64



      Query how many queues the backend supports. This request should be

      sent only when VHOST_USER_PROTOCOL_F_MQ is set in quried protocol

      features by VHOST_USER_GET_PROTOCOL_FEATURES.



 * VHOST_USER_SET_VRING_ENABLE



      Id: 18

      Equivalent ioctl: N/A

      Master payload: vring state description



      Signal slave to enable or disable corresponding vring.

hw/i386/pc_piix.c

+17 −5
Original line number Diff line number Diff line
@@ -460,19 +460,31 @@ static void pc_i440fx_machine_options(MachineClass *m) 
    m->family = "pc_piix";

    m->desc = "Standard PC (i440FX + PIIX, 1996)";

    m->hot_add_cpu = pc_hot_add_cpu;

    m->default_machine_opts = "firmware=bios-256k.bin";

    m->default_display = "std";

}



static void pc_i440fx_2_4_machine_options(MachineClass *m)

static void pc_i440fx_2_5_machine_options(MachineClass *m)

{

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_i440fx_machine_options(m);

    pcmc->broken_reserved_end = true;

    m->default_machine_opts = "firmware=bios-256k.bin";

    m->default_display = "std";

    m->alias = "pc";

    m->is_default = 1;

}



DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL,

                      pc_i440fx_2_5_machine_options);





static void pc_i440fx_2_4_machine_options(MachineClass *m)

{

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_i440fx_2_5_machine_options(m);

    m->alias = NULL;

    m->is_default = 0;

    pcmc->broken_reserved_end = true;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);

}



DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL,

                      pc_i440fx_2_4_machine_options)

hw/i386/pc_q35.c

+16 −6
Original line number Diff line number Diff line
@@ -364,18 +364,28 @@ static void pc_q35_machine_options(MachineClass *m) 
    m->desc = "Standard PC (Q35 + ICH9, 2009)";

    m->hot_add_cpu = pc_hot_add_cpu;

    m->units_per_default_bus = 1;

    m->default_machine_opts = "firmware=bios-256k.bin";

    m->default_display = "std";

    m->no_floppy = 1;

    m->no_tco = 0;

}



static void pc_q35_2_5_machine_options(MachineClass *m)

{

    pc_q35_machine_options(m);

    m->alias = "q35";

}



DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,

                   pc_q35_2_5_machine_options);



static void pc_q35_2_4_machine_options(MachineClass *m)

{

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_q35_machine_options(m);

    pc_q35_2_5_machine_options(m);

    m->alias = NULL;

    pcmc->broken_reserved_end = true;

    m->default_machine_opts = "firmware=bios-256k.bin";

    m->default_display = "std";

    m->no_floppy = 1;

    m->no_tco = 0;

    m->alias = "q35";

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);

}



DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL,

hw/net/vhost_net.c

+39 −5
Original line number Diff line number Diff line
@@ -122,6 +122,11 @@ void vhost_net_ack_features(struct vhost_net *net, uint64_t features) 
    vhost_ack_features(&net->dev, vhost_net_get_feature_bits(net), features);

}



uint64_t vhost_net_get_max_queues(VHostNetState *net)

{

    return net->dev.max_queues;

}



static int vhost_net_get_fd(NetClientState *backend)

{

    switch (backend->info->type) {
@@ -143,6 +148,11 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options) 
        fprintf(stderr, "vhost-net requires net backend to be setup\n");

        goto fail;

    }

    net->nc = options->net_backend;



    net->dev.max_queues = 1;

    net->dev.nvqs = 2;

    net->dev.vqs = net->vqs;



    if (backend_kernel) {

        r = vhost_net_get_fd(options->net_backend);
@@ -152,14 +162,15 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options) 
        net->dev.backend_features = qemu_has_vnet_hdr(options->net_backend)

            ? 0 : (1ULL << VHOST_NET_F_VIRTIO_NET_HDR);

        net->backend = r;

        net->dev.protocol_features = 0;

    } else {

        net->dev.backend_features = 0;

        net->dev.protocol_features = 0;

        net->backend = -1;

    }

    net->nc = options->net_backend;



    net->dev.nvqs = 2;

    net->dev.vqs = net->vqs;

        /* vhost-user needs vq_index to initiate a specific queue pair */

        net->dev.vq_index = net->nc->queue_index * net->dev.nvqs;

    }



    r = vhost_dev_init(&net->dev, options->opaque,

                       options->backend_type);
@@ -285,7 +296,7 @@ static void vhost_net_stop_one(struct vhost_net *net, 
    } else if (net->nc->info->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER) {

        for (file.index = 0; file.index < net->dev.nvqs; ++file.index) {

            const VhostOps *vhost_ops = net->dev.vhost_ops;

            int r = vhost_ops->vhost_call(&net->dev, VHOST_RESET_OWNER,

            int r = vhost_ops->vhost_call(&net->dev, VHOST_RESET_DEVICE,

                                          NULL);

            assert(r >= 0);

        }
@@ -411,7 +422,25 @@ VHostNetState *get_vhost_net(NetClientState *nc) 


    return vhost_net;

}



int vhost_set_vring_enable(NetClientState *nc, int enable)

{

    VHostNetState *net = get_vhost_net(nc);

    const VhostOps *vhost_ops = net->dev.vhost_ops;



    if (vhost_ops->vhost_backend_set_vring_enable) {

        return vhost_ops->vhost_backend_set_vring_enable(&net->dev, enable);

    }



    return 0;

}



#else

uint64_t vhost_net_get_max_queues(VHostNetState *net)

{

    return 1;

}



struct vhost_net *vhost_net_init(VhostNetOptions *options)

{

    error_report("vhost-net support is not compiled in");
@@ -456,4 +485,9 @@ VHostNetState *get_vhost_net(NetClientState *nc) 
{

    return 0;

}



int vhost_set_vring_enable(NetClientState *nc, int enable)

{

    return 0;

}

#endif