From patchwork Wed Oct 21 21:27:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 302316 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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 54B87C4363A for ; Wed, 21 Oct 2020 21:48:24 +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 AD88F223C7 for ; Wed, 21 Oct 2020 21:48:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GFEj7CFQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD88F223C7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVLy2-000728-HZ for qemu-devel@archiver.kernel.org; Wed, 21 Oct 2020 17:48:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVLe3-0003GS-HA for qemu-devel@nongnu.org; Wed, 21 Oct 2020 17:27:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:34810) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kVLdt-00025b-66 for qemu-devel@nongnu.org; Wed, 21 Oct 2020 17:27:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603315651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cMJ0oJkDJS1ct9V7+zYpIxHyvkkNruWU9TQfQ8wCbfY=; b=GFEj7CFQLWskMVwFNCvRWP1jYf38CuxCR0kH77n3axbq7bpT2DWDxloJDOHqTiuhrK6tel xnO3duXtelBiYuLWM0fxCX8jJgPfCELAevuRlYfLLHTQR/PdeZhQZzzE7QB38tdFUq7OYB zIhLVzNb0gHKJ06/J5yVIv8eJIvaVII= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-544-p9z_AjDtNYGRL1XZg7DpsA-1; Wed, 21 Oct 2020 17:27:27 -0400 X-MC-Unique: p9z_AjDtNYGRL1XZg7DpsA-1 Received: by mail-qv1-f71.google.com with SMTP id m11so2097901qvt.11 for ; Wed, 21 Oct 2020 14:27:27 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=cMJ0oJkDJS1ct9V7+zYpIxHyvkkNruWU9TQfQ8wCbfY=; b=dUTeGOHX50Tb6g6RVc7EK9PZw1qPFtxd896Xsc1aFdCH9zqrO6OPJCdE3JjS9t62mO Ec5TTtE6ApsPJRgb/SXhvFG09Hl9LcRKNVKDDPHfuBxTAVtzJmyHJFbEEZzkzOSTUILt dIDVVF4AtHrdmdGfAu16k9EnLH6QhR6zGULlU4Auwzg8E5D5+qKd8MzyaAATadBQLq8k Wm5thobhbb2TaEKZcs1G9fSyzhcsNRY41O13EBgonNOE0rhZIyMZl9BZe+w+fJvvKFhe wie/ocdRTYxABcsWwVutf52pJHLkyj8meewPS1d7YRZigA0pdjvK3Yicm+2SD8dRJJ42 QdEw== X-Gm-Message-State: AOAM533aVpluxLr1ROIxHyhmt/KSbwwZOOsCGnnb+XoOspNZ0paA9jv1 ZxB24rvk372/nL0tU/y+iZAR2PLQUD+CXLEXgIlqvC2jR9dPmWrFsgpj8vnK/0IY4oWS/J6TaZv Qk4bZhEoInYqm8Bg= X-Received: by 2002:ac8:71cc:: with SMTP id i12mr5094787qtp.262.1603315647147; Wed, 21 Oct 2020 14:27:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQgAm2lKb9OBuz7MzS6ON+pLS9HWlihYCu99jlO3ZJSFXqyJ2dZ/fmfpsUxw57zd03H8WlCw== X-Received: by 2002:ac8:71cc:: with SMTP id i12mr5094775qtp.262.1603315646940; Wed, 21 Oct 2020 14:27:26 -0700 (PDT) Received: from xz-x1.redhat.com (toroon474qw-lp140-04-174-95-215-133.dsl.bell.ca. [174.95.215.133]) by smtp.gmail.com with ESMTPSA id p187sm2089145qkf.70.2020.10.21.14.27.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2020 14:27:26 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Subject: [PATCH v6 2/6] migration: Introduce migrate_send_rp_message_req_pages() Date: Wed, 21 Oct 2020 17:27:17 -0400 Message-Id: <20201021212721.440373-3-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201021212721.440373-1-peterx@redhat.com> References: <20201021212721.440373-1-peterx@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/20 22:12:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Peter Maydell , Thomas Huth , "Dr . David Alan Gilbert" , peterx@redhat.com, Juan Quintela Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is another layer wrapper for sending a page request to the source VM. The new migrate_send_rp_message_req_pages() will be used elsewhere in coming patches. Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Peter Xu --- migration/migration.c | 10 ++++++++-- migration/migration.h | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 0575ecb379..255e69c8aa 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -316,8 +316,8 @@ error: * Start: Address offset within the RB * Len: Length in bytes required - must be a multiple of pagesize */ -int migrate_send_rp_req_pages(MigrationIncomingState *mis, RAMBlock *rb, - ram_addr_t start) +int migrate_send_rp_message_req_pages(MigrationIncomingState *mis, + RAMBlock *rb, ram_addr_t start) { uint8_t bufc[12 + 1 + 255]; /* start (8), len (4), rbname up to 256 */ size_t msglen = 12; /* start + len */ @@ -353,6 +353,12 @@ int migrate_send_rp_req_pages(MigrationIncomingState *mis, RAMBlock *rb, return migrate_send_rp_message(mis, msg_type, msglen, bufc); } +int migrate_send_rp_req_pages(MigrationIncomingState *mis, + RAMBlock *rb, ram_addr_t start) +{ + return migrate_send_rp_message_req_pages(mis, rb, start); +} + static bool migration_colo_enabled; bool migration_incoming_colo_enabled(void) { diff --git a/migration/migration.h b/migration/migration.h index deb411aaad..e853ccf8b1 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -333,6 +333,8 @@ void migrate_send_rp_pong(MigrationIncomingState *mis, uint32_t value); int migrate_send_rp_req_pages(MigrationIncomingState *mis, RAMBlock *rb, ram_addr_t start); +int migrate_send_rp_message_req_pages(MigrationIncomingState *mis, + RAMBlock *rb, ram_addr_t start); void migrate_send_rp_recv_bitmap(MigrationIncomingState *mis, char *block_name); void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value);