From patchwork Sat Mar 10 21:21:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10274347 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 20C1D60594 for ; Sat, 10 Mar 2018 21:24:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10F96297A0 for ; Sat, 10 Mar 2018 21:24:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 05478297B2; Sat, 10 Mar 2018 21:24:09 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 9B2AE297A0 for ; Sat, 10 Mar 2018 21:24:08 +0000 (UTC) Received: from localhost ([::1]:51971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eulyJ-0002GJ-PG for patchwork-qemu-devel@patchwork.kernel.org; Sat, 10 Mar 2018 16:24:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eulwt-0002EN-D8 for qemu-devel@nongnu.org; Sat, 10 Mar 2018 16:22:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eulwr-0003K2-T9 for qemu-devel@nongnu.org; Sat, 10 Mar 2018 16:22:39 -0500 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:42898) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eulwr-0003Jc-Mp for qemu-devel@nongnu.org; Sat, 10 Mar 2018 16:22:37 -0500 Received: by mail-pf0-x243.google.com with SMTP id a16so2716640pfn.9 for ; Sat, 10 Mar 2018 13:22:37 -0800 (PST) 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=RyVyyiWz6BVrwmCmJeVQGLsDL7nGb6Qbw2cd4DzIUuw=; b=EK29L9wAr2XDEWo/TFCwMYqniYU+1XDpr+aosmjjDOI2ik4sR3KCPzO5n8c7Vrq5ki mnA1StnHkFI3Sm1yKijK3qjWMyOHT2TrQ7YyQC5yMKWZ5rtXwbjS22+kHTsaw8Flge9n C1UpTu5vvdggA30pHCSEy9ofsxAPAqaFCED/YsjWIelYbFrgRcX6B+aHptnUnKrsaV/j 6leCpDedq+mU+YgH63hznH5O6aXO1tHDnfh5jjYF0Ohf4/tNlzz990yztwODFZvwq5Hx XiCIpSMLOffdbDbIuC76i75rbs8oT9OCuHVjpYGMqh5oJxMRftF0Hc7jtrmBQ5vwD6ZZ pmjw== 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=RyVyyiWz6BVrwmCmJeVQGLsDL7nGb6Qbw2cd4DzIUuw=; b=UeHTJH3nGFOILL85fUmGAFGgAEt9q/L9qDtLKE6BlFujF0/LXeQGan0nMbjbtbL0T1 2OG13IJq2lqIcj0PSfgdlx17sZRkS1+4oZ/FH3A7vrYaoNM5ASFAaanO/IDCvzckUkAA s0VVdGBBUvIk3qwE0rlMysXWq9irj4c/1IO9XGSqZvjxYgizAe7qzGqxm1E4svjku9G9 rqI7B02nkTI9HRkUWfuGRE8y4nt8SRJB+ZkJ+FTL0X8tPPk3Q34E8+XeEsumaiy7sYxY IW0xrimGrx347v4fhWJbKHmfvFMxDhW7y0Ucx8+RTrb0gFH3ELLZVxEzBIGNsteKepCy 4Ngw== X-Gm-Message-State: AElRT7EtpjZziVNw7mSlF5A1eWfwreedGTMSEjUU4mqQwkhdAD8PzVCl u80ShkIguzOkiIt64Wuk2RJ296kc X-Google-Smtp-Source: AG47ELsEtoe0gYXlnYAFQTOYITKL0r/P6Aqc9rKgJAGeqMTTnJDzEaD/QgmKQmF/5htaVQuO+k6pLw== X-Received: by 10.98.218.7 with SMTP id c7mr2998600pfh.162.1520716956498; Sat, 10 Mar 2018 13:22:36 -0800 (PST) Received: from localhost.localdomain (120.236.201.35.bc.googleusercontent.com. [35.201.236.120]) by smtp.gmail.com with ESMTPSA id q65sm10532191pfd.140.2018.03.10.13.22.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 10 Mar 2018 13:22:35 -0800 (PST) From: Zhang Chen To: qemu-devel@nongnu.org Date: Sun, 11 Mar 2018 05:21:53 +0800 Message-Id: <1520716927-17068-4-git-send-email-zhangckid@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520716927-17068-1-git-send-email-zhangckid@gmail.com> References: <1520716927-17068-1-git-send-email-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PATCH V5 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 , Juan Quintela , Jason Wang , "Dr . David Alan Gilbert" , Markus Armbruster , Zhang Chen , Paolo Bonzini 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 7ff3ae8..05061cd 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 1b1ce76..22ddd51 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 */