From nobody Mon Nov 25 04:47:10 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1718385627; cv=none; d=zohomail.com; s=zohoarc; b=HzNfu2BzsCdDq1SO5fGV82jG/sw6tP+KqL9LyfA4/HgzkIDstcoP98h9ABhCZZv1yH2t+4pjGbntMmAFwpCFamxG1oAidxDAf2YgpgyMCE7EQ37UOHjQ6JvUKPOP/6fFYrSgdpTskzzNAMhl+S6X2neCBbzlgUPYqBFZHOxe3iU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718385627; 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=xiYfKzaoqYgWx2X7V35EUZ3Y/jAjSllIfrc0d1B/zZ0=; b=WaYyLvOsDBNnRWF5SoygDzMuVB1/Q4KgwuByRS4Gl0qpC5/64YMbnivF1B/GDJBbJaV6MNmOVAhy4+VHhk1sONtZkU+Nj0XQ+qF82srF6ri/FxYVTS3yYZPbobsXcgLJMqZXzyfpUSaSJhkl4e3sdDxRGIqV+8eGRpbEY0WkVI4= 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 1718385627944335.7241120265418; Fri, 14 Jun 2024 10:20:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sIAZa-0001Ba-2c; Fri, 14 Jun 2024 13:18:46 -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 1sIAZW-0001At-IM for qemu-devel@nongnu.org; Fri, 14 Jun 2024 13:18:43 -0400 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sIAZU-00048S-Ep for qemu-devel@nongnu.org; Fri, 14 Jun 2024 13:18:42 -0400 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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-out1.suse.de (Postfix) with ESMTPS id 0CC39227EA; Fri, 14 Jun 2024 17:18:39 +0000 (UTC) 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 6A14313AB1; Fri, 14 Jun 2024 17:18:37 +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 iEJCDG17bGaVAgAAD6G6ig (envelope-from ); Fri, 14 Jun 2024 17:18:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718385519; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xiYfKzaoqYgWx2X7V35EUZ3Y/jAjSllIfrc0d1B/zZ0=; b=bTJEz1v6aNPt38+BmX06Emra1hagcg3M1pvmK4mE89nrhxAINRWS/wItxRxcgK5la+6pTN 2yEgJU/1XcBUeYGzEbR/07sKaxqkPm8kZxmhJw25n60XN6tOVOu+spGjqBXskTLM8jCjPk p+pr42Gdh7gb0BI0c2ppEOsKbFtrlMM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718385519; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xiYfKzaoqYgWx2X7V35EUZ3Y/jAjSllIfrc0d1B/zZ0=; b=OLYmx9lum2Alouxkiz1VJrXR/emxR4cyDSqWMFWRe0wkd6vD3kayI0lhHxgLhQFxdKTFBh 5Iy6e3/ErQQ6XnAw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=bTJEz1v6; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=OLYmx9lu DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718385519; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xiYfKzaoqYgWx2X7V35EUZ3Y/jAjSllIfrc0d1B/zZ0=; b=bTJEz1v6aNPt38+BmX06Emra1hagcg3M1pvmK4mE89nrhxAINRWS/wItxRxcgK5la+6pTN 2yEgJU/1XcBUeYGzEbR/07sKaxqkPm8kZxmhJw25n60XN6tOVOu+spGjqBXskTLM8jCjPk p+pr42Gdh7gb0BI0c2ppEOsKbFtrlMM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718385519; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xiYfKzaoqYgWx2X7V35EUZ3Y/jAjSllIfrc0d1B/zZ0=; b=OLYmx9lum2Alouxkiz1VJrXR/emxR4cyDSqWMFWRe0wkd6vD3kayI0lhHxgLhQFxdKTFBh 5Iy6e3/ErQQ6XnAw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Richard Henderson , Shameer Kolothum , Zhangfei Gao Subject: [PULL 16/18] migration/multifd: Add UADK based compression and decompression Date: Fri, 14 Jun 2024 14:18:00 -0300 Message-Id: <20240614171802.28451-17-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240614171802.28451-1-farosas@suse.de> References: <20240614171802.28451-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 0CC39227EA X-Spam-Score: -3.01 X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; MIME_TRACE(0.00)[0:+]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_DN_SOME(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; ARC_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DWL_DNSWL_BLOCKED(0.00)[suse.de:dkim]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCPT_COUNT_FIVE(0.00)[5]; DBL_BLOCKED_OPENRESOLVER(0.00)[linaro.org:email,suse.de:email,suse.de:dkim] X-Rspamd-Action: no action X-Rspamd-Server: rspamd1.dmz-prg2.suse.org 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=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1718385628674100003 Content-Type: text/plain; charset="utf-8" From: Shameer Kolothum Uses UADK wd_do_comp_sync() API to (de)compress a normal page using hardware accelerator. Reviewed-by: Fabiano Rosas Signed-off-by: Shameer Kolothum Reviewed-by: Zhangfei Gao Signed-off-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 535411a405..70bba92eaa 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" @@ -142,6 +143,15 @@ static void multifd_uadk_send_cleanup(MultiFDSendParam= s *p, Error **errp) p->compress_data =3D NULL; } =20 +static inline void prepare_next_iov(MultiFDSendParams *p, void *base, + uint32_t len) +{ + p->iov[p->iovs_num].iov_base =3D (uint8_t *)base; + p->iov[p->iovs_num].iov_len =3D len; + p->next_packet_size +=3D len; + p->iovs_num++; +} + /** * multifd_uadk_send_prepare: prepare data to be able to send * @@ -155,7 +165,56 @@ static void multifd_uadk_send_cleanup(MultiFDSendParam= s *p, Error **errp) */ static int multifd_uadk_send_prepare(MultiFDSendParams *p, Error **errp) { - return -1; + struct wd_data *uadk_data =3D p->compress_data; + uint32_t hdr_size; + uint8_t *buf =3D uadk_data->buf; + int ret =3D 0; + + if (!multifd_send_prepare_common(p)) { + goto out; + } + + hdr_size =3D 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 =3D 0; i < p->pages->normal_num; i++) { + struct wd_comp_req creq =3D { + .op_type =3D WD_DIR_COMPRESS, + .src =3D p->pages->block->host + p->pages->offset[i], + .src_len =3D p->page_size, + .dst =3D buf, + /* Set dst_len to double the src in case compressed out >=3D p= age_size */ + .dst_len =3D p->page_size * 2, + }; + + ret =3D wd_do_comp_sync(uadk_data->handle, &creq); + if (ret || creq.status) { + error_setg(errp, "multifd %u: failed compression, ret %d statu= s %d", + p->id, ret, creq.status); + return -1; + } + if (creq.dst_len < p->page_size) { + uadk_data->buf_hdr[i] =3D cpu_to_be32(creq.dst_len); + prepare_next_iov(p, buf, creq.dst_len); + buf +=3D creq.dst_len; + } else { + /* + * Send raw data if compressed out >=3D page_size. We might be= better + * off sending raw data if output is slightly less than page_s= ize + * as well because at the receive end we can skip the decompre= ssion. + * But it is tricky to find the right number here. + */ + uadk_data->buf_hdr[i] =3D cpu_to_be32(p->page_size); + prepare_next_iov(p, p->pages->block->host + p->pages->offset[i= ], + p->page_size); + buf +=3D p->page_size; + } + } +out: + p->flags |=3D MULTIFD_FLAG_UADK; + multifd_send_fill_packet(p); + return 0; } =20 /** @@ -208,7 +267,76 @@ static void multifd_uadk_recv_cleanup(MultiFDRecvParam= s *p) */ static int multifd_uadk_recv(MultiFDRecvParams *p, Error **errp) { - return -1; + struct wd_data *uadk_data =3D p->compress_data; + uint32_t in_size =3D p->next_packet_size; + uint32_t flags =3D p->flags & MULTIFD_FLAG_COMPRESSION_MASK; + uint32_t hdr_len =3D p->normal_num * sizeof(uint32_t); + uint32_t data_len =3D 0; + uint8_t *buf =3D uadk_data->buf; + int ret =3D 0; + + if (flags !=3D 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 =3D=3D 0); + return 0; + } + + /* read compressed data lengths */ + assert(hdr_len < in_size); + ret =3D qio_channel_read_all(p->c, (void *) uadk_data->buf_hdr, + hdr_len, errp); + if (ret !=3D 0) { + return ret; + } + + for (int i =3D 0; i < p->normal_num; i++) { + uadk_data->buf_hdr[i] =3D be32_to_cpu(uadk_data->buf_hdr[i]); + data_len +=3D uadk_data->buf_hdr[i]; + assert(uadk_data->buf_hdr[i] <=3D p->page_size); + } + + /* read compressed data */ + assert(in_size =3D=3D hdr_len + data_len); + ret =3D qio_channel_read_all(p->c, (void *)buf, data_len, errp); + if (ret !=3D 0) { + return ret; + } + + for (int i =3D 0; i < p->normal_num; i++) { + struct wd_comp_req creq =3D { + .op_type =3D WD_DIR_DECOMPRESS, + .src =3D buf, + .src_len =3D uadk_data->buf_hdr[i], + .dst =3D p->host + p->normal[i], + .dst_len =3D p->page_size, + }; + + if (uadk_data->buf_hdr[i] =3D=3D p->page_size) { + memcpy(p->host + p->normal[i], buf, p->page_size); + buf +=3D p->page_size; + continue; + } + + ret =3D wd_do_comp_sync(uadk_data->handle, &creq); + if (ret || creq.status) { + error_setg(errp, "multifd %u: failed decompression, ret %d sta= tus %d", + p->id, ret, creq.status); + return -1; + } + if (creq.dst_len !=3D p->page_size) { + error_setg(errp, "multifd %u: decompressed length error", p->i= d); + return -1; + } + buf +=3D uadk_data->buf_hdr[i]; + } + + return 0; } =20 static MultiFDMethods multifd_uadk_ops =3D { --=20 2.35.3