From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) (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 3677C3568E9 for ; Fri, 5 Sep 2025 13:30:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757079055; cv=none; b=GdtkEDhMk7kScJ69rPCK2o3iQD/3HIuL8m1daKjxLuZ0WXIwHAP1n5LpmySVOwrQr1Wn00EewWWZ7huLqd9cz8vhMiqpAD2g1N6i6Dk4o3ubW4praSDXg5vK7+cfls819ck0GEgk2PesfV7JvSRe8M25ApNt9Bm21/QVZp8t+4c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757079055; c=relaxed/simple; bh=dSZsAM8dQkdzxBR5dzeF0mi5iq6iad7XREh2ikihpVI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=GfFcaQ8EVTvo6STYhb7nKlFfwbpVo1zmZ5EYouJ5rECqD7f73iOYsNd6ryjIWjVC2oM4q9GgVpHOb9AHU/ZgaCWXhvGP+jrqQjiRvyFwathTU01GUw5RMNHU8Q8jkSfPuazFu6poLS5bLwff5wkG+eGKxZWgORa+Pf3T88Zsv4E= 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=OBWUu/fX; arc=none smtp.client-ip=209.85.221.74 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="OBWUu/fX" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-3df9f185c7cso1799039f8f.1 for ; Fri, 05 Sep 2025 06:30:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1757079052; x=1757683852; 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=M5LnJAE3YZc7C+MgCps2xix2Kr7DZlZm+g8SIPc04+Q=; b=OBWUu/fXYinPjbPvXRDhB+IKUgafaRfJA48OqobKipgMMMoA0bJ8upCvFEr7GGTotb eyAVm6QoZAtHuCrNEyUggnIG0ql/ovNKr/74wtOiJvmcggcDdcNy/r5n84ly4pW1C1+Z /MbVgiy4I9UVjKvsyMixmXEV1tM701a4g0vQA+poDBlrFGCiSN+ZT6CwgEaxjVJaqMvV TN/ZdyYa90bTnjRgKV7mx43zMa2jFFh0f9r0MoN3rRxw+SvytlqisgZpi1nlgtdZ/0YA t2iKqABdHhphbzHLXDXmR4DuKo1jQ143gJLwFf5FwTpA2slEZboS68INE29lO0vmnbu3 HJeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757079052; x=1757683852; 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=M5LnJAE3YZc7C+MgCps2xix2Kr7DZlZm+g8SIPc04+Q=; b=baGDss/CMATRh7G+QNWCHEByk4b9aeroZvPbXWK0UYCB+h+3Atpb3onDTgwemHOF2w luG/AvoTirYnUZERSO60gBaROTKyx4EKTeSOMHkZiqNCoIdMYGs3O0tlP8Rl68C8MOUl tMdXnEXNGR63W5MHmA85lBcmfXTzPvntIQ1rtrhNFYkYfL8BGaTLQ+Sy4BuebzFej3nB CIwevalARLns+37w3jJikSZJ9Yb/zmcZU0seHJQkXE7NVKfCqvYHKDpgFLCDmCsGvlGd KM/447iJc6Ry3Cj+1om4/OVYwbUrAHAsDTtl9m7YilU9P5fWC4sj4T7veh0kYDAYIw4d 4QUA== X-Gm-Message-State: AOJu0Yxf7WqLQrnMhSd3ohSbkEmJxcgLquDRUWpJGOx12sWfpdocLDOw N0JRm5uMQoKshVl4SN1U2u/ohFYQvamoOxHjCOeMgzXQbUKgze3+es5fXf5R6otkTdh1JtvAgg= = X-Google-Smtp-Source: AGHT+IHMbBeVKy4nTkbHNNXw1E6U+lB/o2tBsWIP/XOdZuFF9D5csjYK61b/Q6qJIegwb6HxvZsJhbcI X-Received: from wmbf9.prod.google.com ([2002:a05:600c:5949:b0:45b:7262:8426]) (user=ardb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:268a:b0:3d4:2f8c:1d37 with SMTP id ffacd0b85a97d-3d42f8c2014mr18693666f8f.26.1757079052632; Fri, 05 Sep 2025 06:30:52 -0700 (PDT) Date: Fri, 5 Sep 2025 15:30:41 +0200 In-Reply-To: <20250905133035.275517-9-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: <20250905133035.275517-9-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=1404; i=ardb@kernel.org; h=from:subject; bh=LG9z8ZfG/9lulzNu83d9OgD0HFnWetupMNmr542q5Ks=; b=owGbwMvMwCVmkMcZplerG8N4Wi2JIWPXM4Y7F0JYuPJPl/FPqAhOvOS/S0fsxmm5cIbmeQeWv /m6IntxRykLgxgXg6yYIovA7L/vdp6eKFXrPEsWZg4rE8gQBi5OAZjI+oeMDBuXdugdkF+/+e3a sumKH1zmv9ZLvBy+SMj9znyFJZlnEtUY/lnIbpn4UqD00YKSc7W+PmpfbbSXM27XOuGjy3zkxZ1 oSQ4A X-Mailer: git-send-email 2.51.0.355.g5224444f11-goog Message-ID: <20250905133035.275517-14-ardb+git@google.com> Subject: [PATCH v2 5/7] arm64/efi: Use a semaphore to protect the EFI stack and FP/SIMD state 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 Content-Type: text/plain; charset="UTF-8" From: Ard Biesheuvel Replace the spinlock in the arm64 glue code with a semaphore, so that the CPU can preempted while running the EFI runtime service. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/efi.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c index 9b03f3d77a25..8b999c07c7d1 100644 --- a/arch/arm64/kernel/efi.c +++ b/arch/arm64/kernel/efi.c @@ -165,12 +165,19 @@ asmlinkage efi_status_t efi_handle_corrupted_x18(efi_status_t s, const char *f) return s; } -static DEFINE_RAW_SPINLOCK(efi_rt_lock); +static DEFINE_SEMAPHORE(efi_rt_lock, 1); bool arch_efi_call_virt_setup(void) { + /* + * This might be called from a non-sleepable context so try to take the + * lock but don't block on it. This should never occur in practice, as + * all EFI runtime calls are serialized under the efi_runtime_lock. + */ + if (WARN_ON(down_trylock(&efi_rt_lock))) + return false; + efi_virtmap_load(); - raw_spin_lock(&efi_rt_lock); __efi_fpsimd_begin(); return true; } @@ -178,8 +185,8 @@ bool arch_efi_call_virt_setup(void) void arch_efi_call_virt_teardown(void) { __efi_fpsimd_end(); - raw_spin_unlock(&efi_rt_lock); efi_virtmap_unload(); + up(&efi_rt_lock); } asmlinkage u64 *efi_rt_stack_top __ro_after_init; -- 2.51.0.355.g5224444f11-goog