From 98b9a029cfa590301cda089365e03ab02b03685c Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Fri, 16 Dec 2022 21:03:01 +0100 Subject: kernel 6.0.12 --- SOURCES/kernel-aarch64-debug-fedora.config | 1 + SOURCES/kernel-aarch64-debug-rhel.config | 1 + SOURCES/kernel-aarch64-fedora.config | 1 + SOURCES/kernel-aarch64-rhel.config | 1 + SOURCES/kernel-armv7hl-debug-fedora.config | 1 + SOURCES/kernel-armv7hl-fedora.config | 1 + SOURCES/kernel-armv7hl-lpae-debug-fedora.config | 1 + SOURCES/kernel-armv7hl-lpae-fedora.config | 1 + SOURCES/kernel-ppc64le-debug-fedora.config | 1 + SOURCES/kernel-ppc64le-debug-rhel.config | 1 + SOURCES/kernel-ppc64le-fedora.config | 1 + SOURCES/kernel-ppc64le-rhel.config | 1 + SOURCES/kernel-s390x-debug-fedora.config | 1 + SOURCES/kernel-s390x-debug-rhel.config | 1 + SOURCES/kernel-s390x-fedora.config | 1 + SOURCES/kernel-s390x-rhel.config | 1 + SOURCES/kernel-s390x-zfcpdump-rhel.config | 1 + SOURCES/kernel-x86_64-debug-fedora.config | 1 + SOURCES/kernel-x86_64-debug-rhel.config | 1 + SOURCES/kernel-x86_64-fedora.config | 1 + SOURCES/kernel-x86_64-rhel.config | 1 + SOURCES/patch-6.0-redhat.patch | 50 +++---------------------- 22 files changed, 26 insertions(+), 45 deletions(-) (limited to 'SOURCES') diff --git a/SOURCES/kernel-aarch64-debug-fedora.config b/SOURCES/kernel-aarch64-debug-fedora.config index d267b74..ea60b20 100644 --- a/SOURCES/kernel-aarch64-debug-fedora.config +++ b/SOURCES/kernel-aarch64-debug-fedora.config @@ -2394,6 +2394,7 @@ CONFIG_FTRACE=y # CONFIG_FTWDT010_WATCHDOG is not set CONFIG_FUJITSU_ERRATUM_010001=y # CONFIG_FUJITSU_ES is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-aarch64-debug-rhel.config b/SOURCES/kernel-aarch64-debug-rhel.config index ca96b78..7d27f8d 100644 --- a/SOURCES/kernel-aarch64-debug-rhel.config +++ b/SOURCES/kernel-aarch64-debug-rhel.config @@ -1828,6 +1828,7 @@ CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y CONFIG_FUJITSU_ERRATUM_010001=y # CONFIG_FUJITSU_ES is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_FUNCTION_PROFILER is not set CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-aarch64-fedora.config b/SOURCES/kernel-aarch64-fedora.config index a150ae1..d351811 100644 --- a/SOURCES/kernel-aarch64-fedora.config +++ b/SOURCES/kernel-aarch64-fedora.config @@ -2378,6 +2378,7 @@ CONFIG_FTRACE=y # CONFIG_FTWDT010_WATCHDOG is not set CONFIG_FUJITSU_ERRATUM_010001=y # CONFIG_FUJITSU_ES is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-aarch64-rhel.config b/SOURCES/kernel-aarch64-rhel.config index 3aee935..781f543 100644 --- a/SOURCES/kernel-aarch64-rhel.config +++ b/SOURCES/kernel-aarch64-rhel.config @@ -1812,6 +1812,7 @@ CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y CONFIG_FUJITSU_ERRATUM_010001=y # CONFIG_FUJITSU_ES is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_FUNCTION_PROFILER is not set CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-armv7hl-debug-fedora.config b/SOURCES/kernel-armv7hl-debug-fedora.config index c1baf25..82ef080 100644 --- a/SOURCES/kernel-armv7hl-debug-fedora.config +++ b/SOURCES/kernel-armv7hl-debug-fedora.config @@ -2384,6 +2384,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTWDT010_WATCHDOG is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set # CONFIG_FUNCTION_GRAPH_TRACER is not set CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-armv7hl-fedora.config b/SOURCES/kernel-armv7hl-fedora.config index ea30d92..450870d 100644 --- a/SOURCES/kernel-armv7hl-fedora.config +++ b/SOURCES/kernel-armv7hl-fedora.config @@ -2369,6 +2369,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTWDT010_WATCHDOG is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set # CONFIG_FUNCTION_GRAPH_TRACER is not set CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config index 579819c..30b7f92 100644 --- a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config +++ b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config @@ -2338,6 +2338,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTWDT010_WATCHDOG is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set # CONFIG_FUNCTION_GRAPH_TRACER is not set CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-armv7hl-lpae-fedora.config b/SOURCES/kernel-armv7hl-lpae-fedora.config index f4dd454..ee40cf9 100644 --- a/SOURCES/kernel-armv7hl-lpae-fedora.config +++ b/SOURCES/kernel-armv7hl-lpae-fedora.config @@ -2323,6 +2323,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTWDT010_WATCHDOG is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set # CONFIG_FUNCTION_GRAPH_TRACER is not set CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-ppc64le-debug-fedora.config b/SOURCES/kernel-ppc64le-debug-fedora.config index e422e0b..90e485a 100644 --- a/SOURCES/kernel-ppc64le-debug-fedora.config +++ b/SOURCES/kernel-ppc64le-debug-fedora.config @@ -1891,6 +1891,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTR_FIXUP_SELFTEST is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-ppc64le-debug-rhel.config b/SOURCES/kernel-ppc64le-debug-rhel.config index acc21ee..7cfc92f 100644 --- a/SOURCES/kernel-ppc64le-debug-rhel.config +++ b/SOURCES/kernel-ppc64le-debug-rhel.config @@ -1665,6 +1665,7 @@ CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTR_FIXUP_SELFTEST is not set CONFIG_FUJITSU_ERRATUM_010001=y +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-ppc64le-fedora.config b/SOURCES/kernel-ppc64le-fedora.config index e65290a..4ae86a2 100644 --- a/SOURCES/kernel-ppc64le-fedora.config +++ b/SOURCES/kernel-ppc64le-fedora.config @@ -1874,6 +1874,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTR_FIXUP_SELFTEST is not set +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-ppc64le-rhel.config b/SOURCES/kernel-ppc64le-rhel.config index e144416..b2d6830 100644 --- a/SOURCES/kernel-ppc64le-rhel.config +++ b/SOURCES/kernel-ppc64le-rhel.config @@ -1649,6 +1649,7 @@ CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y # CONFIG_FTR_FIXUP_SELFTEST is not set CONFIG_FUJITSU_ERRATUM_010001=y +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-s390x-debug-fedora.config b/SOURCES/kernel-s390x-debug-fedora.config index 6a19fbd..1b1ef89 100644 --- a/SOURCES/kernel-s390x-debug-fedora.config +++ b/SOURCES/kernel-s390x-debug-fedora.config @@ -1888,6 +1888,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-s390x-debug-rhel.config b/SOURCES/kernel-s390x-debug-rhel.config index 38bc9a5..518fe6b 100644 --- a/SOURCES/kernel-s390x-debug-rhel.config +++ b/SOURCES/kernel-s390x-debug-rhel.config @@ -1668,6 +1668,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y CONFIG_FUJITSU_ERRATUM_010001=y +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_FUNCTION_PROFILER is not set CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-s390x-fedora.config b/SOURCES/kernel-s390x-fedora.config index b506da7..88b04f7 100644 --- a/SOURCES/kernel-s390x-fedora.config +++ b/SOURCES/kernel-s390x-fedora.config @@ -1871,6 +1871,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-s390x-rhel.config b/SOURCES/kernel-s390x-rhel.config index ecb4b3d..e07e545 100644 --- a/SOURCES/kernel-s390x-rhel.config +++ b/SOURCES/kernel-s390x-rhel.config @@ -1652,6 +1652,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y CONFIG_FTRACE_SYSCALLS=y CONFIG_FTRACE=y CONFIG_FUJITSU_ERRATUM_010001=y +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_FUNCTION_PROFILER is not set CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-s390x-zfcpdump-rhel.config b/SOURCES/kernel-s390x-zfcpdump-rhel.config index 4d88a2b..0e9d7c6 100644 --- a/SOURCES/kernel-s390x-zfcpdump-rhel.config +++ b/SOURCES/kernel-s390x-zfcpdump-rhel.config @@ -1659,6 +1659,7 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_FTRACE_SYSCALLS=y CONFIG_FUJITSU_ERRATUM_010001=y +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_FUNCTION_PROFILER is not set CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-x86_64-debug-fedora.config b/SOURCES/kernel-x86_64-debug-fedora.config index dc349ff..d716908 100644 --- a/SOURCES/kernel-x86_64-debug-fedora.config +++ b/SOURCES/kernel-x86_64-debug-fedora.config @@ -2056,6 +2056,7 @@ CONFIG_FTRACE=y CONFIG_FUJITSU_ES=m CONFIG_FUJITSU_LAPTOP=m CONFIG_FUJITSU_TABLET=m +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-x86_64-debug-rhel.config b/SOURCES/kernel-x86_64-debug-rhel.config index 93aa93b..b075c06 100644 --- a/SOURCES/kernel-x86_64-debug-rhel.config +++ b/SOURCES/kernel-x86_64-debug-rhel.config @@ -1770,6 +1770,7 @@ CONFIG_FUJITSU_ERRATUM_010001=y CONFIG_FUJITSU_ES=m CONFIG_FUJITSU_LAPTOP=m CONFIG_FUJITSU_TABLET=m +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-x86_64-fedora.config b/SOURCES/kernel-x86_64-fedora.config index 4aeaed1..2679b62 100644 --- a/SOURCES/kernel-x86_64-fedora.config +++ b/SOURCES/kernel-x86_64-fedora.config @@ -2039,6 +2039,7 @@ CONFIG_FTRACE=y CONFIG_FUJITSU_ES=m CONFIG_FUJITSU_LAPTOP=m CONFIG_FUJITSU_TABLET=m +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/kernel-x86_64-rhel.config b/SOURCES/kernel-x86_64-rhel.config index 63a95a8..31d8ed9 100644 --- a/SOURCES/kernel-x86_64-rhel.config +++ b/SOURCES/kernel-x86_64-rhel.config @@ -1754,6 +1754,7 @@ CONFIG_FUJITSU_ERRATUM_010001=y CONFIG_FUJITSU_ES=m CONFIG_FUJITSU_LAPTOP=m CONFIG_FUJITSU_TABLET=m +# CONFIG_FUNCTION_ERROR_INJECTION is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_FUNCTION_TRACER=y diff --git a/SOURCES/patch-6.0-redhat.patch b/SOURCES/patch-6.0-redhat.patch index 97752a2..cb44e77 100644 --- a/SOURCES/patch-6.0-redhat.patch +++ b/SOURCES/patch-6.0-redhat.patch @@ -38,7 +38,6 @@ include/net/sock.h | 2 +- init/Kconfig | 2 +- kernel/module/signing.c | 9 +- - net/ipv4/fib_semantics.c | 8 +- net/l2tp/l2tp_core.c | 19 +- scripts/pahole-flags.sh | 3 + scripts/tags.sh | 2 + @@ -46,11 +45,10 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - tools/testing/selftests/net/fib_nexthops.sh | 5 + - 49 files changed, 776 insertions(+), 369 deletions(-) + 47 files changed, 767 insertions(+), 365 deletions(-) diff --git a/Makefile b/Makefile -index 9fecb094c28a..43753e41fb51 100644 +index 46c6eb57b354..ad3a206451ea 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1090,7 +1088,7 @@ index 3a808146b50f..c1a3f3057921 100644 * Changes the default domain of an iommu group that has *only* one device * diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 01c36284e542..2a5fd205863b 100644 +index f612a0ba64d0..5c4a1ca36aec 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1157,7 +1155,7 @@ index 01c36284e542..2a5fd205863b 100644 #ifdef CONFIG_NVME_AUTH queue_work(nvme_wq, &ctrl->dhchap_auth_work); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index b9cf17cbbbd5..9aa33fc59f67 100644 +index 114e2b9359f8..30049e986fba 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -80,14 +80,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys) @@ -1193,7 +1191,7 @@ index b9cf17cbbbd5..9aa33fc59f67 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) { -@@ -872,8 +878,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) +@@ -875,8 +881,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) int error = 0; /* check if multipath is enabled and we have the capability */ @@ -1995,28 +1993,6 @@ index a2ff4242e623..f0d2be1ee4f1 100644 } int module_sig_check(struct load_info *info, int flags) -diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c -index 2dc97583d279..e9a7f70a54df 100644 ---- a/net/ipv4/fib_semantics.c -+++ b/net/ipv4/fib_semantics.c -@@ -888,13 +888,13 @@ int fib_nh_match(struct net *net, struct fib_config *cfg, struct fib_info *fi, - return 1; - } - -+ /* cannot match on nexthop object attributes */ -+ if (fi->nh) -+ return 1; -+ - if (cfg->fc_oif || cfg->fc_gw_family) { - struct fib_nh *nh; - -- /* cannot match on nexthop object attributes */ -- if (fi->nh) -- return 1; -- - nh = fib_info_nh(fi, 0); - if (cfg->fc_encap) { - if (fib_encap_match(net, cfg->fc_encap_type, diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 7499c51b1850..754fdda8a5f5 100644 --- a/net/l2tp/l2tp_core.c @@ -2184,19 +2160,3 @@ index 4b95de24bc8d..10047790e96e 100644 #ifdef CONFIG_PERF_EVENTS int security_perf_event_open(struct perf_event_attr *attr, int type) { -diff --git a/tools/testing/selftests/net/fib_nexthops.sh b/tools/testing/selftests/net/fib_nexthops.sh -index d5a0dd548989..ee5e98204d3d 100755 ---- a/tools/testing/selftests/net/fib_nexthops.sh -+++ b/tools/testing/selftests/net/fib_nexthops.sh -@@ -1223,6 +1223,11 @@ ipv4_fcnal() - log_test $rc 0 "Delete nexthop route warning" - run_cmd "$IP route delete 172.16.101.1/32 nhid 12" - run_cmd "$IP nexthop del id 12" -+ -+ run_cmd "$IP nexthop add id 21 via 172.16.1.6 dev veth1" -+ run_cmd "$IP ro add 172.16.101.0/24 nhid 21" -+ run_cmd "$IP ro del 172.16.101.0/24 nexthop via 172.16.1.7 dev veth1 nexthop via 172.16.1.8 dev veth1" -+ log_test $? 2 "Delete multipath route with only nh id based entry" - } - - ipv4_grp_fcnal() -- cgit v1.2.3