Commit 784c2e4f authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging 



# gpg: Signature made Fri 19 Oct 2018 04:16:03 BST
# gpg:                using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request: (26 commits)
  qemu-options: Fix bad "macaddr" property in the documentation
  e1000: indicate dropped packets in HW counters
  net: ignore packet size greater than INT_MAX
  pcnet: fix possible buffer overflow
  rtl8139: fix possible out of bound access
  ne2000: fix possible out of bound access in ne2000_receive
  clean up callback when del virtqueue
  docs: Add COLO status diagram to COLO-FT.txt
  COLO: quick failover process by kick COLO thread
  COLO: notify net filters about checkpoint/failover event
  filter-rewriter: handle checkpoint and failover event
  filter: Add handle_event method for NetFilterClass
  COLO: flush host dirty ram from cache
  savevm: split the process of different stages for loadvm/savevm
  qapi: Add new command to query colo status
  qapi/migration.json: Rename COLO unknown mode to none mode.
  qmp event: Add COLO_EXIT event to notify users while exited COLO
  COLO: Flush memory data from ram cache
  ram/COLO: Record the dirty pages that SVM received
  COLO: Load dirty pages into SVM's RAM cache firstly
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1b749044 37a4442a

docs/COLO-FT.txt

+34 −0
Original line number Diff line number Diff line
@@ -110,6 +110,40 @@ Note: 
HeartBeat has not been implemented yet, so you need to trigger failover process

by using 'x-colo-lost-heartbeat' command.



== COLO operation status ==



+-----------------+

|                 |

|    Start COLO   |

|                 |

+--------+--------+

         |

         |  Main qmp command:

         |  migrate-set-capabilities with x-colo

         |  migrate

         |

         v

+--------+--------+

|                 |

|  COLO running   |

|                 |

+--------+--------+

         |

         |  Main qmp command:

         |  x-colo-lost-heartbeat

         |  or

         |  some error happened

         v

+--------+--------+

|                 |  send qmp event:

|  COLO failover  |  COLO_EXIT

|                 |

+-----------------+



COLO use the qmp command to switch and report operation status.

The diagram just shows the main qmp command, you can get the detail

in test procedure.



== Test procedure ==

1. Startup qemu

Primary:

hw/net/e1000.c

+13 −3
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "qemu/range.h"



#include "e1000x_common.h"

#include "trace.h"



static const uint8_t bcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
@@ -847,6 +848,15 @@ static uint64_t rx_desc_base(E1000State *s) 
    return (bah << 32) + bal;

}



static void

e1000_receiver_overrun(E1000State *s, size_t size)

{

    trace_e1000_receiver_overrun(size, s->mac_reg[RDH], s->mac_reg[RDT]);

    e1000x_inc_reg_if_not_full(s->mac_reg, RNBC);

    e1000x_inc_reg_if_not_full(s->mac_reg, MPC);

    set_ics(s, 0, E1000_ICS_RXO);

}



static ssize_t

e1000_receive_iov(NetClientState *nc, const struct iovec *iov, int iovcnt)

{
@@ -916,7 +926,7 @@ e1000_receive_iov(NetClientState *nc, const struct iovec *iov, int iovcnt) 
    desc_offset = 0;

    total_size = size + e1000x_fcs_len(s->mac_reg);

    if (!e1000_has_rxbufs(s, total_size)) {

            set_ics(s, 0, E1000_ICS_RXO);

        e1000_receiver_overrun(s, total_size);

        return -1;

    }

    do {
@@ -969,7 +979,7 @@ e1000_receive_iov(NetClientState *nc, const struct iovec *iov, int iovcnt) 
            rdh_start >= s->mac_reg[RDLEN] / sizeof(desc)) {

            DBGOUT(RXERR, "RDH wraparound @%x, RDT %x, RDLEN %x\n",

                   rdh_start, s->mac_reg[RDT], s->mac_reg[RDLEN]);

            set_ics(s, 0, E1000_ICS_RXO);

            e1000_receiver_overrun(s, total_size);

            return -1;

        }

    } while (desc_offset < total_size);

hw/net/ne2000.c

+2 −2
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int ne2000_buffer_full(NE2000State *s) 
ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_)

{

    NE2000State *s = qemu_get_nic_opaque(nc);

    int size = size_;

    size_t size = size_;

    uint8_t *p;

    unsigned int total_len, next, avail, len, index, mcast_idx;

    uint8_t buf1[60];
@@ -182,7 +182,7 @@ ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_) 
        { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };



#if defined(DEBUG_NE2000)

    printf("NE2000: received len=%d\n", size);

    printf("NE2000: received len=%zu\n", size);

#endif



    if (s->cmd & E8390_STOP || ne2000_buffer_full(s))

hw/net/pcnet.c

+2 −2
Original line number Diff line number Diff line
@@ -988,14 +988,14 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_) 
    uint8_t buf1[60];

    int remaining;

    int crc_err = 0;

    int size = size_;

    size_t size = size_;



    if (CSR_DRX(s) || CSR_STOP(s) || CSR_SPND(s) || !size ||

        (CSR_LOOP(s) && !s->looptest)) {

        return -1;

    }

#ifdef PCNET_DEBUG

    printf("pcnet_receive size=%d\n", size);

    printf("pcnet_receive size=%zu\n", size);

#endif



    /* if too small buffer, then expand it */

hw/net/rtl8139.c

+4 −4
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ static ssize_t rtl8139_do_receive(NetClientState *nc, const uint8_t *buf, size_t 
    RTL8139State *s = qemu_get_nic_opaque(nc);

    PCIDevice *d = PCI_DEVICE(s);

    /* size is the length of the buffer passed to the driver */

    int size = size_;

    size_t size = size_;

    const uint8_t *dot1q_buf = NULL;



    uint32_t packet_header = 0;
@@ -826,7 +826,7 @@ static ssize_t rtl8139_do_receive(NetClientState *nc, const uint8_t *buf, size_t 
    static const uint8_t broadcast_macaddr[6] =

        { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };



    DPRINTF(">>> received len=%d\n", size);

    DPRINTF(">>> received len=%zu\n", size);



    /* test if board clock is stopped */

    if (!s->clock_enabled)
@@ -1035,7 +1035,7 @@ static ssize_t rtl8139_do_receive(NetClientState *nc, const uint8_t *buf, size_t 


        if (size+4 > rx_space)

        {

            DPRINTF("C+ Rx mode : descriptor %d size %d received %d + 4\n",

            DPRINTF("C+ Rx mode : descriptor %d size %d received %zu + 4\n",

                descriptor, rx_space, size);



            s->IntrStatus |= RxOverflow;
@@ -1148,7 +1148,7 @@ static ssize_t rtl8139_do_receive(NetClientState *nc, const uint8_t *buf, size_t 
        if (avail != 0 && RX_ALIGN(size + 8) >= avail)

        {

            DPRINTF("rx overflow: rx buffer length %d head 0x%04x "

                "read 0x%04x === available 0x%04x need 0x%04x\n",

                "read 0x%04x === available 0x%04x need 0x%04zx\n",

                s->RxBufferSize, s->RxBufAddr, s->RxBufPtr, avail, size + 8);



            s->IntrStatus |= RxOverflow;