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 EA7B8C27C52 for ; Wed, 5 Jun 2024 18:57:44 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEvow-0005v2-Gt; Wed, 05 Jun 2024 14:57:14 -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 1sEvot-0005rh-E8 for qemu-devel@nongnu.org; Wed, 05 Jun 2024 14:57:11 -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 1sEvor-0003TM-Ah for qemu-devel@nongnu.org; Wed, 05 Jun 2024 14:57:10 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [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 0B4E51F835; Wed, 5 Jun 2024 18:57:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1717613827; 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=ad4+mKbVklGL2NU0qpOZqMKsizv5qQ638EQ9/Yl4Ysk=; b=pNJMqCxPDPfL7U7vwP+Gx6YiT4J6foks7GOancWDcGGzHpcadpDPHi/ae2l5Hj4k5nZPuM t5InZKXa2N+9GF4URlYIwL2fHb0Tz+Qt9ddYPYGHxg6n5W7X5MNZav6a8VLWL+QNEQA51F VU/5u/v/Fp1141kDVPsl4ZzED0iLA0I= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1717613827; 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=ad4+mKbVklGL2NU0qpOZqMKsizv5qQ638EQ9/Yl4Ysk=; b=loaXWL+9Ol7s+DYXZ84MDtAKHl82EkKaMCrpxHJ/+RaRhero6AXQOGApV4ADQtVVM+tWDI 0A0kxjCKsvwUpfAA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1717613827; 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=ad4+mKbVklGL2NU0qpOZqMKsizv5qQ638EQ9/Yl4Ysk=; b=pNJMqCxPDPfL7U7vwP+Gx6YiT4J6foks7GOancWDcGGzHpcadpDPHi/ae2l5Hj4k5nZPuM t5InZKXa2N+9GF4URlYIwL2fHb0Tz+Qt9ddYPYGHxg6n5W7X5MNZav6a8VLWL+QNEQA51F VU/5u/v/Fp1141kDVPsl4ZzED0iLA0I= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1717613827; 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=ad4+mKbVklGL2NU0qpOZqMKsizv5qQ638EQ9/Yl4Ysk=; b=loaXWL+9Ol7s+DYXZ84MDtAKHl82EkKaMCrpxHJ/+RaRhero6AXQOGApV4ADQtVVM+tWDI 0A0kxjCKsvwUpfAA== 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 8A47113A42; Wed, 5 Jun 2024 18:57:06 +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 2CYPFAK1YGZbCAAAD6G6ig (envelope-from ); Wed, 05 Jun 2024 18:57:06 +0000 From: Fabiano Rosas To: Shameer Kolothum , peterx@redhat.com, yuan1.liu@intel.com Cc: qemu-devel@nongnu.org, linuxarm@huawei.com, linwenkai6@hisilicon.com, zhangfei.gao@linaro.org, huangchenghai2@huawei.com Subject: Re: [PATCH 5/7] migration/multifd: Add UADK based compression and decompression In-Reply-To: <20240529094435.11140-6-shameerali.kolothum.thodi@huawei.com> References: <20240529094435.11140-1-shameerali.kolothum.thodi@huawei.com> <20240529094435.11140-6-shameerali.kolothum.thodi@huawei.com> Date: Wed, 05 Jun 2024 15:57:04 -0300 Message-ID: <87a5jzp69r.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]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_SEVEN(0.00)[8]; 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)[]; TO_DN_SOME(0.00)[]; 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,imap1.dmz-prg2.suse.org:helo] 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, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Shameer Kolothum via writes: > Uses UADK wd_do_comp_sync() API to (de)compress a normal page using > hardware accelerator. > > Signed-off-by: Shameer Kolothum A couple of comments below. Reviewed-by: Fabiano Rosas > --- > migration/multifd-uadk.c | 132 ++++++++++++++++++++++++++++++++++++++- > 1 file changed, 130 insertions(+), 2 deletions(-) > > diff --git a/migration/multifd-uadk.c b/migration/multifd-uadk.c > index 3172e4d5ca..3329819bd4 100644 > --- a/migration/multifd-uadk.c > +++ b/migration/multifd-uadk.c > @@ -13,6 +13,7 @@ > #include "qemu/osdep.h" > #include "qemu/module.h" > #include "qapi/error.h" > +#include "exec/ramblock.h" > #include "migration.h" > #include "multifd.h" > #include "options.h" > @@ -140,6 +141,15 @@ static void multifd_uadk_send_cleanup(MultiFDSendParams *p, Error **errp) > p->compress_data = NULL; > } > > +static inline void prepare_next_iov(MultiFDSendParams *p, void *base, > + uint32_t len) > +{ > + p->iov[p->iovs_num].iov_base = (uint8_t *)base; > + p->iov[p->iovs_num].iov_len = len; > + p->next_packet_size += len; > + p->iovs_num++; > +} > + > /** > * multifd_uadk_send_prepare: prepare data to be able to send > * > @@ -153,7 +163,56 @@ static void multifd_uadk_send_cleanup(MultiFDSendParams *p, Error **errp) > */ > static int multifd_uadk_send_prepare(MultiFDSendParams *p, Error **errp) > { > - return -1; > + struct wd_data *uadk_data = p->compress_data; > + uint32_t hdr_size; > + uint8_t *buf = uadk_data->buf; > + int ret = 0; > + > + if (!multifd_send_prepare_common(p)) { > + goto out; > + } > + > + hdr_size = p->pages->normal_num * sizeof(uint32_t); > + /* prepare the header that stores the lengths of all compressed data */ > + prepare_next_iov(p, uadk_data->buf_hdr, hdr_size); > + > + for (int i = 0; i < p->pages->normal_num; i++) { > + struct wd_comp_req creq = { > + .op_type = WD_DIR_COMPRESS, > + .src = p->pages->block->host + p->pages->offset[i], > + .src_len = p->page_size, > + .dst = buf, > + /* Set dst_len to double the src to take care of -ve compression */ What's -ve compression? > + .dst_len = p->page_size * 2, > + }; > + > + ret = wd_do_comp_sync(uadk_data->handle, &creq); > + if (ret || creq.status) { > + error_setg(errp, "multifd %u: failed wd_do_comp_sync, ret %d status %d", > + p->id, ret, creq.status); > + return -1; > + } > + if (creq.dst_len < p->page_size) { > + uadk_data->buf_hdr[i] = cpu_to_be32(creq.dst_len); > + prepare_next_iov(p, buf, creq.dst_len); > + buf += creq.dst_len; > + } else { > + /* > + * Send raw data if compressed out >= page_size. We might be better > + * off sending raw data if output is slightly less than page_size > + * as well because at the receive end we can skip the decompression. > + * But it is tricky to find the right number here. > + */ > + uadk_data->buf_hdr[i] = cpu_to_be32(p->page_size); > + prepare_next_iov(p, p->pages->block->host + p->pages->offset[i], > + p->page_size); > + buf += p->page_size; > + } > + } > +out: > + p->flags |= MULTIFD_FLAG_UADK; > + multifd_send_fill_packet(p); > + return 0; > } > > /** > @@ -206,7 +265,76 @@ static void multifd_uadk_recv_cleanup(MultiFDRecvParams *p) > */ > static int multifd_uadk_recv(MultiFDRecvParams *p, Error **errp) > { > - return -1; > + struct wd_data *uadk_data = p->compress_data; > + uint32_t in_size = p->next_packet_size; > + uint32_t flags = p->flags & MULTIFD_FLAG_COMPRESSION_MASK; > + uint32_t hdr_len = p->normal_num * sizeof(uint32_t); > + uint32_t data_len = 0; > + uint8_t *buf = uadk_data->buf; > + int ret = 0; > + > + if (flags != MULTIFD_FLAG_UADK) { > + error_setg(errp, "multifd %u: flags received %x flags expected %x", > + p->id, flags, MULTIFD_FLAG_ZLIB); > + return -1; > + } > + > + multifd_recv_zero_page_process(p); > + if (!p->normal_num) { > + assert(in_size == 0); > + return 0; > + } > + > + /* read compressed data lengths */ > + assert(hdr_len < in_size); > + ret = qio_channel_read_all(p->c, (void *) uadk_data->buf_hdr, > + hdr_len, errp); > + if (ret != 0) { > + return ret; > + } > + > + for (int i = 0; i < p->normal_num; i++) { > + uadk_data->buf_hdr[i] = be32_to_cpu(uadk_data->buf_hdr[i]); > + data_len += uadk_data->buf_hdr[i]; > + assert(uadk_data->buf_hdr[i] <= p->page_size); > + } > + > + /* read compressed data */ > + assert(in_size == hdr_len + data_len); > + ret = qio_channel_read_all(p->c, (void *)buf, data_len, errp); > + if (ret != 0) { > + return ret; > + } > + > + for (int i = 0; i < p->normal_num; i++) { > + struct wd_comp_req creq = { > + .op_type = WD_DIR_DECOMPRESS, > + .src = buf, > + .src_len = uadk_data->buf_hdr[i], > + .dst = p->host + p->normal[i], > + .dst_len = p->page_size, > + }; > + > + if (uadk_data->buf_hdr[i] == p->page_size) { > + memcpy(p->host + p->normal[i], buf, p->page_size); > + buf += p->page_size; > + continue; > + } > + > + ret = wd_do_comp_sync(uadk_data->handle, &creq); > + if (ret || creq.status) { > + error_setg(errp, "multifd %u: failed wd_do_comp_sync, ret %d status %d", > + p->id, ret, creq.status); It would be nice to be able to tell compression from decompression in these error messages. > + return -1; > + } > + if (creq.dst_len != p->page_size) { > + error_setg(errp, "multifd %u: decompressed length error", p->id); > + return -1; > + } > + buf += uadk_data->buf_hdr[i]; > + } > + > + return 0; > } > > static MultiFDMethods multifd_uadk_ops = {