From nobody Tue May 14 18:16:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1683200730; cv=none; d=zohomail.com; s=zohoarc; b=VJ0g9ehg16AEVCfLECXjPVGXmcZt1i11SfxgJ725tzn9PdYoqU9JARBnhp9siIvryVBAcaJpZ7fPDUWyl72iIVH+y6DkO+BPklhYdpyMCAYGSDVeyQOv8ctm3w6yWVbANRVSK5SMExrVbzMNr2/Ec/okXK/ByCAtMtTmAOvcLWw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683200730; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IvliJFbskEE69syi3LSxV2GNQts9jtwY9TeWjEQz2JQ=; b=JfRL2H4S3m1hBufaUJjbvWsPVtROs81XZ4A1rO2BAu+SLdyiW99uwB/mK1Jb2Pd8d31k7e6Rs89hsv0Q2dJ/HFfbX/V9uls5iHdHEbKkagW7DTCyObFWvVbeXEyvAsiy/8bSn55H508WgBw5J7IqN7WPqcahvchxLFcuhImPwCo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683200730375276.9189908380414; Thu, 4 May 2023 04:45:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puXOK-0004fU-G4; Thu, 04 May 2023 07:44:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puXOE-0004fC-1E for qemu-devel@nongnu.org; Thu, 04 May 2023 07:44:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puXOB-0004kj-SH for qemu-devel@nongnu.org; Thu, 04 May 2023 07:44:49 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-218-17n8HNXGNx-oj-G5fZpeuA-1; Thu, 04 May 2023 07:44:46 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EA4951C04339 for ; Thu, 4 May 2023 11:44:45 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27EA22026D16; Thu, 4 May 2023 11:44:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683200687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IvliJFbskEE69syi3LSxV2GNQts9jtwY9TeWjEQz2JQ=; b=Y4KJPLpeYxfmItGhzblCx8FN7E1NqfWMnuqgvssQAQnKVznbYUuPpjOeEoW11QVt0QLoX7 0ogF5OWzu99QGjlGG6MZuhF7tKsVF3QHp/dvzfexYWiAe9CnGWwQhjtH3hsuunl2/d2tW6 P+u6cY2DNzEf7VpgrLnD274AvSG6U/A= X-MC-Unique: 17n8HNXGNx-oj-G5fZpeuA-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Leonardo Bras , Peter Xu Subject: [PATCH 1/5] migration: Make RAM_SAVE_FLAG_HOOK a normal case entry Date: Thu, 4 May 2023 13:44:39 +0200 Message-Id: <20230504114443.23891-2-quintela@redhat.com> In-Reply-To: <20230504114443.23891-1-quintela@redhat.com> References: <20230504114443.23891-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.161, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683200731193100001 Content-Type: text/plain; charset="utf-8" Fixes this commit, clearly a bad merge after a rebase or similar, it should have been its own case since that point. commit 5b0e9dd46fbda5152566a4a26fd96bc0d0452bf7 Author: Peter Lieven Date: Tue Jun 24 11:32:36 2014 +0200 migration: catch unknown flag combinations in ram_load Signed-off-by: Juan Quintela Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Xu --- migration/ram.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 7d81c4a39e..43338e1f5b 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -4445,14 +4445,12 @@ static int ram_load_precopy(QEMUFile *f) multifd_recv_sync_main(); } break; + case RAM_SAVE_FLAG_HOOK: + ram_control_load_hook(f, RAM_CONTROL_HOOK, NULL); + break; default: - if (flags & RAM_SAVE_FLAG_HOOK) { - ram_control_load_hook(f, RAM_CONTROL_HOOK, NULL); - } else { - error_report("Unknown combination of migration flags: 0x%x= ", - flags); - ret =3D -EINVAL; - } + error_report("Unknown combination of migration flags: 0x%x", f= lags); + ret =3D -EINVAL; } if (!ret) { ret =3D qemu_file_get_error(f); --=20 2.40.0 From nobody Tue May 14 18:16:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1683200793; cv=none; d=zohomail.com; s=zohoarc; b=COzWUsD5Pj+9s+n0pYl6ZM+VDU6bSYkyE6sDO8zhr+mwrKT7WyBqrihR7A+GyEWeQQOKHarnlCFIfPhCkTZBJS9qGAdsmPWz+FYea58+5JoCHA0I9XopIm6x2DQco1WV9NxytaBOYj7/uv2ZyCf83AtazpK96wQu5mwTHPscaIU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683200793; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NMqgmGPC+Ly6hqQPKjkFgC6O1yvDeEvTc+sJp5y5Lts=; b=kBSxhHYAALa3yBmCuGBVFS0nGXXDYwtjMxw3qibTH9zozh/+6EzLF4zvqPzAAhMtocHTksV7dG361jtNuZwJPC1Hgxkoao5haOEkaQNGWU7m088kWIwu7q+twp1THHDIDUoAMNDveSHuBNO/xxLYIFMqCvbJx6KjIIeN1SegOv0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 168320079319674.92811479107797; Thu, 4 May 2023 04:46:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puXOY-0004kG-4m; Thu, 04 May 2023 07:45:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puXOK-0004hX-E6 for qemu-devel@nongnu.org; Thu, 04 May 2023 07:44:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puXOH-0004kz-Io for qemu-devel@nongnu.org; Thu, 04 May 2023 07:44:56 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-250-qWEPhhGJMYy_fdaD5rYThw-1; Thu, 04 May 2023 07:44:47 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F0E9B1C04337 for ; Thu, 4 May 2023 11:44:46 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3883A2026D16; Thu, 4 May 2023 11:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683200689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NMqgmGPC+Ly6hqQPKjkFgC6O1yvDeEvTc+sJp5y5Lts=; b=jV3DMwjbbyal6BWFW2VKzjOGvYAtA0zGdBmRnd6XCgHtVaS2/PpIzFtqXLVu9FyrIT4gwI MvS+YZbItRBR/OmGVeAk13CJjcWLNXWqxJCr8djPGY0BuLl7HGwGQf3oWNJXJPFrn4O8KS Lm5tm4/dgGc6tBF+BRaepXzEJ3Pcs/I= X-MC-Unique: qWEPhhGJMYy_fdaD5rYThw-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Leonardo Bras , Peter Xu Subject: [PATCH 2/5] migration/rdma: simplify ram_control_load_hook() Date: Thu, 4 May 2023 13:44:40 +0200 Message-Id: <20230504114443.23891-3-quintela@redhat.com> In-Reply-To: <20230504114443.23891-1-quintela@redhat.com> References: <20230504114443.23891-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.161, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683200795279100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Xu --- migration/qemu-file.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 309b4c56f4..112ba742fd 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -338,10 +338,8 @@ void ram_control_after_iterate(QEMUFile *f, uint64_t f= lags) =20 void ram_control_load_hook(QEMUFile *f, uint64_t flags, void *data) { - int ret =3D -EINVAL; - if (f->hooks && f->hooks->hook_ram_load) { - ret =3D f->hooks->hook_ram_load(f, flags, data); + int ret =3D f->hooks->hook_ram_load(f, flags, data); if (ret < 0) { qemu_file_set_error(f, ret); } @@ -351,7 +349,7 @@ void ram_control_load_hook(QEMUFile *f, uint64_t flags,= void *data) * that expects there to be a hook on the destination. */ if (flags =3D=3D RAM_CONTROL_HOOK) { - qemu_file_set_error(f, ret); + qemu_file_set_error(f, -EINVAL); } } } --=20 2.40.0 From nobody Tue May 14 18:16:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1683200744; cv=none; d=zohomail.com; s=zohoarc; b=EPEkCt6kpZ3XWsMkqDv3BIcnx95dclF539RbOZr95hkW+iQw2v0GS0TprGO/rWRzBhcFKpe0NGTd8u1G/9kDZm2QRYFyVVoyS7+r4NCgdF5sL/UG5ikhf6h/MkcqxV5UIopBETTTUElnjiYnDzvpilI3RxkhneAFMy9EHszvInk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683200744; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=c1P8ZbpMlaB0f7vXwWVeLGZhTo7eEkv8iKUNOngYa/c=; b=higjrN7w9kZOicnkz55znOAvLf2v6bsoOTvczWAYCKFg2ZjF+t6+xpQpOPUcq2AG0W0HYEWGdGmlpozHxEUM/D0ri8qem598tsIY8Jz9eE3pa9cegFeOCB0VeKBOdDlneeLRic5YGOyB563FQ5GyPOCR6yDaO4GFXe1xueoo9bc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683200744185159.5182583525327; Thu, 4 May 2023 04:45:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puXOU-0004jo-LJ; Thu, 04 May 2023 07:45:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puXOI-0004fr-9C for qemu-devel@nongnu.org; Thu, 04 May 2023 07:44:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puXOF-0004l7-SG for qemu-devel@nongnu.org; Thu, 04 May 2023 07:44:53 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-79-zoQ7vz_IMm-y8RHM2Y7EMQ-1; Thu, 04 May 2023 07:44:48 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 06AF8800B35 for ; Thu, 4 May 2023 11:44:48 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3FD402026D16; Thu, 4 May 2023 11:44:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683200689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c1P8ZbpMlaB0f7vXwWVeLGZhTo7eEkv8iKUNOngYa/c=; b=PGR4SpHYHJ53CUgo+X12yp5Yza6m17ogWl2O0bEPlYxjs+az2j0Le4tq7fPRwh2X+XT3cz axyjTJN3ZOIDuUY2+LWKboUD62tBeRQkVpYsmcSw7k90wMbP9P0wK6oOiGTUAjFUQC4v2e MoBkCV46xqN6XTEW8extsiNBpDlSTRQ= X-MC-Unique: zoQ7vz_IMm-y8RHM2Y7EMQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Leonardo Bras , Peter Xu Subject: [PATCH 3/5] migration/rdma: We can calculate the rioc from the QEMUFile Date: Thu, 4 May 2023 13:44:41 +0200 Message-Id: <20230504114443.23891-4-quintela@redhat.com> In-Reply-To: <20230504114443.23891-1-quintela@redhat.com> References: <20230504114443.23891-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.161, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683200744628100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Peter Xu --- migration/rdma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index 5b82085bd7..17c4b9206f 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -3811,9 +3811,10 @@ out: * the source. */ static int -rdma_block_notification_handle(QIOChannelRDMA *rioc, const char *name) +rdma_block_notification_handle(QEMUFile *f, const char *name) { RDMAContext *rdma; + QIOChannelRDMA *rioc =3D QIO_CHANNEL_RDMA(qemu_file_get_ioc(f)); int curr; int found =3D -1; =20 @@ -3846,10 +3847,9 @@ rdma_block_notification_handle(QIOChannelRDMA *rioc,= const char *name) =20 static int rdma_load_hook(QEMUFile *f, uint64_t flags, void *data) { - QIOChannelRDMA *rioc =3D QIO_CHANNEL_RDMA(qemu_file_get_ioc(f)); switch (flags) { case RAM_CONTROL_BLOCK_REG: - return rdma_block_notification_handle(rioc, data); + return rdma_block_notification_handle(f, data); =20 case RAM_CONTROL_HOOK: return qemu_rdma_registration_handle(f); --=20 2.40.0 From nobody Tue May 14 18:16:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1683200764; cv=none; d=zohomail.com; s=zohoarc; b=eKpv+AaPo791x4ZtReuEe/rgrunMuKe4sv45L/X/jD2YZhGuKyA39jsFozXpbtBG/gtmvQOHyajzJBj42aWfg5RTSh5HD2naMprzgPdVeO8UyoDfZXgwyiWF4jaUrVsh0ike+kZ40h4sLbdpBNMt4P1IeKTnWXGAc58cUmCJGAE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683200764; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AYoSSBJWHYG9lBfYdLKnRjhNHjYp8jTAiBWjCb4mCFU=; b=j9CnQf6gqq4wL37OcCE+LVmjYfCnRx0jlGBpSixEAcv6u5rZ9JgbIPKwA9vBg/8ybsuTTZcM7vaG3+oMBqpuyrvK8UTSZRn7uIpgUmU4ovohon6qqyj+MEgchGyKQeHFOU7wSNPh3pMlDjN5c/6L+egoZtElEfTav0WW+lAMo6g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683200764761594.6934140919648; Thu, 4 May 2023 04:46:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puXOU-0004jl-0e; Thu, 04 May 2023 07:45:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puXOJ-0004fy-84 for qemu-devel@nongnu.org; Thu, 04 May 2023 07:44:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puXOG-0004ld-8o for qemu-devel@nongnu.org; Thu, 04 May 2023 07:44:54 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-173-54y7WItwMJmCgIrrkOz8Yw-1; Thu, 04 May 2023 07:44:49 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 213BD102F230 for ; Thu, 4 May 2023 11:44:49 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A8ED2026D16; Thu, 4 May 2023 11:44:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683200690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AYoSSBJWHYG9lBfYdLKnRjhNHjYp8jTAiBWjCb4mCFU=; b=go2E92w1krNy4fhelCyRjRYz5qV19b9R2UjKDbU3T6aUWWcyHpc1Yt46pkuPjVT0QbdjiN 4ihdRH6GFUEPqMDwub2fhwOVAddf1lO4CgR9dk/ZGz1aEkES6aAKhJJd8WKKazLA4r7BtR fImdcfXjMGLeg3kEsG3c7G5mS0CgKF4= X-MC-Unique: 54y7WItwMJmCgIrrkOz8Yw-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Leonardo Bras , Peter Xu Subject: [PATCH 4/5] migration/rdma: It makes no sense to recive that flag without RDMA Date: Thu, 4 May 2023 13:44:42 +0200 Message-Id: <20230504114443.23891-5-quintela@redhat.com> In-Reply-To: <20230504114443.23891-1-quintela@redhat.com> References: <20230504114443.23891-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.161, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683200765942100001 Content-Type: text/plain; charset="utf-8" This could only happen if the source send RAM_SAVE_FLAG_HOOK (i.e. rdma) and destination don't have CONFIG_RDMA. Signed-off-by: Juan Quintela Reviewed-by: Daniel P. Berrang=C3=A9 --- migration/qemu-file.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 112ba742fd..5783c9f385 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -343,14 +343,6 @@ void ram_control_load_hook(QEMUFile *f, uint64_t flags= , void *data) if (ret < 0) { qemu_file_set_error(f, ret); } - } else { - /* - * Hook is a hook specifically requested by the source sending a f= lag - * that expects there to be a hook on the destination. - */ - if (flags =3D=3D RAM_CONTROL_HOOK) { - qemu_file_set_error(f, -EINVAL); - } } } =20 --=20 2.40.0 From nobody Tue May 14 18:16:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1683200796; cv=none; d=zohomail.com; s=zohoarc; b=TX+dalbjie5u2RkbF17r0URvI3n8Ps57Bi+6MJuDb/B4rGBQK+yqhWfFb7zjCgJaG7apUqNZk9cLY3nUjOOZGgQ4t5/gDbvVWZnXmLi2uW32KfTjjyjtnyyIjW5dO+g/GnbBA8A1zPrRst8wqayWKeLh6jlE818JNnhV5X3Mc/s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683200796; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=S8IQDMRfVSmvUTSKd8FFQA9JpW3rPFH3vhoL2IfUwcM=; b=hit4+vt5XK8FF5oP/Q4+vHUQnbMDy17jcAa9FamyMy6z1FEKQHBc5ApGB4xV1hGfRXIM0MNBbpfQl+tdz0mrx99nfjpkb23MAafIPiu5uI8CtZuQQQxQZgtnRXzyBkOqlL/K31HjvoIw3sQK2VIPltPkffa4e85MueqQEoc9MEY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683200796265350.3099251949012; Thu, 4 May 2023 04:46:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puXOX-0004k3-Oz; Thu, 04 May 2023 07:45:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puXOK-0004hY-En for qemu-devel@nongnu.org; Thu, 04 May 2023 07:44:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puXOH-0004m2-Q3 for qemu-devel@nongnu.org; Thu, 04 May 2023 07:44:56 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-373-zKfxL9oJMx-E0dx_yKwX-w-1; Thu, 04 May 2023 07:44:50 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 78A2A811E7D for ; Thu, 4 May 2023 11:44:50 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id 694062026D16; Thu, 4 May 2023 11:44:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683200692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S8IQDMRfVSmvUTSKd8FFQA9JpW3rPFH3vhoL2IfUwcM=; b=Ou3suk9ILiFHGLOVgBK9kFQQBNYf04xzxkbDUTPxRa7jADdWSJzpVkHxdMDz4F7VIUXV55 q8V+X4obyckqkggf//6KatYTemZf33xMA4EujDGrB6Iwd+YbrkvyZ0clZycWNVeS4aMGB9 9yVSxt4gEbTmmXbfXuqCt9VKNg9k1wU= X-MC-Unique: zKfxL9oJMx-E0dx_yKwX-w-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Leonardo Bras , Peter Xu Subject: [PATCH 5/5] migration/rdma: Check for postcopy sooner Date: Thu, 4 May 2023 13:44:43 +0200 Message-Id: <20230504114443.23891-6-quintela@redhat.com> In-Reply-To: <20230504114443.23891-1-quintela@redhat.com> References: <20230504114443.23891-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.161, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683200796799100005 Content-Type: text/plain; charset="utf-8" It makes no sense first try to see if there is an rdma error and then do nothing on postcopy stage. Change it so we check we are in postcopy before doing anything. Signed-off-by: Juan Quintela Reviewed-by: Daniel P. Berrang=C3=A9 --- migration/rdma.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index 17c4b9206f..2cd8f1cc66 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -3234,19 +3234,19 @@ static size_t qemu_rdma_save_page(QEMUFile *f, RDMAContext *rdma; int ret; =20 - RCU_READ_LOCK_GUARD(); - rdma =3D qatomic_rcu_read(&rioc->rdmaout); - - if (!rdma) { - return -EIO; - } - - CHECK_ERROR_STATE(); - if (migration_in_postcopy()) { return RAM_SAVE_CONTROL_NOT_SUPP; } =20 + RCU_READ_LOCK_GUARD(); + rdma =3D qatomic_rcu_read(&rioc->rdmaout); + + if (!rdma) { + return -EIO; + } + + CHECK_ERROR_STATE(); + qemu_fflush(f); =20 /* @@ -3866,6 +3866,10 @@ static int qemu_rdma_registration_start(QEMUFile *f, QIOChannelRDMA *rioc =3D QIO_CHANNEL_RDMA(qemu_file_get_ioc(f)); RDMAContext *rdma; =20 + if (migration_in_postcopy()) { + return 0; + } + RCU_READ_LOCK_GUARD(); rdma =3D qatomic_rcu_read(&rioc->rdmaout); if (!rdma) { @@ -3874,10 +3878,6 @@ static int qemu_rdma_registration_start(QEMUFile *f, =20 CHECK_ERROR_STATE(); =20 - if (migration_in_postcopy()) { - return 0; - } - trace_qemu_rdma_registration_start(flags); qemu_put_be64(f, RAM_SAVE_FLAG_HOOK); qemu_fflush(f); @@ -3897,6 +3897,10 @@ static int qemu_rdma_registration_stop(QEMUFile *f, RDMAControlHeader head =3D { .len =3D 0, .repeat =3D 1 }; int ret =3D 0; =20 + if (migration_in_postcopy()) { + return 0; + } + RCU_READ_LOCK_GUARD(); rdma =3D qatomic_rcu_read(&rioc->rdmaout); if (!rdma) { @@ -3905,10 +3909,6 @@ static int qemu_rdma_registration_stop(QEMUFile *f, =20 CHECK_ERROR_STATE(); =20 - if (migration_in_postcopy()) { - return 0; - } - qemu_fflush(f); ret =3D qemu_rdma_drain_cq(f, rdma); =20 --=20 2.40.0