From patchwork Sun Jul 22 19:33:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10539369 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2F3B1174A for ; Sun, 22 Jul 2018 19:36:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 207A72841D for ; Sun, 22 Jul 2018 19:36:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14CC12842A; Sun, 22 Jul 2018 19:36:08 +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 94F402841D for ; Sun, 22 Jul 2018 19:36:07 +0000 (UTC) Received: from localhost ([::1]:57212 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhK9G-0003di-NN for patchwork-qemu-devel@patchwork.kernel.org; Sun, 22 Jul 2018 15:36:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhK7g-0001wn-UW for qemu-devel@nongnu.org; Sun, 22 Jul 2018 15:34:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhK7f-0000UE-Uh for qemu-devel@nongnu.org; Sun, 22 Jul 2018 15:34:28 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]:38102) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhK7f-0000Tn-OW for qemu-devel@nongnu.org; Sun, 22 Jul 2018 15:34:27 -0400 Received: by mail-pg1-x52b.google.com with SMTP id k3-v6so10653962pgq.5 for ; Sun, 22 Jul 2018 12:34:27 -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=Wjh9k6AIGGdX5TYjeH54iduofbef0LaIRxc8FGJ9TAw=; b=AGGby0U6avEeNVFoEuno2BLz+3j824q74LQLrc0GviowKxrDvtCh64WC0Q/qnqv9wH ISiMrN8Wq/lI5B7zQuSG3hadxOfnfRvICqW3l+pmyJ1F6cU0UZxQRF0Zdpi6G4ODjbXw STU+S9Shq5vYpk0oOHR0W5ZfGecamwZPX/bckh9c1riq2Um6L/IS5oSt/UBO/Ob1wAF6 6Qbx8NxXfQq3AFzSdP/6/fvchKIvD9WndwIvHOQPCSQlihJN+iAcB8rGirkg3wfIXepq 7MIz8chQpH0qApLIgeoU9AbuqNalMvakMm2mBZv7JV2fHTSa68lBYV5NSKUyBRWOFJLy monw== 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=Wjh9k6AIGGdX5TYjeH54iduofbef0LaIRxc8FGJ9TAw=; b=QIweKo4BWehsDF62RB/KoSQyL86E5g+1KT3TFCCyujIGpCGJwYYXtqAW32LmDHmJDL kjSgHUaej6WCtHJ/VNrzAafN+vFSX6Ce/oPCIcKMT+vQF87lq8+K2oyDJ4iZKuZZ6Gsj 9wCwR2aqWzj6u8QqnFeWMg42zHNdvumjceRtEAWpAvtKr1C+Xj6YUxjgHgWZKQklybzI MArR0sEBUDzGCWcrxggZ6K9VZj2oTxyNZQgBjmC3JcQ2FbdhLrtSB+uTp9A8AENyvkDT 1+kxFwAsr6Rjqh1LVSlXw4BpI/88NgpQ5jXOW55YBUkqdzzvIAWaU7/vTaeTz2Ck+ScA xbAQ== X-Gm-Message-State: AOUpUlHjwPDgoa4S/Ec8gAEG8yt8s3GfQ4W5AfdEk7XSUYHkIVZU91a1 GzMHJghWT/4hrggxuOsl7BITKVZU X-Google-Smtp-Source: AAOMgpfhX0DW8LaMYMuKWRpyj09jJwUPaPSjljdkFtbEPrs08S7UGzOH3ioJ2fXYZMSOzj2RTOI5yQ== X-Received: by 2002:a62:4494:: with SMTP id m20-v6mr10299400pfi.205.1532288066526; Sun, 22 Jul 2018 12:34:26 -0700 (PDT) Received: from localhost.localdomain (155.150.229.35.bc.googleusercontent.com. [35.229.150.155]) by smtp.gmail.com with ESMTPSA id 87-v6sm14215353pfn.103.2018.07.22.12.34.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Jul 2018 12:34:25 -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: Mon, 23 Jul 2018 03:33:33 +0800 Message-Id: <20180722193350.6028-4-zhangckid@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180722193350.6028-1-zhangckid@gmail.com> References: <20180722193350.6028-1-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::52b Subject: [Qemu-devel] [PATCH V10 03/20] 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 | 37 ++++++++++++++++++++++++++----------- net/colo-compare.h | 2 ++ 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 80e6532e8b..426eab5973 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 @@ -427,10 +431,7 @@ sec: qemu_hexdump((char *)spkt->data, stderr, "colo-compare spkt", spkt->size); - /* - * colo_compare_inconsistent_notify(); - * TODO: notice to checkpoint(); - */ + colo_compare_inconsistency_notify(); } } @@ -561,8 +562,24 @@ static int colo_old_packet_check_one(Packet *pkt, int64_t *check_time) } } +static void colo_compare_inconsistency_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 +590,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_inconsistency_notify(); return 0; } @@ -620,11 +634,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_inconsistency_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 */