From nobody Thu Oct 30 19:06:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1753277973; cv=none; d=zohomail.com; s=zohoarc; b=SuwtWqMYaCP7SeV2gbJIkyE3Y+8v5RZBepLsk+rGgRXNVGV9taX6AOjyXuh0lQvFz002QJY1QD8koeTcP7eMHrmE4vgjYlJmDld0QOWS2/xoiQsNRcJGKZPRNqHNjY5BrOKx/xy5/lQQqg5wm4Y5Ubhk2McGBDtvYGxKRhBns3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1753277973; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7L5UDO5JZREdBukpTjxvxq5jP5oNIubEFJBKAA9peTU=; b=n4Oi7Lf2nizhhaaIK+yN8dbnlYHMbVOCWLZS2XyFWFZybS+dQZTKWioxi73VBfEEise/i147vp3bc6i+t2N4TmmnqQzd3zRFAFSdLyAe8aIOTut+tYuL26my7qXM3MmJjSEtYyg2RuksWC+1LfmFaq74BMSF/wB7IgCCYln/W/I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1753277973074667.986804251145; Wed, 23 Jul 2025 06:39:33 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1054031.1422839 (Exim 4.92) (envelope-from ) id 1ueZgn-0004J7-1x; Wed, 23 Jul 2025 13:39:21 +0000 Received: by outflank-mailman (output) from mailman id 1054031.1422839; Wed, 23 Jul 2025 13:39:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ueZgm-0004J0-VF; Wed, 23 Jul 2025 13:39:20 +0000 Received: by outflank-mailman (input) for mailman id 1054031; Wed, 23 Jul 2025 13:39:20 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ueZgm-0004BM-5F for xen-devel@lists.xenproject.org; Wed, 23 Jul 2025 13:39:20 +0000 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [2a00:1450:4864:20::430]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6efeb1b7-67ca-11f0-a31d-13f23c93f187; Wed, 23 Jul 2025 15:39:19 +0200 (CEST) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3b611665b96so3820722f8f.2 for ; Wed, 23 Jul 2025 06:39:19 -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-23e3b60eb01sm97166105ad.57.2025.07.23.06.39.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 23 Jul 2025 06:39:18 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 6efeb1b7-67ca-11f0-a31d-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1753277959; x=1753882759; darn=lists.xenproject.org; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=7L5UDO5JZREdBukpTjxvxq5jP5oNIubEFJBKAA9peTU=; b=SkHKeZX4NcJbt7vX13KpdDQLAQ6ZTYAZQ78Vw/a/J3E9IuSmiXYh0/oknb8VQ5wi8I a53ga0zVDGB3XCzFnhAjyhlw13y6G3eS3cSC+ljhVEBgx4+kuft5W8099pZX3GxraNTj 8GpCq4H4HuudZtRyQwF3tkyQI9x1TyUsCsH1Z4t2FWfzXvDAAohGzLzJgIdyyNS54KbR nptMCX0yg1sPEDHwME+1ibJ9f+d9RvIdrvPXXwB/FhJlAATipju1sjSq11oT32REd8N6 hK9Yq7Wxp6UDm0SwhlqnguUiuEuo8XIBYDJRz9aCnv0qJaG25n6d3pG66QPI60Lj/STO tAVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753277959; x=1753882759; h=content-transfer-encoding:autocrypt:subject:from:cc:to :content-language:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7L5UDO5JZREdBukpTjxvxq5jP5oNIubEFJBKAA9peTU=; b=Rpvjzq7s/sm8giHh7cWDwDvuXulBhRNZeGrja+NVhZjYpW7gQPUdkg2KcNcNXpiERs 8cO8K3aG/qCQYA87mLjRgXX+H32cV3ZEaiJz/MdZB8UINkGCkl034rM+AXWaS4OY0enx GgLxpqBDy2kBE6vUj8M2j7DdwL1MTZc7QD9sk7ljf1AqJZmY75A6lV+YGe4WneAgdxJs HlUyx5YajkarflF0APtlZD+kjwkGyd/aG7lSeWWHi6YQhqnctkC9ZAsS1zMghQj9Go2h at9t7+Uo19VOToeDP8U/ceSotw7wsOQ6DZSY1TPascW04SPfeAsCo5BV9OqdEDLDetf9 Bxjw== X-Gm-Message-State: AOJu0YweRJtxeHDIynPn+B7v+43kj/Awhpn2k7lL6eR+lJgjNNwX1UzF kiDVIgdE1cjcY/BaVIlcCoQRlM1VYCac1Wuu50Vs9V8uRiyqrBI9VxBzTgG6sWHLBzx5QOuE0PR AqgA= X-Gm-Gg: ASbGncvp1VR1jResqRozjLPJcagtPekQ5atRsHXtLXpenshq3FYdWBOJuBQzeLCIva4 nJiZCdZtoeplLe95JjkHDZt+Sq378SVRfFC4oXCqyJ3yfPuNv+AywzlBfpx5j02DlMInIxpWpe+ rQUYGYfnbNxS5pY30r3jaElA/1FZ8iZOHI/Qd83RUsl0x6ywv4Dit/jip4+1rppq8xahMxy2epk VCrva5eYVk81c0Dz387vSMLbrtr0hNC9voVSqRnUUsEd8Sh+4FC98IrBMUrMqF14VCn42ieKlrr HZhQAORqn7p1ktUO/grWawg3A3hHPlMKfrdwfWeeH/1tN9inYMLjVRRnqbGBtPRim08K0IqbFFO sV1j/KZ4ndlCXhrecT+A3TBU6T4wlnUoRftkPPRaPtsJZP7/ghsobG0evqg/MMdMawLi/50euI+ aM+FlMCcA= X-Google-Smtp-Source: AGHT+IFObyDMnKZfZZyxkchGH0OMS5ZKdDlnnge6dwaidzmYHeQhzkSc/oWgBgMNx1N3Gtb7ouPhTA== X-Received: by 2002:a05:6000:26c9:b0:3b3:9cb4:43f9 with SMTP id ffacd0b85a97d-3b768cb12c7mr2650426f8f.16.1753277958659; Wed, 23 Jul 2025 06:39:18 -0700 (PDT) Message-ID: <41b7e14c-59ef-40f5-8c43-69bdc5fb4531@suse.com> Date: Wed, 23 Jul 2025 15:39:11 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: "xen-devel@lists.xenproject.org" Cc: Marek Marczykowski , Daniel Smith From: Jan Beulich Subject: [PATCH v3] EFI/runtime: switch to xv[mz]alloc_array() 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 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1753277975193116600 Content-Type: text/plain; charset="utf-8" Use the more "modern" form, thus doing away with effectively open-coding xmalloc_array() at the same time. While there is a difference in generated code, as xmalloc_bytes() forces SMP_CACHE_BYTES alignment, if code really cared about such higher than default alignment, it should request so explicitly. Signed-off-by: Jan Beulich Acked-by: Daniel P. Smith Reviewed-by: Denis Mukhin =20 --- v3: Use xv[mz]alloc_array(). --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -6,6 +6,7 @@ #include #include #include +#include =20 DEFINE_XEN_GUEST_HANDLE(CHAR16); =20 @@ -500,23 +501,23 @@ int efi_runtime_call(struct xenpf_efi_ru len =3D gwstrlen(guest_handle_cast(op->u.get_variable.name, CHAR16= )); if ( len < 0 ) return len; - name =3D xmalloc_array(CHAR16, ++len); + name =3D xvmalloc_array(CHAR16, ++len); if ( !name ) return -ENOMEM; if ( __copy_from_guest(name, op->u.get_variable.name, len) || wmemchr(name, 0, len) !=3D name + len - 1 ) { - xfree(name); + xvfree(name); return -EIO; } =20 size =3D op->u.get_variable.size; if ( size ) { - data =3D xmalloc_bytes(size); + data =3D xvmalloc_array(unsigned char, size); if ( !data ) { - xfree(name); + xvfree(name); return -ENOMEM; } } @@ -539,8 +540,8 @@ int efi_runtime_call(struct xenpf_efi_ru else rc =3D -EOPNOTSUPP; =20 - xfree(data); - xfree(name); + xvfree(data); + xvfree(name); } break; =20 @@ -553,17 +554,17 @@ int efi_runtime_call(struct xenpf_efi_ru len =3D gwstrlen(guest_handle_cast(op->u.set_variable.name, CHAR16= )); if ( len < 0 ) return len; - name =3D xmalloc_array(CHAR16, ++len); + name =3D xvmalloc_array(CHAR16, ++len); if ( !name ) return -ENOMEM; if ( __copy_from_guest(name, op->u.set_variable.name, len) || wmemchr(name, 0, len) !=3D name + len - 1 ) { - xfree(name); + xvfree(name); return -EIO; } =20 - data =3D xmalloc_bytes(op->u.set_variable.size); + data =3D xvmalloc_array(unsigned char, op->u.set_variable.size); if ( !data ) rc =3D -ENOMEM; else if ( copy_from_guest(data, op->u.set_variable.data, @@ -581,8 +582,8 @@ int efi_runtime_call(struct xenpf_efi_ru efi_rs_leave(&state); } =20 - xfree(data); - xfree(name); + xvfree(data); + xvfree(name); } break; =20 @@ -598,13 +599,13 @@ int efi_runtime_call(struct xenpf_efi_ru return -EINVAL; =20 size =3D op->u.get_next_variable_name.size; - name.raw =3D xzalloc_bytes(size); + name.raw =3D xvzalloc_array(unsigned char, size); if ( !name.raw ) return -ENOMEM; if ( copy_from_guest(name.raw, op->u.get_next_variable_name.name, size) ) { - xfree(name.raw); + xvfree(name.raw); return -EFAULT; } =20 @@ -629,7 +630,7 @@ int efi_runtime_call(struct xenpf_efi_ru else rc =3D -EOPNOTSUPP; =20 - xfree(name.raw); + xvfree(name.raw); } break;