From: Deepak Gupta <debug@rivosinc.com> To: paul.walmsley@sifive.com, rick.p.edgecombe@intel.com, broonie@kernel.org, Szabolcs.Nagy@arm.com, kito.cheng@sifive.com, keescook@chromium.org, ajones@ventanamicro.com, conor.dooley@microchip.com, cleger@rivosinc.com, atishp@atishpatra.org, alex@ghiti.fr, bjorn@rivosinc.com, alexghiti@rivosinc.com, samuel.holland@sifive.com, conor@kernel.org Cc: linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org, corbet@lwn.net, palmer@dabbelt.com, aou@eecs.berkeley.edu, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, oleg@redhat.com, akpm@linux-foundation.org, arnd@arndb.de, ebiederm@xmission.com, Liam.Howlett@oracle.com, vbabka@suse.cz, lstoakes@gmail.com, shuah@kernel.org, brauner@kernel.org, debug@rivosinc.com, andy.chiu@sifive.com, jerry.shih@sifive.com, hankuan.chen@sifive.com, greentime.hu@sifive.com, evan@rivosinc.com, xiao.w.wang@intel.com, charlie@rivosinc.com, apatel@ventanamicro.com, mchitale@ventanamicro.com, dbarboza@ventanamicro.com, sameo@rivosinc.com, shikemeng@huaweicloud.com, willy@infradead.org, vincent.chen@sifive.com, guoren@kernel.org, samitolvanen@google.com, songshuaishuai@tinylab.org, gerg@kernel.org, heiko@sntech.de, bhe@redhat.com, jeeheng.sia@starfivetech.com, cyy@cyyself.name, maskray@google.com, ancientmodern4@gmail.com, mathis.salmen@matsal.de, cuiyunhui@bytedance.com, bgray@linux.ibm.com, mpe@ellerman.id.au, baruch@tkos.co.il, alx@kernel.org, david@redhat.com, catalin.marinas@arm.com, revest@chromium.org, josh@joshtriplett.org, shr@devkernel.io, deller@gmx.de, omosnace@redhat.com, ojeda@kernel.org, jhubbard@nvidia.com Subject: [PATCH v3 22/29] riscv sigcontext: adding cfi state field in sigcontext Date: Wed, 3 Apr 2024 16:35:10 -0700 [thread overview] Message-ID: <20240403234054.2020347-23-debug@rivosinc.com> (raw) In-Reply-To: <20240403234054.2020347-1-debug@rivosinc.com> Shadow stack needs to be saved and restored on signal delivery and signal return. sigcontext embedded in ucontext is extendible. Adding cfi state in there which can be used to save cfi state before signal delivery and restore cfi state on sigreturn Signed-off-by: Deepak Gupta <debug@rivosinc.com> --- arch/riscv/include/uapi/asm/sigcontext.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/riscv/include/uapi/asm/sigcontext.h b/arch/riscv/include/uapi/asm/sigcontext.h index cd4f175dc837..5ccdd94a0855 100644 --- a/arch/riscv/include/uapi/asm/sigcontext.h +++ b/arch/riscv/include/uapi/asm/sigcontext.h @@ -21,6 +21,10 @@ struct __sc_riscv_v_state { struct __riscv_v_ext_state v_state; } __attribute__((aligned(16))); +struct __sc_riscv_cfi_state { + unsigned long ss_ptr; /* shadow stack pointer */ + unsigned long rsvd; /* keeping another word reserved in case we need it */ +}; /* * Signal context structure * @@ -29,6 +33,7 @@ struct __sc_riscv_v_state { */ struct sigcontext { struct user_regs_struct sc_regs; + struct __sc_riscv_cfi_state sc_cfi_state; union { union __riscv_fp_state sc_fpregs; struct __riscv_extra_ext_header sc_extdesc; -- 2.43.2
WARNING: multiple messages have this Message-ID (diff)
From: Deepak Gupta <debug@rivosinc.com> To: paul.walmsley@sifive.com, rick.p.edgecombe@intel.com, broonie@kernel.org, Szabolcs.Nagy@arm.com, kito.cheng@sifive.com, keescook@chromium.org, ajones@ventanamicro.com, conor.dooley@microchip.com, cleger@rivosinc.com, atishp@atishpatra.org, alex@ghiti.fr, bjorn@rivosinc.com, alexghiti@rivosinc.com, samuel.holland@sifive.com, conor@kernel.org Cc: linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org, corbet@lwn.net, palmer@dabbelt.com, aou@eecs.berkeley.edu, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, oleg@redhat.com, akpm@linux-foundation.org, arnd@arndb.de, ebiederm@xmission.com, Liam.Howlett@oracle.com, vbabka@suse.cz, lstoakes@gmail.com, shuah@kernel.org, brauner@kernel.org, debug@rivosinc.com, andy.chiu@sifive.com, jerry.shih@sifive.com, hankuan.chen@sifive.com, greentime.hu@sifive.com, evan@rivosinc.com, xiao.w.wang@intel.com, charlie@rivosinc.com, apatel@ventanamicro.com, mchitale@ventanamicro.com, dbarboza@ventanamicro.com, sameo@rivosinc.com, shikemeng@huaweicloud.com, willy@infradead.org, vincent.chen@sifive.com, guoren@kernel.org, samitolvanen@google.com, songshuaishuai@tinylab.org, gerg@kernel.org, heiko@sntech.de, bhe@redhat.com, jeeheng.sia@starfivetech.com, cyy@cyyself.name, maskray@google.com, ancientmodern4@gmail.com, mathis.salmen@matsal.de, cuiyunhui@bytedance.com, bgray@linux.ibm.com, mpe@ellerman.id.au, baruch@tkos.co.il, alx@kernel.org, david@redhat.com, catalin.marinas@arm.com, revest@chromium.org, josh@joshtriplett.org, shr@devkernel.io, deller@gmx.de, omosnace@redhat.com, ojeda@kernel.org, jhubbard@nvidia.com Subject: [PATCH v3 22/29] riscv sigcontext: adding cfi state field in sigcontext Date: Wed, 3 Apr 2024 16:35:10 -0700 [thread overview] Message-ID: <20240403234054.2020347-23-debug@rivosinc.com> (raw) In-Reply-To: <20240403234054.2020347-1-debug@rivosinc.com> Shadow stack needs to be saved and restored on signal delivery and signal return. sigcontext embedded in ucontext is extendible. Adding cfi state in there which can be used to save cfi state before signal delivery and restore cfi state on sigreturn Signed-off-by: Deepak Gupta <debug@rivosinc.com> --- arch/riscv/include/uapi/asm/sigcontext.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/riscv/include/uapi/asm/sigcontext.h b/arch/riscv/include/uapi/asm/sigcontext.h index cd4f175dc837..5ccdd94a0855 100644 --- a/arch/riscv/include/uapi/asm/sigcontext.h +++ b/arch/riscv/include/uapi/asm/sigcontext.h @@ -21,6 +21,10 @@ struct __sc_riscv_v_state { struct __riscv_v_ext_state v_state; } __attribute__((aligned(16))); +struct __sc_riscv_cfi_state { + unsigned long ss_ptr; /* shadow stack pointer */ + unsigned long rsvd; /* keeping another word reserved in case we need it */ +}; /* * Signal context structure * @@ -29,6 +33,7 @@ struct __sc_riscv_v_state { */ struct sigcontext { struct user_regs_struct sc_regs; + struct __sc_riscv_cfi_state sc_cfi_state; union { union __riscv_fp_state sc_fpregs; struct __riscv_extra_ext_header sc_extdesc; -- 2.43.2 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2024-04-03 23:42 UTC|newest] Thread overview: 156+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-04-03 23:34 [PATCH v3 00/29] riscv control-flow integrity for usermode Deepak Gupta 2024-04-03 23:34 ` Deepak Gupta 2024-04-03 23:34 ` [PATCH v3 01/29] riscv: envcfg save and restore on task switching Deepak Gupta 2024-04-03 23:34 ` Deepak Gupta 2024-05-09 0:10 ` Charlie Jenkins 2024-05-09 0:10 ` Charlie Jenkins 2024-05-09 19:00 ` Deepak Gupta 2024-05-09 19:00 ` Deepak Gupta 2024-04-03 23:34 ` [PATCH v3 02/29] riscv: define default value for envcfg for task Deepak Gupta 2024-04-03 23:34 ` Deepak Gupta 2024-05-10 22:33 ` Charlie Jenkins 2024-05-10 22:33 ` Charlie Jenkins 2024-05-13 18:33 ` Deepak Gupta 2024-05-13 18:33 ` Deepak Gupta 2024-04-03 23:34 ` [PATCH v3 03/29] riscv/Kconfig: enable HAVE_EXIT_THREAD for riscv Deepak Gupta 2024-04-03 23:34 ` Deepak Gupta 2024-05-10 22:36 ` Charlie Jenkins 2024-05-10 22:36 ` Charlie Jenkins 2024-04-03 23:34 ` [PATCH v3 04/29] riscv: zicfilp / zicfiss in dt-bindings (extensions.yaml) Deepak Gupta 2024-04-03 23:34 ` Deepak Gupta 2024-04-10 11:58 ` Rob Herring 2024-04-10 11:58 ` Rob Herring 2024-04-10 21:37 ` Deepak Gupta 2024-04-10 21:37 ` Deepak Gupta 2024-04-15 19:41 ` Rob Herring 2024-04-15 19:41 ` Rob Herring 2024-04-16 15:44 ` Deepak Gupta 2024-04-16 15:44 ` Deepak Gupta 2024-05-09 18:14 ` Conor Dooley 2024-05-09 18:14 ` Conor Dooley 2024-05-09 18:46 ` Deepak Gupta 2024-05-09 18:46 ` Deepak Gupta 2024-05-09 20:32 ` Conor Dooley 2024-05-09 20:32 ` Conor Dooley 2024-05-09 23:26 ` Deepak Gupta 2024-05-09 23:26 ` Deepak Gupta 2024-04-03 23:34 ` [PATCH v3 05/29] riscv: zicfiss / zicfilp enumeration Deepak Gupta 2024-04-03 23:34 ` Deepak Gupta 2024-05-09 0:00 ` Andy Chiu 2024-05-09 0:00 ` Andy Chiu 2024-05-09 0:07 ` Charlie Jenkins 2024-05-09 0:07 ` Charlie Jenkins 2024-04-03 23:34 ` [PATCH v3 06/29] riscv: zicfiss / zicfilp extension csr and bit definitions Deepak Gupta 2024-04-03 23:34 ` Deepak Gupta 2024-05-10 22:37 ` Charlie Jenkins 2024-05-10 22:37 ` Charlie Jenkins 2024-04-03 23:34 ` [PATCH v3 07/29] riscv: usercfi state for task and save/restore of CSR_SSP on trap entry/exit Deepak Gupta 2024-04-03 23:34 ` Deepak Gupta 2024-05-10 22:51 ` Charlie Jenkins 2024-05-10 22:51 ` Charlie Jenkins 2024-04-03 23:34 ` [PATCH v3 08/29] mm: Define VM_SHADOW_STACK for RISC-V Deepak Gupta 2024-04-03 23:34 ` Deepak Gupta 2024-04-04 18:58 ` David Hildenbrand 2024-04-04 18:58 ` David Hildenbrand 2024-04-04 19:04 ` Mark Brown 2024-04-04 19:04 ` Mark Brown 2024-04-04 19:15 ` David Hildenbrand 2024-04-04 19:15 ` David Hildenbrand 2024-04-04 19:21 ` Deepak Gupta 2024-04-04 19:21 ` Deepak Gupta 2024-04-03 23:34 ` [PATCH v3 09/29] mm: abstract shadow stack vma behind `vma_is_shadow_stack` Deepak Gupta 2024-04-03 23:34 ` Deepak Gupta 2024-04-04 19:02 ` David Hildenbrand 2024-04-04 19:02 ` David Hildenbrand 2024-04-04 21:39 ` Deepak Gupta 2024-04-04 21:39 ` Deepak Gupta 2024-04-03 23:34 ` [PATCH v3 10/29] riscv/mm : ensure PROT_WRITE leads to VM_READ | VM_WRITE Deepak Gupta 2024-04-03 23:34 ` Deepak Gupta 2024-05-10 21:02 ` Charlie Jenkins 2024-05-10 21:02 ` Charlie Jenkins 2024-05-13 17:47 ` Deepak Gupta 2024-05-13 17:47 ` Deepak Gupta 2024-05-13 18:36 ` Charlie Jenkins 2024-05-13 18:36 ` Charlie Jenkins 2024-05-13 18:41 ` Deepak Gupta 2024-05-13 18:41 ` Deepak Gupta 2024-05-13 21:26 ` Charlie Jenkins 2024-05-13 21:26 ` Charlie Jenkins 2024-05-12 16:24 ` Alexandre Ghiti 2024-05-12 16:24 ` Alexandre Ghiti 2024-05-13 18:29 ` Deepak Gupta 2024-05-13 18:29 ` Deepak Gupta 2024-04-03 23:34 ` [PATCH v3 11/29] riscv mm: manufacture shadow stack pte Deepak Gupta 2024-04-03 23:34 ` Deepak Gupta 2024-05-12 16:26 ` Alexandre Ghiti 2024-05-12 16:26 ` Alexandre Ghiti 2024-04-03 23:35 ` [PATCH v3 12/29] riscv mmu: teach pte_mkwrite to manufacture shadow stack PTEs Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-05-12 16:28 ` Alexandre Ghiti 2024-05-12 16:28 ` Alexandre Ghiti 2024-05-13 17:33 ` Deepak Gupta 2024-05-13 17:33 ` Deepak Gupta 2024-04-03 23:35 ` [PATCH v3 13/29] riscv mmu: write protect and shadow stack Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-05-12 16:31 ` Alexandre Ghiti 2024-05-12 16:31 ` Alexandre Ghiti 2024-05-13 17:32 ` Deepak Gupta 2024-05-13 17:32 ` Deepak Gupta 2024-04-03 23:35 ` [PATCH v3 14/29] riscv/mm: Implement map_shadow_stack() syscall Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-05-12 16:50 ` Alexandre Ghiti 2024-05-12 16:50 ` Alexandre Ghiti 2024-05-13 17:25 ` Deepak Gupta 2024-05-13 17:25 ` Deepak Gupta 2024-04-03 23:35 ` [PATCH v3 15/29] riscv/shstk: If needed allocate a new shadow stack on clone Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-05-12 17:05 ` Alexandre Ghiti 2024-05-12 17:05 ` Alexandre Ghiti 2024-05-13 17:10 ` Deepak Gupta 2024-05-13 17:10 ` Deepak Gupta 2024-04-03 23:35 ` [PATCH v3 16/29] prctl: arch-agnostic prctl for shadow stack Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-04-03 23:35 ` [PATCH v3 17/29] prctl: arch-agnostic prctl for indirect branch tracking Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-05-10 23:29 ` Charlie Jenkins 2024-05-10 23:29 ` Charlie Jenkins 2024-05-13 18:31 ` Deepak Gupta 2024-05-13 18:31 ` Deepak Gupta 2024-04-03 23:35 ` [PATCH v3 18/29] riscv: Implements arch agnostic shadow stack prctls Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-04-03 23:35 ` [PATCH v3 19/29] riscv: Implements arch agnostic indirect branch tracking prctls Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-04-03 23:35 ` [PATCH v3 20/29] riscv/kernel: update __show_regs to print shadow stack register Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-05-12 17:10 ` Alexandre Ghiti 2024-05-12 17:10 ` Alexandre Ghiti 2024-04-03 23:35 ` [PATCH v3 21/29] riscv/traps: Introduce software check exception Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta [this message] 2024-04-03 23:35 ` [PATCH v3 22/29] riscv sigcontext: adding cfi state field in sigcontext Deepak Gupta 2024-04-03 23:35 ` [PATCH v3 23/29] riscv signal: Save and restore of shadow stack for signal Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-04-03 23:35 ` [PATCH v3 24/29] riscv/ptrace: riscv cfi status and state via ptrace and in core files Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-04-03 23:35 ` [PATCH v3 25/29] riscv/hwprobe: zicfilp / zicfiss enumeration in hwprobe Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-04-03 23:35 ` [PATCH v3 26/29] riscv: create a config for shadow stack and landing pad instr support Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-04-03 23:35 ` [PATCH v3 27/29] riscv: Documentation for landing pad / indirect branch tracking Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-05-10 20:30 ` Charlie Jenkins 2024-05-10 20:30 ` Charlie Jenkins 2024-05-13 17:07 ` Deepak Gupta 2024-05-13 17:07 ` Deepak Gupta 2024-04-03 23:35 ` [PATCH v3 28/29] riscv: Documentation for shadow stack on riscv Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-04-03 23:35 ` [PATCH v3 29/29] kselftest/riscv: kselftest for user mode cfi Deepak Gupta 2024-04-03 23:35 ` Deepak Gupta 2024-05-09 18:21 ` Charlie Jenkins 2024-05-09 18:21 ` Charlie Jenkins 2024-05-09 19:16 ` Deepak Gupta 2024-05-09 19:16 ` Deepak Gupta 2024-05-10 1:20 ` Charlie Jenkins 2024-05-10 1:20 ` Charlie Jenkins 2024-05-09 0:33 ` [PATCH v3 00/29] riscv control-flow integrity for usermode Charlie Jenkins 2024-05-09 0:33 ` Charlie Jenkins
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240403234054.2020347-23-debug@rivosinc.com \ --to=debug@rivosinc.com \ --cc=Liam.Howlett@oracle.com \ --cc=Szabolcs.Nagy@arm.com \ --cc=ajones@ventanamicro.com \ --cc=akpm@linux-foundation.org \ --cc=alex@ghiti.fr \ --cc=alexghiti@rivosinc.com \ --cc=alx@kernel.org \ --cc=ancientmodern4@gmail.com \ --cc=andy.chiu@sifive.com \ --cc=aou@eecs.berkeley.edu \ --cc=apatel@ventanamicro.com \ --cc=arnd@arndb.de \ --cc=atishp@atishpatra.org \ --cc=baruch@tkos.co.il \ --cc=bgray@linux.ibm.com \ --cc=bhe@redhat.com \ --cc=bjorn@rivosinc.com \ --cc=brauner@kernel.org \ --cc=broonie@kernel.org \ --cc=catalin.marinas@arm.com \ --cc=charlie@rivosinc.com \ --cc=cleger@rivosinc.com \ --cc=conor.dooley@microchip.com \ --cc=conor@kernel.org \ --cc=corbet@lwn.net \ --cc=cuiyunhui@bytedance.com \ --cc=cyy@cyyself.name \ --cc=david@redhat.com \ --cc=dbarboza@ventanamicro.com \ --cc=deller@gmx.de \ --cc=devicetree@vger.kernel.org \ --cc=ebiederm@xmission.com \ --cc=evan@rivosinc.com \ --cc=gerg@kernel.org \ --cc=greentime.hu@sifive.com \ --cc=guoren@kernel.org \ --cc=hankuan.chen@sifive.com \ --cc=heiko@sntech.de \ --cc=jeeheng.sia@starfivetech.com \ --cc=jerry.shih@sifive.com \ --cc=jhubbard@nvidia.com \ --cc=josh@joshtriplett.org \ --cc=keescook@chromium.org \ --cc=kito.cheng@sifive.com \ --cc=krzysztof.kozlowski+dt@linaro.org \ --cc=linux-arch@vger.kernel.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-kselftest@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-riscv@lists.infradead.org \ --cc=lstoakes@gmail.com \ --cc=maskray@google.com \ --cc=mathis.salmen@matsal.de \ --cc=mchitale@ventanamicro.com \ --cc=mpe@ellerman.id.au \ --cc=ojeda@kernel.org \ --cc=oleg@redhat.com \ --cc=omosnace@redhat.com \ --cc=palmer@dabbelt.com \ --cc=paul.walmsley@sifive.com \ --cc=revest@chromium.org \ --cc=rick.p.edgecombe@intel.com \ --cc=robh+dt@kernel.org \ --cc=sameo@rivosinc.com \ --cc=samitolvanen@google.com \ --cc=samuel.holland@sifive.com \ --cc=shikemeng@huaweicloud.com \ --cc=shr@devkernel.io \ --cc=shuah@kernel.org \ --cc=songshuaishuai@tinylab.org \ --cc=vbabka@suse.cz \ --cc=vincent.chen@sifive.com \ --cc=willy@infradead.org \ --cc=xiao.w.wang@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.