From patchwork Thu Oct 1 18:26:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 303880 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 5B614C4727E for ; Thu, 1 Oct 2020 18:37:23 +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 B9DFA20796 for ; Thu, 1 Oct 2020 18:37:22 +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="gq7IF7D8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B9DFA20796 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]:56284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kO3SD-0004LB-Ot for qemu-devel@archiver.kernel.org; Thu, 01 Oct 2020 14:37:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kO3I8-0002X8-PA for qemu-devel@nongnu.org; Thu, 01 Oct 2020 14:26:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:22212) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kO3I3-0003gK-8p for qemu-devel@nongnu.org; Thu, 01 Oct 2020 14:26:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601576808; 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=hSeDqMHpB+FHPSAPyKgXEXUo5azyTlLZe7OlYAX6W4M=; b=gq7IF7D8mXf1yxj80fC5kc9W7Mp4+97RGCpjRH0+meZVaZaaxC/Jc7/lX7G7HjAYsMq8Lt vyhT3AE6GaNBM/vdGpnYmm2uegeiAuHoOunSU2di9OHZyrI4c+AtxGjfLx3wnKQOBc9MlH sIozXuISsOyQqMdD7LEEOW33OCQx35Y= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-192-43C1FY8-Nmy6tICj-n0NFw-1; Thu, 01 Oct 2020 14:26:47 -0400 X-MC-Unique: 43C1FY8-Nmy6tICj-n0NFw-1 Received: by mail-qt1-f200.google.com with SMTP id w10so3387501qtt.23 for ; Thu, 01 Oct 2020 11:26:47 -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=hSeDqMHpB+FHPSAPyKgXEXUo5azyTlLZe7OlYAX6W4M=; b=DmC/HRhu3HVgqOAIYNRiSgyD1o8/hOr9oN602SQg16Hi84GPmGtkrlwiBg+qkiALjb ylEdh7tIEQjY1G4ZbQLA+5HWcSWlPriMdr/N6yqA78boJb2hEsJaef6ZTbdx1ywU3YeR to2WdUcE8WiVnJc1eZth8oQ+VUmHpM+LOJ0BQ39gvtNIfmNLjpM+ZkNbfmOnrdliem2G ZsG21M+EJEEzxIJ9WfM82PwGDNbPIfH+KOB18jkTpBjQDHe1aZzcfG1rYmyT6kizwV8A PPIzxIb+sv7CdznQ29mul5sWxWZq6W69ZrbOGiabUB8sDSH7Qd1LnWjn2z+LKwnWwTuF u66A== X-Gm-Message-State: AOAM530R26TUp5qPV2akXuzxQAmqa9ziQXrKzzMHhoVO5Q5rAv636Ewt Ce5qcEJ9GqktkM8cGD2I5ya8dcKVcCQACGBA+8ovO3g5WYksBckH5DZyV/sMRBmSVtTbRn2u+tV JgnYgCuM5QK0oWyU= X-Received: by 2002:a37:a8ca:: with SMTP id r193mr9086770qke.83.1601576806236; Thu, 01 Oct 2020 11:26:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzH2JQFWveiXshYj/QbHcZOWi8lDX3oNsf7ABft/q6bMzlU3uWrVxMCLsQcoYkJ9939TLSs7A== X-Received: by 2002:a37:a8ca:: with SMTP id r193mr9086752qke.83.1601576806025; Thu, 01 Oct 2020 11:26:46 -0700 (PDT) Received: from xz-x1.redhat.com (toroon474qw-lp130-09-184-147-14-204.dsl.bell.ca. [184.147.14.204]) by smtp.gmail.com with ESMTPSA id v56sm7892699qtc.49.2020.10.01.11.26.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Oct 2020 11:26:45 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Subject: [PATCH v3 2/4] migration: Introduce migrate_send_rp_message_req_pages() Date: Thu, 1 Oct 2020 14:26:39 -0400 Message-Id: <20201001182641.80232-3-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201001182641.80232-1-peterx@redhat.com> References: <20201001182641.80232-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/01 02:15:30 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: "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 aca7fdcd0b..b2dac6b39c 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);