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: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
parent
4875bf1406
commit
50510ea2c2
|
@ -0,0 +1,39 @@
|
||||||
|
/*
|
||||||
|
* 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
|
|
@ -8,6 +8,7 @@
|
||||||
typedef struct AdapterInfo AdapterInfo;
|
typedef struct AdapterInfo AdapterInfo;
|
||||||
typedef struct AddressSpace AddressSpace;
|
typedef struct AddressSpace AddressSpace;
|
||||||
typedef struct AioContext AioContext;
|
typedef struct AioContext AioContext;
|
||||||
|
typedef struct AnnounceTimer AnnounceTimer;
|
||||||
typedef struct BdrvDirtyBitmap BdrvDirtyBitmap;
|
typedef struct BdrvDirtyBitmap BdrvDirtyBitmap;
|
||||||
typedef struct BdrvDirtyBitmapIter BdrvDirtyBitmapIter;
|
typedef struct BdrvDirtyBitmapIter BdrvDirtyBitmapIter;
|
||||||
typedef struct BlockBackend BlockBackend;
|
typedef struct BlockBackend BlockBackend;
|
||||||
|
|
|
@ -45,6 +45,7 @@
|
||||||
#include "migration/colo.h"
|
#include "migration/colo.h"
|
||||||
#include "hw/boards.h"
|
#include "hw/boards.h"
|
||||||
#include "monitor/monitor.h"
|
#include "monitor/monitor.h"
|
||||||
|
#include "net/announce.h"
|
||||||
|
|
||||||
#define MAX_THROTTLE (32 << 20) /* Migration transfer speed throttling */
|
#define MAX_THROTTLE (32 << 20) /* Migration transfer speed throttling */
|
||||||
|
|
||||||
|
|
|
@ -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 += socket.o
|
||||||
common-obj-y += dump.o
|
common-obj-y += dump.o
|
||||||
common-obj-y += eth.o
|
common-obj-y += eth.o
|
||||||
|
common-obj-y += announce.o
|
||||||
common-obj-$(CONFIG_L2TPV3) += l2tpv3.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,$(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
|
common-obj-$(call land,$(call lnot,$(CONFIG_VIRTIO_NET)),$(CONFIG_VHOST_NET_USER)) += vhost-user-stub.o
|
||||||
|
|
|
@ -0,0 +1,60 @@
|
||||||
|
/*
|
||||||
|
* 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);
|
||||||
|
}
|
|
@ -684,3 +684,26 @@
|
||||||
##
|
##
|
||||||
{ 'event': 'NIC_RX_FILTER_CHANGED',
|
{ 'event': 'NIC_RX_FILTER_CHANGED',
|
||||||
'data': { '*name': 'str', 'path': 'str' } }
|
'data': { '*name': 'str', 'path': 'str' } }
|
||||||
|
|
||||||
|
##
|
||||||
|
# @AnnounceParameters:
|
||||||
|
#
|
||||||
|
# Parameters for self-announce timers
|
||||||
|
#
|
||||||
|
# @initial: Initial delay (in ms) before sending the first GARP/RARP
|
||||||
|
# announcement
|
||||||
|
#
|
||||||
|
# @max: Maximum delay (in ms) between GARP/RARP announcement packets
|
||||||
|
#
|
||||||
|
# @rounds: Number of self-announcement attempts
|
||||||
|
#
|
||||||
|
# @step: Delay increase (in ms) after each self-announcement attempt
|
||||||
|
#
|
||||||
|
# Since: 4.0
|
||||||
|
##
|
||||||
|
|
||||||
|
{ 'struct': 'AnnounceParameters',
|
||||||
|
'data': { 'initial': 'int',
|
||||||
|
'max': 'int',
|
||||||
|
'rounds': 'int',
|
||||||
|
'step': 'int' } }
|
||||||
|
|
Loading…
Reference in New Issue