On Mon, Jun 4, 2018 at 2:57 PM, Jason Wang <jasow...@redhat.com> wrote:
>
>
> On 2018年06月03日 13:05, Zhang Chen wrote:
>
>> Filter needs to process the event of checkpoint/failover or
>> other event passed by COLO frame.
>>
>> Signed-off-by: zhanghailiang <zhang.zhanghaili...@huawei.com>
>> ---
>> include/net/filter.h | 5 +++++
>> net/filter.c | 17 +++++++++++++++++
>> net/net.c | 28 ++++++++++++++++++++++++++++
>> 3 files changed, 50 insertions(+)
>>
>> diff --git a/include/net/filter.h b/include/net/filter.h
>> index 435acd6f82..49da666ac0 100644
>> --- a/include/net/filter.h
>> +++ b/include/net/filter.h
>> @@ -38,6 +38,8 @@ typedef ssize_t (FilterReceiveIOV)(NetFilterState *nc,
>> typedef void (FilterStatusChanged) (NetFilterState *nf, Error **errp);
>> +typedef void (FilterHandleEvent) (NetFilterState *nf, int event, Error
>> **errp);
>> +
>> typedef struct NetFilterClass {
>> ObjectClass parent_class;
>> @@ -45,6 +47,7 @@ typedef struct NetFilterClass {
>> FilterSetup *setup;
>> FilterCleanup *cleanup;
>> FilterStatusChanged *status_changed;
>> + FilterHandleEvent *handle_event;
>> /* mandatory */
>> FilterReceiveIOV *receive_iov;
>> } NetFilterClass;
>> @@ -77,4 +80,6 @@ ssize_t qemu_netfilter_pass_to_next(NetClientState
>> *sender,
>> int iovcnt,
>> void *opaque);
>> +void colo_notify_filters_event(int event, Error **errp);
>> +
>> #endif /* QEMU_NET_FILTER_H */
>> diff --git a/net/filter.c b/net/filter.c
>> index 2fd7d7d663..0f17eba143 100644
>> --- a/net/filter.c
>> +++ b/net/filter.c
>> @@ -17,6 +17,8 @@
>> #include "net/vhost_net.h"
>> #include "qom/object_interfaces.h"
>> #include "qemu/iov.h"
>> +#include "net/colo.h"
>> +#include "migration/colo.h"
>> static inline bool qemu_can_skip_netfilter(NetFilterState *nf)
>> {
>> @@ -245,11 +247,26 @@ static void netfilter_finalize(Object *obj)
>> g_free(nf->netdev_id);
>> }
>> +static void dummy_handle_event(NetFilterState *nf, int event, Error
>> **errp)
>> +{
>> + switch (event) {
>> + case COLO_EVENT_CHECKPOINT:
>> + break;
>> + case COLO_EVENT_FAILOVER:
>> + object_property_set_str(OBJECT(nf), "off", "status", errp);
>> + break;
>> + default:
>> + break;
>> + }
>> +}
>> +
>> static void netfilter_class_init(ObjectClass *oc, void *data)
>> {
>> UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
>> + NetFilterClass *nfc = NETFILTER_CLASS(oc);
>> ucc->complete = netfilter_complete;
>> + nfc->handle_event = dummy_handle_event;
>> }
>> static const TypeInfo netfilter_info = {
>> diff --git a/net/net.c b/net/net.c
>> index efb9eaf779..378cd2f9ec 100644
>> --- a/net/net.c
>> +++ b/net/net.c
>> @@ -1329,6 +1329,34 @@ void hmp_info_network(Monitor *mon, const QDict
>> *qdict)
>> }
>> }
>> +void colo_notify_filters_event(int event, Error **errp)
>> +{
>> + NetClientState *nc, *peer;
>> + NetClientDriver type;
>> + NetFilterState *nf;
>> + NetFilterClass *nfc = NULL;
>> + Error *local_err = NULL;
>> +
>> + QTAILQ_FOREACH(nc, &net_clients, next) {
>> + peer = nc->peer;
>> + type = nc->info->type;
>> + if (!peer || type != NET_CLIENT_DRIVER_TAP) {
>> + continue;
>>
>
> I think when COLO is enabled, qemu should reject all other types of
> backends.
Yes, you are right.
May be we should add a assert here? Because we can not get backend info when
colo-compare start up.
Have any idea?
>
>
> + }
>> + QTAILQ_FOREACH(nf, &nc->filters, next) {
>> + nfc = NETFILTER_GET_CLASS(OBJECT(nf));
>> + if (!nfc->handle_event) {
>> + continue;
>> + }
>>
>
> Is this still necessary?
>
>
Yes, may be user will use other filter(like filter-buffer) with COLO at
same time.
Thanks
Zhang Chen
> Thanks
>
>
> + nfc->handle_event(nf, event, &local_err);
>> + if (local_err) {
>> + error_propagate(errp, local_err);
>> + return;
>> + }
>> + }
>> + }
>> +}
>> +
>> void qmp_set_link(const char *name, bool up, Error **errp)
>> {
>> NetClientState *ncs[MAX_QUEUE_NUM];
>>
>
>
