| Message ID | 20200219000817.195049-10-samitolvanen@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v8,01/12] add support for Clang's Shadow Call Stack (SCS) | expand |
On Tue, Feb 18, 2020 at 04:08:14PM -0800, Sami Tolvanen wrote: > Disable SCS for code that runs at a different exception level by > adding __noscs to __hyp_text. > > Suggested-by: James Morse <james.morse@arm.com> > Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> -Kees > --- > arch/arm64/include/asm/kvm_hyp.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h > index a3a6a2ba9a63..0f0603f55ea0 100644 > --- a/arch/arm64/include/asm/kvm_hyp.h > +++ b/arch/arm64/include/asm/kvm_hyp.h > @@ -13,7 +13,7 @@ > #include <asm/kvm_mmu.h> > #include <asm/sysreg.h> > > -#define __hyp_text __section(.hyp.text) notrace > +#define __hyp_text __section(.hyp.text) notrace __noscs > > #define read_sysreg_elx(r,nvh,vh) \ > ({ \ > -- > 2.25.0.265.gbab2e86ba0-goog >
On Tue, 18 Feb 2020 16:08:14 -0800 Sami Tolvanen <samitolvanen@google.com> wrote: > Disable SCS for code that runs at a different exception level by > adding __noscs to __hyp_text. > > Suggested-by: James Morse <james.morse@arm.com> > Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Acked-by: Marc Zyngier <maz@kernel.org> M.
diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h index a3a6a2ba9a63..0f0603f55ea0 100644 --- a/arch/arm64/include/asm/kvm_hyp.h +++ b/arch/arm64/include/asm/kvm_hyp.h @@ -13,7 +13,7 @@ #include <asm/kvm_mmu.h> #include <asm/sysreg.h> -#define __hyp_text __section(.hyp.text) notrace +#define __hyp_text __section(.hyp.text) notrace __noscs #define read_sysreg_elx(r,nvh,vh) \ ({ \
Disable SCS for code that runs at a different exception level by adding __noscs to __hyp_text. Suggested-by: James Morse <james.morse@arm.com> Signed-off-by: Sami Tolvanen <samitolvanen@google.com> --- arch/arm64/include/asm/kvm_hyp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)