From: psutter1 on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1179
Patch 1 syncs netfilter config symbols with RHEL8, enabling three missing ones. Patch 2 enables IP-specific flowtable support, it does not make sense to keep it disabled.
--- redhat/configs/ark/generic/CONFIG_IP_VS_MH | 1 - redhat/configs/ark/generic/CONFIG_NF_FLOW_TABLE | 1 - redhat/configs/fedora/generic/CONFIG_IP_VS_MH => redhat/configs/common/generic/CONFIG_IP_VS_MH | 0 redhat/configs/fedora/generic/CONFIG_MLX5_TC_CT => redhat/configs/common/generic/CONFIG_MLX5_TC_CT | 0 redhat/configs/fedora/generic/CONFIG_NFT_FLOW_OFFLOAD => redhat/configs/common/generic/CONFIG_NFT_FLOW_OFFLOAD | 0 redhat/configs/fedora/generic/CONFIG_NF_FLOW_TABLE => redhat/configs/common/generic/CONFIG_NF_FLOW_TABLE | 0 redhat/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_INET => redhat/configs/common/generic/CONFIG_NF_FLOW_TABLE_INET | 0 redhat/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_IPV4 => redhat/configs/common/generic/CONFIG_NF_FLOW_TABLE_IPV4 | 0 redhat/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_IPV6 => redhat/configs/common/generic/CONFIG_NF_FLOW_TABLE_IPV6 | 0 9 files changed, 0 insertions(+), 2 deletions(-)
From: Phil Sutter psutter@redhat.com
redhat/configs: Sync netfilter options with RHEL8
These three config symbols were missing although enabled in RHEL8. They are enabled in Fedora, so move the respective files (and drop the explicit IP_VS_MH disabler from ark).
Signed-off-by: Phil Sutter psutter@redhat.com
diff --git a/redhat/configs/ark/generic/CONFIG_IP_VS_MH b/redhat/configs/ark/generic/CONFIG_IP_VS_MH deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_IP_VS_MH +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_IP_VS_MH is not set diff --git a/redhat/configs/ark/generic/CONFIG_NF_FLOW_TABLE b/redhat/configs/ark/generic/CONFIG_NF_FLOW_TABLE deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/CONFIG_NF_FLOW_TABLE +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_NF_FLOW_TABLE is not set diff --git a/redhat/configs/fedora/generic/CONFIG_IP_VS_MH b/redhat/configs/common/generic/CONFIG_IP_VS_MH rename from redhat/configs/fedora/generic/CONFIG_IP_VS_MH rename to redhat/configs/common/generic/CONFIG_IP_VS_MH index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_IP_VS_MH +++ b/redhat/configs/common/generic/CONFIG_IP_VS_MH diff --git a/redhat/configs/fedora/generic/CONFIG_MLX5_TC_CT b/redhat/configs/common/generic/CONFIG_MLX5_TC_CT rename from redhat/configs/fedora/generic/CONFIG_MLX5_TC_CT rename to redhat/configs/common/generic/CONFIG_MLX5_TC_CT index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_MLX5_TC_CT +++ b/redhat/configs/common/generic/CONFIG_MLX5_TC_CT diff --git a/redhat/configs/fedora/generic/CONFIG_NFT_FLOW_OFFLOAD b/redhat/configs/common/generic/CONFIG_NFT_FLOW_OFFLOAD rename from redhat/configs/fedora/generic/CONFIG_NFT_FLOW_OFFLOAD rename to redhat/configs/common/generic/CONFIG_NFT_FLOW_OFFLOAD index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_NFT_FLOW_OFFLOAD +++ b/redhat/configs/common/generic/CONFIG_NFT_FLOW_OFFLOAD diff --git a/redhat/configs/fedora/generic/CONFIG_NF_FLOW_TABLE b/redhat/configs/common/generic/CONFIG_NF_FLOW_TABLE rename from redhat/configs/fedora/generic/CONFIG_NF_FLOW_TABLE rename to redhat/configs/common/generic/CONFIG_NF_FLOW_TABLE index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_NF_FLOW_TABLE +++ b/redhat/configs/common/generic/CONFIG_NF_FLOW_TABLE diff --git a/redhat/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_INET b/redhat/configs/common/generic/CONFIG_NF_FLOW_TABLE_INET rename from redhat/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_INET rename to redhat/configs/common/generic/CONFIG_NF_FLOW_TABLE_INET index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_INET +++ b/redhat/configs/common/generic/CONFIG_NF_FLOW_TABLE_INET
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1179
From: Phil Sutter psutter@redhat.com
redhat/configs: nftables: Enable extra flowtable symbols
There is flowtable support for (the combined IPv4/IPv6) inet family already, so having the IP-family specific ones disabled seems artificial.
Signed-off-by: Phil Sutter psutter@redhat.com
diff --git a/redhat/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_IPV4 b/redhat/configs/common/generic/CONFIG_NF_FLOW_TABLE_IPV4 rename from redhat/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_IPV4 rename to redhat/configs/common/generic/CONFIG_NF_FLOW_TABLE_IPV4 index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_IPV4 +++ b/redhat/configs/common/generic/CONFIG_NF_FLOW_TABLE_IPV4 diff --git a/redhat/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_IPV6 b/redhat/configs/common/generic/CONFIG_NF_FLOW_TABLE_IPV6 rename from redhat/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_IPV6 rename to redhat/configs/common/generic/CONFIG_NF_FLOW_TABLE_IPV6 index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_IPV6 +++ b/redhat/configs/common/generic/CONFIG_NF_FLOW_TABLE_IPV6
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1179
From: psutter1 on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1179#note_6042414...
Sorry, I had to respin this one. Turns out I missed to enable CONFIG_NF_FLOW_TABLE and CONFIG_MLX5_TC_CT (which becomes visible after enabling the first one). Changes folded into patch 1, patch 2 remains unchanged.
From: Marcelo Ricardo Leitner on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1179#note_6042518...
Acked-by: Marcelo Ricardo Leitner mleitner@redhat.com
From: Justin M. Forbes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1179#note_6042542...
Acked-by: Justin M. Forbes jforbes@fedoraproject.org (via approve button)
kernel@lists.fedoraproject.org
-
Justin M. Forbes (via Email Bridge) -
Marcelo Ricardo Leitner (via Email Bridge)
-
psutter1 (via Email Bridge)