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 79DFDC4345F for ; Thu, 25 Apr 2024 15:40:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s01C2-0002aY-DC; Thu, 25 Apr 2024 11:39:26 -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 1s01C1-0002Yg-Gk for qemu-devel@nongnu.org; Thu, 25 Apr 2024 11:39:25 -0400 Received: from smtp-out2.suse.de ([195.135.223.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s01Bz-0003JA-DN for qemu-devel@nongnu.org; Thu, 25 Apr 2024 11:39:25 -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 606165BEA6; Thu, 25 Apr 2024 15:39:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1714059561; 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=pHZFPVv/Ro7hB0pHfV4mJgpeX63cjBuXGzcumBcWULY=; b=ArQd2hjpxDd4izR7yrrXKyhSDZ2A68OrkY4UkyYxRy6fWe9cavLiZqKNYgsU5/V3kcrfp7 pm7hI80wAZrQkTN8876KWNuf2s0OjICGM6I4iC75p3UmwwtNnRRPlG25/yjH+CDBOuCiBE B3fN5Z9/X3Nk13iPATH124niepYYVoI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1714059561; 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=pHZFPVv/Ro7hB0pHfV4mJgpeX63cjBuXGzcumBcWULY=; b=QOZEs3NZ9d6IxlcLMHRb6CR+xO+5fh6WXy5KnvN5xKWY7hkE7nN6E5brgMwZl/kSLCkKLM xuveJxnngJZUW4Bg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1714059560; 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=pHZFPVv/Ro7hB0pHfV4mJgpeX63cjBuXGzcumBcWULY=; b=A5JrFYNGukpnP4vX1FijwpPpOk4dYbmGGffIV2kuexKx9bXQKCjD0cLNr5cGeM1trYXzdh wfcgOhHsUfAVdeaY4zxwn/YwUVYaE+isfZxeoIOpy5rvzXHjfLZ5gLWTZwszI1L3qz+BQ9 msrwioztqawyQxHSjW74Jekr14tYDsg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1714059560; 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=pHZFPVv/Ro7hB0pHfV4mJgpeX63cjBuXGzcumBcWULY=; b=6EHRPiSffaQB3lHOMfYgs/6tS7cs5B8QLtRDl7r1ce9IAroUtyfLbgGdnM1/mhCEAtKPBR xnEnvf/mST88wQDQ== 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 DFD651393C; Thu, 25 Apr 2024 15:39:19 +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 B44sKSd5KmaqFQAAD6G6ig (envelope-from ); Thu, 25 Apr 2024 15:39:19 +0000 From: Fabiano Rosas To: Hao Xiang , marcandre.lureau@redhat.com, peterx@redhat.com, armbru@redhat.com, lvivier@redhat.com, qemu-devel@nongnu.org Cc: Hao Xiang Subject: Re: [PATCH v4 10/14] migration/multifd: Enable DSA offloading in multifd sender path. In-Reply-To: <20240425022117.4035031-11-hao.xiang@linux.dev> References: <20240425022117.4035031-1-hao.xiang@linux.dev> <20240425022117.4035031-11-hao.xiang@linux.dev> Date: Thu, 25 Apr 2024 12:39:17 -0300 Message-ID: <878r11ih96.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]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; DBL_BLOCKED_OPENRESOLVER(0.00)[linux.dev:email, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns] Received-SPF: pass client-ip=195.135.223.131; 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 Hao Xiang writes: > Multifd sender path gets an array of pages queued by the migration > thread. It performs zero page checking on every page in the array. > The pages are classfied as either a zero page or a normal page. This > change uses Intel DSA to offload the zero page checking from CPU to > the DSA accelerator. The sender thread submits a batch of pages to DSA > hardware and waits for the DSA completion thread to signal for work > completion. > > Signed-off-by: Hao Xiang > --- > migration/multifd-zero-page.c | 99 +++++++++++++++++++++++++++++++++-- > migration/multifd.c | 27 +++++++++- > migration/multifd.h | 1 + > 3 files changed, 120 insertions(+), 7 deletions(-) > > diff --git a/migration/multifd-zero-page.c b/migration/multifd-zero-page.c > index e1b8370f88..4f426289e4 100644 > --- a/migration/multifd-zero-page.c > +++ b/migration/multifd-zero-page.c > @@ -37,25 +37,83 @@ static void swap_page_offset(ram_addr_t *pages_offset, int a, int b) > } > > /** > - * multifd_send_zero_page_detect: Perform zero page detection on all pages. > + * zero_page_detect_cpu: Perform zero page detection using CPU. > * > * Sorts normal pages before zero pages in p->pages->offset and updates > * p->pages->normal_num. > * > * @param p A pointer to the send params. > */ > -void multifd_send_zero_page_detect(MultiFDSendParams *p) > +static void zero_page_detect_cpu(MultiFDSendParams *p) > { > MultiFDPages_t *pages = p->pages; > RAMBlock *rb = pages->block; > int i = 0; > int j = pages->num - 1; > > - if (!multifd_zero_page_enabled()) { > - pages->normal_num = pages->num; > + /* > + * Sort the page offset array by moving all normal pages to > + * the left and all zero pages to the right of the array. > + */ > + while (i <= j) { > + uint64_t offset = pages->offset[i]; > + > + if (!buffer_is_zero(rb->host + offset, p->page_size)) { > + i++; > + continue; > + } > + > + swap_page_offset(pages->offset, i, j); > + ram_release_page(rb->idstr, offset); > + j--; > + } > + > + pages->normal_num = i; > +} > + > + > +#ifdef CONFIG_DSA_OPT > + > +static void swap_result(bool *results, int a, int b) > +{ > + bool temp; > + > + if (a == b) { > return; > } > > + temp = results[a]; > + results[a] = results[b]; > + results[b] = temp; > +} > + > +/** > + * zero_page_detect_dsa: Perform zero page detection using > + * Intel Data Streaming Accelerator (DSA). > + * > + * Sorts normal pages before zero pages in p->pages->offset and updates > + * p->pages->normal_num. > + * > + * @param p A pointer to the send params. > + */ > +static void zero_page_detect_dsa(MultiFDSendParams *p) > +{ > + MultiFDPages_t *pages = p->pages; > + RAMBlock *rb = pages->block; > + bool *results = p->batch_task->results; At this point I don't see the need to carry p->batch_task in the multifd code. results here could be taken from the buffer_is_zero_dsa_batch_async call below. > + > + for (int i = 0; i < p->pages->num; i++) { > + p->batch_task->addr[i] = (ram_addr_t)(rb->host + p->pages->offset[i]); ... and this is just what p->iov[0].iov_base contains. > + } > + > + buffer_is_zero_dsa_batch_async(p->batch_task, This is not async. You're using the result right after this call. Leave the 'async' for the functions called from whithin this one, which do the actual wait part. > + (const void **)p->batch_task->addr, > + p->pages->num, > + p->page_size); > + > + int i = 0; > + int j = pages->num - 1; > + > /* > * Sort the page offset array by moving all normal pages to > * the left and all zero pages to the right of the array. > @@ -63,11 +121,12 @@ void multifd_send_zero_page_detect(MultiFDSendParams *p) > while (i <= j) { > uint64_t offset = pages->offset[i]; > > - if (!buffer_is_zero(rb->host + offset, p->page_size)) { > + if (!results[i]) { > i++; > continue; > } > > + swap_result(results, i, j); > swap_page_offset(pages->offset, i, j); > ram_release_page(rb->idstr, offset); > j--; > @@ -76,6 +135,15 @@ void multifd_send_zero_page_detect(MultiFDSendParams *p) > pages->normal_num = i; > } > > +#else > + > +static void zero_page_detect_dsa(MultiFDSendParams *p) > +{ > + exit(1); > +} > + > +#endif > + > void multifd_recv_zero_page_process(MultiFDRecvParams *p) > { > for (int i = 0; i < p->zero_num; i++) { > @@ -87,3 +155,24 @@ void multifd_recv_zero_page_process(MultiFDRecvParams *p) > } > } > } > + > +/** > + * multifd_send_zero_page_detect: Perform zero page detection on all pages. > + * > + * @param p A pointer to the send params. > + */ > +void multifd_send_zero_page_detect(MultiFDSendParams *p) > +{ > + MultiFDPages_t *pages = p->pages; > + > + if (!multifd_zero_page_enabled()) { > + pages->normal_num = pages->num; > + return; > + } > + > + if (dsa_is_running()) { > + zero_page_detect_dsa(p); > + } else { > + zero_page_detect_cpu(p); > + } > +} > diff --git a/migration/multifd.c b/migration/multifd.c > index cfd3a92f6c..7316643d0a 100644 > --- a/migration/multifd.c > +++ b/migration/multifd.c > @@ -818,6 +818,8 @@ void multifd_send_shutdown(void) > > multifd_send_terminate_threads(); > > + dsa_cleanup(); > + > for (i = 0; i < migrate_multifd_channels(); i++) { > MultiFDSendParams *p = &multifd_send_state->params[i]; > Error *local_err = NULL; > @@ -1155,11 +1157,20 @@ bool multifd_send_setup(void) > uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size(); > bool use_packets = multifd_use_packets(); > uint8_t i; > + const char *dsa_parameter = migrate_multifd_dsa_accel(); > > if (!migrate_multifd()) { > return true; > } > > + if (dsa_init(dsa_parameter)) { > + error_setg(&local_err, "multifd: Sender failed to initialize DSA."); > + error_report_err(local_err); > + return false; > + } > + > + dsa_start(); > + > thread_count = migrate_multifd_channels(); > multifd_send_state = g_malloc0(sizeof(*multifd_send_state)); > multifd_send_state->params = g_new0(MultiFDSendParams, thread_count); > @@ -1393,6 +1404,7 @@ void multifd_recv_cleanup(void) > qemu_thread_join(&p->thread); > } > } > + dsa_cleanup(); > for (i = 0; i < migrate_multifd_channels(); i++) { > multifd_recv_cleanup_channel(&multifd_recv_state->params[i]); > } > @@ -1568,6 +1580,9 @@ int multifd_recv_setup(Error **errp) > uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size(); > bool use_packets = multifd_use_packets(); > uint8_t i; > + const char *dsa_parameter = migrate_multifd_dsa_accel(); > + int ret; > + Error *local_err = NULL; > > /* > * Return successfully if multiFD recv state is already initialised > @@ -1577,6 +1592,15 @@ int multifd_recv_setup(Error **errp) > return 0; > } > > + ret = dsa_init(dsa_parameter); > + if (ret != 0) { > + error_setg(&local_err, "multifd: Receiver failed to initialize DSA."); > + error_propagate(errp, local_err); > + return ret; > + } > + > + dsa_start(); > + > thread_count = migrate_multifd_channels(); > multifd_recv_state = g_malloc0(sizeof(*multifd_recv_state)); > multifd_recv_state->params = g_new0(MultiFDRecvParams, thread_count); > @@ -1616,13 +1640,12 @@ int multifd_recv_setup(Error **errp) > > for (i = 0; i < thread_count; i++) { > MultiFDRecvParams *p = &multifd_recv_state->params[i]; > - int ret; > - > ret = multifd_recv_state->ops->recv_setup(p, errp); > if (ret) { > return ret; > } > } > + > return 0; > } > > diff --git a/migration/multifd.h b/migration/multifd.h > index 16e27db5e9..b3717fae24 100644 > --- a/migration/multifd.h > +++ b/migration/multifd.h > @@ -14,6 +14,7 @@ > #define QEMU_MIGRATION_MULTIFD_H > > #include "ram.h" > +#include "qemu/dsa.h" > > typedef struct MultiFDRecvData MultiFDRecvData;