From nobody Thu Oct 2 10:55:27 2025 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 496482FB0BF for ; Thu, 18 Sep 2025 10:30:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758191441; cv=none; b=QjUUARG+zmVauV/DD6/D6hnRJ/2rFvVcmTsY6NGHfj7uvqbNcBPfIpd5gUNqTHk5KEVY4r2ENe32lqsIXP8JV4BPlqlNRljFePL+iz5KUcEOYr1sybqqaIATCWBWhxFYyB+sKnmdKV/HXuFL4378TsZ06T11pqVZ+bFAjYLYhy0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758191441; c=relaxed/simple; bh=DW2Ev36DfFisiSLl+rnUFogK7g/mxLQ+QNCw/NXoxlI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Ico4pvAFD0dlAI8Ln7QjGxK9pGnV036uqbt74MqXISoNh0C/Is4CiTn9+8Bhx6C5DMK5ixQyZZvhHRo5HC+TjKLs2B+AWCZWNS3ykb6DLy1BD69cOQgBhaDmkQsRUT6wKbzy9FFYGMY77ZIY0Kpi820dNb758AoK7HXld7OjkMM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=WdK8EDVX; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="WdK8EDVX" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-45f2a1660fcso7003615e9.1 for ; Thu, 18 Sep 2025 03:30:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758191438; x=1758796238; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ZeKidemFHugBWvlLdngZx3GvGl5BhC7gmcxHsIeIDzM=; b=WdK8EDVXcRdGpQWeXdUKaNqKxWsj+eKbyxkm3UcOG3LA+7r73UH2HmkPv7jl9J+V17 OFKO4mW85xiW/pgC6B54pVVigRy03McVrccke9Q+DMIGcx8VD5Plpm7FkGNW5i5BNs/A OpX2i10fJXlXQp6I2KB6ZsuuV9RefAvlONDNAfLOXegn8oDqE6VeiLDEsjDEmvmbptDh KIDYE3eblncJRxSA4PqzcJM6YAPCBZU3uVcHrMr3Kinos23G8+c4ZQR0bBFUUws8UArC lsJCRWUEaeBXEblwEZmIXcDeIGWHJy3b/cnBqP0VClqRvHPcV5Hp8vmVHKfWFtIRpdD3 Dsag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758191438; x=1758796238; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZeKidemFHugBWvlLdngZx3GvGl5BhC7gmcxHsIeIDzM=; b=nxasyxyR/cLpXGWKOlksuhvR+23jZOt33YJ8Y8eml1QlO5NrJSC0/ECKyokCuZVNR8 izlO2dSIiMwoPLXq+dNhjaA07FiLAYujLIM8gbUMxN4wNcRI6l9YMPGloSgrqKWpCFA8 jU6yy+YRCajcRnSvsOfeBHf2zlVGHfvExk0P1D+4YUJxIQJ/1OmTXKtQqDbxUW1ylT/A 9FUKxEuKNrTmvtMhyXqdEo01onTc1J91J47UzYyMJbIsaUlcwfURPUowA6znMNJpgK77 k2oMGjI8cjoXchweMM4XG6RkcqbXp4OYqE4iK+mouxuWy8rPGh0tbQvSRrKDxWfB0dtJ kSWw== X-Gm-Message-State: AOJu0YxPueU+ZmY/veSI89zqpTMrtxcLEpa06DJzfQ7YuAJvuD5Xx1tl EdYlQZsgee1Bn2LiQc1FDhJ7SK2su2zSnxOqj+olh9I/5kYLqF2De43cohBii/NskcdVS+SrEQ= = X-Google-Smtp-Source: AGHT+IGO4Q3fZanqmM0wjFCsbf3Jf0mIV+3pWr1nuubcDlla09trMD8Lvrvc6pAWYylB9LlHYwGCQUbT X-Received: from wmbhh13.prod.google.com ([2002:a05:600c:530d:b0:45d:cf67:3908]) (user=ardb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1554:b0:45d:d6fc:24f7 with SMTP id 5b1f17b1804b1-462074c55cfmr47460695e9.32.1758191437764; Thu, 18 Sep 2025 03:30:37 -0700 (PDT) Date: Thu, 18 Sep 2025 12:30:14 +0200 In-Reply-To: <20250918103010.2973462-10-ardb+git@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250918103010.2973462-10-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=4130; i=ardb@kernel.org; h=from:subject; bh=sXlqN2yq2zEV1WP5L/wE4aoN5/FR7QwPK75VLdrzA4A=; b=owGbwMvMwCVmkMcZplerG8N4Wi2JIeP0fYut8ixeb+/ldwe/Zy95q5z8xOp3Z7Xn8vJFqpM+n gip5eDpKGVhEONikBVTZBGY/ffdztMTpWqdZ8nCzGFlAhnCwMUpABNZVcnIMIF7L//dMvlJe1Wb rH1n/p3Hs5TR8aNi56PZO1wKtNOc8xkZvvPc4/2flPr428W+ecVz+P5FL+Ctl25R7tb+f0rg2cF oJgA= X-Mailer: git-send-email 2.51.0.384.g4c02a37b29-goog Message-ID: <20250918103010.2973462-13-ardb+git@google.com> Subject: [PATCH v3 3/8] efi/runtime: Deal with arch_efi_call_virt_setup() returning failure From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Will Deacon , Mark Rutland , Sebastian Andrzej Siewior , Peter Zijlstra , Catalin Marinas , Mark Brown Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ard Biesheuvel Deal with arch_efi_call_virt_setup() returning failure, by giving up and returning an appropriate error code to the caller. Signed-off-by: Ard Biesheuvel --- arch/x86/platform/uv/bios_uv.c | 3 ++- drivers/firmware/efi/runtime-wrappers.c | 20 +++++++++++++------- include/linux/efi.h | 8 ++++---- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c index bf31af3d32d6..a442bbe5b1c2 100644 --- a/arch/x86/platform/uv/bios_uv.c +++ b/arch/x86/platform/uv/bios_uv.c @@ -32,7 +32,8 @@ static s64 __uv_bios_call(enum uv_bios_cmd which, u64 a1,= u64 a2, u64 a3, */ return BIOS_STATUS_UNIMPLEMENTED; =20 - ret =3D efi_call_virt_pointer(tab, function, (u64)which, a1, a2, a3, a4, = a5); + ret =3D efi_call_virt_pointer(tab, function, BIOS_STATUS_UNIMPLEMENTED, + (u64)which, a1, a2, a3, a4, a5); =20 return ret; } diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi= /runtime-wrappers.c index 708b777857d3..82a27b414485 100644 --- a/drivers/firmware/efi/runtime-wrappers.c +++ b/drivers/firmware/efi/runtime-wrappers.c @@ -219,7 +219,10 @@ static void __nocfi efi_call_rts(struct work_struct *w= ork) efi_status_t status =3D EFI_NOT_FOUND; unsigned long flags; =20 - arch_efi_call_virt_setup(); + if (!arch_efi_call_virt_setup()) { + status =3D EFI_NOT_READY; + goto out; + } flags =3D efi_call_virt_save_flags(); =20 switch (efi_rts_work.efi_rts_id) { @@ -308,6 +311,7 @@ static void __nocfi efi_call_rts(struct work_struct *wo= rk) efi_call_virt_check_flags(flags, efi_rts_work.caller); arch_efi_call_virt_teardown(); =20 +out: efi_rts_work.status =3D status; complete(&efi_rts_work.efi_rts_comp); } @@ -444,8 +448,8 @@ virt_efi_set_variable_nb(efi_char16_t *name, efi_guid_t= *vendor, u32 attr, if (down_trylock(&efi_runtime_lock)) return EFI_NOT_READY; =20 - status =3D efi_call_virt_pointer(efi.runtime, set_variable, name, vendor, - attr, data_size, data); + status =3D efi_call_virt_pointer(efi.runtime, set_variable, EFI_NOT_READY, + name, vendor, attr, data_size, data); up(&efi_runtime_lock); return status; } @@ -481,9 +485,9 @@ virt_efi_query_variable_info_nb(u32 attr, u64 *storage_= space, if (down_trylock(&efi_runtime_lock)) return EFI_NOT_READY; =20 - status =3D efi_call_virt_pointer(efi.runtime, query_variable_info, attr, - storage_space, remaining_space, - max_variable_size); + status =3D efi_call_virt_pointer(efi.runtime, query_variable_info, + EFI_NOT_READY, attr, storage_space, + remaining_space, max_variable_size); up(&efi_runtime_lock); return status; } @@ -509,12 +513,14 @@ virt_efi_reset_system(int reset_type, efi_status_t st= atus, return; } =20 - arch_efi_call_virt_setup(); + if (!arch_efi_call_virt_setup()) + goto out; efi_rts_work.efi_rts_id =3D EFI_RESET_SYSTEM; arch_efi_call_virt(efi.runtime, reset_system, reset_type, status, data_size, data); arch_efi_call_virt_teardown(); =20 +out: up(&efi_runtime_lock); } =20 diff --git a/include/linux/efi.h b/include/linux/efi.h index a98cc39e7aaa..325d892e559b 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1181,19 +1181,19 @@ static inline void efi_check_for_embedded_firmwares= (void) { } * Restores the usual kernel environment once the call has returned. */ =20 -#define efi_call_virt_pointer(p, f, args...) \ +#define efi_call_virt_pointer(p, f, busy, args...) \ ({ \ - typeof((p)->f(args)) __s; \ + typeof((p)->f(args)) __s =3D (busy); \ unsigned long __flags; \ \ - arch_efi_call_virt_setup(); \ + if (!arch_efi_call_virt_setup()) goto __out; \ \ __flags =3D efi_call_virt_save_flags(); \ __s =3D arch_efi_call_virt(p, f, args); \ efi_call_virt_check_flags(__flags, NULL); \ \ arch_efi_call_virt_teardown(); \ - \ +__out: \ __s; \ }) =20 --=20 2.51.0.384.g4c02a37b29-goog