diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch | 2 | ||||
| -rw-r--r-- | 0002-drm-amd-display-Have-Payload-Properly-Created-After-.patch | 50 | ||||
| -rw-r--r-- | 0002-netfilter-nf_tables-deactivate-anonymous-set-from-pr.patch | 122 | ||||
| -rw-r--r-- | PKGBUILD | 76 | ||||
| -rw-r--r-- | config | 24 |
6 files changed, 107 insertions, 185 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-ck - pkgver = 6.3.1 - pkgrel = 2 + pkgver = 6.3.3 + pkgrel = 1 url = https://wiki.archlinux.org/index.php/Linux-ck arch = x86_64 license = GPL2 @@ -15,22 +15,22 @@ pkgbase = linux-ck makedepends = tar makedepends = xz options = !strip - source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.3.1.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.3.1.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.3.3.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.3.3.tar.sign source = config source = more-uarches-20221217.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20221217.tar.gz source = ck-hrtimer-d09271d382ae852c98e17bd7426fc8021e7b465e.tar.gz::https://github.com/graysky2/linux-patches/archive/d09271d382ae852c98e17bd7426fc8021e7b465e.tar.gz source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - source = 0002-netfilter-nf_tables-deactivate-anonymous-set-from-pr.patch + source = 0002-drm-amd-display-Have-Payload-Properly-Created-After-.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - sha256sums = 78620fb4a7d5e0db1d4eb8d5b1c6e207ba5d19564efa63967a59b6daf89b3f2a + sha256sums = 8975216a6cee827390586758ed69d19743367098d1fc5dd5694987bb529e44e5 sha256sums = SKIP - sha256sums = 6b337a9d3cfdc00005589a80b8d36fa500f6a92ed21565a3aceec48d7202a7da + sha256sums = 21b9a9e542f853cdc695648d6ab6219bd2e881a4954277f241e104723c373d42 sha256sums = f1d586e111932890ad5e0df15d092fb9b3f87bae4ea17812aae9b0ec98fe2db0 sha256sums = f781da5ba492d8912c7d4cddac02f21c1799532182e23374c80c19ff0c617373 - sha256sums = 9346a69dad1c83417322551a5af677e5134da9097df6fc60897bf9d35c067df0 - sha256sums = 844c8e4c4b8c6f44a5f0e746c767092cbabf6522d9012d237397ae159ebc3ede + sha256sums = c90ccb8accf7fa59f79318b749f0243c96ed9c1e35461f0dae50772f87a467a3 + sha256sums = 5e0f9ee19cb3ef6b811e1563690852b03bbc73c35113ab765a53597cf2030883 pkgname = linux-ck pkgdesc = The Linux kernel and modules with ck's hrtimer patches diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index 96e301fa14a9..a6d7c2e8094d 100644 --- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch +++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -1,4 +1,4 @@ -From e2e0cdead496d7d17e0376191e3b94261632496a Mon Sep 17 00:00:00 2001 +From 59f2f4ec4f5168b6c8945d59b9859d8b2321882b Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Mon, 16 Sep 2019 04:53:20 +0200 Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged diff --git a/0002-drm-amd-display-Have-Payload-Properly-Created-After-.patch b/0002-drm-amd-display-Have-Payload-Properly-Created-After-.patch new file mode 100644 index 000000000000..ba9a37090e11 --- /dev/null +++ b/0002-drm-amd-display-Have-Payload-Properly-Created-After-.patch @@ -0,0 +1,50 @@ +From 2fd9916a465e3b62452ac4346def013c3d8698a4 Mon Sep 17 00:00:00 2001 +From: Fangzhi Zuo <jerry.zuo@amd.com> +Date: Wed, 17 May 2023 19:37:13 +0800 +Subject: [PATCH 2/3] drm/amd/display: Have Payload Properly Created After + Resume + +At drm suspend sequence, MST dc_sink is removed. When commit cached +MST stream back in drm resume sequence, the MST stream payload is not +properly created and added into the payload table. After resume, topology +change is reprobed by removing existing streams first. That leads to +no payload is found in the existing payload table as below error +"[drm] ERROR No payload for [MST PORT:] found in mst state" + +1. In encoder .atomic_check routine, remove check existance of dc_sink +2. Bypass MST by checking existence of MST root port. dc_link_type cannot +differentiate MST port before topology is rediscovered. + +Reviewed-by: Wayne Lin <wayne.lin@amd.com> +Acked-by: Tom Chung <chiahsuan.chung@amd.com> +Signed-off-by: Fangzhi Zuo <jerry.zuo@amd.com> +(cherry picked from https://patchwork.freedesktop.org/patch/537553/) +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +index f54d670ab3ab..0695c7c3d489 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -2813,7 +2813,7 @@ static int dm_resume(void *handle) + * this is the case when traversing through already created + * MST connectors, should be skipped + */ +- if (aconnector->dc_link->type == dc_connection_mst_branch) ++ if (aconnector && aconnector->mst_root) + continue; + + mutex_lock(&aconnector->hpd_lock); +@@ -6717,7 +6717,7 @@ static int dm_encoder_helper_atomic_check(struct drm_encoder *encoder, + int clock, bpp = 0; + bool is_y420 = false; + +- if (!aconnector->mst_output_port || !aconnector->dc_sink) ++ if (!aconnector->mst_output_port) + return 0; + + mst_port = aconnector->mst_output_port; +-- +2.40.1 + diff --git a/0002-netfilter-nf_tables-deactivate-anonymous-set-from-pr.patch b/0002-netfilter-nf_tables-deactivate-anonymous-set-from-pr.patch deleted file mode 100644 index 00a50897777c..000000000000 --- a/0002-netfilter-nf_tables-deactivate-anonymous-set-from-pr.patch +++ /dev/null @@ -1,122 +0,0 @@ -From f2da18ab5eb4fa936252892cf99b93375f0b299b Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso <pablo@netfilter.org> -Date: Tue, 2 May 2023 10:25:24 +0200 -Subject: [PATCH 2/3] netfilter: nf_tables: deactivate anonymous set from - preparation phase - -Toggle deleted anonymous sets as inactive in the next generation, so -users cannot perform any update on it. Clear the generation bitmask -in case the transaction is aborted. - -The following KASAN splat shows a set element deletion for a bound -anonymous set that has been already removed in the same transaction. - -[ 64.921510] ================================================================== -[ 64.923123] BUG: KASAN: wild-memory-access in nf_tables_commit+0xa24/0x1490 [nf_tables] -[ 64.924745] Write of size 8 at addr dead000000000122 by task test/890 -[ 64.927903] CPU: 3 PID: 890 Comm: test Not tainted 6.3.0+ #253 -[ 64.931120] Call Trace: -[ 64.932699] <TASK> -[ 64.934292] dump_stack_lvl+0x33/0x50 -[ 64.935908] ? nf_tables_commit+0xa24/0x1490 [nf_tables] -[ 64.937551] kasan_report+0xda/0x120 -[ 64.939186] ? nf_tables_commit+0xa24/0x1490 [nf_tables] -[ 64.940814] nf_tables_commit+0xa24/0x1490 [nf_tables] -[ 64.942452] ? __kasan_slab_alloc+0x2d/0x60 -[ 64.944070] ? nf_tables_setelem_notify+0x190/0x190 [nf_tables] -[ 64.945710] ? kasan_set_track+0x21/0x30 -[ 64.947323] nfnetlink_rcv_batch+0x709/0xd90 [nfnetlink] -[ 64.948898] ? nfnetlink_rcv_msg+0x480/0x480 [nfnetlink] - -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - include/net/netfilter/nf_tables.h | 1 + - net/netfilter/nf_tables_api.c | 12 ++++++++++++ - net/netfilter/nft_dynset.c | 2 +- - net/netfilter/nft_lookup.c | 2 +- - net/netfilter/nft_objref.c | 2 +- - 5 files changed, 16 insertions(+), 3 deletions(-) - -diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h -index 1b8e305bb54a..9dace9bcba8e 100644 ---- a/include/net/netfilter/nf_tables.h -+++ b/include/net/netfilter/nf_tables.h -@@ -619,6 +619,7 @@ struct nft_set_binding { - }; - - enum nft_trans_phase; -+void nf_tables_activate_set(const struct nft_ctx *ctx, struct nft_set *set); - void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set, - struct nft_set_binding *binding, - enum nft_trans_phase phase); -diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c -index e48ab8dfb541..223bd16deb70 100644 ---- a/net/netfilter/nf_tables_api.c -+++ b/net/netfilter/nf_tables_api.c -@@ -5004,12 +5004,24 @@ static void nf_tables_unbind_set(const struct nft_ctx *ctx, struct nft_set *set, - } - } - -+void nf_tables_activate_set(const struct nft_ctx *ctx, struct nft_set *set) -+{ -+ if (nft_set_is_anonymous(set)) -+ nft_clear(ctx->net, set); -+ -+ set->use++; -+} -+EXPORT_SYMBOL_GPL(nf_tables_activate_set); -+ - void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set, - struct nft_set_binding *binding, - enum nft_trans_phase phase) - { - switch (phase) { - case NFT_TRANS_PREPARE: -+ if (nft_set_is_anonymous(set)) -+ nft_deactivate_next(ctx->net, set); -+ - set->use--; - return; - case NFT_TRANS_ABORT: -diff --git a/net/netfilter/nft_dynset.c b/net/netfilter/nft_dynset.c -index 274579b1696e..bd19c7aec92e 100644 ---- a/net/netfilter/nft_dynset.c -+++ b/net/netfilter/nft_dynset.c -@@ -342,7 +342,7 @@ static void nft_dynset_activate(const struct nft_ctx *ctx, - { - struct nft_dynset *priv = nft_expr_priv(expr); - -- priv->set->use++; -+ nf_tables_activate_set(ctx, priv->set); - } - - static void nft_dynset_destroy(const struct nft_ctx *ctx, -diff --git a/net/netfilter/nft_lookup.c b/net/netfilter/nft_lookup.c -index cecf8ab90e58..03ef4fdaa460 100644 ---- a/net/netfilter/nft_lookup.c -+++ b/net/netfilter/nft_lookup.c -@@ -167,7 +167,7 @@ static void nft_lookup_activate(const struct nft_ctx *ctx, - { - struct nft_lookup *priv = nft_expr_priv(expr); - -- priv->set->use++; -+ nf_tables_activate_set(ctx, priv->set); - } - - static void nft_lookup_destroy(const struct nft_ctx *ctx, -diff --git a/net/netfilter/nft_objref.c b/net/netfilter/nft_objref.c -index cb37169608ba..a48dd5b5d45b 100644 ---- a/net/netfilter/nft_objref.c -+++ b/net/netfilter/nft_objref.c -@@ -185,7 +185,7 @@ static void nft_objref_map_activate(const struct nft_ctx *ctx, - { - struct nft_objref_map *priv = nft_expr_priv(expr); - -- priv->set->use++; -+ nf_tables_activate_set(ctx, priv->set); - } - - static void nft_objref_map_destroy(const struct nft_ctx *ctx, --- -2.40.1 - @@ -21,7 +21,7 @@ _clangbuild= # Optionally select a sub architecture by number or leave blank which will # require user interaction during the build. Note that the generic (default) -# option is 36. +# option is 39. _subarch= # 1. AMD Opteron/Athlon64/Hammer/K8 (MK8) @@ -37,39 +37,42 @@ _subarch= # 11. AMD Zen (MZEN) (NEW) # 12. AMD Zen 2 (MZEN2) (NEW) # 13. AMD Zen 3 (MZEN3) (NEW) -# 14. Intel P4 / older Netburst based Xeon (MPSC) -# 15. Intel Core 2 (MCORE2) -# 16. Intel Atom (MATOM) -# 17. Intel Nehalem (MNEHALEM) (NEW) -# 18. Intel Westmere (MWESTMERE) (NEW) -# 19. Intel Silvermont (MSILVERMONT) (NEW) -# 20. Intel Goldmont (MGOLDMONT) (NEW) -# 21. Intel Goldmont Plus (MGOLDMONTPLUS) (NEW) -# 22. Intel Sandy Bridge (MSANDYBRIDGE) (NEW) -# 23. Intel Ivy Bridge (MIVYBRIDGE) (NEW) -# 24. Intel Haswell (MHASWELL) (NEW) -# 25. Intel Broadwell (MBROADWELL) (NEW) -# 26. Intel Skylake (MSKYLAKE) (NEW) -# 27. Intel Skylake X (MSKYLAKEX) (NEW) -# 28. Intel Cannon Lake (MCANNONLAKE) (NEW) -# 29. Intel Ice Lake (MICELAKE) (NEW) -# 30. Intel Cascade Lake (MCASCADELAKE) (NEW) -# 31. Intel Cooper Lake (MCOOPERLAKE) (NEW) -# 32. Intel Tiger Lake (MTIGERLAKE) (NEW) -# 33. Intel Sapphire Rapids (MSAPPHIRERAPIDS) (NEW) -# 34. Intel Rocket Lake (MROCKETLAKE) (NEW) -# 35. Intel Alder Lake (MALDERLAKE) (NEW) -# 36. Generic-x86-64 (GENERIC_CPU) -# 37. Generic-x86-64-v2 (GENERIC_CPU2) (NEW) -# 38. Generic-x86-64-v3 (GENERIC_CPU3) (NEW) -# 39. Generic-x86-64-v4 (GENERIC_CPU4) (NEW) -# 40. Intel-Native optimizations autodetected by GCC (MNATIVE_INTEL) (NEW) -# 41. AMD-Native optimizations autodetected by GCC (MNATIVE_AMD) (NEW) +# 14. AMD Zen 4 (MZEN4) (NEW) +# 15. Intel P4 / older Netburst based Xeon (MPSC) +# 16. Intel Core 2 (MCORE2) +# 17. Intel Atom (MATOM) +# 18. Intel Nehalem (MNEHALEM) (NEW) +# 19. Intel Westmere (MWESTMERE) (NEW) +# 20. Intel Silvermont (MSILVERMONT) (NEW) +# 21. Intel Goldmont (MGOLDMONT) (NEW) +# 22. Intel Goldmont Plus (MGOLDMONTPLUS) (NEW) +# 23. Intel Sandy Bridge (MSANDYBRIDGE) (NEW) +# 24. Intel Ivy Bridge (MIVYBRIDGE) (NEW) +# 25. Intel Haswell (MHASWELL) (NEW) +# 26. Intel Broadwell (MBROADWELL) (NEW) +# 27. Intel Skylake (MSKYLAKE) (NEW) +# 28. Intel Skylake X (MSKYLAKEX) (NEW) +# 29. Intel Cannon Lake (MCANNONLAKE) (NEW) +# 30. Intel Ice Lake (MICELAKE) (NEW) +# 31. Intel Cascade Lake (MCASCADELAKE) (NEW) +# 32. Intel Cooper Lake (MCOOPERLAKE) (NEW) +# 33. Intel Tiger Lake (MTIGERLAKE) (NEW) +# 34. Intel Sapphire Rapids (MSAPPHIRERAPIDS) (NEW) +# 35. Intel Rocket Lake (MROCKETLAKE) (NEW) +# 36. Intel Alder Lake (MALDERLAKE) (NEW) +# 37. Intel Raptor Lake (MRAPTORLAKE) (NEW) +# 38. Intel Meteor Lake (MMETEORLAKE) (NEW) +# 39. Generic-x86-64 (GENERIC_CPU) +# 40. Generic-x86-64-v2 (GENERIC_CPU2) (NEW) +# 41. Generic-x86-64-v3 (GENERIC_CPU3) (NEW) +# 42. Generic-x86-64-v4 (GENERIC_CPU4) (NEW) +# 43. Intel-Native optimizations autodetected by the compiler (MNATIVE_INTEL) (NEW) +# 44. AMD-Native optimizations autodetected by the compiler (MNATIVE_AMD) (NEW) ### IMPORTANT: Do no edit below this line unless you know what you're doing pkgbase=linux-ck -pkgver=6.3.1 -pkgrel=2 +pkgver=6.3.3 +pkgrel=1 arch=(x86_64) url="https://wiki.archlinux.org/index.php/Linux-ck" license=(GPL2) @@ -100,19 +103,19 @@ source=( "more-uarches-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/$_gcc_more_v.tar.gz" "ck-hrtimer-$_commit.tar.gz::https://github.com/graysky2/linux-patches/archive/$_commit.tar.gz" 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - 0002-netfilter-nf_tables-deactivate-anonymous-set-from-pr.patch + 0002-drm-amd-display-Have-Payload-Properly-Created-After-.patch ) validpgpkeys=( ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds 647F28654894E3BD457199BE38DBBDC86092693E # Greg Kroah-Hartman ) -sha256sums=('78620fb4a7d5e0db1d4eb8d5b1c6e207ba5d19564efa63967a59b6daf89b3f2a' +sha256sums=('8975216a6cee827390586758ed69d19743367098d1fc5dd5694987bb529e44e5' 'SKIP' - '6b337a9d3cfdc00005589a80b8d36fa500f6a92ed21565a3aceec48d7202a7da' + '21b9a9e542f853cdc695648d6ab6219bd2e881a4954277f241e104723c373d42' 'f1d586e111932890ad5e0df15d092fb9b3f87bae4ea17812aae9b0ec98fe2db0' 'f781da5ba492d8912c7d4cddac02f21c1799532182e23374c80c19ff0c617373' - '9346a69dad1c83417322551a5af677e5134da9097df6fc60897bf9d35c067df0' - '844c8e4c4b8c6f44a5f0e746c767092cbabf6522d9012d237397ae159ebc3ede') + 'c90ccb8accf7fa59f79318b749f0243c96ed9c1e35461f0dae50772f87a467a3' + '5e0f9ee19cb3ef6b811e1563690852b03bbc73c35113ab765a53597cf2030883') _make() { test -s version make KERNELRELEASE="$(<version)" "$@" @@ -124,7 +127,6 @@ prepare() { msg2 "Setting version..." echo "-$pkgrel" > localversion.10-pkgrel echo "${pkgbase#linux}" > localversion.20-pkgname -# make defconfig make -s kernelrelease > version make mrproper @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.3.0-arch1 Kernel Configuration +# Linux/x86 6.3.3-arch1 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.1 20230429" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120201 +CONFIG_GCC_VERSION=130101 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24000 @@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=124 +CONFIG_PAHOLE_VERSION=125 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_THREAD_INFO_IN_TASK=y @@ -6834,7 +6834,7 @@ CONFIG_FB_EFI=y # CONFIG_FB_UDL is not set # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_VIRTUAL is not set -# CONFIG_XEN_FBDEV_FRONTEND is not set +CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set # CONFIG_FB_HYPERV is not set @@ -8852,17 +8852,7 @@ CONFIG_AD2S1210=m # CONFIG_FB_SM750 is not set CONFIG_STAGING_MEDIA=y -CONFIG_INTEL_ATOMISP=y -CONFIG_VIDEO_ATOMISP=m -CONFIG_VIDEO_ATOMISP_ISP2401=y -CONFIG_VIDEO_ATOMISP_OV2722=m -CONFIG_VIDEO_ATOMISP_GC2235=m -CONFIG_VIDEO_ATOMISP_MSRLIST_HELPER=m -CONFIG_VIDEO_ATOMISP_MT9M114=m -CONFIG_VIDEO_ATOMISP_GC0310=m -CONFIG_VIDEO_ATOMISP_OV2680=m -CONFIG_VIDEO_ATOMISP_OV5693=m -CONFIG_VIDEO_ATOMISP_LM3554=m +# CONFIG_INTEL_ATOMISP is not set CONFIG_DVB_AV7110_IR=y CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y @@ -8994,6 +8984,7 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y CONFIG_THINKPAD_LMI=m CONFIG_INTEL_ATOMISP2_PDX86=y CONFIG_INTEL_ATOMISP2_LED=m +CONFIG_INTEL_ATOMISP2_PM=m CONFIG_INTEL_IFS=m CONFIG_INTEL_SAR_INT1092=m CONFIG_INTEL_SKL_INT3472=m @@ -11078,6 +11069,7 @@ CONFIG_DEBUG_INFO_DWARF5=y # CONFIG_DEBUG_INFO_REDUCED is not set CONFIG_DEBUG_INFO_COMPRESSED_NONE=y # CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set +# CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_SPLIT is not set CONFIG_DEBUG_INFO_BTF=y CONFIG_PAHOLE_HAS_SPLIT_BTF=y |