From nobody Mon Nov 25 07:35:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1717507287; cv=none; d=zohomail.com; s=zohoarc; b=h5tcd4xcMfV2pAJiDW7R7v1tmqE7UXqPcInkJRxgD1fEmEpLUmOH3v+jfUWubjsTcWNM1VzOzm1YOEv+STS/ElOohO0unNNDnpyHLdFiky2KHtp9Ry2mYI6Q2sRd7lk6tzsUX1cBMUw521yZ3dUGRPzC9G4exjCbtUkWqURgLms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717507287; 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=MMXvaGYani7A97L21UFQAMf2URIKu2Meh9m+Z9UYcq0=; b=eYvZEX7jV4kvaez0t2g3r6w3sMT5RxWI6qrzpAovkPCMVN9SrkVZdiSmvm3b6Wl0JsqPqnueA9AhfjKbSCO4u3ZQwHcdjCoBotmQOoqi3diogOtiJ1Th4P/1Hx8ZIIwtxLMNvPq/kSda+Dx3qma1oMbXTWddTGY6Ew2qCtemURU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.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 1717507287866921.4235965342618; Tue, 4 Jun 2024 06:21:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEU5w-0001je-UR; Tue, 04 Jun 2024 09:20:56 -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 1sEU5v-0001j7-Ex for qemu-devel@nongnu.org; Tue, 04 Jun 2024 09:20:55 -0400 Received: from mgamail.intel.com ([192.198.163.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEU5s-0000a6-RY for qemu-devel@nongnu.org; Tue, 04 Jun 2024 09:20:55 -0400 Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jun 2024 06:20:51 -0700 Received: from sae-gw02.sh.intel.com (HELO localhost) ([10.239.45.110]) by fmviesa010.fm.intel.com with ESMTP; 04 Jun 2024 06:20:47 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717507253; x=1749043253; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ufN1NxQHDmf3MvXfley11lubXpfkb74YWqLeoINJ1Cw=; b=eU52exLThgiSVPSPjHRpdN9pptTFC6PaO1tU1ENa3N1uILBbuPEP7xf3 kn8ZsHe5QdeHpqxbidUybuudwM1Cg4xfkTHwByrTggeLDIHOSQpi1A/px 37F5c4PZPisOb6qrFTQSRYaTCr04hhxzLXMRkA6JMHwfFdurXpcoAX8HR f6VjCehmf7T3gh5Fp7/lHpbAoZ9/5sq+592NyLJuaEIlTjbXY+UIcQ38C uEwrDy0P6mVuTz+kqCOOGBGlT0NHs8AKbOhvj3/NtraZ/l4I7Ov8Mt+0v VUOKvHCSj6NFXj6M/tn+AgGkIk4YFZEuwhyaRtQilVDeD3u6FujfQQ/7A A==; X-CSE-ConnectionGUID: yxsapZEETOikHBU/Jra3TQ== X-CSE-MsgGUID: rV2zbT7FR6KG7Y3cMj7vSw== X-IronPort-AV: E=McAfee;i="6600,9927,11093"; a="17890688" X-IronPort-AV: E=Sophos;i="6.08,213,1712646000"; d="scan'208";a="17890688" X-CSE-ConnectionGUID: U6oIOGSkS+KlQNBlBOG8Fw== X-CSE-MsgGUID: /j25eATHSaKmqhsVj1oWSw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,213,1712646000"; d="scan'208";a="37315783" From: Yuan Liu To: peterx@redhat.com, farosas@suse.de, pbonzini@redhat.com, marcandre.lureau@redhat.com, berrange@redhat.com, thuth@redhat.com, philmd@linaro.org Cc: qemu-devel@nongnu.org, yuan1.liu@intel.com, nanhai.zou@intel.com, shameerali.kolothum.thodi@huawei.com Subject: [PATCH v7 6/7] migration/multifd: implement qpl compression and decompression Date: Mon, 3 Jun 2024 23:41:05 +0800 Message-ID: <20240603154106.764378-7-yuan1.liu@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240603154106.764378-1-yuan1.liu@intel.com> References: <20240603154106.764378-1-yuan1.liu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=192.198.163.12; envelope-from=yuan1.liu@intel.com; helo=mgamail.intel.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_12_24=1.049, DKIMWL_WL_HIGH=-0.001, 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 @intel.com) X-ZM-MESSAGEID: 1717507289229100003 Content-Type: text/plain; charset="utf-8" QPL compression and decompression will use IAA hardware first. If IAA hardware is not available, it will automatically fall back to QPL software path, if the software job also fails, the uncompressed page is sent directly. Signed-off-by: Yuan Liu Reviewed-by: Nanhai Zou --- migration/multifd-qpl.c | 412 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 408 insertions(+), 4 deletions(-) diff --git a/migration/multifd-qpl.c b/migration/multifd-qpl.c index 6791a204d5..18b3384bd5 100644 --- a/migration/multifd-qpl.c +++ b/migration/multifd-qpl.c @@ -13,9 +13,14 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qapi/error.h" +#include "qapi/qapi-types-migration.h" +#include "exec/ramblock.h" #include "multifd.h" #include "qpl/qpl.h" =20 +/* Maximum number of retries to resubmit a job if IAA work queues are full= */ +#define MAX_SUBMIT_RETRY_NUM (3) + typedef struct { /* the QPL hardware path job */ qpl_job *job; @@ -260,6 +265,219 @@ static void multifd_qpl_send_cleanup(MultiFDSendParam= s *p, Error **errp) p->iov =3D NULL; } =20 +/** + * multifd_qpl_prepare_job: prepare the job + * + * Set the QPL job parameters and properties. + * + * @job: pointer to the qpl_job structure + * @is_compression: indicates compression and decompression + * @input: pointer to the input data buffer + * @input_len: the length of the input data + * @output: pointer to the output data buffer + * @output_len: the length of the output data + */ +static void multifd_qpl_prepare_job(qpl_job *job, bool is_compression, + uint8_t *input, uint32_t input_len, + uint8_t *output, uint32_t output_len) +{ + job->op =3D is_compression ? qpl_op_compress : qpl_op_decompress; + job->next_in_ptr =3D input; + job->next_out_ptr =3D output; + job->available_in =3D input_len; + job->available_out =3D output_len; + job->flags =3D QPL_FLAG_FIRST | QPL_FLAG_LAST | QPL_FLAG_OMIT_VERIFY; + /* only supports compression level 1 */ + job->level =3D 1; +} + +/** + * multifd_qpl_prepare_job: prepare the compression job + * + * Set the compression job parameters and properties. + * + * @job: pointer to the qpl_job structure + * @input: pointer to the input data buffer + * @input_len: the length of the input data + * @output: pointer to the output data buffer + * @output_len: the length of the output data + */ +static void multifd_qpl_prepare_comp_job(qpl_job *job, uint8_t *input, + uint32_t input_len, uint8_t *outp= ut, + uint32_t output_len) +{ + multifd_qpl_prepare_job(job, true, input, input_len, output, output_le= n); +} + +/** + * multifd_qpl_prepare_job: prepare the decompression job + * + * Set the decompression job parameters and properties. + * + * @job: pointer to the qpl_job structure + * @input: pointer to the input data buffer + * @input_len: the length of the input data + * @output: pointer to the output data buffer + * @output_len: the length of the output data + */ +static void multifd_qpl_prepare_decomp_job(qpl_job *job, uint8_t *input, + uint32_t input_len, uint8_t *ou= tput, + uint32_t output_len) +{ + multifd_qpl_prepare_job(job, false, input, input_len, output, output_l= en); +} + +/** + * multifd_qpl_fill_iov: fill in the IOV + * + * Fill in the QPL packet IOV + * + * @p: Params for the channel being used + * @data: pointer to the IOV data + * @len: The length of the IOV data + */ +static void multifd_qpl_fill_iov(MultiFDSendParams *p, uint8_t *data, + uint32_t len) +{ + p->iov[p->iovs_num].iov_base =3D data; + p->iov[p->iovs_num].iov_len =3D len; + p->iovs_num++; + p->next_packet_size +=3D len; +} + +/** + * multifd_qpl_fill_packet: fill the compressed page into the QPL packet + * + * Fill the compressed page length and IOV into the QPL packet + * + * @idx: The index of the compressed length array + * @p: Params for the channel being used + * @data: pointer to the compressed page buffer + * @len: The length of the compressed page + */ +static void multifd_qpl_fill_packet(uint32_t idx, MultiFDSendParams *p, + uint8_t *data, uint32_t len) +{ + QplData *qpl =3D p->compress_data; + + qpl->zlen[idx] =3D cpu_to_be32(len); + multifd_qpl_fill_iov(p, data, len); +} + +/** + * multifd_qpl_submit_job: submit a job to the hardware + * + * Submit a QPL hardware job to the IAA device + * + * Returns true if the job is submitted successfully, otherwise false. + * + * @job: pointer to the qpl_job structure + */ +static bool multifd_qpl_submit_job(qpl_job *job) +{ + qpl_status status; + uint32_t num =3D 0; + +retry: + status =3D qpl_submit_job(job); + if (status =3D=3D QPL_STS_QUEUES_ARE_BUSY_ERR) { + if (num < MAX_SUBMIT_RETRY_NUM) { + num++; + goto retry; + } + } + return (status =3D=3D QPL_STS_OK); +} + +/** + * multifd_qpl_compress_pages_slow_path: compress pages using slow path + * + * Compress the pages using software. If compression fails, the page will + * be sent directly. + * + * @p: Params for the channel being used + */ +static void multifd_qpl_compress_pages_slow_path(MultiFDSendParams *p) +{ + QplData *qpl =3D p->compress_data; + uint32_t size =3D p->page_size; + qpl_job *job =3D qpl->sw_job; + uint8_t *zbuf =3D qpl->zbuf; + uint8_t *buf; + + for (int i =3D 0; i < p->pages->normal_num; i++) { + buf =3D p->pages->block->host + p->pages->offset[i]; + /* Set output length to less than the page to reduce decompression= */ + multifd_qpl_prepare_comp_job(job, buf, size, zbuf, size - 1); + if (qpl_execute_job(job) =3D=3D QPL_STS_OK) { + multifd_qpl_fill_packet(i, p, zbuf, job->total_out); + } else { + /* send the page directly */ + multifd_qpl_fill_packet(i, p, buf, size); + } + zbuf +=3D size; + } +} + +/** + * multifd_qpl_compress_pages: compress pages + * + * Submit the pages to the IAA hardware for compression. If hardware + * compression fails, it falls back to software compression. If software + * compression also fails, the page is sent directly + * + * @p: Params for the channel being used + */ +static void multifd_qpl_compress_pages(MultiFDSendParams *p) +{ + QplData *qpl =3D p->compress_data; + MultiFDPages_t *pages =3D p->pages; + uint32_t size =3D p->page_size; + QplHwJob *hw_job; + uint8_t *buf; + uint8_t *zbuf; + + for (int i =3D 0; i < pages->normal_num; i++) { + buf =3D pages->block->host + pages->offset[i]; + zbuf =3D qpl->zbuf + (size * i); + hw_job =3D &qpl->hw_jobs[i]; + /* Set output length to less than the page to reduce decompression= */ + multifd_qpl_prepare_comp_job(hw_job->job, buf, size, zbuf, size - = 1); + if (multifd_qpl_submit_job(hw_job->job)) { + hw_job->fallback_sw_path =3D false; + } else { + hw_job->fallback_sw_path =3D true; + /* Set output length less than page size to reduce decompressi= on */ + multifd_qpl_prepare_comp_job(qpl->sw_job, buf, size, zbuf, + size - 1); + if (qpl_execute_job(qpl->sw_job) =3D=3D QPL_STS_OK) { + hw_job->sw_output =3D zbuf; + hw_job->sw_output_len =3D qpl->sw_job->total_out; + } else { + hw_job->sw_output =3D buf; + hw_job->sw_output_len =3D size; + } + } + } + + for (int i =3D 0; i < pages->normal_num; i++) { + buf =3D pages->block->host + pages->offset[i]; + zbuf =3D qpl->zbuf + (size * i); + hw_job =3D &qpl->hw_jobs[i]; + if (hw_job->fallback_sw_path) { + multifd_qpl_fill_packet(i, p, hw_job->sw_output, + hw_job->sw_output_len); + continue; + } + if (qpl_wait_job(hw_job->job) =3D=3D QPL_STS_OK) { + multifd_qpl_fill_packet(i, p, zbuf, hw_job->job->total_out); + } else { + /* send the page directly */ + multifd_qpl_fill_packet(i, p, buf, size); + } + } +} + /** * multifd_qpl_send_prepare: prepare data to be able to send * @@ -273,8 +491,26 @@ static void multifd_qpl_send_cleanup(MultiFDSendParams= *p, Error **errp) */ static int multifd_qpl_send_prepare(MultiFDSendParams *p, Error **errp) { - /* Implement in next patch */ - return -1; + QplData *qpl =3D p->compress_data; + uint32_t len =3D 0; + + if (!multifd_send_prepare_common(p)) { + goto out; + } + + /* The first IOV is used to store the compressed page lengths */ + len =3D p->pages->normal_num * sizeof(uint32_t); + multifd_qpl_fill_iov(p, (uint8_t *) qpl->zlen, len); + if (qpl->hw_avail) { + multifd_qpl_compress_pages(p); + } else { + multifd_qpl_compress_pages_slow_path(p); + } + +out: + p->flags |=3D MULTIFD_FLAG_QPL; + multifd_send_fill_packet(p); + return 0; } =20 /** @@ -312,6 +548,134 @@ static void multifd_qpl_recv_cleanup(MultiFDRecvParam= s *p) p->compress_data =3D NULL; } =20 +/** + * multifd_qpl_process_and_check_job: process and check a QPL job + * + * Process the job and check whether the job output length is the + * same as the specified length + * + * Returns true if the job execution succeeded and the output length + * is equal to the specified length, otherwise false. + * + * @job: pointer to the qpl_job structure + * @is_hardware: indicates whether the job is a hardware job + * @len: Specified output length + * @errp: pointer to an error + */ +static bool multifd_qpl_process_and_check_job(qpl_job *job, bool is_hardwa= re, + uint32_t len, Error **errp) +{ + qpl_status status; + + status =3D (is_hardware ? qpl_wait_job(job) : qpl_execute_job(job)); + if (status !=3D QPL_STS_OK) { + error_setg(errp, "qpl_execute_job failed with error %d", status); + return false; + } + if (job->total_out !=3D len) { + error_setg(errp, "qpl decompressed len %u, expected len %u", + job->total_out, len); + return false; + } + return true; +} + +/** + * multifd_qpl_decompress_pages_slow_path: decompress pages using slow path + * + * Decompress the pages using software + * + * Returns 0 on success or -1 on error + * + * @p: Params for the channel being used + * @errp: pointer to an error + */ +static int multifd_qpl_decompress_pages_slow_path(MultiFDRecvParams *p, + Error **errp) +{ + QplData *qpl =3D p->compress_data; + uint32_t size =3D p->page_size; + qpl_job *job =3D qpl->sw_job; + uint8_t *zbuf =3D qpl->zbuf; + uint8_t *addr; + uint32_t len; + + for (int i =3D 0; i < p->normal_num; i++) { + len =3D qpl->zlen[i]; + addr =3D p->host + p->normal[i]; + /* the page is uncompressed, load it */ + if (len =3D=3D size) { + memcpy(addr, zbuf, size); + zbuf +=3D size; + continue; + } + multifd_qpl_prepare_decomp_job(job, zbuf, len, addr, size); + if (!multifd_qpl_process_and_check_job(job, false, size, errp)) { + return -1; + } + zbuf +=3D len; + } + return 0; +} + +/** + * multifd_qpl_decompress_pages: decompress pages + * + * Decompress the pages using the IAA hardware. If hardware + * decompression fails, it falls back to software decompression. + * + * Returns 0 on success or -1 on error + * + * @p: Params for the channel being used + * @errp: pointer to an error + */ +static int multifd_qpl_decompress_pages(MultiFDRecvParams *p, Error **errp) +{ + QplData *qpl =3D p->compress_data; + uint32_t size =3D p->page_size; + uint8_t *zbuf =3D qpl->zbuf; + uint8_t *addr; + uint32_t len; + qpl_job *job; + + for (int i =3D 0; i < p->normal_num; i++) { + addr =3D p->host + p->normal[i]; + len =3D qpl->zlen[i]; + /* the page is uncompressed if received length equals the page siz= e */ + if (len =3D=3D size) { + memcpy(addr, zbuf, size); + zbuf +=3D size; + continue; + } + + job =3D qpl->hw_jobs[i].job; + multifd_qpl_prepare_decomp_job(job, zbuf, len, addr, size); + if (multifd_qpl_submit_job(job)) { + qpl->hw_jobs[i].fallback_sw_path =3D false; + } else { + qpl->hw_jobs[i].fallback_sw_path =3D true; + job =3D qpl->sw_job; + multifd_qpl_prepare_decomp_job(job, zbuf, len, addr, size); + if (!multifd_qpl_process_and_check_job(job, false, size, errp)= ) { + return -1; + } + } + zbuf +=3D len; + } + + for (int i =3D 0; i < p->normal_num; i++) { + /* ignore pages that have already been processed */ + if (qpl->zlen[i] =3D=3D size || qpl->hw_jobs[i].fallback_sw_path) { + continue; + } + + job =3D qpl->hw_jobs[i].job; + if (!multifd_qpl_process_and_check_job(job, true, size, errp)) { + return -1; + } + } + return 0; +} /** * multifd_qpl_recv: read the data from the channel into actual pages * @@ -325,8 +689,48 @@ static void multifd_qpl_recv_cleanup(MultiFDRecvParams= *p) */ static int multifd_qpl_recv(MultiFDRecvParams *p, Error **errp) { - /* Implement in next patch */ - return -1; + QplData *qpl =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 len =3D 0; + uint32_t zbuf_len =3D 0; + int ret; + + if (flags !=3D MULTIFD_FLAG_QPL) { + error_setg(errp, "multifd %u: flags received %x flags expected %x", + p->id, flags, MULTIFD_FLAG_QPL); + return -1; + } + multifd_recv_zero_page_process(p); + if (!p->normal_num) { + assert(in_size =3D=3D 0); + return 0; + } + + /* read compressed page lengths */ + len =3D p->normal_num * sizeof(uint32_t); + assert(len < in_size); + ret =3D qio_channel_read_all(p->c, (void *) qpl->zlen, len, errp); + if (ret !=3D 0) { + return ret; + } + for (int i =3D 0; i < p->normal_num; i++) { + qpl->zlen[i] =3D be32_to_cpu(qpl->zlen[i]); + assert(qpl->zlen[i] <=3D p->page_size); + zbuf_len +=3D qpl->zlen[i]; + } + + /* read compressed pages */ + assert(in_size =3D=3D len + zbuf_len); + ret =3D qio_channel_read_all(p->c, (void *) qpl->zbuf, zbuf_len, errp); + if (ret !=3D 0) { + return ret; + } + + if (qpl->hw_avail) { + return multifd_qpl_decompress_pages(p, errp); + } + return multifd_qpl_decompress_pages_slow_path(p, errp); } =20 static MultiFDMethods multifd_qpl_ops =3D { --=20 2.43.0