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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_2 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 E3CEEC432C0 for ; Thu, 21 Nov 2019 09:57:14 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B62062067D for ; Thu, 21 Nov 2019 09:57:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B62062067D 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 ([::1]:38044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXjD7-00044h-Tz for qemu-devel@archiver.kernel.org; Thu, 21 Nov 2019 04:57:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38720) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXjCO-0003aS-9I for qemu-devel@nongnu.org; Thu, 21 Nov 2019 04:56:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXjCM-0008Ic-PL for qemu-devel@nongnu.org; Thu, 21 Nov 2019 04:56:28 -0500 Received: from 9.mo68.mail-out.ovh.net ([46.105.78.111]:39272) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iXjCM-0008Fj-Hg for qemu-devel@nongnu.org; Thu, 21 Nov 2019 04:56:26 -0500 Received: from player746.ha.ovh.net (unknown [10.108.57.150]) by mo68.mail-out.ovh.net (Postfix) with ESMTP id 2215F14D6BE for ; Thu, 21 Nov 2019 10:56:23 +0100 (CET) Received: from kaod.org (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player746.ha.ovh.net (Postfix) with ESMTPSA id E068EC74CF30; Thu, 21 Nov 2019 09:56:19 +0000 (UTC) Date: Thu, 21 Nov 2019 10:56:18 +0100 From: Greg Kurz To: =?UTF-8?B?Q8OpZHJpYw==?= Le Goater Subject: Re: [PATCH for-5.0 v5 15/23] ppc/xive: Use the XiveFabric and XivePresenter interfaces Message-ID: <20191121105618.54486052@bahia.lan> In-Reply-To: References: <20191115162436.30548-1-clg@kaod.org> <20191115162436.30548-16-clg@kaod.org> <20191120193001.5b9229a2@bahia.lan> <20191121083042.190a038a@bahia.lan> <20191121090801.766e129d@bahia.lan> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Ovh-Tracer-Id: 6865456161204377995 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrudehvddgudduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdqfffguegfifdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhepfffhvffukfgjfhfogggtgfesthhqfedtredtjeenucfhrhhomhepifhrvghgucfmuhhriicuoehgrhhouhhgsehkrghougdrohhrgheqnecukfhppedtrddtrddtrddtpdekvddrvdehfedrvddtkedrvdegkeenucfrrghrrghmpehmohguvgepshhmthhpqdhouhhtpdhhvghlohepphhlrgihvghrjeegiedrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehgrhhouhhgsehkrghougdrohhrghdprhgtphhtthhopehqvghmuhdquggvvhgvlhesnhhonhhgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.78.111 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: , Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, 21 Nov 2019 10:22:38 +0100 C=C3=A9dric Le Goater wrote: > On 21/11/2019 09:08, Greg Kurz wrote: > > On Thu, 21 Nov 2019 08:40:32 +0100 > > C=C3=A9dric Le Goater wrote: > >=20 > >> On 21/11/2019 08:30, Greg Kurz wrote: > >>> On Thu, 21 Nov 2019 08:01:44 +0100 > >>> C=C3=A9dric Le Goater wrote: > >>> > >>>> On 20/11/2019 19:30, Greg Kurz wrote: > >>>>> On Fri, 15 Nov 2019 17:24:28 +0100 > >>>>> C=C3=A9dric Le Goater wrote: > >>>>> > >>>>>> Now that the machines have handlers implementing the XiveFabric and > >>>>>> XivePresenter interfaces, remove xive_presenter_match() and make u= se > >>>>>> of the 'match_nvt' handler of the machine. > >>>>>> > >>>>>> Signed-off-by: C=C3=A9dric Le Goater > >>>>>> --- > >>>>>> hw/intc/xive.c | 48 +++++++++++++++++----------------------------= --- > >>>>>> 1 file changed, 17 insertions(+), 31 deletions(-) > >>>>>> > >>>>> > >>>>> Nice diffstat :) > >>>>> > >>>>>> diff --git a/hw/intc/xive.c b/hw/intc/xive.c > >>>>>> index 1c9e58f8deac..ab62bda85788 100644 > >>>>>> --- a/hw/intc/xive.c > >>>>>> +++ b/hw/intc/xive.c > >>>>>> @@ -1423,30 +1423,6 @@ int xive_presenter_tctx_match(XivePresenter= *xptr, XiveTCTX *tctx, > >>>>>> return -1; > >>>>>> } > >>>>>> =20 > >>>>>> -static bool xive_presenter_match(XiveRouter *xrtr, uint8_t format, > >>>>>> - uint8_t nvt_blk, uint32_t nvt_id= x, > >>>>>> - bool cam_ignore, uint8_t priorit= y, > >>>>>> - uint32_t logic_serv, XiveTCTXMat= ch *match) > >>>>>> -{ > >>>>>> - XivePresenter *xptr =3D XIVE_PRESENTER(xrtr); > >>>>>> - XivePresenterClass *xpc =3D XIVE_PRESENTER_GET_CLASS(xptr); > >>>>>> - int count; > >>>>>> - > >>>>>> - count =3D xpc->match_nvt(xptr, format, nvt_blk, nvt_idx, cam_= ignore, > >>>>>> - priority, logic_serv, match); > >>>>>> - if (count < 0) { > >>>>>> - return false; > >>>>>> - } > >>>>>> - > >>>>>> - if (!match->tctx) { > >>>>>> - qemu_log_mask(LOG_UNIMP, "XIVE: NVT %x/%x is not dispatch= ed\n", > >>>>>> - nvt_blk, nvt_idx); > >>>>> > >>>>> Maybe keep this trace... > >>>> > >>>> It's in spapr_xive_match_nvt() now. > >>>> > >>> > >>> Not really... spapr_xive_match_nvt() has a trace for the opposite cas= e of duplicate > >>> matches: > >> > >> not that one. The one in spapr.c ... Yes I need to change the name. > >> > >=20 > > ... and it seems I cannot memorize a change that was made by the > > previous patch :-\ Sorry for the noise. >=20 > np but this is problem for gdb ! Any suggestion on the name :=20 >=20 > spapr_match_nvt()=20 >=20 I guess having nvt in the name is enough to identify this as a XIVE related function. It's ok for me. BTW, the same problem exists in powernv: $ git grep pnv_xive_match_nvt hw/intc/pnv_xive.c:static int pnv_xive_match_nvt(XivePresenter *xptr, uint8= _t format, hw/intc/pnv_xive.c: xpc->match_nvt =3D pnv_xive_match_nvt; hw/ppc/pnv.c:static int pnv_xive_match_nvt(XiveFabric *xfb, uint8_t format, hw/ppc/pnv.c: xfc->match_nvt =3D pnv_xive_match_nvt; > ? > =20 > > With or without the !!count change: >=20 > I will add the !!=20 >=20 > C.=20 >=20 > >=20 > > Reviewed-by: Greg Kurz > >=20 > >> C. > >> > >>> > >>> if (match->tctx) { > >>> qemu_log_mask(LOG_GUEST_ERROR, "XIVE: already found a= thread " > >>> "context NVT %x/%x\n", nvt_blk, nvt_idx= ); > >>> return -1; > >>> } > >>> > >>>>> > >>>>>> - return false; > >>>>>> - } > >>>>>> - > >>>>>> - return true; > >>>>>> -} > >>>>>> - > >>>>>> /* > >>>>>> * This is our simple Xive Presenter Engine model. It is merged i= n the > >>>>>> * Router as it does not require an extra object. > >>>>>> @@ -1462,22 +1438,32 @@ static bool xive_presenter_match(XiveRoute= r *xrtr, uint8_t format, > >>>>>> * > >>>>>> * The parameters represent what is sent on the PowerBus > >>>>>> */ > >>>>>> -static bool xive_presenter_notify(XiveRouter *xrtr, uint8_t forma= t, > >>>>>> +static bool xive_presenter_notify(uint8_t format, > >>>>>> uint8_t nvt_blk, uint32_t nvt_i= dx, > >>>>>> bool cam_ignore, uint8_t priori= ty, > >>>>>> uint32_t logic_serv) > >>>>>> { > >>>>>> + XiveFabric *xfb =3D XIVE_FABRIC(qdev_get_machine()); > >>>>>> + XiveFabricClass *xfc =3D XIVE_FABRIC_GET_CLASS(xfb); > >>>>>> XiveTCTXMatch match =3D { .tctx =3D NULL, .ring =3D 0 }; > >>>>>> - bool found; > >>>>>> + int count; > >>>>>> =20 > >>>>>> - found =3D xive_presenter_match(xrtr, format, nvt_blk, nvt_idx= , cam_ignore, > >>>>>> - priority, logic_serv, &match); > >>>>>> - if (found) { > >>>>>> + /* > >>>>>> + * Ask the machine to scan the interrupt controllers for a ma= tch > >>>>>> + */ > >>>>>> + count =3D xfc->match_nvt(xfb, format, nvt_blk, nvt_idx, cam_i= gnore, > >>>>>> + priority, logic_serv, &match); > >>>>>> + if (count < 0) { > >>>>>> + return false; > >>>>>> + } > >>>>>> + > >>>>>> + /* handle CPU exception delivery */ > >>>>>> + if (count) { > >>>>>> ipb_update(&match.tctx->regs[match.ring], priority); > >>>>>> xive_tctx_notify(match.tctx, match.ring); > >>>>>> } > >>>>> > >>>>> ... in an else block here ^^ ? > >>>>> > >>>>>> =20 > >>>>>> - return found; > >>>>>> + return count; > >>>>> > >>>>> Implicit cast is ok I guess, but !!count would ensure no paranoid > >>>>> compiler ever complains. > >>>> > >>>> yes.=20 > >>>> > >>>> Thanks, > >>>> > >>>> C. > >>>> > >>>> > >>>>> > >>>>>> } > >>>>>> =20 > >>>>>> /* > >>>>>> @@ -1590,7 +1576,7 @@ static void xive_router_end_notify(XiveRoute= r *xrtr, uint8_t end_blk, > >>>>>> return; > >>>>>> } > >>>>>> =20 > >>>>>> - found =3D xive_presenter_notify(xrtr, format, nvt_blk, nvt_id= x, > >>>>>> + found =3D xive_presenter_notify(format, nvt_blk, nvt_idx, > >>>>>> xive_get_field32(END_W7_F0_IGNORE, end.= w7), > >>>>>> priority, > >>>>>> xive_get_field32(END_W7_F1_LOG_SERVER_I= D, end.w7)); > >>>>> > >>>> > >>> > >> > >=20 >=20