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 A1D28C433EF for ; Tue, 23 Nov 2021 18:01:09 +0000 (UTC) Received: from localhost ([::1]:41932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpa6O-0001Nm-JH for qemu-devel@archiver.kernel.org; Tue, 23 Nov 2021 13:01:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpZxH-0006f1-5T for qemu-devel@nongnu.org; Tue, 23 Nov 2021 12:51:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:21538) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpZx8-0006rV-SV for qemu-devel@nongnu.org; Tue, 23 Nov 2021 12:51:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637689893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OOPs/N6btQ9utuN8+Y/Y/kSvzMd2iTMlpcachHpy1kQ=; b=b0kcxcHZjo54AtncVTxDPyjcIgswcvSFLSItiyB8esN9m0P5O/FVT8vhlX7W4X4QKfs86k G0yTJjGWKDWt0i67RGl1zh06XDKqRNow0fY7sVDgaZ/z2m0DFnW2TPZb2HFanNc3aAtAbU PxWF0KnxqKLTSJ8MTSExR+kzFYijdAs= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-219-LLEqr5UnMNOnrfVmnr_n0Q-1; Tue, 23 Nov 2021 12:51:32 -0500 X-MC-Unique: LLEqr5UnMNOnrfVmnr_n0Q-1 Received: by mail-wm1-f71.google.com with SMTP id g80-20020a1c2053000000b003331a764709so1582288wmg.2 for ; Tue, 23 Nov 2021 09:51:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OOPs/N6btQ9utuN8+Y/Y/kSvzMd2iTMlpcachHpy1kQ=; b=R5WfYi7/0KqFDe4QyL5MTV1us7Pb0TqaxKwK8QxmoOurJb58Ga6nLdAlCV9pKut2ar hGixvG3BG2YeyOSrRpj9A/H6Hl3iv3KwoF2jotZJVD++UFqj6qcxJPc9CM3X47NFyxqA httpsy6ici4ZJb8VRNNI125qhChDhckCDy6pYt1SrCNmPJKgLLV2CTIt/i5wZNt92L3B l3qD3JyEY4uTTP2t1iJTrPJbGs9w9hOTFfkhjT2YmGrN1l3JyOnfyxTbEirgg1iqGBs/ UMl6pS1wDRKnhcw0GwWkLSzqSx9dNb5aT1zs92V1QmFd5AFoAxyvKXVtvaldzw97KSh5 tbhQ== X-Gm-Message-State: AOAM5330kRiHzScQEYKFrXzxv05NAh/XXjH8N9bOL/dxM+NhkpwahMdq Q7WlvyWtPm68SWqf4s11Xi20IkF4zZ8v0Ub28AmSECsQcPTX72XDNly4vSSwuglA+pc4d/BleV3 jz75zSZSRGyTtp6IPHCR8FoT0hRWrvwuebIpM5nCz3M4k8KpdEiIIlHmOyZFfCD5dn34= X-Received: by 2002:adf:f60e:: with SMTP id t14mr9279111wrp.112.1637689890493; Tue, 23 Nov 2021 09:51:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJy0EDvm0E8Q0WqBm/9L/bKsl91cLNlg7nMTUseSToz0JwGJrv5Ji4tdljm6SHdfa/HHZzVxzw== X-Received: by 2002:adf:f60e:: with SMTP id t14mr9279068wrp.112.1637689890217; Tue, 23 Nov 2021 09:51:30 -0800 (PST) Received: from localhost (static-233-86-86-188.ipcom.comunitel.net. [188.86.86.233]) by smtp.gmail.com with ESMTPSA id j11sm12631023wrt.3.2021.11.23.09.51.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Nov 2021 09:51:29 -0800 (PST) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH 10/23] multifd: Make zlib compression method not use iovs Date: Tue, 23 Nov 2021 18:51:00 +0100 Message-Id: <20211123175113.35569-11-quintela@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211123175113.35569-1-quintela@redhat.com> References: <20211123175113.35569-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Juan Quintela --- migration/multifd-zlib.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c index e85ef8824d..da6201704c 100644 --- a/migration/multifd-zlib.c +++ b/migration/multifd-zlib.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include #include "qemu/rcu.h" +#include "exec/ramblock.h" #include "exec/target_page.h" #include "qapi/error.h" #include "migration.h" @@ -98,8 +99,8 @@ static void zlib_send_cleanup(MultiFDSendParams *p, Error **errp) */ static int zlib_send_prepare(MultiFDSendParams *p, Error **errp) { - struct iovec *iov = p->pages->iov; struct zlib_data *z = p->data; + size_t page_size = qemu_target_page_size(); z_stream *zs = &z->zs; uint32_t out_size = 0; int ret; @@ -113,8 +114,8 @@ static int zlib_send_prepare(MultiFDSendParams *p, Error **errp) flush = Z_SYNC_FLUSH; } - zs->avail_in = iov[i].iov_len; - zs->next_in = iov[i].iov_base; + zs->avail_in = page_size; + zs->next_in = p->pages->block->host + p->pages->offset[i]; zs->avail_out = available; zs->next_out = z->zbuff + out_size; @@ -235,6 +236,7 @@ static void zlib_recv_cleanup(MultiFDRecvParams *p) static int zlib_recv_pages(MultiFDRecvParams *p, Error **errp) { struct zlib_data *z = p->data; + size_t page_size = qemu_target_page_size(); z_stream *zs = &z->zs; uint32_t in_size = p->next_packet_size; /* we measure the change of total_out */ @@ -259,7 +261,6 @@ static int zlib_recv_pages(MultiFDRecvParams *p, Error **errp) zs->next_in = z->zbuff; for (i = 0; i < p->pages->num; i++) { - struct iovec *iov = &p->pages->iov[i]; int flush = Z_NO_FLUSH; unsigned long start = zs->total_out; @@ -267,8 +268,8 @@ static int zlib_recv_pages(MultiFDRecvParams *p, Error **errp) flush = Z_SYNC_FLUSH; } - zs->avail_out = iov->iov_len; - zs->next_out = iov->iov_base; + zs->avail_out = page_size; + zs->next_out = p->pages->block->host + p->pages->offset[i]; /* * Welcome to inflate semantics @@ -281,8 +282,8 @@ static int zlib_recv_pages(MultiFDRecvParams *p, Error **errp) do { ret = inflate(zs, flush); } while (ret == Z_OK && zs->avail_in - && (zs->total_out - start) < iov->iov_len); - if (ret == Z_OK && (zs->total_out - start) < iov->iov_len) { + && (zs->total_out - start) < page_size); + if (ret == Z_OK && (zs->total_out - start) < page_size) { error_setg(errp, "multifd %d: inflate generated too few output", p->id); return -1; -- 2.33.1