From nobody Mon Nov 25 08:34:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1716976034; cv=none; d=zohomail.com; s=zohoarc; b=m//KzwN5c8uwktQIeLTrbyvO1b8WwYWs2qWQ5FE0BhXNB8wLCcmKkjepXuoM2hpPyEFXSvIoxcvJvMvtiBmAcPefeTHIvq8LX8Ios8198KMeb3vn2inDPVAzovfNYlGuuHcpVyI/+3TJcmsmuJXDqTvqCf7onSt4PznlSpLVoUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1716976034; h=Content-Type: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:Sender:Subject:Subject:To:To:Message-Id; bh=fEqCj/7uFvDSlNKkLtYBBobplhM05S4BZHqCXIziFG4=; b=MsSpBPtnrRBbFA70OWl4IXTOrPDEMWVQ/UW1gONHsZGx4AGjsXQ+s15gLx/zZYST+esusuyIZphdMSEDIxCaAPP+6WEf5Q4m0k2GdG5j2q/uQzz6sVAF7jGpx2nqIyHqZ99Ealg64TSXoiWTeO/v//g/xhjbPr1zmyp99OZgCqc= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1716976034629865.3925720813888; Wed, 29 May 2024 02:47:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCFsY-0005Or-1l; Wed, 29 May 2024 05:45:54 -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 1sCFsU-0005J6-Dk for qemu-devel@nongnu.org; Wed, 29 May 2024 05:45:51 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sCFsS-0000Un-K5 for qemu-devel@nongnu.org; Wed, 29 May 2024 05:45:50 -0400 Received: from mail.maildlp.com (unknown [172.18.186.216]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4Vq4CK4jhZz6K6lW; Wed, 29 May 2024 17:41:33 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id E76D6140D26; Wed, 29 May 2024 17:45:46 +0800 (CST) Received: from A2303104131.china.huawei.com (10.202.227.28) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Wed, 29 May 2024 10:45:41 +0100 To: , , CC: , , , , Subject: [PATCH 5/7] migration/multifd: Add UADK based compression and decompression Date: Wed, 29 May 2024 10:44:25 +0100 Message-ID: <20240529094435.11140-6-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20240529094435.11140-1-shameerali.kolothum.thodi@huawei.com> References: <20240529094435.11140-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.202.227.28] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To lhrpeml500005.china.huawei.com (7.191.163.240) 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=185.176.79.56; envelope-from=shameerali.kolothum.thodi@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Reply-to: Shameer Kolothum From: Shameer Kolothum via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1716976035870100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Uses UADK wd_do_comp_sync() API to (de)compress a normal page using hardware accelerator. Signed-off-by: Shameer Kolothum 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(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 * @@ -153,7 +163,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 to take care of -ve compressi= on */ + .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 wd_do_comp_sync, ret %d s= tatus %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 /** @@ -206,7 +265,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 wd_do_comp_sync, ret %d s= tatus %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.17.1