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 20337C433EF for ; Tue, 5 Jul 2022 09:51:33 +0000 (UTC) Received: from localhost ([::1]:40504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o8fDQ-0007Zy-7h for qemu-devel@archiver.kernel.org; Tue, 05 Jul 2022 05:51:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8f7M-0002K4-Tn for qemu-devel@nongnu.org; Tue, 05 Jul 2022 05:45:17 -0400 Received: from smtpout3.mo529.mail-out.ovh.net ([46.105.54.81]:38385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8f7F-0006NA-Tg for qemu-devel@nongnu.org; Tue, 05 Jul 2022 05:45:16 -0400 Received: from mxplan5.mail.ovh.net (unknown [10.109.156.124]) by mo529.mail-out.ovh.net (Postfix) with ESMTPS id 996EA114784B7; Tue, 5 Jul 2022 11:44:58 +0200 (CEST) Received: from kaod.org (37.59.142.99) by DAG4EX1.mxp5.local (172.16.2.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.9; Tue, 5 Jul 2022 11:44:58 +0200 Authentication-Results: garm.ovh; auth=pass (GARM-99G003657e85de-1d3a-4a25-8256-874da54274dc, 4FF77D4A254985FC0BE9A952312E42D6E34C6CC4) smtp.auth=clg@kaod.org X-OVh-ClientIp: 82.64.250.170 Message-ID: <7b897ea9-9afb-e669-3d93-dd33bbd78867@kaod.org> Date: Tue, 5 Jul 2022 11:44:57 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: Re: [PATCH 2/9] target/ppc: add errp to kvmppc_read_int_cpu_dt() Content-Language: en-US To: Daniel Henrique Barboza , Mark Cave-Ayland , CC: References: <20220630194249.886747-1-danielhb413@gmail.com> <20220630194249.886747-3-danielhb413@gmail.com> <55014e2a-a668-4843-8338-850abeb5ff04@kaod.org> <47277f4f-a6a5-85dc-4806-67df8e2fc153@gmail.com> <6d37b1dc-5dfb-2513-f74e-3f58e84e8117@kaod.org> <1d2cd44f-fd61-4693-ecc0-f71c80131005@ilande.co.uk> <38468531-5eb0-a421-f90f-2a3c67222d40@gmail.com> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= In-Reply-To: <38468531-5eb0-a421-f90f-2a3c67222d40@gmail.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [37.59.142.99] X-ClientProxiedBy: DAG9EX2.mxp5.local (172.16.2.82) To DAG4EX1.mxp5.local (172.16.2.31) X-Ovh-Tracer-GUID: 28ad992d-678e-479c-a4c3-dc380036734a X-Ovh-Tracer-Id: 583779104574442464 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrudeiuddgvdduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhepkfffgggfuffvvehfhfgjtgfgihesthekredttdefjeenucfhrhhomhepveorughrihgtpgfnvggpifhorghtvghruceotghlgheskhgrohgurdhorhhgqeenucggtffrrghtthgvrhhnpeegudfgvedvieehvefffffgleekheeiudevjeelheekffdvveejjedttedtjeehkeenucffohhmrghinhepfhgrthgrlhdrnhhonecukfhppedtrddtrddtrddtpdefjedrheelrddugedvrdelleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghlohepmhigphhlrghnhedrmhgrihhlrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpegtlhhgsehkrghougdrohhrghdpnhgspghrtghpthhtohepuddprhgtphhtthhopehqvghmuhdqphhptgesnhhonhhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehvdel Received-SPF: pass client-ip=46.105.54.81; envelope-from=clg@kaod.org; helo=smtpout3.mo529.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, NICE_REPLY_A=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 7/5/22 11:39, Daniel Henrique Barboza wrote: > > > On 7/5/22 03:51, Mark Cave-Ayland wrote: >> On 04/07/2022 18:34, Cédric Le Goater wrote: >> >>> On 7/2/22 15:34, Daniel Henrique Barboza wrote: >>>> >>>> >>>> On 7/2/22 03:24, Cédric Le Goater wrote: >>>>> On 6/30/22 21:42, Daniel Henrique Barboza wrote: >>>>>> The function can't just return 0 whether an error happened and call it a >>>>>> day. We must provide a way of letting callers know if the zero return is >>>>>> legitimate or due to an error. >>>>>> >>>>>> Add an Error pointer to kvmppc_read_int_cpu_dt() that will be filled >>>>>> with an appropriate error, if one occurs. Callers are then free to pass >>>>>> an Error pointer and handle it. >>>>>> >>>>>> Signed-off-by: Daniel Henrique Barboza >>>>>> --- >>>>>>   target/ppc/kvm.c | 16 +++++++++------- >>>>>>   1 file changed, 9 insertions(+), 7 deletions(-) >>>>>> >>>>>> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c >>>>>> index 109823136d..bc17437097 100644 >>>>>> --- a/target/ppc/kvm.c >>>>>> +++ b/target/ppc/kvm.c >>>>>> @@ -1925,15 +1925,17 @@ static uint64_t kvmppc_read_int_dt(const char *filename) >>>>>>   /* >>>>>>    * Read a CPU node property from the host device tree that's a single >>>>>> - * integer (32-bit or 64-bit).  Returns 0 if anything goes wrong >>>>>> - * (can't find or open the property, or doesn't understand the format) >>>>>> + * integer (32-bit or 64-bit).  Returns 0 and set errp if anything goes >>>>>> + * wrong (can't find or open the property, or doesn't understand the >>>>>> + * format) >>>>>>    */ >>>>>> -static uint64_t kvmppc_read_int_cpu_dt(const char *propname) >>>>>> +static uint64_t kvmppc_read_int_cpu_dt(const char *propname, Error **errp) >>>>>>   { >>>>>>       char buf[PATH_MAX], *tmp; >>>>>>       uint64_t val; >>>>>>       if (kvmppc_find_cpu_dt(buf, sizeof(buf))) { >>>>>> +        error_setg(errp, "Failed to read CPU property %s", propname); >>>>>>           return 0; >>>>>>       } >>>>>> @@ -1946,12 +1948,12 @@ static uint64_t kvmppc_read_int_cpu_dt(const char *propname) >>>>>>   uint64_t kvmppc_get_clockfreq(void) >>>>>>   { >>>>>> -    return kvmppc_read_int_cpu_dt("clock-frequency"); >>>>>> +    return kvmppc_read_int_cpu_dt("clock-frequency", NULL); >>>>> >>>>> >>>>> This should be fatal. no ? >>>> >>>> >>>> I'm not sure. I went under the assumption that there might be some weird >>>> condition where 'clock-frequency' might be missing from the DT, and this >>>> is why we're not exiting out immediately. >>>> >>>> That said, the advantage of turning this into fatal is that we won't need >>>> all the other patches that handles error on this function. We're going to >>>> assume that if 'clock-frequency' is missing then we can't boot. I'm okay >>>> with that. >>> >>> I think so. Some machines behave badly when 'clock-frequency' is bogus, >>> division by zero, no console, etc. We could check easily with pseries >>> which is the only KVM PPC platform. >> >> Well not quite true ;)  I haven't tested it during the last release cycle, but the Mac machines were still working fine to boot OS X with KVM-PR on my G4 Mac Mini last time I checked. > > > We can't just error_fatal by default then. > > Each machine should be able to determine how to handle this missing DT > element. If I want to error_fatal for pseries then I can do so in patch > 9/9, but other than that I'll keep the existing behavior. Or add an errp here : hw/ppc/e500.c: clock_freq = kvmppc_get_clockfreq(); hw/ppc/sam460ex.c: clock_freq = kvmppc_get_clockfreq(); hw/ppc/ppc440_bamboo.c: clock_freq = kvmppc_get_clockfreq(); hw/ppc/spapr.c: uint32_t cpufreq = kvm_enabled() ? kvmppc_get_clockfreq() : 1000000000; C.