From patchwork Sat Jul 1 18:08:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 115059 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp11208791vqr; Sat, 1 Jul 2023 12:21:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4FL4n+hCEtxcMbpoW0+hYXxuxiVbT8LI/JlOhtZJxMx2m5/d0wFZ+4fBY7hPfzjdEc9YJL X-Received: by 2002:a05:6a20:42a8:b0:117:3c00:77da with SMTP id o40-20020a056a2042a800b001173c0077damr5787176pzj.20.1688239281586; Sat, 01 Jul 2023 12:21:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688239281; cv=none; d=google.com; s=arc-20160816; b=H6eOOF3fKvkUSlFsCLzn1QfGG3FPs2Nl1bOjvceUbgGqUpIqTUYRpwjUEegutfP1Rd nDobapw4yot6G54Di8LdmxqLKIor8KNQHYDlmDGyFuz/x3Zqe08361lUHjM6+2nHtof4 QKyvXV/MBkf2PPZEnOmKuU4bdXRXkyB7zHlqNB5vhfrt9mF5SMjIiutf5E9kiC/l/OWC EtteBdQJusP1WlqqfYuUURfGj0C1MZ4cpNe496IzRghLMRVmqMd1P5XPOb7g+n9HWBcK rXZd5QTu9qrqDHRe51m3eOa4vTvM0pgkLWHSGhtSbcQegWcY3UqxY453oEnYVFLAb9YK HBWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:content-transfer-encoding :message-id:subject:cc:to:dkim-signature:dkim-signature:from; bh=Z7n65yztowNTsN6knddAU63E2VJZBTfxWUPidBhKx1U=; fh=6LkEhNBL2mo5Mo+t6yemqdayPsF8SyUW68IBAGIUZAo=; b=t5awya9t/aDMUHTGggEyWCxK7h1nmbjnk/SCipCQjSJNa4PLescG7e/MO/Buo2BCoe 8eeIrwISllgaGsbhv0DbvcL92xyZo7vfUsorrbC42ryfW5vloLxfIj8tu4+T/0eODqRd 9rgnrzY5YTAY7XNt1MB8qjhkJPvJEYDruAmoVi+rz2i4abOblCdqCIqdYNR3KpUt63Ci TtoEx5A8P3Xd/fxLdPTTRiB8Hzz83kgk5T931rAlBn3eaulZSj4vkH88H36+FX2XkWAY TMBeXDwQ5dsSiKiunAqmG4P01c+vtiDBzUjVHINKcMPoJcAkTZC3ac0tGYujQkKkO+hC HTfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=d6646aj5; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q28-20020a635c1c000000b0054fd1c6d253si15184289pgb.760.2023.07.01.12.21.07; Sat, 01 Jul 2023 12:21:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=d6646aj5; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229779AbjGASIY (ORCPT + 99 others); Sat, 1 Jul 2023 14:08:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229446AbjGASIX (ORCPT ); Sat, 1 Jul 2023 14:08:23 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD4F1E60 for ; Sat, 1 Jul 2023 11:08:22 -0700 (PDT) From: Thomas Gleixner DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1688234901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z7n65yztowNTsN6knddAU63E2VJZBTfxWUPidBhKx1U=; b=d6646aj5wg0yj4mdJao8Dgf0qZu4IG98x0Nvbz5K1JL8XYZ6oXy494B4ZXhZdygACZ9GXV 8lAZZQ9QGeRPhkAGrNBqvDF6wipLiNc+QlCfUFRuC/UKPWCWkPolVrPfSHNvkNa5vLrwBL JjwVY6BftUCbTO/TqOnHjqU7YgrTd2XcBub+O8hb4+kZCjzNLvbbes8r8NaR5zv73GfvPw YPoRugeyySvdeq4hWVyJnwUarUmj0b2J55sU4Oy9LFERo6o+kjil79m3203XPFc6UTU3OW pxwUzF+rX5QfTJiVAlzpcc9B/XOg9wjG2pIke+i2Vu6J+bOI5Yqo4ddcB4pYfQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1688234901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z7n65yztowNTsN6knddAU63E2VJZBTfxWUPidBhKx1U=; b=Lro8dXmykNRkQq+JZMqMpD3EiSgGFAb6haa2ngyLq6nisDwcUqdrlgbX3J9O2EIyTv2LGN Mc2MnNy6/eODpnCA== To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, x86@kernel.org Subject: [GIT pull] x86/urgent for v6.5-rc1 Message-ID: <168823486244.3978156.6059859588267964136.tglx@xen13> MIME-Version: 1.0 Date: Sat, 1 Jul 2023 20:08:20 +0200 (CEST) X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770247163108246389?= X-GMAIL-MSGID: =?utf-8?q?1770247192618495988?= Linus, please pull the latest x86/urgent branch from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-2023-07-01 up to: 0303c9729afc: x86/efi: Make efi_set_virtual_address_map IBT safe A single regression fix for x86: Moving the invocation of arch_cpu_finalize_init() earlier in the boot process caused a boot regression on IBT enabled system. The root cause is not the move of arch_cpu_finalize_init() itself. The system fails to boot because the subsequent efi_enter_virtual_mode() code has a non-IBT safe EFI call inside. This was never noticed because IBT was enabled after the EFI initialization. Switching the EFI call to use the IBT safe wrapper cures the problem. Thanks, tglx ------------------> Thomas Gleixner (1): x86/efi: Make efi_set_virtual_address_map IBT safe arch/x86/platform/efi/efi_64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index 232acf418cfb..77f7ac3668cb 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c @@ -853,9 +853,9 @@ efi_set_virtual_address_map(unsigned long memory_map_size, /* Disable interrupts around EFI calls: */ local_irq_save(flags); - status = efi_call(efi.runtime->set_virtual_address_map, - memory_map_size, descriptor_size, - descriptor_version, virtual_map); + status = arch_efi_call_virt(efi.runtime, set_virtual_address_map, + memory_map_size, descriptor_size, + descriptor_version, virtual_map); local_irq_restore(flags); efi_fpu_end();