From nobody Mon Feb 9 11:26:56 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A8A8717A2F2; Fri, 25 Apr 2025 02:38:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745548706; cv=none; b=SC/3a7FcX38mhknsMYnqIX96MizZnE9EzgWsbwZhu4Mj7GUHXDsbXOHRXI2gTAbHaqnwECwugaiN69RUTgqDPZXSX89AJ8iAtsMjCyl6R1/BJ2RRAkS/XQ+I43tN/HDBHh0IPvmp0PMR3mGsJJQE/5uSYoE/IHvHxHkP6gAWqfc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745548706; c=relaxed/simple; bh=UihD/TmxEBCrTh8U8AQInq1+Tc3Opzly13UDOmOBkLE=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=gZBIsv6IeHsYaGWBdUUFadKT8EsInx3N8BJmdMfCQx7gKsADgWR8PtgWKxkKu+L4SzPw/1rp9wFC/Il6wZmIH5+JLfqdPk9HrKqjr2Dl8QDBjusMc5pgEZVxXbb+JO7g0A+nRMmr1oqIIwjihetnGWaW+pxamg0EltqtZkBK/Ck= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51BE5C4CEE3; Fri, 25 Apr 2025 02:38:26 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98) (envelope-from ) id 1u88zH-0000000HC8t-0dWF; Thu, 24 Apr 2025 22:40:23 -0400 Message-ID: <20250425024023.000117829@goodmis.org> User-Agent: quilt/0.68 Date: Thu, 24 Apr 2025 22:37:55 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Josh Poimboeuf , Jens Remus , x86@kernel.org, Peter Zijlstra , Ingo Molnar , Indu Bhagat , Andy Lutomirski , Thomas Gleixner , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH 5/6] x86/vdso: Use CFI macros in __vdso_sgx_enter_enclave() References: <20250425023750.669174660@goodmis.org> 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" From: Josh Poimboeuf Use the CFI macros instead of the raw .cfi_* directives to be consistent with the rest of the VDSO asm. It's also easier on the eyes. No functional changes. Signed-off-by: Josh Poimboeuf Signed-off-by: Steven Rostedt (Google) --- arch/x86/entry/vdso/vsgx.S | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/x86/entry/vdso/vsgx.S b/arch/x86/entry/vdso/vsgx.S index c0342238c976..8d7b8eb45c50 100644 --- a/arch/x86/entry/vdso/vsgx.S +++ b/arch/x86/entry/vdso/vsgx.S @@ -24,13 +24,14 @@ .section .text, "ax" =20 SYM_FUNC_START(__vdso_sgx_enter_enclave) + SYM_F_ALIGN push %rbp - .cfi_adjust_cfa_offset 8 - .cfi_rel_offset %rbp, 0 + CFI_ADJUST_CFA_OFFSET 8 + CFI_REL_OFFSET %rbp, 0 mov %rsp, %rbp - .cfi_def_cfa_register %rbp + CFI_DEF_CFA_REGISTER %rbp push %rbx - .cfi_rel_offset %rbx, -8 + CFI_REL_OFFSET %rbx, -8 =20 mov %ecx, %eax .Lenter_enclave: @@ -77,13 +78,11 @@ SYM_FUNC_START(__vdso_sgx_enter_enclave) .Lout: pop %rbx leave - .cfi_def_cfa %rsp, 8 + CFI_DEF_CFA %rsp, 8 RET =20 - /* The out-of-line code runs with the pre-leave stack frame. */ - .cfi_def_cfa %rbp, 16 - .Linvalid_input: + CFI_DEF_CFA %rbp, 16 mov $(-EINVAL), %eax jmp .Lout =20 --=20 2.47.2