@@ -1,17 +1,17 @@

 %global security_hardening none

 Summary:        The Behavioral Activity Monitor With Container Support

 Name:           falco

-Version:        0.6.0

-Release:        3%{?kernelsubrelease}%{?dist}

+Version:        0.8.1

+Release:        1%{?kernelsubrelease}%{?dist}

 License:        GPLv2

 URL:            http://www.sysdig.org/falco/

 Group:          Applications/System

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        https://github.com/draios/%{name}/archive/%{name}-%{version}.tar.gz

-%define sha1    falco=04dc79c1c4773ba2080c2c49c718305e7920c2f7

-Source1:        https://github.com/draios/sysdig/archive/sysdig-0.15.1.tar.gz

-%define sha1    sysdig=5b1a7a4978315176412989b5400572d849691917

+%define sha1    falco=7873d34769656349678584502296b147aa5445fa

+Source1:        https://github.com/draios/sysdig/archive/sysdig-0.19.1.tar.gz

+%define sha1    sysdig=425ea9fab8e831274626a9c9e65f0dfb4f9bc019

 Source2:        http://libvirt.org/sources/libvirt-2.0.0.tar.xz

 %define sha1    libvirt=9a923b06df23f7a5526e4ec679cdadf4eb35a38f

 BuildRequires:  cmake

@@ -50,12 +50,9 @@ Sysdig falco is an open source, behavioral activity monitor designed to detect a

 tar xf %{SOURCE2} --no-same-owner

 %build

-mv sysdig-0.15.1 ../sysdig

+mv sysdig-0.19.1 ../sysdig

 sed -i 's|../falco/rules|rules|g' userspace/engine/CMakeLists.txt

 sed -i 's|../falco/userspace|userspace|g' userspace/engine/config_falco_engine.h.in

-# fix for linux-4.9

-sed -i 's|task_thread_info(current)->status|current->thread.status|g' ../sysdig/driver/main.c

-sed -i 's|task_thread_info(task)->status|current->thread.status|g' ../sysdig/driver/ppm_syscall.h

 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} CMakeLists.txt

 make KERNELDIR="/lib/modules/%{KERNEL_VERSION}-%{KERNEL_RELEASE}/build"

@@ -87,6 +84,8 @@ rm -rf %{buildroot}/*

 /lib/modules/%{KERNEL_VERSION}-%{KERNEL_RELEASE}/extra/falco-probe.ko

 %changelog

+*   Tue Jan 02 2018 Alexey Makhalov <amakhalov@vmware.com> 0.8.1-1

+-   Version update to build against linux-4.14.y kernel

 *   Thu Aug 24 2017 Rui Gu <ruig@vmware.com> 0.6.0-3

 -   Disable check section (Bug 1900272).

 *   Thu May 11 2017 Chang Lee <changlee@vmware.com> 0.6.0-2

@@ -1,7 +1,7 @@

 Summary: A New Scripting Dynamic Tracing Tool For Linux

 Name:    ktap

 Version: 0.4

-Release: 7%{?kernelsubrelease}%{?dist}

+Release: 8%{?kernelsubrelease}%{?dist}

 License: GPLv2

 URL: https://github.com/ktap/ktap

 Source: %{name}-master.zip

@@ -9,6 +9,7 @@ Source: %{name}-master.zip

 Group:      Development/Tools

 Vendor:     VMware, Inc.

 Patch0:        linux-4.9-support.patch

+Patch1:        linux-4.14-support.patch

 Distribution:  Photon

 BuildRequires: elfutils-devel

 BuildRequires: linux-devel = %{KERNEL_VERSION}-%{KERNEL_RELEASE}

@@ -23,6 +24,7 @@ ktap is a new scripting dynamic tracing tool for Linux, it uses a scripting lang

 %prep

 %setup -q -n ktap-master

 %patch0 -p1

+%patch1 -p1

 %build

 make ktap

@@ -48,6 +50,8 @@ make install DESTDIR=%{buildroot} KVERSION=%{KERNEL_VERSION}-%{KERNEL_RELEASE}

 /lib/modules/%{KERNEL_VERSION}-%{KERNEL_RELEASE}/extra/ktapvm.ko

 %changelog

+*   Tue Dec 26 2017 Alexey Makhalov <amakhalov@vmware.com> 0.4-8

+-   Update to linux-4.14.y. Added support patch

 *   Fri Jun 09 2017 Chang Lee <changlee@vmware.com> 0.4-7

 -   Remove %check

 *   Thu Dec 15 2016 Alexey Makhalov <amakhalov@vmware.com> 0.4-6

new file mode 100644

@@ -0,0 +1,68 @@

+From af5b37cb95ae43815e7399c92596856a1bbacd2a Mon Sep 17 00:00:00 2001

+From: Alexey Makhalov <amakhalov@vmware.com>

+Date: Tue, 26 Dec 2017 20:43:49 +0000

+Subject: [PATCH] Fix building for v4.14 kernel

+

+---

+ runtime/kp_transport.c | 2 +-

+ runtime/kp_vm.c        | 3 ++-

+ runtime/lib_base.c     | 2 +-

+ runtime/lib_kdebug.c   | 2 +-

+ 4 files changed, 5 insertions(+), 4 deletions(-)

+

+diff --git a/runtime/kp_transport.c b/runtime/kp_transport.c

+index 4f76bbd..09a6f87 100644

+--- a/runtime/kp_transport.c

+@@ -119,7 +119,7 @@ static void trace_consume(struct trace_iterator *iter)

+ 			    &iter->lost_events);

+ }

+ 

+-unsigned long long ns2usecs(cycle_t nsec)

++unsigned long long ns2usecs(u64 nsec)

+ {

+ 	nsec += 500;

+ 	do_div(nsec, 1000);

+diff --git a/runtime/kp_vm.c b/runtime/kp_vm.c

+index 0b4787c..761b51b 100644

+--- a/runtime/kp_vm.c

+@@ -1367,7 +1367,8 @@ static int init_arguments(ktap_state_t *ks, int argc, char __user **user_argv)

+ 		int len;

+ 		int res;

+ 

+-		len = strlen_user(ustr);

++		/* +2 including final NUL */

