config: remove unneeded options, annotate what changes in future

common/DAX:
 - ARCH_ENABLE_MEMORY_HOTPLUG: not needed (auto-selected)
 - ARCH_HAS_ZONE_DEVICE: already automatically selected. This is
also removed in future kernels, so let's go ahead and drop.
 - RADIX_TREE_MULTIORDER: already autoselected, and dropped in future
kernels

common/net:
 - NF_NAT_NEEDED, NF_NAT_PROTO_*: these don't exist in newer kernels, as
they are refactored and unecessary in the upstream kernel. Keep them for
now, but consider dropping if we move to newer LTS. These are part of
whitelist of options we expect to be dropped with newer kernels in our
fragment building.
 - NF_NAT_MASQUERADE_IPV4: this is a select, not a tristate. Also, in
the future much of the ipv4/ipv6 nat code is combined, so this config
will not exist in newer kernels. Dropped.
 - INET6_XFRM_MODE_* are not needed on newer kernels. While I'm not
confident they are needed today for Kata, we will just note them and add
to whitelist for options we expect to be dropped with newer kernels in
our fragment building.
 - MAY_USE_DEVLINK: removed in future kernels, and should not be needed
anyway. Dropped.

x86_64/DAX:
 - ARCH_HAS_HMM: should not be needed, and is dropped in future kernels.
Dropped

Signed-off-by: Eric Ernst <eric.ernst@intel.com>

kernel/configs/fragments/common/dax.conf

@@ -3,12 +3,9 @@
 # Need HOTREMOVE, or ZONE_DEVICE will not get enabled
 # We don't actually afaik remove any memory once we have plugged it in, as
 # generally it is too 'expensive' an operation.
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_MEMORY_HOTREMOVE=y
 # Also need this
 CONFIG_SPARSEMEM_VMEMMAP=y
-# And this should be auto set by the arch already
-CONFIG_ARCH_HAS_ZONE_DEVICE=y
 
 # Without these the pmem_should_map_pages() call in the kernel fails with new
 # Related to the ARCH_HAS_HMM set in the arch files.
@@ -19,8 +16,6 @@ CONFIG_ND_PFN=y
 CONFIG_NVDIMM_PFN=y
 CONFIG_NVDIMM_DAX=y
 
-CONFIG_RADIX_TREE_MULTIORDER=y
-
 CONFIG_BLOCK=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_PMEM=y

kernel/configs/fragments/common/netfilter.conf

@@ -41,10 +41,16 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=y
 CONFIG_NF_CT_NETLINK_HELPER=y
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=y
+# NF_NAT_NEEDED is removed in newer kernels - we should drop once we move to next LTS (5.4).
+#  This is part of whitelist.conf
 CONFIG_NF_NAT_NEEDED=y
+
+# NF_NAT_PROTO_* are removed in newer kernels, but needed currentlyi. They are part of whitelist.conf:
 CONFIG_NF_NAT_PROTO_DCCP=y
 CONFIG_NF_NAT_PROTO_UDPLITE=y
 CONFIG_NF_NAT_PROTO_SCTP=y
+CONFIG_NF_NAT_PROTO_GRE=y
+
 CONFIG_NF_NAT_AMANDA=y
 CONFIG_NF_NAT_FTP=y
 CONFIG_NF_NAT_IRC=y
@@ -164,10 +170,11 @@ CONFIG_NF_TPROXY_IPV4=y
 CONFIG_NF_DUP_IPV4=y
 CONFIG_NF_LOG_IPV4=y
 CONFIG_NF_REJECT_IPV4=y
+
+# NF_NAT_IPV4 is removed in future kernel, and is part of whitelist.conf:
 CONFIG_NF_NAT_IPV4=y
-CONFIG_NF_NAT_MASQUERADE_IPV4=y
+
 CONFIG_NF_NAT_SNMP_BASIC=y
-CONFIG_NF_NAT_PROTO_GRE=y
 CONFIG_NF_NAT_PPTP=y
 CONFIG_NF_NAT_H323=y
 CONFIG_IP_NF_IPTABLES=y

kernel/configs/fragments/common/network.conf

@@ -35,11 +35,11 @@ CONFIG_TCP_CONG_BBR=y
 CONFIG_DEFAULT_BBR=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_IPV6=y
+# Once we move to 5.4, INET6_XFRM_MODE_* are not needed. I don't think these are actually needed, but
+# for now we just place them in whitelist.conf:
 CONFIG_INET6_XFRM_MODE_TRANSPORT=y
 CONFIG_INET6_XFRM_MODE_TUNNEL=y
 CONFIG_INET6_XFRM_MODE_BEET=y
-# Is automatically selected by other options
-#CONFIG_NET_PTP_CLASSIFY=y
 
 CONFIG_STP=y
 CONFIG_BRIDGE=y
@@ -68,7 +68,6 @@ CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
 CONFIG_NET_FLOW_LIMIT=y
 CONFIG_GRO_CELLS=y
-CONFIG_MAY_USE_DEVLINK=y
 CONFIG_FAILOVER=y
 CONFIG_HAVE_EBPF_JIT=y
 

kernel/configs/fragments/x86_64/dax.conf

@@ -1,2 +0,0 @@
-# We need to set this to enable ZONE_DEVICE etc., which is now needed to enable DAX
-CONFIG_ARCH_HAS_HMM=y

kernel/kata_config_version

@@ -1 +1 @@
-48
+49