From nobody Tue Oct 22 23:32:57 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=treblig.org ARC-Seal: i=1; a=rsa-sha256; t=1726753694; cv=none; d=zohomail.com; s=zohoarc; b=GspRBvx32CRggsWglBRZ4G0insTyN1WW2MMP6FjU9zYgdAkSE8URa9BcsZYFnIzkCUrFeA/kzCSORiB9Olm93dAdx0ldoUOtPoJgLkW3ILYAWguH7mDMspJVbTUpXCqCZhKkf1JR5bD7lZfCFmQqEhlg/CRsZiMwjeGMjBF744M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1726753694; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=iIi4XYDAIN0x4iyYQPhfWqN51Z2+zfNdJj4hCZEgqfc=; b=cOTEMXk+6mdkvBkdLLUygoRgFUm5X6cZjDKdjN3GXZyy2nzoD6WUHZaaxtv5FgTqTtSHZfl3/sKfuDUdQUs4SjSharnT7oAeJGJC2iTtOUtIsVDuLVEgFbxXI+J6HKdfKDdr5D7exurzL7EQuGFbV/ScVQhxMQC4Wg6WckRW6EE= 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 1726753694388454.8320431829459; Thu, 19 Sep 2024 06:48:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srHUj-00081G-1f; Thu, 19 Sep 2024 09:46:53 -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 1srHUW-0007CV-0H for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:46:45 -0400 Received: from mx.treblig.org ([2a00:1098:5b::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srHUQ-0005zn-UP for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:46:39 -0400 Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1srHUK-006QOJ-2B; Thu, 19 Sep 2024 13:46:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=iIi4XYDAIN0x4iyYQPhfWqN51Z2+zfNdJj4hCZEgqfc=; b=CHOnsEnZlnN+ASYZ l9UGUbxCQvTBQ9Isib7/6RxLwxpvQQWB+Y3kSZRZ5uaBfgLZ6e9r0wDzB8uq+hbyJTBZToexVvmIH ahqf3UcWVZ++l4neARVgfijLXErvtgB7+zEtbFrVUf6WZO+iHcbWZRjnWEKJsjvtXNmqZl5f7Q1wO g76x+DYKQKUR8VVSfK/CzWGEKJ5QDWac4fxsS4L0xNruUzKYaXsCbzyO+Zb2lfoCseEhheG6yhsMe b2CLom8BFSd0eIQH43pn3OSb7iAoDJY8hcrYVkFYrYM76QQMimUAGV7Rkfevx8gmW7c5VZUu9RAhC frWgqGobQk1Dzloy3Q==; From: dave@treblig.org To: peterx@redhat.com, farosas@suse.de, eblake@redhat.com, armbru@redhat.com Cc: qemu-devel@nongnu.org, "Dr. David Alan Gilbert" Subject: [PATCH v2 1/7] migration: Remove migrate_cap_set Date: Thu, 19 Sep 2024 14:46:20 +0100 Message-ID: <20240919134626.166183-2-dave@treblig.org> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240919134626.166183-1-dave@treblig.org> References: <20240919134626.166183-1-dave@treblig.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1098:5b::1; envelope-from=dave@treblig.org; helo=mx.treblig.org 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.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 @treblig.org) X-ZM-MESSAGEID: 1726753694869116600 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" migrate_cap_set has been unused since 18d154f575 ("migration: Remove 'blk/-b' option from migrate commands") Remove it. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Fabiano Rosas --- migration/options.c | 20 -------------------- migration/options.h | 1 - 2 files changed, 21 deletions(-) diff --git a/migration/options.c b/migration/options.c index 147cd2b8fd..9460c5dee9 100644 --- a/migration/options.c +++ b/migration/options.c @@ -605,26 +605,6 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps= , Error **errp) return true; } =20 -bool migrate_cap_set(int cap, bool value, Error **errp) -{ - MigrationState *s =3D migrate_get_current(); - bool new_caps[MIGRATION_CAPABILITY__MAX]; - - if (migration_is_running()) { - error_setg(errp, "There's a migration process in progress"); - return false; - } - - memcpy(new_caps, s->capabilities, sizeof(new_caps)); - new_caps[cap] =3D value; - - if (!migrate_caps_check(s->capabilities, new_caps, errp)) { - return false; - } - s->capabilities[cap] =3D value; - return true; -} - MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp) { MigrationCapabilityStatusList *head =3D NULL, **tail =3D &head; diff --git a/migration/options.h b/migration/options.h index a0bd6edc06..36e7b3723f 100644 --- a/migration/options.h +++ b/migration/options.h @@ -58,7 +58,6 @@ bool migrate_tls(void); /* capabilities helpers */ =20 bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp); -bool migrate_cap_set(int cap, bool value, Error **errp); =20 /* parameters */ =20 --=20 2.46.1 From nobody Tue Oct 22 23:32:57 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=treblig.org ARC-Seal: i=1; a=rsa-sha256; t=1726753698; cv=none; d=zohomail.com; s=zohoarc; b=BnVz5jAIaTJJ7HtDCR7cIuCESGHy+lR3aYZrdYFCj1UTKp50fT2D5SAwGohjsl6xOxXuF5I7LRdEH82wAqEY+Lp8Xf+BdX0qH6KehHlcU7YwcQZeUEMKV3Oh6rIl2wLxW0bbuKlGkaXJ+D2UM1dhfailzsvUj/npYepOjSKGSVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1726753698; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yth4XXP3doal8mi5kLWYXcmT+5/Krh3E/otCxVnGH08=; b=Mqz8C7vtg3No1COsssutPYJLE72rgzQ6AYxUCcUx0q+9j4IP/bBKOwY6IgrmjE7+XScfCr9NAydHpTy8pJJQOTcyr6x4h5RFy4LFoMKYdcOq2XUzvj24MjvOMy0jyEoxYzxQ6DfXHyDmwqZ8MgAHAdBimiX0hnm2vsR2Xm7Twy4= 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 1726753698331820.3987770877349; Thu, 19 Sep 2024 06:48:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srHUg-0007rw-Vs; Thu, 19 Sep 2024 09:46:51 -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 1srHUW-0007ES-Ip for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:46:45 -0400 Received: from mx.treblig.org ([2a00:1098:5b::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srHUQ-0005zp-UN for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:46:39 -0400 Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1srHUL-006QOJ-0x; Thu, 19 Sep 2024 13:46:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=yth4XXP3doal8mi5kLWYXcmT+5/Krh3E/otCxVnGH08=; b=rCkMbo81Gy7YknXH 2fWsXnJ9xiZVShtbTLOUGNdnuTmd6LuQb1h7rLCVvIKU5HRUkxrL01LacqvVZuBFIYkVi3JarstW1 mkwESKSHv7LlNxbtdxQ0MujAUPMmfifU2J6kQINKqJYBZDiWC1UJUm0ptqenGZpBd2Hg2bDcP2ZID jx6dx0NEGhHN2JLP9CCLK2jPyR29eSvYarLFDqAJoK460d2oAAJcJKMpUz/+0Y2BFYjY02Y0xQQM3 K685qClXh1YV8Z+ghDlxF9wfzZ7bdFNnDr1/kmUFRuVFw0dcyCyK9AfLmiIdj/sgHb1BOTIVu7wSz DnDvI+V+ZwdLkehGPg==; From: dave@treblig.org To: peterx@redhat.com, farosas@suse.de, eblake@redhat.com, armbru@redhat.com Cc: qemu-devel@nongnu.org, "Dr. David Alan Gilbert" Subject: [PATCH v2 2/7] migration: Remove unused migrate_zero_blocks Date: Thu, 19 Sep 2024 14:46:21 +0100 Message-ID: <20240919134626.166183-3-dave@treblig.org> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240919134626.166183-1-dave@treblig.org> References: <20240919134626.166183-1-dave@treblig.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1098:5b::1; envelope-from=dave@treblig.org; helo=mx.treblig.org 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.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 @treblig.org) X-ZM-MESSAGEID: 1726753698671116600 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" migrate_zero_blocks is unused since eef0bae3a7 ("migration: Remove block migration") Remove it. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu --- migration/options.c | 7 ------- migration/options.h | 1 - 2 files changed, 8 deletions(-) diff --git a/migration/options.c b/migration/options.c index 9460c5dee9..6f549984cb 100644 --- a/migration/options.c +++ b/migration/options.c @@ -339,13 +339,6 @@ bool migrate_xbzrle(void) return s->capabilities[MIGRATION_CAPABILITY_XBZRLE]; } =20 -bool migrate_zero_blocks(void) -{ - MigrationState *s =3D migrate_get_current(); - - return s->capabilities[MIGRATION_CAPABILITY_ZERO_BLOCKS]; -} - bool migrate_zero_copy_send(void) { MigrationState *s =3D migrate_get_current(); diff --git a/migration/options.h b/migration/options.h index 36e7b3723f..79084eed0d 100644 --- a/migration/options.h +++ b/migration/options.h @@ -40,7 +40,6 @@ bool migrate_release_ram(void); bool migrate_return_path(void); bool migrate_validate_uuid(void); bool migrate_xbzrle(void); -bool migrate_zero_blocks(void); bool migrate_zero_copy_send(void); =20 /* --=20 2.46.1 From nobody Tue Oct 22 23:32:57 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=treblig.org ARC-Seal: i=1; a=rsa-sha256; t=1726753639; cv=none; d=zohomail.com; s=zohoarc; b=l6V/7aLYMkAxuABR8QgoB2kbQPqeyf/V0zaaYzODUAfXSQ0csu8JmpYH0QU8a5KHVo1s5ZjwPId6NDj90MDi1FijUF8Eu7zeGmhvww9/LbLzvBZQ3xbUhSO/8x5ypjHj6rJXbze8OdQKp7xFYNIOQxG2uDSf06s2Kl5yfXHigeI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1726753639; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=l4UyVNwJ4yMa4BuDM6CsK36HOowHp3U5Yt7uEmfutOk=; b=ET8J7YZ15+6sdJBLQzqCI/VR3lWIGuMxYy4UERSlV01GpkyyrNCE6Rlk1ikqURIku+vzDLXvoKqnSFhqmzKtZwblMLyEMK60HyQtMmfMK/nK/qNNcigSj0fDTNflfN5+hRgImPfn342l7fBFqSmrDDV3LmzOJesSJgX9b3guEfE= 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 172675363903487.31164510262522; Thu, 19 Sep 2024 06:47:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srHUk-00086I-6c; Thu, 19 Sep 2024 09:46:54 -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 1srHUg-0007qG-Bw for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:46:50 -0400 Received: from mx.treblig.org ([2a00:1098:5b::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srHUQ-0005zr-UV for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:46:41 -0400 Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1srHUM-006QOJ-0B; Thu, 19 Sep 2024 13:46:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=l4UyVNwJ4yMa4BuDM6CsK36HOowHp3U5Yt7uEmfutOk=; b=rNny+XlTXCax2NqA gfjwzh442GvmLcUjFCtnnDmU8KU/rCFg1dddE07Q2OZB55/mJeQbL6ePWKR0RB8wetjJjHkqvYbFW TU16MJvJtAhsOHHEQEKl2MPeM8q2TnY+9McRCB2DwDsGmM6dakPp46aO2zMMDIDpAhKs6b/Pc8nG8 6wxOfYwL1w8xTjUlbQ+JyFvpB9O7a/h4wiKu+oPkC3Va+vSpD818xhA5CtsExa6Y8ngiWlPLQ0JMG hWJutBqOI8u0uAtrIgH6iy8C34weoARaQJUd7StEzqTp8VT/EofDUbNTEGHbJz0iFBwdP17dPPfr/ OMIv0JG10UVAWD9Frw==; From: dave@treblig.org To: peterx@redhat.com, farosas@suse.de, eblake@redhat.com, armbru@redhat.com Cc: qemu-devel@nongnu.org Subject: [PATCH v2 3/7] migration: Deprecate zero-blocks capability Date: Thu, 19 Sep 2024 14:46:22 +0100 Message-ID: <20240919134626.166183-4-dave@treblig.org> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240919134626.166183-1-dave@treblig.org> References: <20240919134626.166183-1-dave@treblig.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1098:5b::1; envelope-from=dave@treblig.org; helo=mx.treblig.org 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.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 @treblig.org) X-ZM-MESSAGEID: 1726753640769116600 Content-Type: text/plain; charset="utf-8" From: Fabiano Rosas The zero-blocks capability was meant to be used along with the block migration, which has been removed already in commit eef0bae3a7 ("migration: Remove block migration"). Setting zero-blocks is currently a noop, but the outright removal of the capability would cause and error in case some users are still setting it. Put the capability through the deprecation process. Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- docs/about/deprecated.rst | 6 ++++++ migration/options.c | 4 ++++ qapi/migration.json | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index ed31d4b0b2..47cabb6fcc 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -476,3 +476,9 @@ usage of providing a file descriptor to a plain file ha= s been deprecated in favor of explicitly using the ``file:`` URI with the file descriptor being passed as an ``fdset``. Refer to the ``add-fd`` command documentation for details on the ``fdset`` usage. + +``zero-blocks`` capability (since 9.2) +'''''''''''''''''''''''''''''''''''''' + +The ``zero-blocks`` capability was part of the block migration which +doesn't exist anymore since it was removed in QEMU v9.1. diff --git a/migration/options.c b/migration/options.c index 6f549984cb..ad8d6989a8 100644 --- a/migration/options.c +++ b/migration/options.c @@ -450,6 +450,10 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps= , Error **errp) ERRP_GUARD(); MigrationIncomingState *mis =3D migration_incoming_get_current(); =20 + if (new_caps[MIGRATION_CAPABILITY_ZERO_BLOCKS]) { + warn_report("zero-blocks capability is deprecated"); + } + #ifndef CONFIG_REPLICATION if (new_caps[MIGRATION_CAPABILITY_X_COLO]) { error_setg(errp, "QEMU compiled without replication module" diff --git a/qapi/migration.json b/qapi/migration.json index b66cccf107..3af6aa1740 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -479,11 +479,14 @@ # Features: # # @unstable: Members @x-colo and @x-ignore-shared are experimental. +# @deprecated: Member @zero-blocks is deprecated as being part of +# block migration which was already removed. # # Since: 1.2 ## { 'enum': 'MigrationCapability', - 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', 'zero-blocks', + 'data': ['xbzrle', 'rdma-pin-all', 'auto-converge', + { 'name': 'zero-blocks', 'features': [ 'deprecated' ] }, 'events', 'postcopy-ram', { 'name': 'x-colo', 'features': [ 'unstable' ] }, 'release-ram', --=20 2.46.1 From nobody Tue Oct 22 23:32:57 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=treblig.org ARC-Seal: i=1; a=rsa-sha256; t=1726753648; cv=none; d=zohomail.com; s=zohoarc; b=A+iqOOKR+qkrup7+lxfNjeY537SEcAQNB4Oqbbc+xe9P/EUg0grdsqIcSN3Mn1CTAj80OzuOjc5VBFDxMVuT6gxkRONqg3nPJZR8tXDYwf9uFfsQ6JCIh/1KMlUQJ34NTPI+TcWSWA07d0W7CvRe5FcgpBkVZ0ZySgl4NHxYDWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1726753648; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6vNa82WphtB1is9lgrKpqh6cZbhNlLMUwM6YrQbpBXs=; b=R84Bn23MjKUpDo4LXk03VyCUf7jtNFhNXG5xLQWfxsx1UP5/6NNkgWk6Rh4cTsR/Hyf3yen+xO/XQYTtMdP7B9hB4r7Zn29HVfPALYBfv3xPrxn3Y/ZqcaZkQ1la9J89gTswavy790FXulZRzAlMvp/QJu8PDxM/ctqz0G+xCDU= 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 1726753648032501.5606342288172; Thu, 19 Sep 2024 06:47:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srHUi-0007yW-UL; Thu, 19 Sep 2024 09:46:52 -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 1srHUg-0007qI-Bu for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:46:50 -0400 Received: from mx.treblig.org ([2a00:1098:5b::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srHUQ-0005zx-UR for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:46:41 -0400 Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1srHUM-006QOJ-2F; Thu, 19 Sep 2024 13:46:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=6vNa82WphtB1is9lgrKpqh6cZbhNlLMUwM6YrQbpBXs=; b=h+Fy/18hZSQWnxkI cF1soIFGxmL4f+WRJZzgcY2y5z1fXstdXPMfi5xzatT64qXLveqtF0kk/TkI1ANJ7DMkzKm0yV5bQ gfVx+is6u337HH568vRVrzejyhUMHP3D5QTP3dSgKUQsCFtbMt0yMHLG+tDK8ReXVgxicucxA1EJl +bh8FHp7b+kAsfYgNSz1xHhEMAKXxe7jyL6zer+q4JvbqjG3fzfYpQa1Q3WB+3ePlQLpUpTPHmz5B mK5x/vUL2Oxg+qRF0GixSX3YfQqDQ+UbWzG/y5kzqS70l1SjNovhPK5QYV8JJuuRDDlDQ9M6wUmwh 0rlgiK9fvrSxYSmEGA==; From: dave@treblig.org To: peterx@redhat.com, farosas@suse.de, eblake@redhat.com, armbru@redhat.com Cc: qemu-devel@nongnu.org, "Dr. David Alan Gilbert" Subject: [PATCH v2 4/7] migration: Remove unused socket_send_channel_create_sync Date: Thu, 19 Sep 2024 14:46:23 +0100 Message-ID: <20240919134626.166183-5-dave@treblig.org> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240919134626.166183-1-dave@treblig.org> References: <20240919134626.166183-1-dave@treblig.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1098:5b::1; envelope-from=dave@treblig.org; helo=mx.treblig.org 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.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 @treblig.org) X-ZM-MESSAGEID: 1726753648505116600 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" socket_send_channel_create_sync only use was removed by d0edb8a173 ("migration: Create the postcopy preempt channel asynchronousl= y") Remove it. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Fabiano Rosas --- migration/socket.c | 18 ------------------ migration/socket.h | 1 - 2 files changed, 19 deletions(-) diff --git a/migration/socket.c b/migration/socket.c index 9ab89b1e08..5ec65b8c03 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -42,24 +42,6 @@ void socket_send_channel_create(QIOTaskFunc f, void *dat= a) f, data, NULL, NULL); } =20 -QIOChannel *socket_send_channel_create_sync(Error **errp) -{ - QIOChannelSocket *sioc =3D qio_channel_socket_new(); - - if (!outgoing_args.saddr) { - object_unref(OBJECT(sioc)); - error_setg(errp, "Initial sock address not set!"); - return NULL; - } - - if (qio_channel_socket_connect_sync(sioc, outgoing_args.saddr, errp) <= 0) { - object_unref(OBJECT(sioc)); - return NULL; - } - - return QIO_CHANNEL(sioc); -} - struct SocketConnectData { MigrationState *s; char *hostname; diff --git a/migration/socket.h b/migration/socket.h index 46c233ecd2..04ebbe95a1 100644 --- a/migration/socket.h +++ b/migration/socket.h @@ -22,7 +22,6 @@ #include "qemu/sockets.h" =20 void socket_send_channel_create(QIOTaskFunc f, void *data); -QIOChannel *socket_send_channel_create_sync(Error **errp); =20 void socket_start_incoming_migration(SocketAddress *saddr, Error **errp); =20 --=20 2.46.1 From nobody Tue Oct 22 23:32:57 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=treblig.org ARC-Seal: i=1; a=rsa-sha256; t=1726753684; cv=none; d=zohomail.com; s=zohoarc; b=S/kvwtIK8gAmMx68DzhA+TIS6ajEhys9sPpwbHWF6JXhYqPSHoS+7riB8aHnWCbR14+3C4iOcg75EYO1Dk1TcD7xojYutCzr3XqKPzQE5CGSixjvCyfySBfuG9r2XhsgKX3tNi8jmXbEGvwrr1B4Rs0YW2uUp1i5qB11fnxLfH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1726753684; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+ITeZviAUjdU79Lh7KnozJBelk/8symZBSM8bBXNmh8=; b=QVuRT9T0XekQGxOHB1iM/leRYG6HwjDFph2dVjHJ6dz70yB/hWhJWARxIqLk23m473hr3TyKFHl8QgEtBggFxdqcqsJkjULmfyYOrnkzTBIR5m6D3V7A8AOcf340gaK6oIg+zIQi8if1oT1OhQlJy8Be3AdymCzqhbgLttXWYgQ= 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 1726753684928805.0308683974996; Thu, 19 Sep 2024 06:48:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srHUf-0007kN-0H; Thu, 19 Sep 2024 09:46:49 -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 1srHUU-00078J-TI for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:46:39 -0400 Received: from mx.treblig.org ([2a00:1098:5b::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srHUQ-000609-UN for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:46:38 -0400 Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1srHUN-006QOJ-0s; Thu, 19 Sep 2024 13:46:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=+ITeZviAUjdU79Lh7KnozJBelk/8symZBSM8bBXNmh8=; b=hTDDoJfmTCNi14vv 2lkRR0W9oAS61ad+vNLQYnVT/ZBeE7aOct/u4ZB1qvUNirQ1FGSSPXgl85gnGse/y6vetv0u6SDEi zcTkWb0AegkR44sjgko7In5ZEKj9RqpYwY0tPyFhKbMxLbI/xkE8I/3xkvK4lXUf9SfaoaV/iN/DJ bDalJNs+YVSlBfj7HPPvUTUOBR1VPa+prD5i2OqjPqKuNQsRqQ837y5+9IB91B0HG5ag1Ci7bZ7On 7K/4q/9wQTHpozhv+zhZYtTNq9YYXbjhdS/2RJARnFqPxi8JflDU3ZDeezUkMWFaJZ4yUTdk8kLtq kC5JhoYLQ8s+c4bs3Q==; From: dave@treblig.org To: peterx@redhat.com, farosas@suse.de, eblake@redhat.com, armbru@redhat.com Cc: qemu-devel@nongnu.org, "Dr. David Alan Gilbert" Subject: [PATCH v2 5/7] util/userfaultfd: Return -errno on error Date: Thu, 19 Sep 2024 14:46:24 +0100 Message-ID: <20240919134626.166183-6-dave@treblig.org> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240919134626.166183-1-dave@treblig.org> References: <20240919134626.166183-1-dave@treblig.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1098:5b::1; envelope-from=dave@treblig.org; helo=mx.treblig.org 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.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 @treblig.org) X-ZM-MESSAGEID: 1726753686736116600 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Convert (the currently unused) uffd_wakeup, uffd_copy_page and uffd_zero_page to return -errno on error rather than -1. That will make it easier to reuse in postcopy. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu --- util/userfaultfd.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/util/userfaultfd.c b/util/userfaultfd.c index 1b2fa949d4..518d5c3586 100644 --- a/util/userfaultfd.c +++ b/util/userfaultfd.c @@ -240,7 +240,7 @@ int uffd_change_protection(int uffd_fd, void *addr, uin= t64_t length, * Copy range of source pages to the destination to resolve * missing page fault somewhere in the destination range. * - * Returns 0 on success, negative value in case of an error + * Returns 0 on success, -errno in case of an error * * @uffd_fd: UFFD file descriptor * @dst_addr: destination base address @@ -259,10 +259,11 @@ int uffd_copy_page(int uffd_fd, void *dst_addr, void = *src_addr, uffd_copy.mode =3D dont_wake ? UFFDIO_COPY_MODE_DONTWAKE : 0; =20 if (ioctl(uffd_fd, UFFDIO_COPY, &uffd_copy)) { + int e =3D errno; error_report("uffd_copy_page() failed: dst_addr=3D%p src_addr=3D%p= length=3D%" PRIu64 " mode=3D%" PRIx64 " errno=3D%i", dst_addr, src_addr, - length, (uint64_t) uffd_copy.mode, errno); - return -1; + length, (uint64_t) uffd_copy.mode, e); + return -e; } =20 return 0; @@ -273,7 +274,7 @@ int uffd_copy_page(int uffd_fd, void *dst_addr, void *s= rc_addr, * * Fill range pages with zeroes to resolve missing page fault within the r= ange. * - * Returns 0 on success, negative value in case of an error + * Returns 0 on success, -errno in case of an error * * @uffd_fd: UFFD file descriptor * @addr: base address @@ -289,10 +290,11 @@ int uffd_zero_page(int uffd_fd, void *addr, uint64_t = length, bool dont_wake) uffd_zeropage.mode =3D dont_wake ? UFFDIO_ZEROPAGE_MODE_DONTWAKE : 0; =20 if (ioctl(uffd_fd, UFFDIO_ZEROPAGE, &uffd_zeropage)) { + int e =3D errno; error_report("uffd_zero_page() failed: addr=3D%p length=3D%" PRIu64 " mode=3D%" PRIx64 " errno=3D%i", addr, length, - (uint64_t) uffd_zeropage.mode, errno); - return -1; + (uint64_t) uffd_zeropage.mode, e); + return -e; } =20 return 0; @@ -306,7 +308,7 @@ int uffd_zero_page(int uffd_fd, void *addr, uint64_t le= ngth, bool dont_wake) * via UFFD-IO IOCTLs with MODE_DONTWAKE flag set, then after that all wai= ts * for the whole memory range are satisfied in a single call to uffd_wakeu= p(). * - * Returns 0 on success, negative value in case of an error + * Returns 0 on success, -errno in case of an error * * @uffd_fd: UFFD file descriptor * @addr: base address @@ -320,9 +322,10 @@ int uffd_wakeup(int uffd_fd, void *addr, uint64_t leng= th) uffd_range.len =3D length; =20 if (ioctl(uffd_fd, UFFDIO_WAKE, &uffd_range)) { + int e =3D errno; error_report("uffd_wakeup() failed: addr=3D%p length=3D%" PRIu64 "= errno=3D%i", - addr, length, errno); - return -1; + addr, length, e); + return -e; } =20 return 0; --=20 2.46.1 From nobody Tue Oct 22 23:32:57 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=treblig.org ARC-Seal: i=1; a=rsa-sha256; t=1726753685; cv=none; d=zohomail.com; s=zohoarc; b=VIwRAXZrBWJvkRpK3BdBN96AOWuPzZY2rTxgqTw4hU3r24o+Ov7OAyMyu7X+T6gCfc0rOtJBL/FGtwtg6ky0hzj7a1GDQRxg01ol3hxECspegprC9DvI0Xruy9odrifgeLTCaB0qVYHCa/mR/KFNs7c3eCAIjNeSbOvZ+a+qy8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1726753685; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Ms2aBAQ13vf0pUFCc2B0msBVzqbN2IXx+OGBi5iEVWk=; b=MxA6V4nhqOt1v00FkHNrdh09ceW9H+lOC9ZD2qhlB/GLD8W2Uwbey8ex2jpbT7/6fh5lVXXFJZIwCDO2mtRNo0N/n2nVZrKpGJhKDqcYx8EZ2jtSImUo24BfpXC/hNbMJo+Y9fFkVrvfSRg7Wm//8WObV1aAW7R8BkAl6k2MCvg= 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 1726753685017846.1184381659042; Thu, 19 Sep 2024 06:48:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srHUd-0007ec-Uy; Thu, 19 Sep 2024 09:46:48 -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 1srHUU-00078G-Sc for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:46:39 -0400 Received: from mx.treblig.org ([2a00:1098:5b::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srHUQ-00060C-UT for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:46:38 -0400 Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1srHUN-006QOJ-2y; Thu, 19 Sep 2024 13:46:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=Ms2aBAQ13vf0pUFCc2B0msBVzqbN2IXx+OGBi5iEVWk=; b=sCaWngQK1cv1KaXT nYVu+vgsWJLvBnHFQ0IcHWRnY7x7FJ1EPo6La4sFs7S1zyCILWW8OFUYVK8c66neS7qJP5wdHc1/w ss+jqlZWJhQnbiEuk8bFvYI51X0Rvfgudy4nIa7/5Y8Cw9CoOV+ZCsAN6g1qUvSQaoO8YMYQCpBNF /T8vI0SKfIiU5y4X1mL0Dw1VbFD3SIoJ6Qz9zLjjbcrvrbChW63hM5nLqJVO+LUPh9YDl0/jlQJSY r48jfUR2fv/6OKpVThE2jys1lWLtu8ccohqMKIQmEVPsKEoMcEwU03onLBGXNkmwdw4SmmVjXlRGN G7GjPonexS0qK4GhdQ==; From: dave@treblig.org To: peterx@redhat.com, farosas@suse.de, eblake@redhat.com, armbru@redhat.com Cc: qemu-devel@nongnu.org, "Dr. David Alan Gilbert" Subject: [PATCH v2 6/7] migration/postcopy: Use uffd helpers Date: Thu, 19 Sep 2024 14:46:25 +0100 Message-ID: <20240919134626.166183-7-dave@treblig.org> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240919134626.166183-1-dave@treblig.org> References: <20240919134626.166183-1-dave@treblig.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1098:5b::1; envelope-from=dave@treblig.org; helo=mx.treblig.org 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.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 @treblig.org) X-ZM-MESSAGEID: 1726753686720116600 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Use the uffd_copy_page, uffd_zero_page and uffd_wakeup helpers rather than calling ioctl ourselves. They return -errno on error, and print an error_report themselves. I think this actually makes postcopy_place_page actually more consistent in it's callers. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu --- migration/postcopy-ram.c | 47 +++++++++++----------------------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 1c374b7ea1..e2b318d3da 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -746,18 +746,9 @@ int postcopy_wake_shared(struct PostCopyFD *pcfd, RAMBlock *rb) { size_t pagesize =3D qemu_ram_pagesize(rb); - struct uffdio_range range; - int ret; trace_postcopy_wake_shared(client_addr, qemu_ram_get_idstr(rb)); - range.start =3D ROUND_DOWN(client_addr, pagesize); - range.len =3D pagesize; - ret =3D ioctl(pcfd->fd, UFFDIO_WAKE, &range); - if (ret) { - error_report("%s: Failed to wake: %zx in %s (%s)", - __func__, (size_t)client_addr, qemu_ram_get_idstr(rb), - strerror(errno)); - } - return ret; + return uffd_wakeup(pcfd->fd, (void *)ROUND_DOWN(client_addr, pagesize), + pagesize); } =20 static int postcopy_request_page(MigrationIncomingState *mis, RAMBlock *rb, @@ -1275,18 +1266,10 @@ static int qemu_ufd_copy_ioctl(MigrationIncomingSta= te *mis, void *host_addr, int ret; =20 if (from_addr) { - struct uffdio_copy copy_struct; - copy_struct.dst =3D (uint64_t)(uintptr_t)host_addr; - copy_struct.src =3D (uint64_t)(uintptr_t)from_addr; - copy_struct.len =3D pagesize; - copy_struct.mode =3D 0; - ret =3D ioctl(userfault_fd, UFFDIO_COPY, ©_struct); + ret =3D uffd_copy_page(userfault_fd, host_addr, from_addr, pagesiz= e, + false); } else { - struct uffdio_zeropage zero_struct; - zero_struct.range.start =3D (uint64_t)(uintptr_t)host_addr; - zero_struct.range.len =3D pagesize; - zero_struct.mode =3D 0; - ret =3D ioctl(userfault_fd, UFFDIO_ZEROPAGE, &zero_struct); + ret =3D uffd_zero_page(userfault_fd, host_addr, pagesize, false); } if (!ret) { qemu_mutex_lock(&mis->page_request_mutex); @@ -1343,18 +1326,16 @@ int postcopy_place_page(MigrationIncomingState *mis= , void *host, void *from, RAMBlock *rb) { size_t pagesize =3D qemu_ram_pagesize(rb); + int e; =20 /* copy also acks to the kernel waking the stalled thread up * TODO: We can inhibit that ack and only do it if it was requested * which would be slightly cheaper, but we'd have to be careful * of the order of updating our page state. */ - if (qemu_ufd_copy_ioctl(mis, host, from, pagesize, rb)) { - int e =3D errno; - error_report("%s: %s copy host: %p from: %p (size: %zd)", - __func__, strerror(e), host, from, pagesize); - - return -e; + e =3D qemu_ufd_copy_ioctl(mis, host, from, pagesize, rb); + if (e) { + return e; } =20 trace_postcopy_place_page(host); @@ -1376,12 +1357,10 @@ int postcopy_place_page_zero(MigrationIncomingState= *mis, void *host, * but it's not available for everything (e.g. hugetlbpages) */ if (qemu_ram_is_uf_zeroable(rb)) { - if (qemu_ufd_copy_ioctl(mis, host, NULL, pagesize, rb)) { - int e =3D errno; - error_report("%s: %s zero host: %p", - __func__, strerror(e), host); - - return -e; + int e; + e =3D qemu_ufd_copy_ioctl(mis, host, NULL, pagesize, rb); + if (e) { + return e; } return postcopy_notify_shared_wake(rb, qemu_ram_block_host_offset(rb, --=20 2.46.1 From nobody Tue Oct 22 23:32:57 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=treblig.org ARC-Seal: i=1; a=rsa-sha256; t=1726753800; cv=none; d=zohomail.com; s=zohoarc; b=dLG4OoaCqbk7N+ePaoAGgap+nk3XPb8iagg9+55pxrdOAwHkXXijrZQYqfnsNFmjCVJsfnmF2Xlthuv1AIlB6KEPIDVGZ0agSDdo3AVuoNIGdVvWAsYL7E7xjLw5euHlmQokZmaMFS2VqaXLG48sFPgN3MZvWsPMma/3zEYiuZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1726753800; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WpHNe7TXr6HaQLeHukME84FM+iJR/rwtrGszqmqqelg=; b=jmDJ2XgQJ4ZfBjMDZLXfJkGeAeFZVFL1p7PoFyCfHYERqkY7VN4JpYef9eYBMJK50Lo41n6GbOxYjODLD/ULD03wvpvU+tbOFaZOMdhs16ljZfxPMS28E4zr0UMCgNjmzYAsi7Gb5wOzQuOSeq1VrUY7iyaM0kHfdYvWPaVrE5I= 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 1726753800687197.69081352411274; Thu, 19 Sep 2024 06:50:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srHXc-0006gm-13; Thu, 19 Sep 2024 09:49:52 -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 1srHXU-0006JE-97 for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:49:45 -0400 Received: from mx.treblig.org ([2a00:1098:5b::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srHXR-0006Mq-P3 for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:49:44 -0400 Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1srHXM-006QOJ-03; Thu, 19 Sep 2024 13:49:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=WpHNe7TXr6HaQLeHukME84FM+iJR/rwtrGszqmqqelg=; b=D/FvDNOIihSCBkgc 24gXXwSu23d7IUR7FeSAiKLEPrrfSeogTd4CiyfhurCkKcZ2+D3+HmbosO8BXrKtzfJH9ulNY2O/Z d026odqINELDLDh0wl2J1Rt6pnWs5/tmTXwcqEWHCLE+46PrpjvrZP7i4JGlEdKWJzkhML1VqekUq UmeP6gkbrq8Hmkfku910AtSDRnMam0XkGpFd+p9DRPqh+WC73X7qRgG9oTK49T615Tt65/AjQlGAi yYRXr9UxW23GJrZrhXi1DXLUmf1J0LC7yiG5rM3wrSe4ojaACFrGzM+9k2SK6DbW9hsFgCw82kr2i A+CFMNqAkxvvFuO0bg==; From: dave@treblig.org To: peterx@redhat.com, farosas@suse.de, eblake@redhat.com, armbru@redhat.com Cc: qemu-devel@nongnu.org, "Dr. David Alan Gilbert" Subject: [PATCH v2 7/7] util/userfaultfd: Remove unused uffd_poll_events Date: Thu, 19 Sep 2024 14:46:26 +0100 Message-ID: <20240919134626.166183-8-dave@treblig.org> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240919134626.166183-1-dave@treblig.org> References: <20240919134626.166183-1-dave@treblig.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1098:5b::1; envelope-from=dave@treblig.org; helo=mx.treblig.org 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.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 @treblig.org) X-ZM-MESSAGEID: 1726753801343116600 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" uffd_poll_events has been unused since it was added; it's also just a wrapper around a plain old poll call, so doesn't add anything. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu --- include/qemu/userfaultfd.h | 1 - util/userfaultfd.c | 28 ---------------------------- 2 files changed, 29 deletions(-) diff --git a/include/qemu/userfaultfd.h b/include/qemu/userfaultfd.h index 18a4314212..a1979308d7 100644 --- a/include/qemu/userfaultfd.h +++ b/include/qemu/userfaultfd.h @@ -39,7 +39,6 @@ int uffd_copy_page(int uffd_fd, void *dst_addr, void *src= _addr, int uffd_zero_page(int uffd_fd, void *addr, uint64_t length, bool dont_wak= e); int uffd_wakeup(int uffd_fd, void *addr, uint64_t length); int uffd_read_events(int uffd_fd, struct uffd_msg *msgs, int count); -bool uffd_poll_events(int uffd_fd, int tmo); =20 #endif /* CONFIG_LINUX */ =20 diff --git a/util/userfaultfd.c b/util/userfaultfd.c index 518d5c3586..2396104f23 100644 --- a/util/userfaultfd.c +++ b/util/userfaultfd.c @@ -358,31 +358,3 @@ int uffd_read_events(int uffd_fd, struct uffd_msg *msg= s, int count) =20 return (int) (res / sizeof(struct uffd_msg)); } - -/** - * uffd_poll_events: poll UFFD file descriptor for read - * - * Returns true if events are available for read, false otherwise - * - * @uffd_fd: UFFD file descriptor - * @tmo: timeout value - */ -bool uffd_poll_events(int uffd_fd, int tmo) -{ - int res; - struct pollfd poll_fd =3D { .fd =3D uffd_fd, .events =3D POLLIN, .reve= nts =3D 0 }; - - do { - res =3D poll(&poll_fd, 1, tmo); - } while (res < 0 && errno =3D=3D EINTR); - - if (res =3D=3D 0) { - return false; - } - if (res < 0) { - error_report("uffd_poll_events() failed: errno=3D%i", errno); - return false; - } - - return (poll_fd.revents & POLLIN) !=3D 0; -} --=20 2.46.1