Commit Graph

3 Commits

Author SHA1 Message Date
Waiman Long 3342973efe x86/bugs: Rename CONFIG_RETPOLINE => CONFIG_MITIGATION_RETPOLINE
JIRA: https://issues.redhat.com/browse/RHEL-31230
Conflicts:
 1) The net/netfilter/Makefile hunk is dropped due to missing
    nft_ct_fast.c file first intruduced by commit d9e789147605
    ("netfilter: nf_tables: avoid retpoline overhead for some ct
    expression calls").
 2) A merge conflict in the tools/objtool/check.c hunk due to missing
    upstream commit 9bb2ec608a20 ("objtool: Update Retpoline validation").
 3) First hunk of net/netfilter/nf_tables_core.c is dropped and a merge
    conflict in the second hunk due to missing upstream commit
    d8d760627855 ("netfilter: nf_tables: add static key to skip retpoline
    workarounds").
 4) The net/netfilter/nft_ct.c hunks are dropped due to missing upstream
    commit d9e789147605 ("netfilter: nf_tables: avoid retpoline overhead
    for some ct expression calls").

commit aefb2f2e619b6c334bcb31de830aa00ba0b11129
Author: Breno Leitao <leitao@debian.org>
Date:   Tue, 21 Nov 2023 08:07:32 -0800

    x86/bugs: Rename CONFIG_RETPOLINE            => CONFIG_MITIGATION_RETPOLINE

    Step 5/10 of the namespace unification of CPU mitigations related Kconfig options.

    [ mingo: Converted a few more uses in comments/messages as well. ]

    Suggested-by: Josh Poimboeuf <jpoimboe@kernel.org>
    Signed-off-by: Breno Leitao <leitao@debian.org>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Reviewed-by: Ariel Miculas <amiculas@cisco.com>
    Acked-by: Josh Poimboeuf <jpoimboe@kernel.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Link: https://lore.kernel.org/r/20231121160740.1249350-6-leitao@debian.org

Signed-off-by: Waiman Long <longman@redhat.com>
2024-07-26 14:33:35 -04:00
Prarit Bhargava bab2e8d9f5 x86: enable initial Rust support
JIRA: https://issues.redhat.com/browse/RHEL-25415

commit 094981352ce27bc36018c009d07ddf974c9725f5
Author: Miguel Ojeda <ojeda@kernel.org>
Date:   Thu Aug 4 12:16:44 2022 +0200

    x86: enable initial Rust support

    Note that only x86_64 is covered and not all features nor mitigations
    are handled, but it is enough as a starting point and showcases
    the basics needed to add Rust support for a new architecture.

    Reviewed-by: Kees Cook <keescook@chromium.org>
    Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Co-developed-by: Alex Gaynor <alex.gaynor@gmail.com>
    Signed-off-by: Alex Gaynor <alex.gaynor@gmail.com>
    Co-developed-by: Wedson Almeida Filho <wedsonaf@google.com>
    Signed-off-by: Wedson Almeida Filho <wedsonaf@google.com>
    Co-developed-by: David Gow <davidgow@google.com>
    Signed-off-by: David Gow <davidgow@google.com>
    Signed-off-by: Miguel Ojeda <ojeda@kernel.org>

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
2024-03-20 09:42:43 -04:00
Prarit Bhargava 299181c70f scripts: add `generate_rust_target.rs`
JIRA: https://issues.redhat.com/browse/RHEL-25415

Conflicts: Minor drift issues.

commit 9a8ff24ce584ad9895f9416fe8fad6f8842f758d
Author: Miguel Ojeda <ojeda@kernel.org>
Date:   Thu Aug 4 12:20:37 2022 +0200

    scripts: add `generate_rust_target.rs`

    This script takes care of generating the custom target specification
    file for `rustc`, based on the kernel configuration.

    It also serves as an example of a Rust host program.

    A dummy architecture is kept in this patch so that a later patch
    adds x86 support on top with as few changes as possible.

    Reviewed-by: Kees Cook <keescook@chromium.org>
    Co-developed-by: Alex Gaynor <alex.gaynor@gmail.com>
    Signed-off-by: Alex Gaynor <alex.gaynor@gmail.com>
    Co-developed-by: Wedson Almeida Filho <wedsonaf@google.com>
    Signed-off-by: Wedson Almeida Filho <wedsonaf@google.com>
    Co-developed-by: David Gow <davidgow@google.com>
    Signed-off-by: David Gow <davidgow@google.com>
    Signed-off-by: Miguel Ojeda <ojeda@kernel.org>

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
2024-03-20 09:42:43 -04:00