From patchwork Sun Jun 3 05:05:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10445129 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F066C60234 for ; Sun, 3 Jun 2018 05:14:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1A4C28989 for ; Sun, 3 Jun 2018 05:14:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D30F428A4D; Sun, 3 Jun 2018 05:14:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4609828989 for ; Sun, 3 Jun 2018 05:14:21 +0000 (UTC) Received: from localhost ([::1]:33666 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPLLQ-0005Ke-E2 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 03 Jun 2018 01:14:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPLDZ-0008Cb-Pe for qemu-devel@nongnu.org; Sun, 03 Jun 2018 01:06:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fPLDY-0000hh-RV for qemu-devel@nongnu.org; Sun, 03 Jun 2018 01:06:13 -0400 Received: from mail-pf0-x22d.google.com ([2607:f8b0:400e:c00::22d]:37479) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fPLDY-0000hR-Ky for qemu-devel@nongnu.org; Sun, 03 Jun 2018 01:06:12 -0400 Received: by mail-pf0-x22d.google.com with SMTP id e9-v6so14350529pfi.4 for ; Sat, 02 Jun 2018 22:06:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rI/OUn5nKZGeFVE0YBkyZT2FOjo2TGgXCiCUgS4lTAI=; b=k4rOWKKQKL/7X5Z/XXV/4FxDrOsRnpaNzEQSkmTl4dh0cbbubA3u633f32IiVKRLHL tDZO/X24lVR4ry+n4gmXD+m+Umz1BZfYXIcHON7R9PBboTY+C4wvs+zMXYxI/TKIHhRs BpNEcohoU3WvgGOOgNM9fD775vQAvHdXDHZxoPJBMpCiIR3DNEHSVS3hmVNmCxnyfkz7 PDJ3QmYRS+crYUk5K4tByafBy3scDoaG9Kv4LwAxmHaGkgb9OSe/Wd3ByTJv/D/cS6Ql EgfeIrdQmmWm7n6K7dORRxbE/AsK+sVKF1XVQ7VhmuaTTpI85xTav76uDTPs3V/alEhy vI0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rI/OUn5nKZGeFVE0YBkyZT2FOjo2TGgXCiCUgS4lTAI=; b=B48fVjGP4fzChodn6w7PTYjP3/ysV3iYKAQW0P73LdbS5rB36Xzc4+MuUqxcd3YlG+ VboLeAbRBe7l/lpsecZhS0rtQ0ci1SZmcx0IxaOnDzZnweBp2poiQVf8HzhhRx0Xy+DN EtaPO6va5NPJwDuQ3he5+CxWu4yZ8p5rHQo8quzq4DSVaXyNRfmYl8OUngoCVv1uMxns rTkhYOvg/GzRizFwZGHYM0cNxMzqCpY1+2Qvro1oe2gYezid+joO4yoPl3y/8hX+462Q Gn7nf9Wr2Z6viJ8A3wzKAeucuvq8BbHi8yoKpV+/GE3RkMF9SYVynHAAALXUs5tn/43y MSbA== X-Gm-Message-State: ALKqPwfFzOlaqoob9dAZ2KPLi/sxeOo1JD2s0lr2mqAG6k6czzQW3xKe hTIqSQJzTbncRGxQHRaZkjk0Og== X-Google-Smtp-Source: ADUXVKKVUb/wnkxCSbGOZD6thLODPhd19UY2KySLtiApL7Fva086miCdEJJlr9YPiU3E227jwz6TwA== X-Received: by 2002:a62:9e0b:: with SMTP id s11-v6mr16609614pfd.198.1528002371507; Sat, 02 Jun 2018 22:06:11 -0700 (PDT) Received: from localhost.localdomain (197.225.229.35.bc.googleusercontent.com. [35.229.225.197]) by smtp.gmail.com with ESMTPSA id 10-v6sm45841595pgb.40.2018.06.02.22.06.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Jun 2018 22:06:10 -0700 (PDT) From: Zhang Chen To: qemu-devel@nongnu.org, Paolo Bonzini , Juan Quintela , "Dr . David Alan Gilbert" , Jason Wang , Eric Blake , Markus Armbruster Date: Sun, 3 Jun 2018 13:05:32 +0800 Message-Id: <20180603050546.6827-4-zhangckid@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180603050546.6827-1-zhangckid@gmail.com> References: <20180603050546.6827-1-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::22d Subject: [Qemu-devel] [PATCH V8 03/17] colo-compare: use notifier to notify packets comparing result X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhanghailiang , Li Zhijian , Zhang Chen Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP It's a good idea to use notifier to notify COLO frame of inconsistent packets comparing. Signed-off-by: Zhang Chen Signed-off-by: zhanghailiang --- net/colo-compare.c | 32 +++++++++++++++++++++++++------- net/colo-compare.h | 2 ++ 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 7ff3ae8904..05061cd1c4 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -29,6 +29,7 @@ #include "sysemu/iothread.h" #include "net/colo-compare.h" #include "migration/colo.h" +#include "migration/migration.h" #define TYPE_COLO_COMPARE "colo-compare" #define COLO_COMPARE(obj) \ @@ -37,6 +38,9 @@ static QTAILQ_HEAD(, CompareState) net_compares = QTAILQ_HEAD_INITIALIZER(net_compares); +static NotifierList colo_compare_notifiers = + NOTIFIER_LIST_INITIALIZER(colo_compare_notifiers); + #define COMPARE_READ_LEN_MAX NET_BUFSIZE #define MAX_QUEUE_SIZE 1024 @@ -561,8 +565,24 @@ static int colo_old_packet_check_one(Packet *pkt, int64_t *check_time) } } +static void colo_compare_inconsistent_notify(void) +{ + notifier_list_notify(&colo_compare_notifiers, + migrate_get_current()); +} + +void colo_compare_register_notifier(Notifier *notify) +{ + notifier_list_add(&colo_compare_notifiers, notify); +} + +void colo_compare_unregister_notifier(Notifier *notify) +{ + notifier_remove(notify); +} + static int colo_old_packet_check_one_conn(Connection *conn, - void *user_data) + void *user_data) { GList *result = NULL; int64_t check_time = REGULAR_PACKET_CHECK_MS; @@ -573,10 +593,7 @@ static int colo_old_packet_check_one_conn(Connection *conn, if (result) { /* Do checkpoint will flush old packet */ - /* - * TODO: Notify colo frame to do checkpoint. - * colo_compare_inconsistent_notify(); - */ + colo_compare_inconsistent_notify(); return 0; } @@ -620,11 +637,12 @@ static void colo_compare_packet(CompareState *s, Connection *conn, /* * If one packet arrive late, the secondary_list or * primary_list will be empty, so we can't compare it - * until next comparison. + * until next comparison. If the packets in the list are + * timeout, it will trigger a checkpoint request. */ trace_colo_compare_main("packet different"); g_queue_push_head(&conn->primary_list, pkt); - /* TODO: colo_notify_checkpoint();*/ + colo_compare_inconsistent_notify(); break; } } diff --git a/net/colo-compare.h b/net/colo-compare.h index 1b1ce76aea..22ddd512e2 100644 --- a/net/colo-compare.h +++ b/net/colo-compare.h @@ -18,5 +18,7 @@ #define QEMU_COLO_COMPARE_H void colo_notify_compares_event(void *opaque, int event, Error **errp); +void colo_compare_register_notifier(Notifier *notify); +void colo_compare_unregister_notifier(Notifier *notify); #endif /* QEMU_COLO_COMPARE_H */