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 X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80D39C282CE for ; Wed, 22 May 2019 12:23:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5A1A42173C for ; Wed, 22 May 2019 12:23:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A1A42173C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:42524 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTQHZ-0001sj-Gh for qemu-devel@archiver.kernel.org; Wed, 22 May 2019 08:23:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54464) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTQGJ-0001E4-BN for qemu-devel@nongnu.org; Wed, 22 May 2019 08:22:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTQGI-0007fu-0m for qemu-devel@nongnu.org; Wed, 22 May 2019 08:22:27 -0400 Received: from 2.mo2.mail-out.ovh.net ([188.165.53.149]:36013) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hTQGH-0007eD-Nm for qemu-devel@nongnu.org; Wed, 22 May 2019 08:22:25 -0400 Received: from player738.ha.ovh.net (unknown [10.108.42.145]) by mo2.mail-out.ovh.net (Postfix) with ESMTP id C45F319BE2B for ; Wed, 22 May 2019 14:22:22 +0200 (CEST) Received: from kaod.org (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player738.ha.ovh.net (Postfix) with ESMTPSA id 9A64A629D81A; Wed, 22 May 2019 12:22:16 +0000 (UTC) Date: Wed, 22 May 2019 14:22:14 +0200 From: Greg Kurz To: David Gibson Message-ID: <20190522142214.01c3109c@bahia.lan> In-Reply-To: <20190522111035.GI30423@umbus.fritz.box> References: <20190522044600.16534-1-david@gibson.dropbear.id.au> <20190522044600.16534-22-david@gibson.dropbear.id.au> <20190522095829.7b688f35@bahia.lan> <20190522111035.GI30423@umbus.fritz.box> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/VvHN5pJ2jsZ_285MaRJ==G/"; protocol="application/pgp-signature" X-Ovh-Tracer-Id: 4539065474934086118 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeduuddrudduvddgheduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 188.165.53.149 Subject: Re: [Qemu-devel] [PULL 21/38] spapr: Add forgotten capability to migration stream X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, peter.maydell@linaro.org, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, clg@kaod.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --Sig_/VvHN5pJ2jsZ_285MaRJ==G/ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Wed, 22 May 2019 21:10:35 +1000 David Gibson wrote: > On Wed, May 22, 2019 at 09:58:29AM +0200, Greg Kurz wrote: > > On Wed, 22 May 2019 14:45:43 +1000 > > David Gibson wrote: > > =20 > > > spapr machine capabilities are supposed to be sent in the migration s= tream > > > so that we can sanity check the source and destination have compatible > > > configuration. Unfortunately, when we added the hpt-max-page-size > > > capability, we forgot to add it to the migration state. This means t= hat we > > > can generate spurious warnings when both ends are configured for large > > > pages, or potentially fail to warn if the source is configured for hu= ge > > > pages, but the destination is not. > > >=20 > > > Fixes: 2309832afda "spapr: Maximum (HPT) pagesize property" > > >=20 > > > Signed-off-by: David Gibson > > > Reviewed-by: C=C3=A9dric Le Goater > > > --- =20 > >=20 > > Huh... we discussed that it was breaking backward migration: > >=20 > > https://lists.gnu.org/archive/html/qemu-ppc/2019-05/msg00330.html > >=20 > > So I'm a bit surprised to see this in the PR... is it intentional ? =20 >=20 > Sod, no, I forgot to remove it from my tree. >=20 > Having been through the test cycle, I'd prefer not to hold up the PR > for this - as long as we fix it before the release we should be ok. >=20 Fair enough, I'll re-post my fix proposal in a proper patch ASAP. > > =20 > > > hw/ppc/spapr.c | 1 + > > > hw/ppc/spapr_caps.c | 1 + > > > include/hw/ppc/spapr.h | 1 + > > > 3 files changed, 3 insertions(+) > > >=20 > > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > > > index 8580a8dc67..bcae30ad26 100644 > > > --- a/hw/ppc/spapr.c > > > +++ b/hw/ppc/spapr.c > > > @@ -2125,6 +2125,7 @@ static const VMStateDescription vmstate_spapr = =3D { > > > &vmstate_spapr_cap_cfpc, > > > &vmstate_spapr_cap_sbbc, > > > &vmstate_spapr_cap_ibs, > > > + &vmstate_spapr_cap_hpt_maxpagesize, > > > &vmstate_spapr_irq_map, > > > &vmstate_spapr_cap_nested_kvm_hv, > > > &vmstate_spapr_dtb, > > > diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c > > > index 9b1c10baa6..658eb15a14 100644 > > > --- a/hw/ppc/spapr_caps.c > > > +++ b/hw/ppc/spapr_caps.c > > > @@ -703,6 +703,7 @@ SPAPR_CAP_MIG_STATE(dfp, SPAPR_CAP_DFP); > > > SPAPR_CAP_MIG_STATE(cfpc, SPAPR_CAP_CFPC); > > > SPAPR_CAP_MIG_STATE(sbbc, SPAPR_CAP_SBBC); > > > SPAPR_CAP_MIG_STATE(ibs, SPAPR_CAP_IBS); > > > +SPAPR_CAP_MIG_STATE(hpt_maxpagesize, SPAPR_CAP_HPT_MAXPAGESIZE); > > > SPAPR_CAP_MIG_STATE(nested_kvm_hv, SPAPR_CAP_NESTED_KVM_HV); > > > SPAPR_CAP_MIG_STATE(large_decr, SPAPR_CAP_LARGE_DECREMENTER); > > > SPAPR_CAP_MIG_STATE(ccf_assist, SPAPR_CAP_CCF_ASSIST); > > > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > > > index 7e32f309c2..9fc91c8f5e 100644 > > > --- a/include/hw/ppc/spapr.h > > > +++ b/include/hw/ppc/spapr.h > > > @@ -849,6 +849,7 @@ extern const VMStateDescription vmstate_spapr_cap= _dfp; > > > extern const VMStateDescription vmstate_spapr_cap_cfpc; > > > extern const VMStateDescription vmstate_spapr_cap_sbbc; > > > extern const VMStateDescription vmstate_spapr_cap_ibs; > > > +extern const VMStateDescription vmstate_spapr_cap_hpt_maxpagesize; > > > extern const VMStateDescription vmstate_spapr_cap_nested_kvm_hv; > > > extern const VMStateDescription vmstate_spapr_cap_large_decr; > > > extern const VMStateDescription vmstate_spapr_cap_ccf_assist; =20 > > =20 >=20 --Sig_/VvHN5pJ2jsZ_285MaRJ==G/ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEtIKLr5QxQM7yo0kQcdTV5YIvc9YFAlzlPvYACgkQcdTV5YIv c9YUwRAAmkOYCYvK+q4dgEx/NUUhdZu8uBTnfY5RFODXVvbcVpMoeoI97tFMbZiw sEyioZdSqnU6zIOwH60bXDpM2K+GY7aaoZkWG9Ed4js8GxgZ2dpNh4Bq+jVhiwQH 59Ca/QtMA7/Bhb7MfDdoN37GKNMucDb4sLqJnZOoFJMxMF4jfIQ5HnF/bwIllROa RaZoRuG6VnrTgIrHOth5D6A3BD3bgq5mbWuP/q3yj5w5AewekpHLDQHVnBsOZS6c 0XnbW8Nk61+K7Ybo6lSVVVDI7xbTzY1IgOoVSf3hkVIw9D/hx61XNWP6N3hPcy+3 grfFOXX0eJk2EWO7XVW4VK1R4BQbft5ps00spVEAxmLMo/yi3Opim9WxlTpVn40T bGGZu/1oSULTxfbz/1vkq8jXL3FrFHcPlIJssLWmiUXLL/TOkfws3tnO0jpLH+Za 1TASvLbRYAMvXUB3weolcwJbZopKcahauQLv69898cyYvr4sz3XOlqniBJcODtiU VloqNySdZ+ub5UjYuKM+bPioplB1qU5L5nhUuAgbKD7D2BfiXfCxjfKfNZtCmcnT bKQT/YULOBsZ4Ppzz+tgfGmpjFyecSLKY/VowqkRTHYi5TeeTtiVaiQ4zDEJjJPu MMdCuRnLlFOxZct85XpuOUF88fRbu8UC1onUjpu9ZbA7zmT9EZg= =518L -----END PGP SIGNATURE----- --Sig_/VvHN5pJ2jsZ_285MaRJ==G/--