From patchwork Mon Dec 16 11:08:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 181694 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp4177200och; Mon, 16 Dec 2019 03:29:51 -0800 (PST) X-Google-Smtp-Source: APXvYqzz2HB2WxkRDJLMjpKrbxtU54Srh+fsFgiPJ4gPA83QUSMy/gpir8BmAQaDchD9z6ZDH0NF X-Received: by 2002:a05:6830:1415:: with SMTP id v21mr32610117otp.188.1576495790982; Mon, 16 Dec 2019 03:29:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576495790; cv=none; d=google.com; s=arc-20160816; b=Pk9FqUVE6atgf1RHnKkapfZ14v03ZnSNG3YpNbZ821mRsY7e/ATALepV4xhQ5Bw1oY 3BzI+OWSd6JjDa0Fej/7WxT67dmCsgf3m0E3jHYfU0tEd9rOIf3Jh/nOvldJS0vi8jVb OrDnDRQ/Y1mAqxTOAqz+VeTQM4bLhD9mJNxP7gTW61SpUDLsSPsIjTpHLgzI/Gquuq9x 7As+02UjMZEV4yXtqtFPx8bkXZR2js/Yrh8x6R+qpKxNe50prRQBw9OyAriLVabsIXOP Udf1LmSEXYitw8i6/EWaGC0f8J78Em5kajodcXsbCG3mG7tEzolW8grr25pXDDKx7pd5 M8wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=kiznhuvKz4jfIKm/7fpiveKPXoY6Nj6u7zhRBMk1ww0=; b=UzbGbH0KMXsxFIpdtjSYRLMy4Yl58JHoivHMqpwXxBmyxIpISVa0rT240kay14Zv6i gtFilnbqsMehENEPI9PZd7Uuv2VaiigRueLEHzkhS6uv0uMVVhSXBYb92mfVk7u9xFVn LQZfIJl+MEPpIthg3RzEVrLnZ9hzvPGmoZn/uXczKh+Bdb/VlHf87Zg0nM/hF/8V/sqQ UTSSGIps7itu6YY68TcKEXCNhxQU6BlvhB9b1Nm9fE30hbjlYSHu9ezQXX43FZ1eBhf2 FLzfiG2mI9kV5enVYpHytK3shn808+e4diSgCXn1XxRK7n6wfMCmoknSAi8iZNamXkPV Ga3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jyhMQ+kX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g62si10592411oia.57.2019.12.16.03.29.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Dec 2019 03:29:50 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jyhMQ+kX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igoZS-0000i7-5c for patch@linaro.org; Mon, 16 Dec 2019 06:29:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51222) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igoFz-00087T-3P for qemu-devel@nongnu.org; Mon, 16 Dec 2019 06:09:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igoFy-0000Dz-02 for qemu-devel@nongnu.org; Mon, 16 Dec 2019 06:09:42 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:47051) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1igoFx-0000Ax-OA for qemu-devel@nongnu.org; Mon, 16 Dec 2019 06:09:41 -0500 Received: by mail-wr1-x433.google.com with SMTP id z7so6675108wrl.13 for ; Mon, 16 Dec 2019 03:09:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=kiznhuvKz4jfIKm/7fpiveKPXoY6Nj6u7zhRBMk1ww0=; b=jyhMQ+kXhJwCl7jlcf4vSMmzMKHXjoZe9RoDRxsO6VMmvBwcEQuG8QMzoLNsnJBsDB 9QSoNvUeba/BCASgJBkRhfA0HacXKLKDsGMe3T3UcFpReDktkSpYedl4U7s9oaN5z/Oc 10NBytX9CMfE2Pso225fcCfFN4VPg4ZHYaT4pqK/CWM2NGbwEuw94gpkkS6ynFVIoeI5 OVM25fRGqbQlfTJkK4qQT2GJkDqV+h3FhstVfVaUtbGedZZ2Jo/Lo9qYU93F448eIFNo zeQIPdR9WpSFSOfuew/Mz0goCba1JmYkWEEpAY1xroyPF/YkBID+wpiw4vHRbr0rd062 B7qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kiznhuvKz4jfIKm/7fpiveKPXoY6Nj6u7zhRBMk1ww0=; b=rp3YLZaTPu7K3Ml8qR0lsbRcV71A6RtIEFdtPBL9J49fSU3xr4ZfTX4Balw+bM3nua c3VBJt45i7/pxVA6igDQy5DCDH3H2meEZrmk3b4VshGzD4ebxCW5AN5dzVhjE5NyFZqO 5opy3JuaZqHvIWyjtsSlBciCpNdnmUUBx6a6JQmEx6vjrENLt6sInf1Gn020xP78gcnD X/D/qsHHhqrnE8zSRH1jo+fRZNU2HWLE/+mGJy3ChCjx5x8V6RO1QWLELxHTJP/siDaV 6JqixJa8EgoivUWC+84CBAs3TbqR1z06Y9rofSirLo7AJ5dGzO5Buh4xIAY/ERwbIDLG ruIA== X-Gm-Message-State: APjAAAWUOvMp8qRZr422CDSBzMC110L3TBQU9mSuSzkYaQkBO8SsEiy4 Qy8V2hvZxiXmVPsDKrwWAEWaD7I8Q5PyXw== X-Received: by 2002:adf:de84:: with SMTP id w4mr28221776wrl.97.1576494577133; Mon, 16 Dec 2019 03:09:37 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id x10sm20976131wrp.58.2019.12.16.03.09.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2019 03:09:36 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 28/34] migration: ram: Switch to ram block writeback Date: Mon, 16 Dec 2019 11:08:58 +0000 Message-Id: <20191216110904.30815-29-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191216110904.30815-1-peter.maydell@linaro.org> References: <20191216110904.30815-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Beata Michalska Switch to ram block writeback for pmem migration. Signed-off-by: Beata Michalska Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée Acked-by: Dr. David Alan Gilbert Message-id: 20191121000843.24844-4-beata.michalska@linaro.org Signed-off-by: Peter Maydell --- migration/ram.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 2.20.1 diff --git a/migration/ram.c b/migration/ram.c index 5078f94490d..38070f1bb23 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -33,7 +33,6 @@ #include "qemu/bitops.h" #include "qemu/bitmap.h" #include "qemu/main-loop.h" -#include "qemu/pmem.h" #include "xbzrle.h" #include "ram.h" #include "migration.h" @@ -3981,9 +3980,7 @@ static int ram_load_cleanup(void *opaque) RAMBlock *rb; RAMBLOCK_FOREACH_NOT_IGNORED(rb) { - if (ramblock_is_pmem(rb)) { - pmem_persist(rb->host, rb->used_length); - } + qemu_ram_block_writeback(rb); } xbzrle_load_cleanup();