From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:906:cf90:b0:9bd:85f7:2662 with SMTP id um16csp785185ejb; Thu, 19 Oct 2023 13:50:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHorbT06bnDKkPgTWqDOsls+lj6vLa1+Gn6VxQyzcy6L+UkOa/4yl0YGN85icEHF2uwrG4G X-Received: by 2002:a05:620a:802:b0:778:8f29:5e68 with SMTP id s2-20020a05620a080200b007788f295e68mr3479147qks.26.1697748607844; Thu, 19 Oct 2023 13:50:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697748607; cv=none; d=google.com; s=arc-20160816; b=MtnG8cQDjkhw1BbRn/Hq6q8lmakeQK3nKYvw9VrCcpWRmQDizJ80Nqg9xSWox2dOr7 j1T+trQayo2qjBbCoM7Qstx8M8Ga2yIb0nkCXRy4FxDdk/ubk32D9b3oU5T1jv3nzhl8 oDD3ViMbglvqE1Kr9Vs/4Grb9Z+LUKkJsPRAD569xwrV7ZDDWx9hFs16485iX2cVJNp/ pq4n/8va7t/Bx10vVLU/e0HPfa7zfD7J6txVedhPuKU5GcsqAy8SZivw1JeFFdhRqISq F08EWBh3Xn9vZhhz0iLXOTXPNm3w3dsdPj/Tt9rKl+yKBA9Xd93Gn4mR5CG0ge9jCm6A AWCw== 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:subject:cc:to:from :date; bh=oAvj/VS8XzzMgXqW7+1v9dPcIhNXeZaAZluBxZhO6bU=; fh=AqS06bBI2fiG66EUFW2L1h7q+nGqVsFELILF2r+ow1A=; b=Jk2gbtj6o6s9dr2EVmCK/IMzSYE/c6I5jOzCjGV5yo8S+C/txhUGwphj5FN97D7hD+ ydLhiTqwOdAm9VdO1w8HKwYj3yzyKNeJ4/ho373qieB+FRTs/hrNIS8DA8VLWRn0wKqs CmNvhXtKSM7X98n5S3/YsMaWbTV0LjaDk8OoIdPLOLqRXMW8jQXVlS11kR/6tTgrFpWE y32l0X0GQ83PWQCiMh/c2cGhHVcM+7g6/O5Ghi8oLBJojoJhHpgPr8qKwDxWZ+q5Itgt tsVtnwxDan52z8fvW4iBXlkPJWzC7t0Hvd50jWhnetNe/oB8itqbZsnxf3dReV4i/91t YUCQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g21-20020a05620a40d500b0077429eb9588si213172qko.326.2023.10.19.13.50.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Oct 2023 13:50:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtZxs-0002gx-8Z; Thu, 19 Oct 2023 16:49: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 1qtZxp-0002fQ-R6 for qemu-devel@nongnu.org; Thu, 19 Oct 2023 16:49:53 -0400 Received: from 3.mo552.mail-out.ovh.net ([178.33.254.192]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtZxn-0004sv-6U for qemu-devel@nongnu.org; Thu, 19 Oct 2023 16:49:53 -0400 Received: from mxplan5.mail.ovh.net (unknown [10.109.156.124]) by mo552.mail-out.ovh.net (Postfix) with ESMTPS id 171E32C550; Thu, 19 Oct 2023 20:49:39 +0000 (UTC) Received: from kaod.org (37.59.142.110) by DAG6EX1.mxp5.local (172.16.2.51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Thu, 19 Oct 2023 22:49:37 +0200 Authentication-Results: garm.ovh; auth=pass (GARM-110S004e4e44197-2c7d-41ce-abad-59af31aa2463, 40A84FA1BFAB306571EA24E7D640879C68C08F1A) smtp.auth=groug@kaod.org X-OVh-ClientIp: 88.179.9.154 Date: Thu, 19 Oct 2023 22:49:35 +0200 From: Greg Kurz To: Juan Quintela CC: , Stefan Berger , Marcel Apfelbaum , , Nicholas Piggin , , Gerd Hoffmann , Corey Minyard , Samuel Thibault , Richard Henderson , David Hildenbrand , "Ilya Leoshkevich" , Fabiano Rosas , "Eric Farman" , Peter Xu , "Harsh Prateek Bora" , John Snow , , Mark Cave-Ayland , Christian Borntraeger , =?UTF-8?B?TWFyYy1BbmRy?= =?UTF-8?B?w6k=?= Lureau , Stefan Weil , , Jason Wang , Corey Minyard , Leonardo Bras , "Thomas Huth" , Peter Maydell , "Michael S. Tsirkin" , =?UTF-8?B?Q8OpZHJpYw==?= Le Goater , David Gibson , Halil Pasic , Daniel Henrique Barboza Subject: Re: [PATCH 07/13] RFC migration: icp/server is a mess Message-ID: <20231019224935.03232495@bahia> In-Reply-To: <20231019190831.20363-8-quintela@redhat.com> References: <20231019190831.20363-1-quintela@redhat.com> <20231019190831.20363-8-quintela@redhat.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [37.59.142.110] X-ClientProxiedBy: DAG6EX1.mxp5.local (172.16.2.51) To DAG6EX1.mxp5.local (172.16.2.51) X-Ovh-Tracer-GUID: b8ab38fa-49a4-4d46-b91e-e57b645b5a28 X-Ovh-Tracer-Id: 10836223656682035575 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrjeeigdduhedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhepfffhvfevuffkjghfofggtgfgihesthejfedtredtvdenucfhrhhomhepifhrvghgucfmuhhriicuoehgrhhouhhgsehkrghougdrohhrgheqnecuggftrfgrthhtvghrnheptefffeehgfegueetteeghfeufffhveeuudegtdefieeftdehveegvdduhfeggefgnecukfhppeduvdejrddtrddtrddupdefjedrheelrddugedvrdduuddtpdekkedrudejledrledrudehgeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehgrhhouhhgsehkrghougdrohhrgheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepqhhuihhnthgvlhgrsehrvgguhhgrthdrtghomhdpuggrvhhiugesghhisghsohhnrdgurhhophgsvggrrhdrihgurdgruhdpmhhsthesrhgvughhrghtrdgtohhmpdhpvghtvghrrdhmrgihuggvlhhlsehlihhnrghrohdrohhrghdpthhhuhhthhesrhgvughhrghtrdgtohhmpdhlvghosghrrghssehrvgguhhgrthdrtghomhdpmhhinhihrghrugesrggtmhdrohhrghdpjhgrshhofigrnhhgsehrvgguhhgrthdrtghomhdpqhgvmhhuqdgrrhhmsehnoh hnghhnuhdrohhrghdpshifseifvghilhhnvghtiidruggvpdhmrghrtggrnhgurhgvrdhluhhrvggruhesrhgvughhrghtrdgtohhmpdgsohhrnhhtrhgrvghgvghrsehlihhnuhigrdhisghmrdgtohhmpdhmrghrkhdrtggrvhgvqdgrhihlrghnugesihhlrghnuggvrdgtohdruhhkpdhqvghmuhdqsghlohgtkhesnhhonhhgnhhurdhorhhgpdhjshhnohifsehrvgguhhgrthdrtghomhdpphgrshhitgeslhhinhhugidrihgsmhdrtghomhdphhgrrhhshhhpsgeslhhinhhugidrihgsmhdrtghomhdpfhgrrhhmrghnsehlihhnuhigrdhisghmrdgtohhmpdhfrghrohhsrghssehsuhhsvgdruggvpdhiihhisehlihhnuhigrdhisghmrdgtohhmpdgurghvihgusehrvgguhhgrthdrtghomhdprhhitghhrghrugdrhhgvnhguvghrshhonheslhhinhgrrhhordhorhhgpdhsrghmuhgvlhdrthhhihgsrghulhhtsegvnhhsqdhlhihonhdrohhrghdptghmihhnhigrrhgusehmvhhishhtrgdrtghomhdpkhhrrgigvghlsehrvgguhhgrthdrtghomhdpqhgvmhhuqdhsfeeltdigsehnohhnghhnuhdrohhrghdpnhhpihhgghhinhesghhmrghilhdrtghomhdpqhgvmhhuqdhpphgtsehnohhnghhnuhdrohhrghdpmhgrrhgtvghlrdgrphhfvghlsggruhhmsehgmhgrihhlrdgtohhmpdhsthgvfhgrnhgssehlihhnuhigrdhvnhgvthdrihgsmhdrtghomhdpqhgvmhhuqdguvghvvghlsehnohhnghhnuhdrohhrghdpphgvthgvrhi gsehrvgguhhgrthdrtghomhdpuggrnhhivghlhhgsgedufeesghhmrghilhdrtghomhdpoffvtefjohhsthepmhhoheehvddpmhhouggvpehsmhhtphhouhht Received-SPF: pass client-ip=178.33.254.192; envelope-from=groug@kaod.org; helo=3.mo552.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+alex.bennee=linaro.org@nongnu.org Sender: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: 1W6vIbtc30pV Hi Juan, On Thu, 19 Oct 2023 21:08:25 +0200 Juan Quintela wrote: > Current code does: > - register pre_2_10_vmstate_dummy_icp with "icp/server" and instance > dependinfg on cpu number > - for newer machines, it register vmstate_icp with "icp/server" name > and instance 0 > - now it unregisters "icp/server" for the 1st instance. > Heh I remember about this hack... it was caused by some rework in the interrupt controller that broke migration. > This is wrong at many levels: > - we shouldn't have two VMSTATEDescriptions with the same name I don't know how bad it is. The idea here is to send extra state in the stream because older QEMU expect it (but won't use it), so it made sense to keep the same name. > - In case this is the only solution that we can came with, it needs to > be: > * register pre_2_10_vmstate_dummy_icp > * unregister pre_2_10_vmstate_dummy_icp > * register real vmstate_icp > > As the initialization of this machine is already complex enough, I > need help from PPC maintainers to fix this. > What about dropping all this code, i.e. basically reverting 46f7afa37096 ("spapr: fix migration of ICPState objects from/to older QEMU") ? Unless we still care to migrate pseries machine types from 2017 of course... > Volunteers? > Not working on PPC anymore since almost two years, I certainly don't have time, nor motivation to fix this. I might be able to answer some questions or to review someone else's patch that gets rid of the offending code, at best. Cheers, -- Greg > CC: Cedric Le Goater > CC: Daniel Henrique Barboza > CC: David Gibson > CC: Greg Kurz > > Signed-off-by: Juan Quintela > --- > hw/ppc/spapr.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index cb840676d3..8531d13492 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -143,7 +143,12 @@ static bool pre_2_10_vmstate_dummy_icp_needed(void *opaque) > } > > static const VMStateDescription pre_2_10_vmstate_dummy_icp = { > - .name = "icp/server", > + /* > + * Hack ahead. We can't have two devices with the same name and > + * instance id. So I rename this to pass make check. > + * Real help from people who knows the hardware is needed. > + */ > + .name = "pre-2.10-icp/server", > .version_id = 1, > .minimum_version_id = 1, > .needed = pre_2_10_vmstate_dummy_icp_needed, -- Greg