Commit 50510ea2 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Jason Wang
Browse files

net: Introduce announce timer 



The 'announce timer' will be used by migration, and explicit
requests for qemu to perform network announces.

Based on the work by Germano Veit Michel <germano@redhat.com>
 and Vlad Yasevich <vyasevic@redhat.com>

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 4875bf14

include/net/announce.h

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 *  Self-announce facility

 *  (c) 2017-2019 Red Hat, Inc.

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#ifndef QEMU_NET_ANNOUNCE_H

#define QEMU_NET_ANNOUNCE_H



#include "qemu-common.h"

#include "qapi/qapi-types-net.h"

#include "qemu/timer.h"



struct AnnounceTimer {

    QEMUTimer *tm;

    AnnounceParameters params;

    QEMUClockType type;

    int round;

};



/* Returns: update the timer to the next time point */

int64_t qemu_announce_timer_step(AnnounceTimer *timer);



/* Delete the underlying timer */

void qemu_announce_timer_del(AnnounceTimer *timer);



/*

 * Under BQL/main thread

 * Reset the timer to the given parameters/type/notifier.

 */

void qemu_announce_timer_reset(AnnounceTimer *timer,

                               AnnounceParameters *params,

                               QEMUClockType type,

                               QEMUTimerCB *cb,

                               void *opaque);



#endif

include/qemu/typedefs.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
typedef struct AdapterInfo AdapterInfo;

typedef struct AddressSpace AddressSpace;

typedef struct AioContext AioContext;

typedef struct AnnounceTimer AnnounceTimer;

typedef struct BdrvDirtyBitmap BdrvDirtyBitmap;

typedef struct BdrvDirtyBitmapIter BdrvDirtyBitmapIter;

typedef struct BlockBackend BlockBackend;

migration/migration.c

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include "migration/colo.h"

#include "hw/boards.h"

#include "monitor/monitor.h"

#include "net/announce.h"



#define MAX_THROTTLE  (32 << 20)      /* Migration transfer speed throttling */

net/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ common-obj-y = net.o queue.o checksum.o util.o hub.o 
common-obj-y += socket.o

common-obj-y += dump.o

common-obj-y += eth.o

common-obj-y += announce.o

common-obj-$(CONFIG_L2TPV3) += l2tpv3.o

common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET_USER)) += vhost-user.o

common-obj-$(call land,$(call lnot,$(CONFIG_VIRTIO_NET)),$(CONFIG_VHOST_NET_USER)) += vhost-user-stub.o

net/announce.c

0 → 100644
+60 −0
Original line number Diff line number Diff line 
/*

 *  Self-announce

 *  (c) 2017-2019 Red Hat, Inc.

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"

#include "qemu-common.h"

#include "net/announce.h"

#include "qapi/clone-visitor.h"

#include "qapi/qapi-visit-net.h"



int64_t qemu_announce_timer_step(AnnounceTimer *timer)

{

    int64_t step;



    step =  timer->params.initial +

            (timer->params.rounds - timer->round - 1) *

            timer->params.step;



    if (step < 0 || step > timer->params.max) {

        step = timer->params.max;

    }

    timer_mod(timer->tm, qemu_clock_get_ms(timer->type) + step);



    return step;

}



void qemu_announce_timer_del(AnnounceTimer *timer)

{

    if (timer->tm) {

        timer_del(timer->tm);

        timer_free(timer->tm);

        timer->tm = NULL;

    }

}



/*

 * Under BQL/main thread

 * Reset the timer to the given parameters/type/notifier.

 */

void qemu_announce_timer_reset(AnnounceTimer *timer,

                               AnnounceParameters *params,

                               QEMUClockType type,

                               QEMUTimerCB *cb,

                               void *opaque)

{

    /*

     * We're under the BQL, so the current timer can't

     * be firing, so we should be able to delete it.

     */

    qemu_announce_timer_del(timer);



    QAPI_CLONE_MEMBERS(AnnounceParameters, &timer->params, params);

    timer->round = params->rounds;

    timer->type = type;

    timer->tm = timer_new_ms(type, cb, opaque);

}