From nobody Fri Dec 19 20:16:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1738953924; cv=none; d=zohomail.com; s=zohoarc; b=C47qLCJ5qSe/Xc0sP/DyUZpbPdiYLjhDOMGhPtC09St8dc2QqrZzlZu0zoqw6WPsy28/uFDnoV6opaETdYbqUyxyRFWmQQPSpeY5mg3cxdFIBJTrAq5IaS1qPmCFzrjJhodCDyIaCcVj0onaZqA4T4SqjcJaeAs6R9OeQ8Tn96A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1738953924; 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:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=YxFqOM2XG6rlAVmVf5p+QMuZHDLwSKthHRXCpjZu5vs=; b=D9hN57TOamL5Zic+lqlUwYRchMQde0BB7ez5rRetYMLrgroC2zNxiSmTJghffZTP5p8cyH7cDRJb88DELpHlKBrSs6TsZfY/71Nypky20swgClIbsedeeL1k3/zdDegsrpUOyNtY/MNwX6Yw5XRFSPB96wKAqHjEIWgDz+cQunU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1738953924008616.1738643067977; Fri, 7 Feb 2025 10:45:24 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 553C9A29; Fri, 7 Feb 2025 13:45:23 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3008817AC; Fri, 7 Feb 2025 13:38:34 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 92CAC14D1; Fri, 7 Feb 2025 13:38:28 -0500 (EST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5B3C314CE for ; Fri, 7 Feb 2025 13:38:07 -0500 (EST) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-38dcb97e8a3so730052f8f.3 for ; Fri, 07 Feb 2025 10:38:07 -0800 (PST) Received: from localhost (205-201-32-8.scinternet.net. [205.201.32.8]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-73048a9d7aesm3338939b3a.33.2025.02.07.10.38.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2025 10:38:05 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1738953486; x=1739558286; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lPJckepq7iCnpN0ASP2V3KPuLEjA/I8S44N3hwzgjnY=; b=d3sV+LTJV5PsQP4x9BEU0QV/FAvFd2sNtNkR5BPuG1P6U5efJOF6qFRg4QVPuX6HtP NJJZ2UaUoksW5By9RkmGKdmwXczzRGrJ01ILwOCa49T3mJ1Tn/UAb245E0qtvJ7SO7Bx GBjDryY7PtAbu1rfSYYaB3vj9FwNCCB9fBeJVINWRNo2Zv8XC9/ylPB05Bty60X4fc1E phX+iYr3QScp9dH8lG0Bw2oMHCb0axPMGReOJm0wnKaWQ7A3xzW+QcZMIJsLmG7PyF2s xn2DqK/bI3dtUUN3snbOZ8YR+GyeaTPRs4uhYu39f5A9guYTJkUNhHt2mwzKSluFQ3+Y GYFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738953486; x=1739558286; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lPJckepq7iCnpN0ASP2V3KPuLEjA/I8S44N3hwzgjnY=; b=fJs2pCcCDFYcN5FCRbGVJNIdhohBn7HgOyosH42MmcFo3G4b2kmq2pp6NjNV1ory1F 2YjsB0yqfX1VDz/lDXwvJ5XPSIBunJpCz505TTN/+8vrqA64Pl+G0X3hW6ysPbzNCJez BvfgGhOOZ4madeNke6vv3o9Bs+2N12ML1rdsujXCQo4BIVMlA5eewsk+ov14K2bDVoKw 5nPR9AIFUvWl0GNBsXz+PTtjb5m1zaHPk9WxTKC37K7A4qZ7TxY4st3EQjo8qRBb7vtA Topz4E7rPEvNq6fvS1AfV+ufTUnaKLokZ9qheoNUbAq5gEfIKEF3D68ZpNEGnm4jdmSL BF4g== X-Gm-Message-State: AOJu0YyjnM18pCY4nIS0jRQFHjHsAuOkOjEDS40ViJ+3uEyPDdpem0HL 8NowfzMs9A7P4pw/J0prvh0Epsz50Aw3VMxSBIA2J+RVAl4H/bbn1G9odph1+aeGD2MYoVKsrm+ R X-Gm-Gg: ASbGncuRntPctipYOaf/Nno9tf3JLMNfRESERirXB28rCYUIey9nk099TkpnA3fhXm9 tiu1YMdeRF0EILNEwkCxmtZnnbg3Js1CXLIEYo332CPv/Wmg/PEXw0VyGnC/xvfl/WH/7B3ZWS/ fsNIAk2ZMpHdaHLPlofvcoV8CXcRQukGMU0wRV+3ZDkPyensfujWkHpEkN7mikVYIuTOh8/Sw7S Je0WriWQDvWKFhOpP3LBlB9lEyU6XIbyQbq+Zh4215UI4zlVWWc9WQaX6ucZ3IK3pvmqv8zp50E d/q8FxFoXAOTCDqX1kzrOWYLqf2Orv6ylg== X-Google-Smtp-Source: AGHT+IEpdUUtIXRgGV6/DIRUFtayEzlZsVstC8fi0h6WSYit9TCRL3nM41+hOwDz9kUJ81yGgMiSBA== X-Received: by 2002:a05:6000:1ac6:b0:385:fae7:fe50 with SMTP id ffacd0b85a97d-38dc9346e4emr2811268f8f.42.1738953486211; Fri, 07 Feb 2025 10:38:06 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH V3 15/19] qemu: Support O_DIRECT with mapped-ram on restore Date: Fri, 7 Feb 2025 11:27:26 -0700 Message-ID: <20250207183730.21686-16-jfehlig@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250207183730.21686-1-jfehlig@suse.com> References: <20250207183730.21686-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VROJLHYFTUE4YAL6EWXAF4ZWDTVLP2OR X-Message-ID-Hash: VROJLHYFTUE4YAL6EWXAF4ZWDTVLP2OR X-MailFrom: jfehlig@suse.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: farosas@suse.de X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Jim Fehlig via Devel Reply-To: Jim Fehlig X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1738953925179019000 Content-Type: text/plain; charset="utf-8" When using the mapped-ram migration capability, direct IO is enabled by setting the "direct-io" migration parameter to "true" and passing QEMU an additional fd with O_DIRECT set. Signed-off-by: Jim Fehlig --- src/qemu/qemu_migration.c | 11 ++++++----- src/qemu/qemu_process.c | 27 +++++++++++++++++++++++---- src/qemu/qemu_process.h | 6 ++++-- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a5a80230b2..d0cbcce044 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3063,7 +3063,8 @@ qemuMigrationDstPrepareCleanup(virQEMUDriver *driver, } =20 static qemuProcessIncomingDef * -qemuMigrationDstPrepare(virDomainObj *vm, +qemuMigrationDstPrepare(virQEMUDriver *driver, + virDomainObj *vm, bool tunnel, const char *protocol, const char *listenAddress, @@ -3123,9 +3124,9 @@ qemuMigrationDstPrepare(virDomainObj *vm, migrateFrom =3D g_strdup_printf(incFormat, protocol, listenAddress= , port); } =20 - return qemuProcessIncomingDefNew(vm, listenAddress, + return qemuProcessIncomingDefNew(driver, vm, listenAddress, migrateFrom, fd, - NULL, NULL); + NULL, NULL, NULL); } =20 =20 @@ -3265,7 +3266,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver, goto error; stopProcess =3D true; =20 - if (!(incoming =3D qemuMigrationDstPrepare(vm, tunnel, protocol, + if (!(incoming =3D qemuMigrationDstPrepare(driver, vm, tunnel, protoco= l, listenAddress, port, &dataFD[0]))) goto error; @@ -3637,7 +3638,7 @@ qemuMigrationDstPrepareResume(virQEMUDriver *driver, =20 priv->origname =3D g_strdup(origname); =20 - if (!(incoming =3D qemuMigrationDstPrepare(vm, false, protocol, + if (!(incoming =3D qemuMigrationDstPrepare(driver, vm, false, protocol, listenAddress, port, NULL))) goto cleanup; =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 94e7e90d28..f51378aeba 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4837,13 +4837,16 @@ qemuProcessIncomingDefFree(qemuProcessIncomingDef *= inc) * qemuProcessIncomingDefFree will NOT close it. */ qemuProcessIncomingDef * -qemuProcessIncomingDefNew(virDomainObj *vm, +qemuProcessIncomingDefNew(virQEMUDriver *driver, + virDomainObj *vm, const char *listenAddress, const char *migrateFrom, int *fd, const char *path, - virQEMUSaveData *data) + virQEMUSaveData *data, + qemuMigrationParams *migParams) { + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivate *priv =3D vm->privateData; qemuProcessIncomingDef *inc =3D NULL; =20 @@ -4856,9 +4859,25 @@ qemuProcessIncomingDefNew(virDomainObj *vm, =20 if (data && data->header.format =3D=3D QEMU_SAVE_FORMAT_SPARSE) { size_t offset =3D sizeof(virQEMUSaveHeader) + data->header.data_le= n; + bool directio =3D false; =20 inc->fdPassMigrate =3D qemuFDPassNew("libvirt-incoming-migrate", p= riv); - qemuFDPassAddFD(inc->fdPassMigrate, fd, "-fd"); + /* When using directio with mapped-ram, qemu needs an fd without + * O_DIRECT set for reading small bits of unaligned state. */ + if (qemuMigrationParamsGetBool(migParams, QEMU_MIGRATION_PARAM_DIR= ECT_IO, &directio) < 0) + goto error; + + if (directio) { + VIR_AUTOCLOSE bufferedFd =3D -1; + + if ((bufferedFd =3D qemuDomainOpenFile(cfg, NULL, path, O_RDON= LY, NULL)) < 0) + goto error; + + qemuFDPassAddFD(inc->fdPassMigrate, &bufferedFd, "-buffered-fd= "); + qemuFDPassAddFD(inc->fdPassMigrate, fd, "direct-io-fd"); + } else { + qemuFDPassAddFD(inc->fdPassMigrate, fd, "-buffered-fd"); + } inc->uri =3D g_strdup_printf("file:%s,offset=3D%#lx", qemuFDPassGetPath(inc->fdPassMigrate), = offset); } else { @@ -8499,7 +8518,7 @@ qemuProcessStartWithMemoryState(virConnectPtr conn, /* The fd passed to qemuProcessIncomingDefNew is used to create the mi= gration * URI, so it must be called after starting the decompression program. */ - incoming =3D qemuProcessIncomingDefNew(vm, NULL, "stdio", fd, path, da= ta); + incoming =3D qemuProcessIncomingDefNew(driver, vm, NULL, "stdio", fd, = path, data, migParams); if (!incoming) return -1; =20 diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index c51335ad7a..8f7b3f24c4 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -57,12 +57,14 @@ struct _qemuProcessIncomingDef { const char *path; /* path associated with fd */ }; =20 -qemuProcessIncomingDef *qemuProcessIncomingDefNew(virDomainObj *vm, +qemuProcessIncomingDef *qemuProcessIncomingDefNew(virQEMUDriver *driver, + virDomainObj *vm, const char *listenAddres= s, const char *migrateFrom, int *fd, const char *path, - virQEMUSaveData *data); + virQEMUSaveData *data, + qemuMigrationParams *mig= Params); =20 void qemuProcessIncomingDefFree(qemuProcessIncomingDef *inc); =20 --=20 2.43.0