++		len = strnlen_user(ustr, 0x1002);

+ 		if (len > 0x1000) {

+ 			ret = -EINVAL;

+ 			break;

+diff --git a/runtime/lib_base.c b/runtime/lib_base.c

+index 691f7d4..420b4b4 100644

+--- a/runtime/lib_base.c

+@@ -151,7 +151,7 @@ static int kplib_stack(ktap_state_t *ks)

+ #endif

+ 

+ 

+-extern unsigned long long ns2usecs(cycle_t nsec);

++extern unsigned long long ns2usecs(u64 nsec);

+ static int kplib_print_trace_clock(ktap_state_t *ks)

+ {

+ 	unsigned long long t;

+diff --git a/runtime/lib_kdebug.c b/runtime/lib_kdebug.c

+index ecd7cbe..f7ed11f 100644

+--- a/runtime/lib_kdebug.c

+@@ -70,7 +70,7 @@ static int kplib_kdebug_trace_by_id(ktap_state_t *ks)

+ 	if (eventsdesc.filter) {

+ 		int len;

+ 

+-		len = strlen_user(eventsdesc.filter);

++		len = strnlen_user(eventsdesc.filter, 0x1002);

+ 		if (len > 0x1000)

+ 			return -1;

+ 

+-- 

+2.14.2

+

@@ -1,6 +1,6 @@

 Summary:	Linux API header files

 Name:		linux-api-headers

-Version:	4.9.66

+Version:	4.14.8

 Release:	1%{?dist}

 License:	GPLv2

 URL:		http://www.kernel.org/

@@ -8,7 +8,7 @@ Group:		System Environment/Kernel

 Vendor:		VMware, Inc.

 Distribution: Photon

 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

-%define sha1 linux=ecb5adfa84ab6f06f2cb07b56517883310710a0b

+%define sha1 linux=45f140e0eab08428d78d81d4169d531a3e65a297

 BuildArch:	noarch

 %description

 The Linux API Headers expose the kernel's API for use by Glibc.

@@ -25,6 +25,8 @@ find /%{buildroot}%{_includedir} \( -name .install -o -name ..install.cmd \) -de

 %defattr(-,root,root)

 %{_includedir}/*

 %changelog

+*   Fri Dec 22 2017 Alexey Makhalov <amakhalov@vmware.com> 4.14.8-1

+-   Version update

 *   Mon Dec 04 2017 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.66-1

 -   Version update

 *   Tue Nov 21 2017 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.64-1

new file mode 100644

@@ -0,0 +1,96 @@

+From 6cf100df51539210b9115fe74f27ff5b139a5cfc Mon Sep 17 00:00:00 2001

+From: Alexey Makhalov <amakhalov@vmware.com>

+Date: Fri, 22 Dec 2017 15:54:02 -0800

+Subject: [PATCH] Allow some algo tests for FIPS

+

+---

+ crypto/testmgr.c | 10 ++++++++++

+ 1 file changed, 10 insertions(+)

+

+diff --git a/crypto/testmgr.c b/crypto/testmgr.c

+index 7125ba38..1729c52a 100644

+--- a/crypto/testmgr.c

+@@ -2357,6 +2357,7 @@ static const struct alg_test_desc alg_test_descs[] = {

+ 	}, {

+ 		.alg = "authenc(hmac(md5),ecb(cipher_null))",

+ 		.test = alg_test_aead,

++                .fips_allowed = 1,

+ 		.suite = {

+ 			.aead = {

+ 				.enc = __VECS(hmac_md5_ecb_cipher_null_enc_tv_template),

+@@ -2375,6 +2376,7 @@ static const struct alg_test_desc alg_test_descs[] = {

+ 	}, {

+ 		.alg = "authenc(hmac(sha1),cbc(des))",

+ 		.test = alg_test_aead,

++                .fips_allowed = 1,

+ 		.suite = {

+ 			.aead = {

+ 				.enc = __VECS(hmac_sha1_des_cbc_enc_tv_temp)

+@@ -2396,6 +2398,7 @@ static const struct alg_test_desc alg_test_descs[] = {

+ 	}, {

+ 		.alg = "authenc(hmac(sha1),ecb(cipher_null))",

+ 		.test = alg_test_aead,

++                .fips_allowed = 1,

+ 		.suite = {

+ 			.aead = {

+ 				.enc = __VECS(hmac_sha1_ecb_cipher_null_enc_tv_temp),

+@@ -2435,6 +2438,7 @@ static const struct alg_test_desc alg_test_descs[] = {

+ 	}, {

+ 		.alg = "authenc(hmac(sha256),cbc(des))",

+ 		.test = alg_test_aead,

++                .fips_allowed = 1,

+ 		.suite = {

+ 			.aead = {

+ 				.enc = __VECS(hmac_sha256_des_cbc_enc_tv_temp)

+@@ -2460,6 +2464,7 @@ static const struct alg_test_desc alg_test_descs[] = {

+ 	}, {

+ 		.alg = "authenc(hmac(sha384),cbc(des))",

+ 		.test = alg_test_aead,

++                .fips_allowed = 1,

+ 		.suite = {

+ 			.aead = {

+ 				.enc = __VECS(hmac_sha384_des_cbc_enc_tv_temp)

+@@ -2494,6 +2499,7 @@ static const struct alg_test_desc alg_test_descs[] = {

+ 	}, {

+ 		.alg = "authenc(hmac(sha512),cbc(des))",

+ 		.test = alg_test_aead,

++                .fips_allowed = 1,

+ 		.suite = {

+ 			.aead = {

+ 				.enc = __VECS(hmac_sha512_des_cbc_enc_tv_temp)

+@@ -3193,6 +3199,7 @@ static const struct alg_test_desc alg_test_descs[] = {

+ 		.alg = "jitterentropy_rng",

+ 		.fips_allowed = 1,

+ 		.test = alg_test_null,

++                .fips_allowed = 1,

+ 	}, {

+ 		.alg = "kw(aes)",

+ 		.test = alg_test_skcipher,

+@@ -3373,6 +3380,7 @@ static const struct alg_test_desc alg_test_descs[] = {

+ 	}, {

+ 		.alg = "rfc4543(gcm(aes))",

+ 		.test = alg_test_aead,

++                .fips_allowed = 1,

+ 		.suite = {

+ 			.aead = {

+ 				.enc = __VECS(aes_gcm_rfc4543_enc_tv_template),

+@@ -3391,6 +3399,7 @@ static const struct alg_test_desc alg_test_descs[] = {

+ 	}, {

+ 		.alg = "rfc7539esp(chacha20,poly1305)",

+ 		.test = alg_test_aead,

++                .fips_allowed = 1,

+ 		.suite = {

+ 			.aead = {

+ 				.enc = __VECS(rfc7539esp_enc_tv_template),

+@@ -3587,6 +3596,7 @@ static const struct alg_test_desc alg_test_descs[] = {

+ 	}, {

+ 		.alg = "xts(twofish)",

+ 		.test = alg_test_skcipher,

++                .fips_allowed = 1,

+ 		.suite = {

+ 			.cipher = {

+ 				.enc = __VECS(tf_xts_enc_tv_template),

+-- 

+2.11.0

+

@@ -1,6 +1,6 @@

 #

 # Automatically generated file; DO NOT EDIT.

-# Linux/x86 4.9.64 Kernel Configuration

+# Linux/x86 4.14.8 Kernel Configuration

 #

 CONFIG_64BIT=y

 CONFIG_X86_64=y

@@ -41,7 +41,6 @@ CONFIG_HAVE_INTEL_TXT=y

 CONFIG_X86_64_SMP=y

 CONFIG_ARCH_SUPPORTS_UPROBES=y

 CONFIG_FIX_EARLYCON_MEM=y

-CONFIG_DEBUG_RODATA=y

 CONFIG_PGTABLE_LEVELS=4

 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

 CONFIG_IRQ_WORK=y

@@ -88,7 +87,9 @@ CONFIG_AUDIT_TREE=y

 #

 CONFIG_GENERIC_IRQ_PROBE=y

 CONFIG_GENERIC_IRQ_SHOW=y

+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y

 CONFIG_GENERIC_PENDING_IRQ=y

+CONFIG_GENERIC_IRQ_MIGRATION=y

 CONFIG_IRQ_DOMAIN=y

 CONFIG_IRQ_DOMAIN_HIERARCHY=y

 CONFIG_GENERIC_MSI_IRQ=y

@@ -96,6 +97,7 @@ CONFIG_GENERIC_MSI_IRQ_DOMAIN=y

 # CONFIG_IRQ_DOMAIN_DEBUG is not set

 CONFIG_IRQ_FORCED_THREADING=y

 CONFIG_SPARSE_IRQ=y

+# CONFIG_GENERIC_IRQ_DEBUGFS is not set

 CONFIG_CLOCKSOURCE_WATCHDOG=y

 CONFIG_ARCH_CLOCKSOURCE_DATA=y

 CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y

@@ -135,16 +137,16 @@ CONFIG_TASK_IO_ACCOUNTING=y

 CONFIG_TREE_RCU=y

 # CONFIG_RCU_EXPERT is not set

 CONFIG_SRCU=y

+CONFIG_TREE_SRCU=y

 # CONFIG_TASKS_RCU is not set

 CONFIG_RCU_STALL_COMMON=y

-# CONFIG_TREE_RCU_TRACE is not set

-# CONFIG_RCU_EXPEDITE_BOOT is not set

+CONFIG_RCU_NEED_SEGCBLIST=y

 CONFIG_BUILD_BIN2C=y

 CONFIG_IKCONFIG=y

 CONFIG_IKCONFIG_PROC=y

 CONFIG_LOG_BUF_SHIFT=18

 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12

-CONFIG_NMI_LOG_BUF_SHIFT=13

+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13

 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y

 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y

 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y

@@ -163,6 +165,7 @@ CONFIG_FAIR_GROUP_SCHED=y

 CONFIG_CFS_BANDWIDTH=y

 # CONFIG_RT_GROUP_SCHED is not set

 CONFIG_CGROUP_PIDS=y

+CONFIG_CGROUP_RDMA=y

 CONFIG_CGROUP_FREEZER=y

 CONFIG_CGROUP_HUGETLB=y

 CONFIG_CPUSETS=y

@@ -171,6 +174,7 @@ CONFIG_CGROUP_DEVICE=y

 CONFIG_CGROUP_CPUACCT=y

 CONFIG_CGROUP_PERF=y

 # CONFIG_CGROUP_DEBUG is not set

+CONFIG_SOCK_CGROUP_DATA=y

 # CONFIG_CHECKPOINT_RESTORE is not set

 CONFIG_NAMESPACES=y

 CONFIG_UTS_NS=y

@@ -203,6 +207,7 @@ CONFIG_MULTIUSER=y

 CONFIG_SGETMASK_SYSCALL=y

 CONFIG_SYSFS_SYSCALL=y

 # CONFIG_SYSCTL_SYSCALL is not set

+CONFIG_POSIX_TIMERS=y

 CONFIG_KALLSYMS=y

 CONFIG_KALLSYMS_ALL=y

 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y

@@ -214,6 +219,7 @@ CONFIG_ELF_CORE=y

 # CONFIG_PCSPKR_PLATFORM is not set

 CONFIG_BASE_FULL=y

 CONFIG_FUTEX=y

+CONFIG_FUTEX_PI=y

 CONFIG_EPOLL=y

 CONFIG_SIGNALFD=y

 CONFIG_TIMERFD=y

@@ -227,6 +233,7 @@ CONFIG_PCI_QUIRKS=y

 CONFIG_MEMBARRIER=y

 # CONFIG_EMBEDDED is not set

 CONFIG_HAVE_PERF_EVENTS=y

+# CONFIG_PC104 is not set

 #

 # Kernel Performance Events And Counters

@@ -238,10 +245,12 @@ CONFIG_COMPAT_BRK=y

 CONFIG_SLAB=y

 # CONFIG_SLUB is not set

 # CONFIG_SLOB is not set

+CONFIG_SLAB_MERGE_DEFAULT=y

 # CONFIG_SLAB_FREELIST_RANDOM is not set

 CONFIG_SYSTEM_DATA_VERIFICATION=y

 CONFIG_PROFILING=y

 CONFIG_TRACEPOINTS=y

+CONFIG_CRASH_CORE=y

 CONFIG_KEXEC_CORE=y

 CONFIG_OPROFILE=m

 CONFIG_OPROFILE_EVENT_MULTIPLEX=y

@@ -266,16 +275,21 @@ CONFIG_HAVE_NMI=y

 CONFIG_HAVE_ARCH_TRACEHOOK=y

 CONFIG_HAVE_DMA_CONTIGUOUS=y

 CONFIG_GENERIC_SMP_IDLE_THREAD=y

+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y

+CONFIG_ARCH_HAS_SET_MEMORY=y

 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y

 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y

+CONFIG_HAVE_CLK=y

 CONFIG_HAVE_DMA_API_DEBUG=y

 CONFIG_HAVE_HW_BREAKPOINT=y

 CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y

 CONFIG_HAVE_USER_RETURN_NOTIFIER=y

 CONFIG_HAVE_PERF_EVENTS_NMI=y

+CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y

 CONFIG_HAVE_PERF_REGS=y

 CONFIG_HAVE_PERF_USER_STACK_DUMP=y

 CONFIG_HAVE_ARCH_JUMP_LABEL=y

+CONFIG_HAVE_RCU_TABLE_FREE=y

 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y

 CONFIG_HAVE_CMPXCHG_LOCAL=y

 CONFIG_HAVE_CMPXCHG_DOUBLE=y

@@ -287,18 +301,23 @@ CONFIG_HAVE_GCC_PLUGINS=y

 CONFIG_GCC_PLUGINS=y

 # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set

 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set

+# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set

+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set

 CONFIG_HAVE_CC_STACKPROTECTOR=y

 CONFIG_CC_STACKPROTECTOR=y

 # CONFIG_CC_STACKPROTECTOR_NONE is not set

 CONFIG_CC_STACKPROTECTOR_REGULAR=y

 # CONFIG_CC_STACKPROTECTOR_STRONG is not set

+CONFIG_THIN_ARCHIVES=y

 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y

 CONFIG_HAVE_CONTEXT_TRACKING=y

 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y

 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y

 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y

+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y

 CONFIG_HAVE_ARCH_HUGE_VMAP=y

 CONFIG_HAVE_ARCH_SOFT_DIRTY=y

+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y

 CONFIG_MODULES_USE_ELF_RELA=y

 CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y

 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y

@@ -307,8 +326,10 @@ CONFIG_HAVE_EXIT_THREAD=y

 CONFIG_ARCH_MMAP_RND_BITS=28

 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y

 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8

+CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y

 CONFIG_HAVE_COPY_THREAD_TLS=y

 CONFIG_HAVE_STACK_VALIDATION=y

+CONFIG_HAVE_RELIABLE_STACKTRACE=y

 # CONFIG_HAVE_ARCH_HASH is not set

 # CONFIG_ISA_BUS_API is not set

 CONFIG_OLD_SIGSUSPEND3=y

@@ -316,6 +337,14 @@ CONFIG_COMPAT_OLD_SIGACTION=y

 # CONFIG_CPU_NO_EFFICIENT_FFS is not set

 CONFIG_HAVE_ARCH_VMAP_STACK=y

 CONFIG_VMAP_STACK=y

+# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set

+# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set

+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y

+CONFIG_STRICT_KERNEL_RWX=y

+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y

+CONFIG_STRICT_MODULE_RWX=y

+CONFIG_ARCH_HAS_REFCOUNT=y

+# CONFIG_REFCOUNT_FULL is not set

 #

 # GCOV-based kernel profiling

@@ -344,11 +373,17 @@ CONFIG_MODULE_SIG_HASH="sha512"

 # CONFIG_MODULE_COMPRESS is not set

 CONFIG_MODULES_TREE_LOOKUP=y

 CONFIG_BLOCK=y

+CONFIG_BLK_SCSI_REQUEST=y

 CONFIG_BLK_DEV_BSG=y

 CONFIG_BLK_DEV_BSGLIB=y

 CONFIG_BLK_DEV_INTEGRITY=y

+# CONFIG_BLK_DEV_ZONED is not set

 CONFIG_BLK_DEV_THROTTLING=y

+# CONFIG_BLK_DEV_THROTTLING_LOW is not set

 # CONFIG_BLK_CMDLINE_PARSER is not set

+# CONFIG_BLK_WBT is not set

+CONFIG_BLK_DEBUG_FS=y

+# CONFIG_BLK_SED_OPAL is not set

 #

 # Partition Types

@@ -375,6 +410,7 @@ CONFIG_EFI_PARTITION=y

 # CONFIG_CMDLINE_PARTITION is not set

 CONFIG_BLOCK_COMPAT=y

 CONFIG_BLK_MQ_PCI=y

+CONFIG_BLK_MQ_VIRTIO=y

 #

 # IO Schedulers

@@ -387,6 +423,9 @@ CONFIG_CFQ_GROUP_IOSCHED=y

 CONFIG_DEFAULT_CFQ=y

 # CONFIG_DEFAULT_NOOP is not set

 CONFIG_DEFAULT_IOSCHED="cfq"

+CONFIG_MQ_IOSCHED_DEADLINE=y

+CONFIG_MQ_IOSCHED_KYBER=y

+# CONFIG_IOSCHED_BFQ is not set

 CONFIG_PREEMPT_NOTIFIERS=y

 CONFIG_ASN1=y

 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y

@@ -414,6 +453,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y

 CONFIG_X86_X2APIC=y

 # CONFIG_X86_MPPARSE is not set

 # CONFIG_GOLDFISH is not set

+# CONFIG_INTEL_RDT is not set

 # CONFIG_X86_EXTENDED_PLATFORM is not set

 # CONFIG_X86_INTEL_LPSS is not set

 # CONFIG_X86_AMD_PLATFORM_DEVICE is not set

@@ -426,8 +466,11 @@ CONFIG_PARAVIRT=y

 # CONFIG_PARAVIRT_DEBUG is not set

 # CONFIG_PARAVIRT_SPINLOCKS is not set

 CONFIG_XEN=y

+CONFIG_XEN_PV=y

+CONFIG_XEN_PV_SMP=y

 CONFIG_XEN_DOM0=y

 CONFIG_XEN_PVHVM=y

+CONFIG_XEN_PVHVM_SMP=y

 CONFIG_XEN_512GB=y

 CONFIG_XEN_SAVE_RESTORE=y

 CONFIG_XEN_DEBUG_FS=y

@@ -464,6 +507,7 @@ CONFIG_MAXSMP=y

 CONFIG_NR_CPUS=8192

 CONFIG_SCHED_SMT=y

 CONFIG_SCHED_MC=y

+CONFIG_SCHED_MC_PRIO=y

 CONFIG_PREEMPT_NONE=y

 # CONFIG_PREEMPT_VOLUNTARY is not set

 # CONFIG_PREEMPT is not set

@@ -471,6 +515,7 @@ CONFIG_X86_LOCAL_APIC=y

 CONFIG_X86_IO_APIC=y

 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y

 CONFIG_X86_MCE=y

+# CONFIG_X86_MCELOG_LEGACY is not set

 CONFIG_X86_MCE_INTEL=y

 CONFIG_X86_MCE_AMD=y

 CONFIG_X86_MCE_THRESHOLD=y

@@ -495,9 +540,12 @@ CONFIG_MICROCODE_AMD=y

 CONFIG_MICROCODE_OLD_INTERFACE=y

 CONFIG_X86_MSR=m

 CONFIG_X86_CPUID=m

+# CONFIG_X86_5LEVEL is not set

 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y

 CONFIG_ARCH_DMA_ADDR_T_64BIT=y

 CONFIG_X86_DIRECT_GBPAGES=y

+CONFIG_ARCH_HAS_MEM_ENCRYPT=y

+# CONFIG_AMD_MEM_ENCRYPT is not set

 CONFIG_NUMA=y

 CONFIG_AMD_NUMA=y

 CONFIG_X86_64_ACPI_NUMA=y

@@ -521,9 +569,9 @@ CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y

 CONFIG_SPARSEMEM_VMEMMAP=y

 CONFIG_HAVE_MEMBLOCK=y

 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y

+CONFIG_HAVE_GENERIC_GUP=y

 CONFIG_ARCH_DISCARD_MEMBLOCK=y

 CONFIG_MEMORY_ISOLATION=y

-# CONFIG_MOVABLE_NODE is not set

 CONFIG_HAVE_BOOTMEM_INFO_NODE=y

 CONFIG_MEMORY_HOTPLUG=y

 CONFIG_MEMORY_HOTPLUG_SPARSE=y

@@ -536,6 +584,7 @@ CONFIG_BALLOON_COMPACTION=y

 CONFIG_COMPACTION=y

 CONFIG_MIGRATION=y

 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y

+CONFIG_ARCH_ENABLE_THP_MIGRATION=y

 CONFIG_PHYS_ADDR_T_64BIT=y

 CONFIG_VIRT_TO_BUS=y

 CONFIG_MMU_NOTIFIER=y

@@ -547,6 +596,8 @@ CONFIG_MEMORY_FAILURE=y

 CONFIG_TRANSPARENT_HUGEPAGE=y

 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y

 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set

+CONFIG_ARCH_WANTS_THP_SWAP=y

+CONFIG_THP_SWAP=y

 CONFIG_TRANSPARENT_HUGE_PAGECACHE=y

 CONFIG_CLEANCACHE=y

 # CONFIG_FRONTSWAP is not set

@@ -558,9 +609,15 @@ CONFIG_GENERIC_EARLY_IOREMAP=y

 CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y

 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set

 # CONFIG_IDLE_PAGE_TRACKING is not set

+CONFIG_ARCH_HAS_ZONE_DEVICE=y

 CONFIG_ZONE_DEVICE=y

+CONFIG_ARCH_HAS_HMM=y

+# CONFIG_HMM_MIRROR is not set

+# CONFIG_DEVICE_PRIVATE is not set

+# CONFIG_DEVICE_PUBLIC is not set

 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y

 CONFIG_ARCH_HAS_PKEYS=y

+# CONFIG_PERCPU_STATS is not set

 CONFIG_X86_PMEM_LEGACY_DEVICE=y

 CONFIG_X86_PMEM_LEGACY=y

 CONFIG_X86_CHECK_BIOS_CORRUPTION=y

@@ -603,6 +660,7 @@ CONFIG_LEGACY_VSYSCALL_EMULATE=y

 # CONFIG_CMDLINE_BOOL is not set

 CONFIG_MODIFY_LDT_SYSCALL=y

 CONFIG_HAVE_LIVEPATCH=y

+CONFIG_ARCH_HAS_ADD_PAGES=y

 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y

 CONFIG_USE_PERCPU_NUMA_NODE_ID=y

@@ -623,6 +681,8 @@ CONFIG_PM_SLEEP_SMP=y

 # CONFIG_PM_WAKELOCKS is not set

 CONFIG_PM=y

 # CONFIG_PM_DEBUG is not set

+CONFIG_PM_OPP=y

+CONFIG_PM_CLK=y

 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set

 CONFIG_ACPI=y

 CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y

@@ -642,6 +702,7 @@ CONFIG_ACPI_FAN=m

 CONFIG_ACPI_CPU_FREQ_PSS=y

 CONFIG_ACPI_PROCESSOR_CSTATE=y

 CONFIG_ACPI_PROCESSOR_IDLE=y

+CONFIG_ACPI_CPPC_LIB=y

 CONFIG_ACPI_PROCESSOR=y

 CONFIG_ACPI_IPMI=m

 CONFIG_ACPI_HOTPLUG_CPU=y

@@ -663,7 +724,6 @@ CONFIG_ACPI_HED=y

 # CONFIG_ACPI_BGRT is not set

 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set

 CONFIG_ACPI_NFIT=m

-# CONFIG_ACPI_NFIT_DEBUG is not set

 CONFIG_HAVE_ACPI_APEI=y

 CONFIG_HAVE_ACPI_APEI_NMI=y

 CONFIG_ACPI_APEI=y

@@ -685,7 +745,6 @@ CONFIG_CPU_FREQ=y

 CONFIG_CPU_FREQ_GOV_ATTR_SET=y

 CONFIG_CPU_FREQ_GOV_COMMON=y

 CONFIG_CPU_FREQ_STAT=y

-CONFIG_CPU_FREQ_STAT_DETAILS=y

 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set

 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set

@@ -726,12 +785,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y

 CONFIG_INTEL_IDLE=y

 #

-# Memory power savings

-#

-CONFIG_I7300_IDLE_IOAT_CHANNEL=y

-CONFIG_I7300_IDLE=m

-

-#

 # Bus options (PCI etc.)

 #

 CONFIG_PCI=y

@@ -749,6 +802,7 @@ CONFIG_PCIEASPM=y

 # CONFIG_PCIEASPM_DEBUG is not set

 CONFIG_PCIEASPM_DEFAULT=y

 # CONFIG_PCIEASPM_POWERSAVE is not set

+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set

 # CONFIG_PCIEASPM_PERFORMANCE is not set

 CONFIG_PCIE_PME=y

 # CONFIG_PCIE_DPC is not set

@@ -762,6 +816,7 @@ CONFIG_PCI_MSI_IRQ_DOMAIN=y

 CONFIG_XEN_PCIDEV_FRONTEND=m

 CONFIG_HT_IRQ=y

 CONFIG_PCI_ATS=y

+CONFIG_PCI_LOCKLESS_CONFIG=y

 CONFIG_PCI_IOV=y

 CONFIG_PCI_PRI=y

 CONFIG_PCI_PASID=y

@@ -774,10 +829,24 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m

 # CONFIG_HOTPLUG_PCI_SHPC is not set

 #

-# PCI host controller drivers

+# DesignWare PCI Core Support

 #

 # CONFIG_PCIE_DW_PLAT is not set

+

+#

+# PCI host controller drivers

+#

 CONFIG_VMD=y

+

+#

+# PCI Endpoint

+#

+# CONFIG_PCI_ENDPOINT is not set

+

+#

+# PCI switch controller drivers

+#

+# CONFIG_PCI_SW_SWITCHTEC is not set

 # CONFIG_ISA_BUS is not set

 CONFIG_ISA_DMA_API=y

 CONFIG_AMD_NB=y

@@ -799,11 +868,11 @@ CONFIG_COREDUMP=y

 CONFIG_IA32_EMULATION=y

 # CONFIG_IA32_AOUT is not set

 # CONFIG_X86_X32 is not set

+CONFIG_COMPAT_32=y

 CONFIG_COMPAT=y

 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y

 CONFIG_SYSVIPC_COMPAT=y

 CONFIG_X86_DEV_DMA_OPS=y

-CONFIG_PMC_ATOM=y

 CONFIG_NET=y

 CONFIG_NET_INGRESS=y

 CONFIG_NET_EGRESS=y

@@ -815,6 +884,7 @@ CONFIG_PACKET=y

 CONFIG_PACKET_DIAG=m

 CONFIG_UNIX=y

 CONFIG_UNIX_DIAG=m

+# CONFIG_TLS is not set

 CONFIG_XFRM=y

 CONFIG_XFRM_ALGO=m

 CONFIG_XFRM_USER=m

@@ -849,6 +919,7 @@ CONFIG_NET_UDP_TUNNEL=m

 # CONFIG_NET_FOU_IP_TUNNELS is not set

 CONFIG_INET_AH=m

 CONFIG_INET_ESP=m

+# CONFIG_INET_ESP_OFFLOAD is not set

 CONFIG_INET_IPCOMP=m

 CONFIG_INET_XFRM_TUNNEL=m

 CONFIG_INET_TUNNEL=m

@@ -858,6 +929,7 @@ CONFIG_INET_XFRM_MODE_BEET=m

 CONFIG_INET_DIAG=m

 CONFIG_INET_TCP_DIAG=m

 CONFIG_INET_UDP_DIAG=m

+# CONFIG_INET_RAW_DIAG is not set

 # CONFIG_INET_DIAG_DESTROY is not set

 CONFIG_TCP_CONG_ADVANCED=y

 # CONFIG_TCP_CONG_BIC is not set

@@ -886,6 +958,7 @@ CONFIG_IPV6_ROUTE_INFO=y

 CONFIG_IPV6_OPTIMISTIC_DAD=y

 CONFIG_INET6_AH=m

 CONFIG_INET6_ESP=m

+# CONFIG_INET6_ESP_OFFLOAD is not set

 CONFIG_INET6_IPCOMP=m

 CONFIG_IPV6_MIP6=m

 # CONFIG_IPV6_ILA is not set

@@ -908,12 +981,13 @@ CONFIG_IPV6_SUBTREES=y

 CONFIG_IPV6_MROUTE=y

 CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y

 CONFIG_IPV6_PIMSM_V2=y

+# CONFIG_IPV6_SEG6_LWTUNNEL is not set

+# CONFIG_IPV6_SEG6_HMAC is not set

 CONFIG_NETLABEL=y

 CONFIG_NETWORK_SECMARK=y

 CONFIG_NET_PTP_CLASSIFY=y

 CONFIG_NETWORK_PHY_TIMESTAMPING=y

 CONFIG_NETFILTER=y

-# CONFIG_NETFILTER_DEBUG is not set

 CONFIG_NETFILTER_ADVANCED=y

 CONFIG_BRIDGE_NETFILTER=m

@@ -927,6 +1001,7 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m

 CONFIG_NETFILTER_NETLINK_LOG=m

 CONFIG_NF_CONNTRACK=m

 CONFIG_NF_LOG_COMMON=m

+# CONFIG_NF_LOG_NETDEV is not set

 CONFIG_NF_CONNTRACK_MARK=y

 CONFIG_NF_CONNTRACK_SECMARK=y

 CONFIG_NF_CONNTRACK_ZONES=y

@@ -935,10 +1010,10 @@ CONFIG_NF_CONNTRACK_EVENTS=y

 CONFIG_NF_CONNTRACK_TIMEOUT=y

 CONFIG_NF_CONNTRACK_TIMESTAMP=y

 CONFIG_NF_CONNTRACK_LABELS=y

-CONFIG_NF_CT_PROTO_DCCP=m

+CONFIG_NF_CT_PROTO_DCCP=y

 CONFIG_NF_CT_PROTO_GRE=m

-CONFIG_NF_CT_PROTO_SCTP=m

-CONFIG_NF_CT_PROTO_UDPLITE=m

+CONFIG_NF_CT_PROTO_SCTP=y

+CONFIG_NF_CT_PROTO_UDPLITE=y

 CONFIG_NF_CONNTRACK_AMANDA=m

 CONFIG_NF_CONNTRACK_FTP=m

 CONFIG_NF_CONNTRACK_H323=m

@@ -955,9 +1030,9 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m

 # CONFIG_NETFILTER_NETLINK_GLUE_CT is not set

 CONFIG_NF_NAT=m

 CONFIG_NF_NAT_NEEDED=y

-CONFIG_NF_NAT_PROTO_DCCP=m

-CONFIG_NF_NAT_PROTO_UDPLITE=m

-CONFIG_NF_NAT_PROTO_SCTP=m

+CONFIG_NF_NAT_PROTO_DCCP=y

+CONFIG_NF_NAT_PROTO_UDPLITE=y

+CONFIG_NF_NAT_PROTO_SCTP=y

 CONFIG_NF_NAT_AMANDA=m

 CONFIG_NF_NAT_FTP=m

 CONFIG_NF_NAT_IRC=m

@@ -970,16 +1045,19 @@ CONFIG_NF_TABLES_INET=m

 CONFIG_NF_TABLES_NETDEV=m

 CONFIG_NFT_EXTHDR=m

 CONFIG_NFT_META=m

+CONFIG_NFT_RT=m

 CONFIG_NFT_NUMGEN=m

 CONFIG_NFT_CT=m

 CONFIG_NFT_SET_RBTREE=m

 CONFIG_NFT_SET_HASH=m

+CONFIG_NFT_SET_BITMAP=m

 CONFIG_NFT_COUNTER=m

 CONFIG_NFT_LOG=m

 CONFIG_NFT_LIMIT=m

 CONFIG_NFT_MASQ=m

 CONFIG_NFT_REDIR=m

 CONFIG_NFT_NAT=m

+# CONFIG_NFT_OBJREF is not set

 CONFIG_NFT_QUEUE=m

 CONFIG_NFT_QUOTA=m

 CONFIG_NFT_REJECT=m

@@ -1069,7 +1147,6 @@ CONFIG_NETFILTER_XT_MATCH_RATEEST=m

 CONFIG_NETFILTER_XT_MATCH_REALM=m

 CONFIG_NETFILTER_XT_MATCH_RECENT=m

 CONFIG_NETFILTER_XT_MATCH_SCTP=m

-CONFIG_NETFILTER_XT_MATCH_SOCKET=m

 CONFIG_NETFILTER_XT_MATCH_STATE=m

 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m

 CONFIG_NETFILTER_XT_MATCH_STRING=m

@@ -1086,6 +1163,7 @@ CONFIG_IP_SET_HASH_IPMARK=m

 CONFIG_IP_SET_HASH_IPPORT=m

 CONFIG_IP_SET_HASH_IPPORTIP=m

 CONFIG_IP_SET_HASH_IPPORTNET=m

+CONFIG_IP_SET_HASH_IPMAC=m

 CONFIG_IP_SET_HASH_MAC=m

 CONFIG_IP_SET_HASH_NETPORTNET=m

 CONFIG_IP_SET_HASH_NET=m

@@ -1141,10 +1219,12 @@ CONFIG_IP_VS_PE_SIP=m

 #

 CONFIG_NF_DEFRAG_IPV4=m

 CONFIG_NF_CONNTRACK_IPV4=m

+# CONFIG_NF_SOCKET_IPV4 is not set

 CONFIG_NF_TABLES_IPV4=m

 # CONFIG_NFT_CHAIN_ROUTE_IPV4 is not set

 CONFIG_NFT_REJECT_IPV4=m

 # CONFIG_NFT_DUP_IPV4 is not set

+# CONFIG_NFT_FIB_IPV4 is not set

 # CONFIG_NF_TABLES_ARP is not set

 CONFIG_NF_DUP_IPV4=m

 # CONFIG_NF_LOG_ARP is not set

@@ -1186,10 +1266,12 @@ CONFIG_IP_NF_ARP_MANGLE=m

 #

 CONFIG_NF_DEFRAG_IPV6=m

 CONFIG_NF_CONNTRACK_IPV6=m

+# CONFIG_NF_SOCKET_IPV6 is not set

 CONFIG_NF_TABLES_IPV6=m

 CONFIG_NFT_CHAIN_ROUTE_IPV6=m

 CONFIG_NFT_REJECT_IPV6=m

 CONFIG_NFT_DUP_IPV6=m

+# CONFIG_NFT_FIB_IPV6 is not set

 CONFIG_NF_DUP_IPV6=m

 CONFIG_NF_REJECT_IPV6=m

 CONFIG_NF_LOG_IPV6=m

@@ -1321,6 +1403,7 @@ CONFIG_NET_SCH_FQ=m

 # CONFIG_NET_SCH_PIE is not set

 CONFIG_NET_SCH_INGRESS=m

 CONFIG_NET_SCH_PLUG=m

+# CONFIG_NET_SCH_DEFAULT is not set

 #

 # Classification

@@ -1353,6 +1436,7 @@ CONFIG_NET_ACT_POLICE=m

 CONFIG_NET_ACT_GACT=m

 CONFIG_GACT_PROB=y

 CONFIG_NET_ACT_MIRRED=m

+# CONFIG_NET_ACT_SAMPLE is not set

 CONFIG_NET_ACT_IPT=m

 CONFIG_NET_ACT_NAT=m

 CONFIG_NET_ACT_PEDIT=m

@@ -1378,11 +1462,12 @@ CONFIG_VSOCKETS=m

 CONFIG_VMWARE_VMCI_VSOCKETS=m

 CONFIG_VIRTIO_VSOCKETS=m

 CONFIG_VIRTIO_VSOCKETS_COMMON=m

-CONFIG_HYPERV_SOCK=m

+CONFIG_HYPERV_VSOCKETS=m

 CONFIG_NETLINK_DIAG=m

 CONFIG_MPLS=y

 CONFIG_NET_MPLS_GSO=m

 # CONFIG_MPLS_ROUTING is not set

+# CONFIG_NET_NSH is not set

 # CONFIG_HSR is not set

 # CONFIG_NET_SWITCHDEV is not set

 CONFIG_NET_L3_MASTER_DEV=y

@@ -1390,7 +1475,6 @@ CONFIG_NET_L3_MASTER_DEV=y

 CONFIG_RPS=y

 CONFIG_RFS_ACCEL=y

 CONFIG_XPS=y

-CONFIG_SOCK_CGROUP_DATA=y

 CONFIG_CGROUP_NET_PRIO=y

 CONFIG_CGROUP_NET_CLASSID=y

 CONFIG_NET_RX_BUSY_POLL=y

@@ -1406,7 +1490,6 @@ CONFIG_NET_FLOW_LIMIT=y

 CONFIG_NET_DROP_MONITOR=m

 # CONFIG_HAMRADIO is not set

 # CONFIG_CAN is not set

-# CONFIG_IRDA is not set

 # CONFIG_BT is not set

 # CONFIG_AF_RXRPC is not set

 # CONFIG_AF_KCM is not set

@@ -1417,14 +1500,18 @@ CONFIG_FIB_RULES=y

 # CONFIG_RFKILL is not set

 CONFIG_NET_9P=m

 CONFIG_NET_9P_VIRTIO=m

+CONFIG_NET_9P_XEN=m

 # CONFIG_NET_9P_DEBUG is not set

 # CONFIG_CAIF is not set

 CONFIG_CEPH_LIB=m

 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set

 # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set

 # CONFIG_NFC is not set

+# CONFIG_PSAMPLE is not set

+# CONFIG_NET_IFE is not set

 # CONFIG_LWTUNNEL is not set

 CONFIG_DST_CACHE=y

+CONFIG_GRO_CELLS=y

 # CONFIG_NET_DEVLINK is not set

 CONFIG_MAY_USE_DEVLINK=y

 CONFIG_HAVE_EBPF_JIT=y

@@ -1450,13 +1537,14 @@ CONFIG_ALLOW_DEV_COREDUMP=y

 # CONFIG_DEBUG_DRIVER is not set

 # CONFIG_DEBUG_DEVRES is not set

 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set

+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set

 CONFIG_SYS_HYPERVISOR=y