From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 39598C4345F for ; Fri, 3 May 2024 20:55:11 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2zvV-0003tv-13; Fri, 03 May 2024 16:54:41 -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 1s2zvQ-0003tG-Jy for qemu-devel@nongnu.org; Fri, 03 May 2024 16:54:38 -0400 Received: from smtp-out2.suse.de ([2a07:de40:b251:101:10:150:64:2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2zvN-0001LJ-HK for qemu-devel@nongnu.org; Fri, 03 May 2024 16:54:35 -0400 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id D959D20780; Fri, 3 May 2024 20:54:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1714769671; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tXuNHybXe15vqoUqSo4xDzxb+QmAbazHawwC5aAIEls=; b=RbuPrI1qEbm2F5CVrgcJNuong9OYqsyFr9G7zp8JmNTbYyQJTU86M0Xpf8y+a5QYd9C022 IyzU539Ew+e26u5q5NQd454zWm1+RVwJP3OrkFKUGjE81eeDZ0ee8Viv7Zekcc/3t/Ac/1 wTjz49GEMVrueTsqKB2Jw2CZyS1rBL8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1714769671; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tXuNHybXe15vqoUqSo4xDzxb+QmAbazHawwC5aAIEls=; b=glPs6ErPjt67hhEnixE6JVA4nyLHrjnvzs/FzaJafuOWB8qb1vcCb7wDqUfrQe0ZyiT47S A/52+VT6SfCQi+Cg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1714769671; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tXuNHybXe15vqoUqSo4xDzxb+QmAbazHawwC5aAIEls=; b=RbuPrI1qEbm2F5CVrgcJNuong9OYqsyFr9G7zp8JmNTbYyQJTU86M0Xpf8y+a5QYd9C022 IyzU539Ew+e26u5q5NQd454zWm1+RVwJP3OrkFKUGjE81eeDZ0ee8Viv7Zekcc/3t/Ac/1 wTjz49GEMVrueTsqKB2Jw2CZyS1rBL8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1714769671; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tXuNHybXe15vqoUqSo4xDzxb+QmAbazHawwC5aAIEls=; b=glPs6ErPjt67hhEnixE6JVA4nyLHrjnvzs/FzaJafuOWB8qb1vcCb7wDqUfrQe0ZyiT47S A/52+VT6SfCQi+Cg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 5E00813991; Fri, 3 May 2024 20:54:31 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id GmykCQdPNWaxCgAAD6G6ig (envelope-from ); Fri, 03 May 2024 20:54:31 +0000 From: Fabiano Rosas To: Peter Xu Cc: qemu-devel@nongnu.org, berrange@redhat.com, armbru@redhat.com, Claudio Fontana , Jim Fehlig Subject: Re: [PATCH 5/9] migration/multifd: Add direct-io support In-Reply-To: References: <20240426142042.14573-1-farosas@suse.de> <20240426142042.14573-6-farosas@suse.de> Date: Fri, 03 May 2024 17:54:28 -0300 Message-ID: <87y18qmxa3.fsf@suse.de> MIME-Version: 1.0 Content-Type: text/plain X-Spamd-Result: default: False [-4.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email] Received-SPF: pass client-ip=2a07:de40:b251:101:10:150:64:2; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Peter Xu writes: > On Fri, Apr 26, 2024 at 11:20:38AM -0300, Fabiano Rosas wrote: >> When multifd is used along with mapped-ram, we can take benefit of a >> filesystem that supports the O_DIRECT flag and perform direct I/O in >> the multifd threads. This brings a significant performance improvement >> because direct-io writes bypass the page cache which would otherwise >> be thrashed by the multifd data which is unlikely to be needed again >> in a short period of time. >> >> To be able to use a multifd channel opened with O_DIRECT, we must >> ensure that a certain aligment is used. Filesystems usually require a >> block-size alignment for direct I/O. The way to achieve this is by >> enabling the mapped-ram feature, which already aligns its I/O properly >> (see MAPPED_RAM_FILE_OFFSET_ALIGNMENT at ram.c). >> >> By setting O_DIRECT on the multifd channels, all writes to the same >> file descriptor need to be aligned as well, even the ones that come >> from outside multifd, such as the QEMUFile I/O from the main migration >> code. This makes it impossible to use the same file descriptor for the >> QEMUFile and for the multifd channels. The various flags and metadata >> written by the main migration code will always be unaligned by virtue >> of their small size. To workaround this issue, we'll require a second >> file descriptor to be used exclusively for direct I/O. >> >> The second file descriptor can be obtained by QEMU by re-opening the >> migration file (already possible), or by being provided by the user or >> management application (support to be added in future patches). >> >> Signed-off-by: Fabiano Rosas >> --- >> migration/file.c | 22 +++++++++++++++++++--- >> migration/migration.c | 23 +++++++++++++++++++++++ >> 2 files changed, 42 insertions(+), 3 deletions(-) >> >> diff --git a/migration/file.c b/migration/file.c >> index 8f30999400..b9265b14dd 100644 >> --- a/migration/file.c >> +++ b/migration/file.c >> @@ -83,17 +83,33 @@ void file_cleanup_outgoing_migration(void) >> >> bool file_send_channel_create(gpointer opaque, Error **errp) >> { >> - QIOChannelFile *ioc; >> + QIOChannelFile *ioc = NULL; >> int flags = O_WRONLY; >> - bool ret = true; >> + bool ret = false; >> + >> + if (migrate_direct_io()) { >> +#ifdef O_DIRECT >> + /* >> + * Enable O_DIRECT for the secondary channels. These are used >> + * for sending ram pages and writes should be guaranteed to be >> + * aligned to at least page size. >> + */ >> + flags |= O_DIRECT; >> +#else >> + error_setg(errp, "System does not support O_DIRECT"); >> + error_append_hint(errp, >> + "Try disabling direct-io migration capability\n"); >> + goto out; >> +#endif > > Hopefully if we can fail migrate-set-parameters correctly always, we will > never trigger this error. > > I know Linux used some trick like this to even avoid such ifdefs: > > if (qemu_has_direct_io() && migrate_direct_io()) { > // reference O_DIRECT > } > > So as long as qemu_has_direct_io() can return a constant "false" when > O_DIRECT not defined, the compiler is smart enough to ignore the O_DIRECT > inside the block. > > Even if it won't work, we can still avoid that error (and rely on the > set-parameter failure): > > #ifdef O_DIRECT > if (migrate_direct_io()) { > // reference O_DIRECT > } > #endif > > Then it should run the same, just to try making ifdefs as light as > possible.. Ok. Just FYI, in v2 I'm adding direct-io to migration incoming side as well, so I put this logic into a helper: static bool file_enable_direct_io(int *flags, Error **errp) { if (migrate_direct_io()) { #ifdef O_DIRECT *flags |= O_DIRECT; #else error_setg(errp, "System does not support O_DIRECT"); error_append_hint(errp, "Try disabling direct-io migration capability\n"); return false; #endif } return true; } But I'll apply your suggestions nonetheless. > >> + } >> >> ioc = qio_channel_file_new_path(outgoing_args.fname, flags, 0, errp); >> if (!ioc) { >> - ret = false; >> goto out; >> } >> >> multifd_channel_connect(opaque, QIO_CHANNEL(ioc)); >> + ret = true; >> >> out: >> /* >> diff --git a/migration/migration.c b/migration/migration.c >> index b5af6b5105..cb923a3f62 100644 >> --- a/migration/migration.c >> +++ b/migration/migration.c >> @@ -155,6 +155,16 @@ static bool migration_needs_seekable_channel(void) >> return migrate_mapped_ram(); >> } >> >> +static bool migration_needs_multiple_fds(void) > > If I suggest to rename this, would you agree? :) > Sure, although this is the more accurate usage than "multifd" hehe. > I'd try with "migrate_needs_extra_fd()" or "migrate_needs_two_fds()", > or... just to avoid "multi" + "fd" used altogether, perhaps. > > Other than that looks all good. > > Thanks, > >> +{ >> + /* >> + * When doing direct-io, multifd requires two different, >> + * non-duplicated file descriptors so we can use one of them for >> + * unaligned IO. >> + */ >> + return migrate_multifd() && migrate_direct_io(); >> +} >> + >> static bool transport_supports_seeking(MigrationAddress *addr) >> { >> if (addr->transport == MIGRATION_ADDRESS_TYPE_FILE) { >> @@ -164,6 +174,12 @@ static bool transport_supports_seeking(MigrationAddress *addr) >> return false; >> } >> >> +static bool transport_supports_multiple_fds(MigrationAddress *addr) >> +{ >> + /* file: works because QEMU can open it multiple times */ >> + return addr->transport == MIGRATION_ADDRESS_TYPE_FILE; >> +} >> + >> static bool >> migration_channels_and_transport_compatible(MigrationAddress *addr, >> Error **errp) >> @@ -180,6 +196,13 @@ migration_channels_and_transport_compatible(MigrationAddress *addr, >> return false; >> } >> >> + if (migration_needs_multiple_fds() && >> + !transport_supports_multiple_fds(addr)) { >> + error_setg(errp, >> + "Migration requires a transport that allows for multiple fds (e.g. file)"); >> + return false; >> + } >> + >> return true; >> } >> >> -- >> 2.35.3 >>