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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 E9B8EC7EE31 for ; Thu, 26 Jun 2025 14:50:56 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.1026578.1401742 (Exim 4.92) (envelope-from ) id 1uUnw5-00048n-Mh; Thu, 26 Jun 2025 14:50:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1026578.1401742; Thu, 26 Jun 2025 14:50:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUnw5-00048g-JS; Thu, 26 Jun 2025 14:50:45 +0000 Received: by outflank-mailman (input) for mailman id 1026578; Thu, 26 Jun 2025 14:50:44 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uUnw4-00048a-Q4 for xen-devel@lists.xenproject.org; Thu, 26 Jun 2025 14:50:44 +0000 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [2a00:1450:4864:20::42c]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id ef109a8f-529c-11f0-b894-0df219b8e170; Thu, 26 Jun 2025 16:50:42 +0200 (CEST) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3a4fd1ba177so790236f8f.0 for ; Thu, 26 Jun 2025 07:50:42 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23abe329b85sm319805ad.65.2025.06.26.07.50.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 26 Jun 2025 07:50:41 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ef109a8f-529c-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1750949442; x=1751554242; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to; bh=lAxWw6kamL9VL9aPQKfyJmUPbAlK3M80eAWF7PJIgJg=; b=gsyD6AleU4rYA7NFCeSfIw2P3pYy33H9wBrhPt3Ma7Zj/l3MZ6DyiWAc7cnuseiYDk 9jj4zN9jm2SPf9SJVP6G0sUZ/9Xz6hgtvRQRKiCIq94qefnnVIM5bPV9t8Ts3SaSID+A +HY5Od9anbDHbc6GSBySEGoPLXWSsgGoLxQrMPr51XyLM6Eraz9y3jCw36PMm4V1UA8r sBN2s2xntBwx4SJZ8WrYfLvupCT0n8rVuNgTwR/fysbjZJF+uZb+yWgMiCVIDx6KoupZ SDLak6pVaNIFvMz8y4/VQ+UBJZgmGo9j8ppxb8mOM3IOktVwqO/WS5uvW+X1QumNjmIK tlsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750949442; x=1751554242; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=lAxWw6kamL9VL9aPQKfyJmUPbAlK3M80eAWF7PJIgJg=; b=E7/6KF6F9yklKtbaEKQmguwNQ+s+I/IpoMYu0NQH1B1dIUBJDt1H/fI0TBms57tPK0 qsyc7tpyjMClmhRcfLD73hesloO1WMKehiImHGzan1T6iGIcDx8JXryu20zFPXWn8PaQ tSEXXbs6sQYWocmZXMYWcWK2SqyqXNoDltxDCx/bUV5lz4JDJrCrEQgXayMcVxPfnT/1 H0ulpBHOCsI8KG0Evtyw7Yf4+qwRjxUZs+fcqSceamf6RFZcR1/jkLTQv7/P1mAQvqfU +QeqUaIQ14E29YSQKgYaMglnbd4WEqp5jzQg5QtB+fFSlaltQSXF+fttM5OZExB20I3t MQhg== X-Forwarded-Encrypted: i=1; AJvYcCXNdEIgntS14t/uajxibLaRTf1JY7qHhMf5oPMCIE6PHS0HqtHkBpCcqFWkkqhBes8tLDR2e/0CiSQ=@lists.xenproject.org X-Gm-Message-State: AOJu0YzTK3bRpGs6OkMHYPrT1Z+59hYsCF+JJJqDO8I61qsvwfvSR2kf ZWGoVGsmuAJmCj11NWG5ECbqRoTF8MtgSzCbrv+E/F9nMvlY2IoJpxBZ7xdlqFpXgQ== X-Gm-Gg: ASbGncudCWVbzsQc0RdKLhP+Hw7PG7f8mm0lZUdC20l73N9KZ1Su1a4ItX1qIufBtdG OFsJ8pksUi/O2om3lpju/wdNexq/BDdVEJto9A5ZxpiYpk3mVHJdX/iVWXqqVyyI/yVIx3xyL1n 7AxS5nVXXC789/wDtFw+k2sELDHIi3DsLNLpVthiWKT72bePhEzqrciifFL+v0aulB36RHrC4My fzhhXoLuMuFRyiMsqDcZRO57sNUh8Fo8tK6M+UFmYAZ2LU9rQYgMr5WG+dSQU3mahRXlyhUJC6D vciqXj7q29vlHRHFZLmArLuf0CIDU/mOpZSTvMKn/ESnSVR0oLrhzKqFX7gi1sCt6K1ZycY56sY uAxeR/eyOYbq6moCKJLUALpQu+/FKroyOaoZjl4A6tx//E8E= X-Google-Smtp-Source: AGHT+IGNzN5cfC3/OUlWg9VbMPY7KaQOuIfh8Twk2zE5SOVRfSNFE4JVJPEFDlOW5CztMZKQ5UnRyg== X-Received: by 2002:a5d:584b:0:b0:3a5:1360:6b34 with SMTP id ffacd0b85a97d-3a6f30fc280mr3336130f8f.2.1750949442153; Thu, 26 Jun 2025 07:50:42 -0700 (PDT) Message-ID: Date: Thu, 26 Jun 2025 16:50:34 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 3/3] xen/efi: Update error flow for read_file function To: Frediano Ziglio Cc: "Daniel P. Smith" , =?UTF-8?Q?Marek_Marczykowski-G=C3=B3recki?= , xen-devel@lists.xenproject.org References: <20250626131059.61894-1-frediano.ziglio@cloud.com> <20250626131059.61894-4-frediano.ziglio@cloud.com> <9d64c239-d6cc-4eb5-b180-a5034bedcfdb@suse.com> Content-Language: en-US From: Jan Beulich Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 26.06.2025 15:41, Frediano Ziglio wrote: > On Thu, Jun 26, 2025 at 2:31 PM Jan Beulich wrote: >> >> On 26.06.2025 15:10, Frediano Ziglio wrote: >>> --- a/xen/common/efi/boot.c >>> +++ b/xen/common/efi/boot.c >>> @@ -792,6 +792,8 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, >>> >>> if ( !name ) >>> PrintErrMesg(L"No filename", EFI_OUT_OF_RESOURCES); >>> + >>> + what = L"Open"; >>> if ( dir_handle ) >>> ret = dir_handle->Open(dir_handle, &FileHandle, name, >>> EFI_FILE_MODE_READ, 0); >>> @@ -800,54 +802,58 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, >>> if ( file == &cfg && ret == EFI_NOT_FOUND ) >>> return false; >>> if ( EFI_ERROR(ret) ) >>> - what = L"Open"; >>> - else >>> - ret = FileHandle->SetPosition(FileHandle, -1); >>> + goto fail; >>> + >>> + what = L"Seek"; >>> + ret = FileHandle->SetPosition(FileHandle, -1); >>> if ( EFI_ERROR(ret) ) >>> - what = what ?: L"Seek"; >>> - else >>> - ret = FileHandle->GetPosition(FileHandle, &size); >>> + goto fail; >>> + >>> + what = L"Get size"; >>> + ret = FileHandle->GetPosition(FileHandle, &size); >>> if ( EFI_ERROR(ret) ) >>> - what = what ?: L"Get size"; >>> - else >>> - ret = FileHandle->SetPosition(FileHandle, 0); >>> + goto fail; >>> + >>> + what = L"Seek"; >>> + ret = FileHandle->SetPosition(FileHandle, 0); >>> if ( EFI_ERROR(ret) ) >>> - what = what ?: L"Seek"; >>> - else >>> - { >>> - file->addr = min(1UL << (32 + PAGE_SHIFT), >>> - HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START); >>> - ret = efi_bs->AllocatePages(AllocateMaxAddress, EfiLoaderData, >>> - PFN_UP(size), &file->addr); >>> - } >>> + goto fail; >>> + >>> + what = L"Allocation"; >>> + file->addr = min(1UL << (32 + PAGE_SHIFT), >>> + HYPERVISOR_VIRT_END - DIRECTMAP_VIRT_START); >>> + ret = efi_bs->AllocatePages(AllocateMaxAddress, EfiLoaderData, >>> + PFN_UP(size), &file->addr); >>> if ( EFI_ERROR(ret) ) >>> - what = what ?: L"Allocation"; >>> - else >>> - { >>> - file->need_to_free = true; >>> - file->size = size; >>> - handle_file_info(name, file, options); >>> + goto fail; >>> >>> - ret = FileHandle->Read(FileHandle, &file->size, file->str); >>> - if ( !EFI_ERROR(ret) && file->size != size ) >>> - ret = EFI_ABORTED; >>> - if ( EFI_ERROR(ret) ) >>> - what = L"Read"; >>> - } >>> + file->need_to_free = true; >>> + file->size = size; >>> + handle_file_info(name, file, options); >>> >>> - if ( FileHandle ) >>> - FileHandle->Close(FileHandle); >>> + what = L"Read"; >>> + ret = FileHandle->Read(FileHandle, &file->size, file->str); >>> + if ( !EFI_ERROR(ret) && file->size != size ) >>> + ret = EFI_ABORTED; >>> + if ( EFI_ERROR(ret) ) >>> + goto fail; >>> >>> - if ( what ) >>> - { >>> - PrintErr(what); >>> - PrintErr(L" failed for "); >>> - PrintErrMesg(name, ret); >>> - } >>> + FileHandle->Close(FileHandle); >>> >>> efi_arch_flush_dcache_area(file->ptr, file->size); >>> >>> return true; >>> + >>> +fail: >> >> Nit: Style (see ./CODING_STYLE). >> > > What specifically? I checked the indentation and it's 4 spaces. if-s > are spaced correctly. About labels I didn't find much on CODING_STYLE > so I opened 3/4 files and most of them are indented with no spaces > (they start at column 1). You didn't search for the word "label" then, did you? Quote: 'Due to the behavior of GNU diffutils "diff -p", labels should be indented by at least one blank. Non-case labels inside switch() bodies are preferred to be indented the same as the block's case labels.' Jan