From nobody Sun Feb 8 11:44:49 2026 Received: from mail-yw1-f182.google.com (mail-yw1-f182.google.com [209.85.128.182]) (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 8E08631B100 for ; Tue, 3 Feb 2026 17:59:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770141542; cv=none; b=C6jqdokh4kO9e6jNUoAK8aNAtx+2qYhym8jSTce6sGEAgibUO6wGqZ6fji3yJQ11u8KfJZhHALcoQCanAZGlthLdp2yP4V5Ndc4BaBHQSYc4zJusaWbJW0PzvfOHt3P8E99wI5Cd3UDUfgKrgFcNgAF9uyPAUCyWTGXCpF6yiYk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770141542; c=relaxed/simple; bh=xTZo6DvhrJhSN43KQ8a4nO6tilTwGGnmhB0NCTVr11Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X0WwYlxy5rsZeDckRd/hDyAMK0vRmfw4m2YTuPQxXYF0UplGdCzwSMoUykNaRV82zJMDGwisGBrP+zogspOEERl2ACSnP2E8uHa9ke432z4wzRkYfHRyHnmb4n/6Jfedz/iHURBL1l5s4GYcVVu0vwhUqForXjVwkvr3DArEoyk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eS1qzZsw; arc=none smtp.client-ip=209.85.128.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eS1qzZsw" Received: by mail-yw1-f182.google.com with SMTP id 00721157ae682-794db376fc3so23797617b3.0 for ; Tue, 03 Feb 2026 09:59:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770141539; x=1770746339; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8UCs0JK9f32+gffEVJ8m8OvhzMDLw9dM5nje1FPgabQ=; b=eS1qzZswhX4OobSMzqBZRng9rPy2MRBy/hhbzKiw9CYzYSUjSB7IFnt0E1iLV4m4Bw FlfAYTOsB5ffszpCSwjOeiySmKYFvcd2sUR6gw5xmsrmsTrBejWmlIvLmPpLzITXz7VE XluhBnTmiSqkGlhXgWIpmeN1vUoFvCI9yzEFCDu2X097hpEr6f2IRHrSOlTWXXAareDM fuTnSNuWdMfh0klDNb9FZrpxglZYpi1512B2KR71Z9sc9v0AxGxYz42UkxGyffweGYVY wf2HwSS5iov8V1WwFJe6iPyaoPiX1diXzRRK4wvzAnMeGDXjn8/HNi61vcCh3T8fGRRt B/7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770141539; x=1770746339; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=8UCs0JK9f32+gffEVJ8m8OvhzMDLw9dM5nje1FPgabQ=; b=X7SfA2N8hSyNYDBakuCwkgjYKIzNfm+EZ3o/6lsQyF4VDommq2uXZhw3ScmTVpSFdp mjtVo01ZC8jb+qqceww17BWqu1DZ3j9U8jMNKItn7rsLFyd7YUak0IsQ35XT8ipbyhLA P3NvbCG2SghfQmoT3rz9KtEjdnCRXbVtHkf0EVdRuXxXgQlnvwjFFCvjflWmqWZnnYLC 1e4Mf81WbpVi3pkQdrUNYGyBqwdZUNEa/99Ej3c6UMR8J+qOkP/SmzqLwZVNYiqpyyIK +OrfJ7A89O10ZmqGzZrrpXDTQI3MguST/vrUDdstMN48f2TabEpeTcIm4cKXhTpMri8J 5r+Q== X-Gm-Message-State: AOJu0YwU7D6NnGmXHluddlB3QRmzj2H4GxCL8OBWvqGURlf0UqXfBaPV BaxEFcz7TYvYNPGYkIt5caWyYEU0W+Fo5RGtCj97B4v/Zk61vpTcdnN1CpFG X-Gm-Gg: AZuq6aIbQJvw3dclAKJ0s0oaiMNzKNCEphCgi+x0BbxYi5lA+s/cYTwkWBvW4FwuuuS wuMlDKDgegKW589WtsFb0zylyv7oYhJ+a1NnZoi5zDOEem2Q5Lfg54UeL++PS2iI+cEvcZxwhEH BZKyvvzUO3g2Vz9Pwkwsa0xov+KZL9xqO+YBNjNC4dlElwG5EuUBYDYw+VU4sqNRWUysde28K82 FId7KP7UQ6LfiAVFqpMsB3V4s5ZEIXwaohG7ApX3mtjfR8KRFbbHCWSvN2N62oOeYBMGSzxYvzR AIQn4XGhCvOFAoLVgZS6v0hsVnylh/Cpwnfw8XcJaVvu0egkir7YGa9XwH7eFp/RMl/sNEuAkwL fnAh8X9XOuYV9v6pfcLMTgdPwkYgDqOoCCqu76mIz649VYfhZJyHHdR26xV2LfcAwhDhi X-Received: by 2002:a05:690c:1a:b0:794:c7db:51d with SMTP id 00721157ae682-794fe6361a1mr3681097b3.9.1770141539222; Tue, 03 Feb 2026 09:58:59 -0800 (PST) Received: from citadel.lan ([2600:6c4a:4d3f:6d5c::1dba]) by smtp.gmail.com with ESMTPSA id 00721157ae682-794fefc8849sm1204647b3.38.2026.02.03.09.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Feb 2026 09:58:58 -0800 (PST) From: Brian Gerst To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Ingo Molnar , "H . Peter Anvin" , Thomas Gleixner , Borislav Petkov , Ard Biesheuvel , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Brian Gerst Subject: [PATCH v2 1/4] x86/acpi/suspend: Remove indirect jump Date: Tue, 3 Feb 2026 12:58:18 -0500 Message-ID: <20260203175821.511847-2-brgerst@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260203175821.511847-1-brgerst@gmail.com> References: <20260203175821.511847-1-brgerst@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" wakeup_long64() is called from common_startup_64() via initial_code, so it is already running on the normal virtual mapping. There is no need to use an indirect jump since it is not switching mappings. Signed-off-by: Brian Gerst --- arch/x86/kernel/acpi/wakeup_64.S | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup= _64.S index 04f561f75e99..3d56610f0108 100644 --- a/arch/x86/kernel/acpi/wakeup_64.S +++ b/arch/x86/kernel/acpi/wakeup_64.S @@ -41,10 +41,9 @@ SYM_FUNC_START(wakeup_long64) movq saved_rsi(%rip), %rsi movq saved_rbp(%rip), %rbp =20 - movq saved_rip(%rip), %rax - ANNOTATE_RETPOLINE_SAFE - jmp *%rax + jmp .Lresume_point SYM_FUNC_END(wakeup_long64) +STACK_FRAME_NON_STANDARD wakeup_long64 =20 SYM_FUNC_START(do_suspend_lowlevel) FRAME_BEGIN @@ -71,8 +70,6 @@ SYM_FUNC_START(do_suspend_lowlevel) pushfq popq pt_regs_flags(%rax) =20 - movq $.Lresume_point, saved_rip(%rip) - movq %rsp, saved_rsp(%rip) movq %rbp, saved_rbp(%rip) movq %rbx, saved_rbx(%rip) @@ -84,11 +81,8 @@ SYM_FUNC_START(do_suspend_lowlevel) xorl %eax, %eax call x86_acpi_enter_sleep_state /* in case something went wrong, restore the machine status and go on */ - jmp .Lresume_point =20 - .align 4 .Lresume_point: - ANNOTATE_NOENDBR /* We don't restore %rax, it must be 0 anyway */ movq $saved_context, %rax movq saved_context_cr4(%rax), %rbx @@ -139,7 +133,6 @@ saved_rsi: .quad 0 saved_rdi: .quad 0 saved_rbx: .quad 0 =20 -saved_rip: .quad 0 saved_rsp: .quad 0 =20 SYM_DATA(saved_magic, .quad 0) --=20 2.52.0