From: Jens Remus <jremus@linux.ibm.com>
Date: Thu, 19 Sep 2024 12:40:06 +0000 (+0200)
Subject: s390/vdso: Add CFI annotations to __arch_chacha20_blocks_nostack()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5cccfc8be6d256e91d155313edef20c1a89064b2;p=linux-platform-drivers-x86.git

s390/vdso: Add CFI annotations to __arch_chacha20_blocks_nostack()

This allows proper unwinding, for instance when using a debugger such
as GDB.

Signed-off-by: Jens Remus <jremus@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Acked-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
---

diff --git a/arch/s390/kernel/vdso64/vgetrandom-chacha.S b/arch/s390/kernel/vdso64/vgetrandom-chacha.S
index 3f7e30886d1b..894954bf3b41 100644
--- a/arch/s390/kernel/vdso64/vgetrandom-chacha.S
+++ b/arch/s390/kernel/vdso64/vgetrandom-chacha.S
@@ -3,6 +3,7 @@
 #include <linux/stringify.h>
 #include <linux/linkage.h>
 #include <asm/alternative.h>
+#include <asm/dwarf.h>
 #include <asm/fpu-insn.h>
 
 #define STATE0	%v0
@@ -38,6 +39,7 @@
  *				       size_t nblocks)
  */
 SYM_FUNC_START(__arch_chacha20_blocks_nostack)
+	CFI_STARTPROC
 	larl	%r1,.Lconstants
 
 	/* COPY0 = "expand 32-byte k" */
@@ -177,4 +179,5 @@ SYM_FUNC_START(__arch_chacha20_blocks_nostack)
 	VPERM	TMP3,STATE3,STATE3,BEPERM
 	VSTM	TMP0,TMP3,0,%r2
 	j	.Lstoredone
+	CFI_ENDPROC
 SYM_FUNC_END(__arch_chacha20_blocks_nostack)