From patchwork Wed Jul 22 08:11:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Plotnikov X-Patchwork-Id: 277626 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67363C433E0 for ; Wed, 22 Jul 2020 08:12:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 388A120657 for ; Wed, 22 Jul 2020 08:12:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 388A120657 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy9rn-0000X3-Fn for qemu-devel@archiver.kernel.org; Wed, 22 Jul 2020 04:12:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy9qt-0007jV-Sk for qemu-devel@nongnu.org; Wed, 22 Jul 2020 04:11:47 -0400 Received: from relay.sw.ru ([185.231.240.75]:54952 helo=relay3.sw.ru) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy9qr-0004p6-7y for qemu-devel@nongnu.org; Wed, 22 Jul 2020 04:11:47 -0400 Received: from [10.94.4.71] (helo=dptest2.qa.sw.ru) by relay3.sw.ru with esmtp (Exim 4.93) (envelope-from ) id 1jy9ql-0002yK-Uz; Wed, 22 Jul 2020 11:11:39 +0300 From: Denis Plotnikov To: qemu-devel@nongnu.org Subject: [PATCH v0 4/4] background snapshot: add trace events for page fault processing Date: Wed, 22 Jul 2020 11:11:33 +0300 Message-Id: <20200722081133.29926-5-dplotnikov@virtuozzo.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20200722081133.29926-1-dplotnikov@virtuozzo.com> References: <20200722081133.29926-1-dplotnikov@virtuozzo.com> Received-SPF: pass client-ip=185.231.240.75; envelope-from=dplotnikov@virtuozzo.com; helo=relay3.sw.ru X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/22 04:11:41 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -5 X-Spam_score: -0.6 X-Spam_bar: / X-Spam_report: (-0.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_BL_SPAMCOP_NET=1.347, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: quintela@redhat.com, dgilbert@redhat.com, peterx@redhat.com, armbru@redhat.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Denis Plotnikov --- migration/ram.c | 4 ++++ migration/trace-events | 2 ++ 2 files changed, 6 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index f187b5b494..29712a11c2 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2172,12 +2172,16 @@ again: break; } + trace_page_fault_processing_start(msg.arg.pagefault.address); + if (ram_process_page_fault(msg.arg.pagefault.address) < 0) { error_report("page fault: error on write protected page " "processing [0x%llx]", msg.arg.pagefault.address); break; } + + trace_page_fault_processing_finish(msg.arg.pagefault.address); } return NULL; diff --git a/migration/trace-events b/migration/trace-events index 4ab0a503d2..f46b3b9a72 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -128,6 +128,8 @@ save_xbzrle_page_skipping(void) "" save_xbzrle_page_overflow(void) "" ram_save_iterate_big_wait(uint64_t milliconds, int iterations) "big wait: %" PRIu64 " milliseconds, %d iterations" ram_load_complete(int ret, uint64_t seq_iter) "exit_code %d seq iteration %" PRIu64 +page_fault_processing_start(unsigned long address) "HVA: 0x%lx" +page_fault_processing_finish(unsigned long address) "HVA: 0x%lx" # migration.c await_return_path_close_on_source_close(void) ""