From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.214.200 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794890122; b=xhVI+D+Mf0vxIB7w90hNKfYapIwyc37+kFoF5ZIGMOgdHgxJXBWlWLXbrz6gQyzom4WB eL4I58ATuwjnv94IgrUMwAUelin+8iYaeZyUVUEC2gu/dsheP3y2x75CiTAThmW88y3Gu WGmKUzhwHiDqQEdybHFXMxhLXjEBNofBu8onX7HcsSROwXTmOP7Uy9HHGw3sC4AvDgZn9 mYG0Paj96/e9BLzdKFaZNjmcYUTqC8Y146sE5v6x9JQkZ6GioEhuODV/rIILcGgAsc8wO ALCFCFIb99xCfdhZqj2GZcmcdjqRXQ9CagWKnkYIoJNv5rgT+HvzKvWVgRjoaLLkWyA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794890122; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=vDuDdRL8iZneo/phC8IWAHFDoAthrBkjX6kaJXJOz94=; b=bYm/kMQkoXmgLAeI3N0C0pactnvAbrgZZ9nFfchcOxvp+rqkGz7mK1Q/2sKyo7tUIqNB LfdzaIcItD3a+vT+HmGT6VPVB5kzvQ7mpUN9zGRmvQuRdp3TbhYOZV6xfxWWnlqhgVQVw 3Le7+mnuvQpJjVDShnrfMqfw2zydXfU6DtHArH9YzztvsKmByfvGBKkrSbGrc4X31R3iP U6fI8PAPzP3+KMmGAhkAO4z1uLpbvj2E/wQBYnvC52HQ8dPOpSBjc/jQ+wAyZGaO2HJr5 ufM8VgxKoKk+npN4wHw5EHKNGMES4hssifGKjWigwXnO9JHdhdBQWprioagT6QeTJgQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--dylanbhatch.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=SP+W2Lfk; arc=none smtp.remote-ip=209.85.214.200 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9870160A263D for ; Tue, 17 Nov 2026 04:35:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 9870160A263D 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--dylanbhatch.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=SP+W2Lfk Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2e9501034c4so61655125ad.0 for ; Mon, 16 Nov 2026 20:35:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1794890122; x=1795494922; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=vDuDdRL8iZneo/phC8IWAHFDoAthrBkjX6kaJXJOz94=; b=SP+W2LfkrNnx1jjN1YNt85F6BWfWujzUbmezApdaGbnymMtHckzkHgEeMcGL6xU8h1 nD6R3fyN/x1rYwdbf4MAqKbtXEEaEmvXvDpWHPEGH3/bk+OX6xV8DF2LigTbmgUbUPb0 r1dE0YwMPw7w1SKCVJ727fHAREoHGUBOGBZWsVnjYzEPGQ31Nn61uqXpHcoAhbLg9WUE KzEwoZTL9etEHuGkwJzVXhuF4ls/afNviCViuQngeDFWeKRszizOxBwX9oN1ngT37jyK R4RVV0MG/lW9MQYke19cs3iDXlRvJtstT9NhsOAhnCWYYYvYtdLp4kTN72OdXE61KzQk uvFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794890122; x=1795494922; h=content-type: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:content-type; bh=vDuDdRL8iZneo/phC8IWAHFDoAthrBkjX6kaJXJOz94=; b=EeeJjy11co70QZ8LNHkm6ubwSFsxiHvv/bfaeMp/2sOHQgTJrV/zZpfvgR8JL5nrR4 3YTzxGFHKIBGLitLWTPHDEFNWLI+sSzLlnHS7cfoNNe2oifCCswE63UIrb8FJFAW2AIz 8EkPcJ7d8fxUI0MIlTBFc+rdY5D55NsGPyHy2EmFfk5e8sZcXoaA9rRGTb3t83BXqiEA uR1v/idyg8fb5x0Y1LEb8nrgLRo4q1DJ4CEDOZHpXCt8JhkzujUMSInXlTajDf8/2RF9 jqp0srZuW5R8ZEnvu0VWRiLsVym3QVAs9FE2dTiUNTzA6Cwl/ermMkowZDoYypICufNM iDeQ== X-Forwarded-Encrypted: i=1; AL+hErE4zW3DoyWBMq5tcCxdySnjAeJAWz7cEZEtax2DgqnWPzBV9sOeNCoB0XqnouHeuHU4Wwnp+JQg/+Flj9Cc@vger.kernel.org X-Gm-Message-State: APuU4Z8YOaXCd0yiWqbTHKT3d+MNs5ICAP9n/8RoGImsI+TSs2pyb6Gz b56W/OhAyQosfl1+ZMcodSguEd7b3TPexQNw9mwioVmTbby/QIdpU1eGubQhFOae5KSKR7zEJDy EmnMRb/fNjAoDzaYISybC9rswgw== X-Received: from plgn9.prod.google.com ([2002:a17:902:f609:b0:2df:4aa4:16d0]) (user=dylanbhatch job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:f8d:b0:2e9:5507:b52c with SMTP id d9443c01a7336-2ee0de03f7dmr125521225ad.34.1794890121819; Mon, 16 Nov 2026 20:35:21 -0800 (PST) Date: Tue, 17 Nov 2026 04:35:02 +0000 In-Reply-To: <20261117043504.1021063-1-dylanbhatch@google.com> X-Mailing-List: live-patching@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261117043504.1021063-1-dylanbhatch@google.com> X-Mailer: git-send-email 2.56.0.679.gc527c65306-goog Message-ID: <20261117043504.1021063-11-dylanbhatch@google.com> Subject: [RFC PATCH 10/12] arm64: entry: add unwind info for call_on_irq_stack() From: Dylan Hatch To: Catalin Marinas , Will Deacon , Mark Rutland Cc: Herbert Xu , "David S . Miller" , Nathan Chancellor , Nicolas Schier , Nick Desaulniers , Bill Wendling , Justin Stitt , Weinan Liu , Jens Remus , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-crypto@vger.kernel.org, llvm@lists.linux.dev, Josh Poimboeuf , Steven Rostedt , Ard Biesheuvel , Indu Bhagat , Prasanna Kumar T S M , live-patching@vger.kernel.org, Dylan Hatch Content-Type: text/plain; charset="UTF-8" From: Weinan Liu DWARF CFI (Call Frame Information) specifies how to recover the return address and callee-saved registers at each PC in a given function. Compilers are able to generate the CFI annotations when they compile the code to assembly language. For handcrafted assembly, we need to annotate them by hand. Frame pointers alone are usually sufficient to recover stack frames (without CFI), except at the exception boundary, where more information is needed to determine if the LR is live. Since an exception can be taken from call_on_irq_stack(), annotate it with CFI. The actual entry assembly functions are left untouched, since they are not expected to take exceptions themselves. Signed-off-by: Weinan Liu Suggested-by: Jens Remus Signed-off-by: Dylan Hatch --- arch/arm64/kernel/entry.S | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 8d17f61d1b5b2..aae27ccc0f2c1 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -30,6 +30,13 @@ #include #include +#ifndef CONFIG_UNWIND_TABLES +/* + * Do not generate .eh_frame unless CONFIG_UNWIND_TABLES is enabled. + */ + .cfi_sections .debug_frame +#endif + .macro clear_gp_regs .irp n,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29 mov x\n, xzr @@ -880,8 +887,11 @@ NOKPROBE(ret_from_fork) * void (*func)(struct pt_regs *)); * * Calls func(regs) using this CPU's irq stack and shadow irq stack. + * Open-code SYM_FUNC_START() so .cfi_startproc precedes the BTI landing pad. */ -SYM_FUNC_START(call_on_irq_stack) +SYM_START(call_on_irq_stack, SYM_L_GLOBAL, SYM_A_ALIGN) + .cfi_startproc + bti c save_and_disable_daif x9 #ifdef CONFIG_SHADOW_CALL_STACK get_current_task x16 @@ -892,6 +902,9 @@ SYM_FUNC_START(call_on_irq_stack) /* Create a frame record to save our LR and SP (implicit in FP) */ stp x29, x30, [sp, #-16]! mov x29, sp + .cfi_def_cfa 29, 16 + .cfi_offset 29, -16 + .cfi_offset 30, -8 ldr_this_cpu x16, irq_stack_ptr, x17 @@ -907,9 +920,13 @@ SYM_FUNC_START(call_on_irq_stack) */ mov sp, x29 ldp x29, x30, [sp], #16 + .cfi_restore 29 + .cfi_restore 30 + .cfi_def_cfa 31, 0 scs_load_current restore_irq x9 ret + .cfi_endproc SYM_FUNC_END(call_on_irq_stack) NOKPROBE(call_on_irq_stack) -- 2.56.0.679.gc527c65306-goog