From: Hangbin Liu on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/993
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1613522 Upstream: RHEL only
Enable CONFIG_WIREGUARD as requested in the bugzilla. Configs CONFIG_CRYPTO_LIB_BLAKE2S, CONFIG_CRYPTO_LIB_CHACHA20POLY1305, CONFIG_CRYPTO_LIB_CURVE25519 are needed by wireguard.
Remove the fedora specific configs and enable them in common folder. Do not enable it on zfcpdump as it has "#CONFIG_INET is not set".
Disabling wireguard in FIPS mode will be fixed in another bug.
Signed-off-by: Hangbin Liu haliu@redhat.com
From: Hangbin Liu haliu@redhat.com
configs: enable CONFIG_WIREGUARD in ARK
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1613522 Upstream: RHEL only
Enable CONFIG_WIREGUARD as requested in the bugzilla. Configs CONFIG_CRYPTO_LIB_BLAKE2S, CONFIG_CRYPTO_LIB_CHACHA20POLY1305, CONFIG_CRYPTO_LIB_CURVE25519 are needed by wireguard.
Remove the fedora specific configs and enable them in common folder. Do not enable it on zfcpdump as it has "#CONFIG_INET is not set".
Disabling wireguard in FIPS mode will be fixed in another bug.
Signed-off-by: Hangbin Liu haliu@redhat.com
diff a/redhat/configs/common/generic/CONFIG_CRYPTO_LIB_BLAKE2S b/redhat/configs/common/generic/CONFIG_CRYPTO_LIB_BLAKE2S --- a/redhat/configs/common/generic/CONFIG_CRYPTO_LIB_BLAKE2S +++ b/redhat/configs/common/generic/CONFIG_CRYPTO_LIB_BLAKE2S @@ -1 +1 @@ -# CONFIG_CRYPTO_LIB_BLAKE2S is not set +CONFIG_CRYPTO_LIB_BLAKE2S=m diff a/redhat/configs/fedora/generic/CONFIG_CRYPTO_LIB_CHACHA20POLY1305 b/redhat/configs/common/generic/CONFIG_CRYPTO_LIB_CHACHA20POLY1305 --- a/redhat/configs/fedora/generic/CONFIG_CRYPTO_LIB_CHACHA20POLY1305 +++ b/redhat/configs/common/generic/CONFIG_CRYPTO_LIB_CHACHA20POLY1305 diff a/redhat/configs/common/generic/CONFIG_CRYPTO_LIB_CURVE25519 b/redhat/configs/common/generic/CONFIG_CRYPTO_LIB_CURVE25519 --- a/redhat/configs/common/generic/CONFIG_CRYPTO_LIB_CURVE25519 +++ b/redhat/configs/common/generic/CONFIG_CRYPTO_LIB_CURVE25519 @@ -1 +1 @@ -# CONFIG_CRYPTO_LIB_CURVE25519 is not set +CONFIG_CRYPTO_LIB_CURVE25519=m diff a/redhat/configs/common/generic/CONFIG_WIREGUARD b/redhat/configs/common/generic/CONFIG_WIREGUARD --- a/redhat/configs/common/generic/CONFIG_WIREGUARD +++ b/redhat/configs/common/generic/CONFIG_WIREGUARD @@ -1 +1 @@ -# CONFIG_WIREGUARD is not set +CONFIG_WIREGUARD=m diff a/redhat/configs/fedora/generic/CONFIG_WIREGUARD_DEBUG b/redhat/configs/common/generic/CONFIG_WIREGUARD_DEBUG --- a/redhat/configs/fedora/generic/CONFIG_WIREGUARD_DEBUG +++ b/redhat/configs/common/generic/CONFIG_WIREGUARD_DEBUG diff a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_BLAKE2S b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_BLAKE2S --- /dev/null +++ b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_BLAKE2S @@ -0,0 +1 @@ +# CONFIG_CRYPTO_LIB_BLAKE2S is not set diff a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_LIB_CHACHA20POLY1305 b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA20POLY1305 --- a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_LIB_CHACHA20POLY1305 +++ b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA20POLY1305 diff a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CURVE25519 b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CURVE25519 --- /dev/null +++ b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CURVE25519 @@ -0,0 +1 @@ +# CONFIG_CRYPTO_LIB_CURVE25519 is not set diff a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_WIREGUARD b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_WIREGUARD --- /dev/null +++ b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_WIREGUARD @@ -0,0 +1 @@ +# CONFIG_WIREGUARD is not set diff a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_BLAKE2S_X86 b/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_BLAKE2S_X86 --- a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_BLAKE2S_X86 +++ b/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_BLAKE2S_X86 diff a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_CURVE25519_X86 b/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CURVE25519_X86 --- a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_CRYPTO_CURVE25519_X86 +++ b/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CURVE25519_X86 diff a/redhat/configs/fedora/generic/CONFIG_CRYPTO_LIB_BLAKE2S b/redhat/configs/fedora/generic/CONFIG_CRYPTO_LIB_BLAKE2S --- a/redhat/configs/fedora/generic/CONFIG_CRYPTO_LIB_BLAKE2S +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_LIB_BLAKE2S=m diff a/redhat/configs/fedora/generic/CONFIG_CRYPTO_LIB_CURVE25519 b/redhat/configs/fedora/generic/CONFIG_CRYPTO_LIB_CURVE25519 --- a/redhat/configs/fedora/generic/CONFIG_CRYPTO_LIB_CURVE25519 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_LIB_CURVE25519=m diff a/redhat/configs/fedora/generic/CONFIG_WIREGUARD b/redhat/configs/fedora/generic/CONFIG_WIREGUARD --- a/redhat/configs/fedora/generic/CONFIG_WIREGUARD +++ /dev/null @@ -1 +0,0 @@ -CONFIG_WIREGUARD=m diff a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_BLAKE2S_X86 b/redhat/configs/pending-common/generic/CONFIG_CRYPTO_BLAKE2S_X86 --- a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_BLAKE2S_X86 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_CRYPTO_BLAKE2S_X86 is not set diff a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_CURVE25519_X86 b/redhat/configs/pending-common/generic/CONFIG_CRYPTO_CURVE25519_X86 --- a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_CURVE25519_X86 +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_CRYPTO_CURVE25519_X86 is not set
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/993
From: Hangbin Liu haliu@redhat.com
wireguard: mark as Tech Preview
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1613522 Upstream: RHEL only
WireGuard is Tech Preview in RHEL 9.0.
Signed-off-by: Hangbin Liu haliu@redhat.com
diff a/drivers/net/wireguard/main.c b/drivers/net/wireguard/main.c --- a/drivers/net/wireguard/main.c +++ b/drivers/net/wireguard/main.c @@ -39,6 +39,7 @@ static int __init mod_init(void) pr_info("WireGuard " WIREGUARD_VERSION " loaded. See www.wireguard.com for information.\n"); pr_info("Copyright (C) 2015-2019 Jason A. Donenfeld Jason@zx2c4.com. All Rights Reserved.\n");
+ mark_tech_preview("WireGuard", THIS_MODULE); return 0;
err_netlink:
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/993
From: Hangbin Liu on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/993#note_54642526...
@omos Thanks, I have updated the subject. Would you please help ack the bug if it's OK for you?
From: Herbert Xu on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/993#note_54648646...
Acked-by: Herbert Xu herbert.xu@redhat.com
kernel@lists.fedoraproject.org