From: Sami Tolvanen <samitolvanen@google.com> To: linux-kernel@vger.kernel.org Cc: Kees Cook <keescook@chromium.org>, Josh Poimboeuf <jpoimboe@redhat.com>, Peter Zijlstra <peterz@infradead.org>, x86@kernel.org, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Joao Moreira <joao@overdrivepizza.com>, Sedat Dilek <sedat.dilek@gmail.com>, Steven Rostedt <rostedt@goodmis.org>, linux-hardening@vger.kernel.org, linux-arm-kernel@lists.infradead.org, llvm@lists.linux.dev, Sami Tolvanen <samitolvanen@google.com> Subject: [PATCH v4 11/21] arm64: Drop unneeded __nocfi attributes Date: Tue, 30 Aug 2022 16:31:19 -0700 [thread overview] Message-ID: <20220830233129.30610-12-samitolvanen@google.com> (raw) In-Reply-To: <20220830233129.30610-1-samitolvanen@google.com> With -fsanitize=kcfi, CONFIG_CFI_CLANG no longer has issues with address space confusion in functions that switch to linear mapping. Now that the indirectly called assembly functions have type annotations, drop the __nocfi attributes. Suggested-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> --- arch/arm64/include/asm/mmu_context.h | 2 +- arch/arm64/kernel/alternative.c | 2 +- arch/arm64/kernel/cpufeature.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/mmu_context.h b/arch/arm64/include/asm/mmu_context.h index c7ccd82db1d2..bba0e630c8bc 100644 --- a/arch/arm64/include/asm/mmu_context.h +++ b/arch/arm64/include/asm/mmu_context.h @@ -147,7 +147,7 @@ static inline void cpu_install_ttbr0(phys_addr_t ttbr0, unsigned long t0sz) * Atomically replaces the active TTBR1_EL1 PGD with a new VA-compatible PGD, * avoiding the possibility of conflicting TLB entries being allocated. */ -static inline void __nocfi cpu_replace_ttbr1(pgd_t *pgdp, pgd_t *idmap) +static inline void cpu_replace_ttbr1(pgd_t *pgdp, pgd_t *idmap) { typedef void (ttbr_replace_func)(phys_addr_t); extern ttbr_replace_func idmap_cpu_replace_ttbr1; diff --git a/arch/arm64/kernel/alternative.c b/arch/arm64/kernel/alternative.c index 9bcaa5eacf16..d2c66507398d 100644 --- a/arch/arm64/kernel/alternative.c +++ b/arch/arm64/kernel/alternative.c @@ -133,7 +133,7 @@ static void clean_dcache_range_nopatch(u64 start, u64 end) } while (cur += d_size, cur < end); } -static void __nocfi __apply_alternatives(struct alt_region *region, bool is_module, +static void __apply_alternatives(struct alt_region *region, bool is_module, unsigned long *feature_mask) { struct alt_instr *alt; diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index af4de817d712..ca6e5ca7104e 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1685,7 +1685,7 @@ static phys_addr_t kpti_ng_pgd_alloc(int shift) return kpti_ng_temp_alloc; } -static void __nocfi +static void kpti_install_ng_mappings(const struct arm64_cpu_capabilities *__unused) { typedef void (kpti_remap_fn)(int, int, phys_addr_t, unsigned long); -- 2.37.2.672.g94769d06f0-goog
WARNING: multiple messages have this Message-ID (diff)
From: Sami Tolvanen <samitolvanen@google.com> To: linux-kernel@vger.kernel.org Cc: Kees Cook <keescook@chromium.org>, Josh Poimboeuf <jpoimboe@redhat.com>, Peter Zijlstra <peterz@infradead.org>, x86@kernel.org, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Joao Moreira <joao@overdrivepizza.com>, Sedat Dilek <sedat.dilek@gmail.com>, Steven Rostedt <rostedt@goodmis.org>, linux-hardening@vger.kernel.org, linux-arm-kernel@lists.infradead.org, llvm@lists.linux.dev, Sami Tolvanen <samitolvanen@google.com> Subject: [PATCH v4 11/21] arm64: Drop unneeded __nocfi attributes Date: Tue, 30 Aug 2022 16:31:19 -0700 [thread overview] Message-ID: <20220830233129.30610-12-samitolvanen@google.com> (raw) In-Reply-To: <20220830233129.30610-1-samitolvanen@google.com> With -fsanitize=kcfi, CONFIG_CFI_CLANG no longer has issues with address space confusion in functions that switch to linear mapping. Now that the indirectly called assembly functions have type annotations, drop the __nocfi attributes. Suggested-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> --- arch/arm64/include/asm/mmu_context.h | 2 +- arch/arm64/kernel/alternative.c | 2 +- arch/arm64/kernel/cpufeature.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/mmu_context.h b/arch/arm64/include/asm/mmu_context.h index c7ccd82db1d2..bba0e630c8bc 100644 --- a/arch/arm64/include/asm/mmu_context.h +++ b/arch/arm64/include/asm/mmu_context.h @@ -147,7 +147,7 @@ static inline void cpu_install_ttbr0(phys_addr_t ttbr0, unsigned long t0sz) * Atomically replaces the active TTBR1_EL1 PGD with a new VA-compatible PGD, * avoiding the possibility of conflicting TLB entries being allocated. */ -static inline void __nocfi cpu_replace_ttbr1(pgd_t *pgdp, pgd_t *idmap) +static inline void cpu_replace_ttbr1(pgd_t *pgdp, pgd_t *idmap) { typedef void (ttbr_replace_func)(phys_addr_t); extern ttbr_replace_func idmap_cpu_replace_ttbr1; diff --git a/arch/arm64/kernel/alternative.c b/arch/arm64/kernel/alternative.c index 9bcaa5eacf16..d2c66507398d 100644 --- a/arch/arm64/kernel/alternative.c +++ b/arch/arm64/kernel/alternative.c @@ -133,7 +133,7 @@ static void clean_dcache_range_nopatch(u64 start, u64 end) } while (cur += d_size, cur < end); } -static void __nocfi __apply_alternatives(struct alt_region *region, bool is_module, +static void __apply_alternatives(struct alt_region *region, bool is_module, unsigned long *feature_mask) { struct alt_instr *alt; diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index af4de817d712..ca6e5ca7104e 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1685,7 +1685,7 @@ static phys_addr_t kpti_ng_pgd_alloc(int shift) return kpti_ng_temp_alloc; } -static void __nocfi +static void kpti_install_ng_mappings(const struct arm64_cpu_capabilities *__unused) { typedef void (kpti_remap_fn)(int, int, phys_addr_t, unsigned long); -- 2.37.2.672.g94769d06f0-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-08-30 23:32 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-08-30 23:31 [PATCH v4 00/21] KCFI support Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 01/21] treewide: Filter out CC_FLAGS_CFI Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 02/21] scripts/kallsyms: Ignore __kcfi_typeid_ Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 03/21] cfi: Remove CONFIG_CFI_CLANG_SHADOW Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 04/21] cfi: Drop __CFI_ADDRESSABLE Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 05/21] cfi: Switch to -fsanitize=kcfi Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 06/21] cfi: Add type helper macros Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 07/21] lkdtm: Emit an indirect call for CFI tests Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 08/21] psci: Fix the function type for psci_initcall_t Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-31 18:22 ` Kees Cook 2022-08-31 18:22 ` Kees Cook 2022-08-30 23:31 ` [PATCH v4 09/21] arm64: Add types to indirect called assembly functions Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 10/21] arm64: Add CFI error handling Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen [this message] 2022-08-30 23:31 ` [PATCH v4 11/21] arm64: Drop unneeded __nocfi attributes Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 12/21] init: Drop __nocfi from __init Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 13/21] treewide: Drop function_nocfi Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 14/21] treewide: Drop WARN_ON_FUNCTION_MISMATCH Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 15/21] treewide: Drop __cficanonical Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 16/21] objtool: Disable CFI warnings Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-31 18:23 ` Kees Cook 2022-08-31 18:23 ` Kees Cook 2022-08-30 23:31 ` [PATCH v4 17/21] kallsyms: Drop CONFIG_CFI_CLANG workarounds Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-31 18:23 ` Kees Cook 2022-08-31 18:23 ` Kees Cook 2022-08-30 23:31 ` [PATCH v4 18/21] x86/tools/relocs: Ignore __kcfi_typeid_ relocations Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 19/21] x86: Add types to indirectly called assembly functions Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 20/21] x86/purgatory: Disable CFI Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-30 23:31 ` [PATCH v4 21/21] x86: Add support for CONFIG_CFI_CLANG Sami Tolvanen 2022-08-30 23:31 ` Sami Tolvanen 2022-08-31 18:28 ` Kees Cook 2022-08-31 18:28 ` Kees Cook 2022-08-31 22:04 ` [PATCH v4 00/21] KCFI support Kees Cook 2022-08-31 22:04 ` Kees Cook 2022-09-01 21:19 ` Nathan Chancellor 2022-09-01 21:19 ` Nathan Chancellor 2022-09-02 0:33 ` Sami Tolvanen 2022-09-02 0:33 ` Sami Tolvanen 2022-09-02 7:51 ` Peter Zijlstra 2022-09-02 7:51 ` Peter Zijlstra 2022-09-02 15:39 ` Sami Tolvanen 2022-09-02 15:39 ` Sami Tolvanen
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=20220830233129.30610-12-samitolvanen@google.com \ --to=samitolvanen@google.com \ --cc=catalin.marinas@arm.com \ --cc=joao@overdrivepizza.com \ --cc=jpoimboe@redhat.com \ --cc=keescook@chromium.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-hardening@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=llvm@lists.linux.dev \ --cc=mark.rutland@arm.com \ --cc=nathan@kernel.org \ --cc=ndesaulniers@google.com \ --cc=peterz@infradead.org \ --cc=rostedt@goodmis.org \ --cc=sedat.dilek@gmail.com \ --cc=will@kernel.org \ --cc=x86@kernel.org \ /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.