From patchwork Thu Jan 4 06:01:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10143883 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 1DA4F602A0 for ; Thu, 4 Jan 2018 06:03:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 112AA27031 for ; Thu, 4 Jan 2018 06:03:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04FC928414; Thu, 4 Jan 2018 06:03:26 +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 9B3EA27031 for ; Thu, 4 Jan 2018 06:03:25 +0000 (UTC) Received: from localhost ([::1]:47454 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWyce-0004lw-Mj for patchwork-qemu-devel@patchwork.kernel.org; Thu, 04 Jan 2018 01:03:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWybC-0003Va-44 for qemu-devel@nongnu.org; Thu, 04 Jan 2018 01:01:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWybB-0003xu-90 for qemu-devel@nongnu.org; Thu, 04 Jan 2018 01:01:54 -0500 Received: from mail-pl0-x243.google.com ([2607:f8b0:400e:c01::243]:45258) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWybB-0003xT-2y for qemu-devel@nongnu.org; Thu, 04 Jan 2018 01:01:53 -0500 Received: by mail-pl0-x243.google.com with SMTP id o2so502853plk.12 for ; Wed, 03 Jan 2018 22:01:52 -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=kbtB0BcNQHThGQQ1iIJPBdBIOj3/Jf8DLVXdz1dowKw=; b=mheA3wcL1QicrafnikG2pv1sqmCZ4Agd3Lf7PDoS2FXdykfD6C0/Uw7YbmLxIIgYIQ 4qyj15oj3Y//rhxgo6y7K8FHnQNy9dxxgeFJ8f67St+kZXROJdsydgSQykJF+NOGtqbk QPzGwTFTq61+w8U5ScNXApqzRT+95dB+ZXQyy/t8Kk31F87VlYYnaZDNseG25pP+WKxj AQ8MqXlhlyfAPjqY+S6cmfj3roqUB5k9ZTpVk09W8M/WFqwA0DnWeEvzqbSQ51J/bolV 7O+GNIntXXjn73FO1w+UFhwe4bO9SrTzxxvSZPm19p2V4pGi35JUdqrcfFOYGz6a5TRq NoCQ== 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=kbtB0BcNQHThGQQ1iIJPBdBIOj3/Jf8DLVXdz1dowKw=; b=XvTCbs0AH9QQMoDX9dVC4/Cr26Az1qUErIWE+78bSi1LKLIROtZfEqiWw2WLMzOucH XNIXNNuoWEuFIVJvoFJLxl3XFoWL3QhMJoaoM1ZTQ51tTjBnPBKz9x3Pttg86syu0q72 EKRo0P10MzVLAigdUSAFfTlKMb6kWfmEpLLCoXiowG00UmDqIJ1SK51SzKabB+iadaf2 IZ9IUeYOudb39DB2jugKqKOybhUViD7X8hVs7RMfGqztnxuV02DCoXTPFT5UQ2Ct+AGK oHpnYx84wYLXkIV+sDEd19oBkPiIAUDi3pt5yuHwSpJmWT1fC2OfWVbfeOkSl1nvtskA 1jeA== X-Gm-Message-State: AKGB3mLpyJtoCdIDOCyCZqEahjK1MU2hhlgE6xlr/CNAfgjFVe6FdKYr EyEOdDK1O2EUsITLOQKtCztciwJW X-Google-Smtp-Source: ACJfBotpF3wqdVL+X1PNTChqwopQ3J3QNhZ4Ozp+hwBb1Low5t3pyCe8sLIMQXaWeIzeJ9wZQZx1yg== X-Received: by 10.84.211.143 with SMTP id c15mr3701855pli.100.1515045711629; Wed, 03 Jan 2018 22:01:51 -0800 (PST) Received: from localhost.localdomain (120.236.201.35.bc.googleusercontent.com. [35.201.236.120]) by smtp.gmail.com with ESMTPSA id w5sm6214775pfi.74.2018.01.03.22.01.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jan 2018 22:01:50 -0800 (PST) From: Zhang Chen To: qemu devel Date: Thu, 4 Jan 2018 14:01:02 +0800 Message-Id: <1515045675-6993-4-git-send-email-zhangckid@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515045675-6993-1-git-send-email-zhangckid@gmail.com> References: <1515045675-6993-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:c01::243 Subject: [Qemu-devel] [PATCH RESEND V3 03/16] 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: Jason Wang , zhanghailiang , 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. Cc: Jason Wang 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 e9cfca2..dfaa81f 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -31,6 +31,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) \ @@ -39,6 +40,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 @@ -454,8 +458,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; @@ -466,10 +486,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; } @@ -544,11 +561,12 @@ static void colo_compare_connection(void *opaque, void *user_data) /* * 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 */