From c12cee78560b0a9b562b1bd81362b6d5d6541bbd Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Mon, 4 Nov 2024 12:42:15 +0100 Subject: [PATCH] Rebase on a v6.6.59 kernel This is a clean rebase with no changes needed in the downstream patches. Signed-off-by: Sergio Lopez --- Makefile | 6 +++--- ...virtio-enable-DMA-API-if-memory-is-restricted.patch | 4 ++-- patches-sev/0002-x86-sev-write-AP-reset-vector.patch | 4 ++-- ...ement-driver-to-retrieve-secrets-from-cmdline.patch | 4 ++-- .../0004-x86-sev-Avoid-using-native_cpuid.patch | 4 ++-- patches/0001-krunfw-Don-t-panic-when-init-dies.patch | 4 ++-- .../0002-krunfw-Ignore-run_cmd-on-orderly-reboot.patch | 4 ++-- ...gram-generalize-recvmsg-and-drop-transport-dg.patch | 4 ++-- .../0004-vsock-refactor-transport-lookup-code.patch | 4 ++-- .../0005-vsock-support-multi-transport-datagrams.patch | 4 ++-- patches/0006-vsock-make-vsock-bind-reusable.patch | 4 ++-- ...io-vsock-add-VIRTIO_VSOCK_F_DGRAM-feature-bit.patch | 4 ++-- patches/0008-virtio-vsock-support-dgrams.patch | 4 ++-- patches/0009-tests-add-vsock-dgram-tests.patch | 4 ++-- ...ansparent-Socket-Impersonation-implementation.patch | 4 ++-- .../0011-tsi-allow-hijacking-sockets-tsi_hijack.patch | 6 +++--- ...pufeature-Unify-SCOPE_LOCAL_CPU-early-late-be.patch | 6 +++--- .../0013-prctl-Introduce-PR_-SET-GET-_MEM_MODEL.patch | 6 +++--- ...mplement-PR_-GET-SET-_MEM_MODEL-for-always-TS.patch | 6 +++--- ...ntroduce-scaffolding-to-add-ACTLR_EL1-to-thre.patch | 6 +++--- ...mplement-Apple-IMPDEF-TSO-memory-model-contro.patch | 6 +++--- ...0017-drm-virtio-Support-fence-passing-feature.patch | 6 +++--- ...64-bit-processes-to-use-compat-input-syscalls.patch | 6 +++--- patches/0019-dax-Allow-block-size-PAGE_SIZE.patch | 8 ++++---- ...__wp_page_copy_user-fallback-path-for-remote-.patch | 10 +++++----- 25 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Makefile b/Makefile index c80b805..5aef2ea 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -KERNEL_VERSION = linux-6.6.52 +KERNEL_VERSION = linux-6.6.59 KERNEL_REMOTE = https://cdn.kernel.org/pub/linux/kernel/v6.x/$(KERNEL_VERSION).tar.xz KERNEL_TARBALL = tarballs/$(KERNEL_VERSION).tar.xz KERNEL_SOURCES = $(KERNEL_VERSION) @@ -6,8 +6,8 @@ KERNEL_PATCHES = $(shell find patches/ -name "0*.patch" | sort) KERNEL_C_BUNDLE = kernel.c ABI_VERSION = 4 -FULL_VERSION = 4.4.2 -TIMESTAMP = "Tue Oct 8 13:02:33 CEST 2024" +FULL_VERSION = 4.5.0 +TIMESTAMP = "Mon Nov 4 12:34:02 CET 2024" KERNEL_FLAGS = KBUILD_BUILD_TIMESTAMP=$(TIMESTAMP) KERNEL_FLAGS += KBUILD_BUILD_USER=root diff --git a/patches-sev/0001-virtio-enable-DMA-API-if-memory-is-restricted.patch b/patches-sev/0001-virtio-enable-DMA-API-if-memory-is-restricted.patch index e6a9fbc..6a2a5dd 100644 --- a/patches-sev/0001-virtio-enable-DMA-API-if-memory-is-restricted.patch +++ b/patches-sev/0001-virtio-enable-DMA-API-if-memory-is-restricted.patch @@ -1,4 +1,4 @@ -From 6616593252269d81b003d7aa1e7e4dd156d1a629 Mon Sep 17 00:00:00 2001 +From 83aec6003044244d4c2e3851dcec0af97ec0486f Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Fri, 10 Sep 2021 13:05:01 +0200 Subject: [PATCH 1/4] virtio: enable DMA API if memory is restricted @@ -54,5 +54,5 @@ index 80669e05bf0e..438b4f6c5cdb 100644 /* * In theory, it's possible to have a buggy QEMU-supposed -- -2.46.0 +2.45.2 diff --git a/patches-sev/0002-x86-sev-write-AP-reset-vector.patch b/patches-sev/0002-x86-sev-write-AP-reset-vector.patch index 511b51b..60a80ef 100644 --- a/patches-sev/0002-x86-sev-write-AP-reset-vector.patch +++ b/patches-sev/0002-x86-sev-write-AP-reset-vector.patch @@ -1,4 +1,4 @@ -From ecbb6d5db802293ef27575a672336e17e8c2abfd Mon Sep 17 00:00:00 2001 +From b6379abecd7a40dbbd98ef09eca23789c693bc24 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Thu, 20 Oct 2022 10:23:16 +0200 Subject: [PATCH 2/4] x86/sev: write AP reset vector @@ -55,5 +55,5 @@ index 9905dc0e0b09..38df85fd1324 100644 /* Check if AP Jump Table is page-aligned */ if (jump_table_addr & ~PAGE_MASK) -- -2.46.0 +2.45.2 diff --git a/patches-sev/0003-Implement-driver-to-retrieve-secrets-from-cmdline.patch b/patches-sev/0003-Implement-driver-to-retrieve-secrets-from-cmdline.patch index df1835a..beffa0a 100644 --- a/patches-sev/0003-Implement-driver-to-retrieve-secrets-from-cmdline.patch +++ b/patches-sev/0003-Implement-driver-to-retrieve-secrets-from-cmdline.patch @@ -1,4 +1,4 @@ -From 0738c09d916b06afa162facb0edc84ffe121c35a Mon Sep 17 00:00:00 2001 +From d10df5bc5c8986a6dd0961ebf354c7e6ecfbda32 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Wed, 3 Aug 2022 12:35:12 +0200 Subject: [PATCH 3/4] Implement driver to retrieve secrets from cmdline @@ -292,5 +292,5 @@ index c787e94cc898..2fb8a8af9af6 100644 /* -- -2.46.0 +2.45.2 diff --git a/patches-sev/0004-x86-sev-Avoid-using-native_cpuid.patch b/patches-sev/0004-x86-sev-Avoid-using-native_cpuid.patch index ac632e6..1f22170 100644 --- a/patches-sev/0004-x86-sev-Avoid-using-native_cpuid.patch +++ b/patches-sev/0004-x86-sev-Avoid-using-native_cpuid.patch @@ -1,4 +1,4 @@ -From 95ae01ac9240b47dcdeda540e59a24ba0bdaf963 Mon Sep 17 00:00:00 2001 +From baaba00fa3a3c5407b8a08f262388b173306219f Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Wed, 5 Jun 2024 16:20:08 +0200 Subject: [PATCH 4/4] x86/sev: Avoid using native_cpuid @@ -61,5 +61,5 @@ index cc47a818a640..a2b5b08eee23 100644 /* Check the SEV MSR whether SEV or SME is enabled */ RIP_REL_REF(sev_status) = msr = __rdmsr(MSR_AMD64_SEV); -- -2.46.0 +2.45.2 diff --git a/patches/0001-krunfw-Don-t-panic-when-init-dies.patch b/patches/0001-krunfw-Don-t-panic-when-init-dies.patch index 64af668..d2f4290 100644 --- a/patches/0001-krunfw-Don-t-panic-when-init-dies.patch +++ b/patches/0001-krunfw-Don-t-panic-when-init-dies.patch @@ -1,7 +1,7 @@ From 7f18f75689b7b0f34ca711daa4e29e2d4ae5f910 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Thu, 2 Mar 2023 07:34:49 +0100 -Subject: [PATCH 01/17] krunfw: Don't panic when init dies +Subject: [PATCH 01/20] krunfw: Don't panic when init dies In libkrun, the isolated process runs as PID 1. When it exits, trigger an orderly reboot instead of panic'ing. @@ -58,5 +58,5 @@ index 6ebef11c8876..4323caa5b871 100644 machine_restart(cmd); } -- -2.46.0 +2.45.2 diff --git a/patches/0002-krunfw-Ignore-run_cmd-on-orderly-reboot.patch b/patches/0002-krunfw-Ignore-run_cmd-on-orderly-reboot.patch index 4850491..ea06cc9 100644 --- a/patches/0002-krunfw-Ignore-run_cmd-on-orderly-reboot.patch +++ b/patches/0002-krunfw-Ignore-run_cmd-on-orderly-reboot.patch @@ -1,7 +1,7 @@ From 5ed6edb3e75df34958f788bca363748cea75eea1 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Mon, 16 May 2022 16:04:27 +0200 -Subject: [PATCH 02/17] krunfw: Ignore run_cmd on orderly reboot +Subject: [PATCH 02/20] krunfw: Ignore run_cmd on orderly reboot We don't really support restarting the conventional way, so ignore "run_cmd" so we can fall back to an emergency sync and reboot. @@ -28,5 +28,5 @@ index 4323caa5b871..d9d6f0dd2ebc 100644 if (ret) { pr_warn("Failed to start orderly reboot: forcing the issue\n"); -- -2.46.0 +2.45.2 diff --git a/patches/0003-vsock-dgram-generalize-recvmsg-and-drop-transport-dg.patch b/patches/0003-vsock-dgram-generalize-recvmsg-and-drop-transport-dg.patch index f94ba60..e116d1d 100644 --- a/patches/0003-vsock-dgram-generalize-recvmsg-and-drop-transport-dg.patch +++ b/patches/0003-vsock-dgram-generalize-recvmsg-and-drop-transport-dg.patch @@ -1,7 +1,7 @@ From 06a9c813b4f59d92edf78a6011a719629323081c Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:28 +0000 -Subject: [PATCH 03/17] vsock/dgram: generalize recvmsg and drop +Subject: [PATCH 03/20] vsock/dgram: generalize recvmsg and drop transport->dgram_dequeue This commit drops the transport->dgram_dequeue callback and makes @@ -348,5 +348,5 @@ index 0ce65d0a4a44..6b19e308a140 100644 .stream_dequeue = virtio_transport_stream_dequeue, .stream_enqueue = virtio_transport_stream_enqueue, -- -2.46.0 +2.45.2 diff --git a/patches/0004-vsock-refactor-transport-lookup-code.patch b/patches/0004-vsock-refactor-transport-lookup-code.patch index bbdde21..ee2ae0d 100644 --- a/patches/0004-vsock-refactor-transport-lookup-code.patch +++ b/patches/0004-vsock-refactor-transport-lookup-code.patch @@ -1,7 +1,7 @@ From 5a2b5b9c1a9f473836c361153b15c10eab012e9a Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:29 +0000 -Subject: [PATCH 04/17] vsock: refactor transport lookup code +Subject: [PATCH 04/20] vsock: refactor transport lookup code Introduce new reusable function vsock_connectible_lookup_transport() that performs the transport lookup logic. @@ -57,5 +57,5 @@ index c3fdb22cfd39..5a517638deed 100644 default: return -ESOCKTNOSUPPORT; -- -2.46.0 +2.45.2 diff --git a/patches/0005-vsock-support-multi-transport-datagrams.patch b/patches/0005-vsock-support-multi-transport-datagrams.patch index 0728692..2cb6056 100644 --- a/patches/0005-vsock-support-multi-transport-datagrams.patch +++ b/patches/0005-vsock-support-multi-transport-datagrams.patch @@ -1,7 +1,7 @@ From 10b18bb2d94abcf35e199c76fcf9921de1dbb9ae Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:30 +0000 -Subject: [PATCH 05/17] vsock: support multi-transport datagrams +Subject: [PATCH 05/20] vsock: support multi-transport datagrams This patch adds support for multi-transport datagrams. @@ -304,5 +304,5 @@ index 6b19e308a140..21a4debde550 100644 .dgram_allow = virtio_transport_dgram_allow, .dgram_get_cid = virtio_transport_dgram_get_cid, -- -2.46.0 +2.45.2 diff --git a/patches/0006-vsock-make-vsock-bind-reusable.patch b/patches/0006-vsock-make-vsock-bind-reusable.patch index e2f0ca4..2e5806e 100644 --- a/patches/0006-vsock-make-vsock-bind-reusable.patch +++ b/patches/0006-vsock-make-vsock-bind-reusable.patch @@ -1,7 +1,7 @@ From 9b076ce6da60de7904d340289a2187325efee512 Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:31 +0000 -Subject: [PATCH 06/17] vsock: make vsock bind reusable +Subject: [PATCH 06/20] vsock: make vsock bind reusable This commit makes the bind table management functions in vsock usable for different bind tables. For use by datagrams in a future patch. @@ -102,5 +102,5 @@ index afe28d3b0b74..6a94a623dd07 100644 struct sockaddr_vm *addr) { -- -2.46.0 +2.45.2 diff --git a/patches/0007-virtio-vsock-add-VIRTIO_VSOCK_F_DGRAM-feature-bit.patch b/patches/0007-virtio-vsock-add-VIRTIO_VSOCK_F_DGRAM-feature-bit.patch index 1617b51..62c292c 100644 --- a/patches/0007-virtio-vsock-add-VIRTIO_VSOCK_F_DGRAM-feature-bit.patch +++ b/patches/0007-virtio-vsock-add-VIRTIO_VSOCK_F_DGRAM-feature-bit.patch @@ -1,7 +1,7 @@ From f9c572bf348f3eda2d0763ecf0e212cf6861d769 Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:32 +0000 -Subject: [PATCH 07/17] virtio/vsock: add VIRTIO_VSOCK_F_DGRAM feature bit +Subject: [PATCH 07/20] virtio/vsock: add VIRTIO_VSOCK_F_DGRAM feature bit This commit adds a feature bit for virtio vsock to support datagrams. @@ -24,5 +24,5 @@ index 64738838bee5..9c25f267bbc0 100644 struct virtio_vsock_config { __le64 guest_cid; -- -2.46.0 +2.45.2 diff --git a/patches/0008-virtio-vsock-support-dgrams.patch b/patches/0008-virtio-vsock-support-dgrams.patch index 9ce0df8..15702b4 100644 --- a/patches/0008-virtio-vsock-support-dgrams.patch +++ b/patches/0008-virtio-vsock-support-dgrams.patch @@ -1,7 +1,7 @@ From cea879931c45169784b8b2301ae02ee45c4aa20d Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:33 +0000 -Subject: [PATCH 08/17] virtio/vsock: support dgrams +Subject: [PATCH 08/20] virtio/vsock: support dgrams This commit adds support for datagrams over virtio/vsock. @@ -741,5 +741,5 @@ index 21a4debde550..20f5b123bde5 100644 { return true; -- -2.46.0 +2.45.2 diff --git a/patches/0009-tests-add-vsock-dgram-tests.patch b/patches/0009-tests-add-vsock-dgram-tests.patch index 61a8fc3..fa9dbab 100644 --- a/patches/0009-tests-add-vsock-dgram-tests.patch +++ b/patches/0009-tests-add-vsock-dgram-tests.patch @@ -1,7 +1,7 @@ From aacd77363c0f5c8515f9ef55889cd367d42d06f9 Mon Sep 17 00:00:00 2001 From: Jiang Wang Date: Sat, 10 Jun 2023 00:58:35 +0000 -Subject: [PATCH 09/17] tests: add vsock dgram tests +Subject: [PATCH 09/20] tests: add vsock dgram tests This patch adds tests for vsock datagram. @@ -667,5 +667,5 @@ index 5dc7767039f6..7c66e934341a 100644 {}, }; -- -2.46.0 +2.45.2 diff --git a/patches/0010-Transparent-Socket-Impersonation-implementation.patch b/patches/0010-Transparent-Socket-Impersonation-implementation.patch index 9d5aae6..cada8ba 100644 --- a/patches/0010-Transparent-Socket-Impersonation-implementation.patch +++ b/patches/0010-Transparent-Socket-Impersonation-implementation.patch @@ -1,7 +1,7 @@ -From b4ce449d32a4a9c71041052c1e4599f3a01eccfa Mon Sep 17 00:00:00 2001 +From bf4eb6179408f2fb6bbdd0d750a494ca1d0bf9c2 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Thu, 19 May 2022 22:38:26 +0200 -Subject: [PATCH 10/21] Transparent Socket Impersonation implementation +Subject: [PATCH 10/20] Transparent Socket Impersonation implementation Transparent Socket Impersonation (AF_TSI) is an address family that provides sockets presenting two simultaneous personalities, AF_INET diff --git a/patches/0011-tsi-allow-hijacking-sockets-tsi_hijack.patch b/patches/0011-tsi-allow-hijacking-sockets-tsi_hijack.patch index 07c6fbf..6cb54b1 100644 --- a/patches/0011-tsi-allow-hijacking-sockets-tsi_hijack.patch +++ b/patches/0011-tsi-allow-hijacking-sockets-tsi_hijack.patch @@ -1,7 +1,7 @@ -From 38643ecb3d75f3c156249b6488b76ef608e990cb Mon Sep 17 00:00:00 2001 +From 4cb286e56e14f2ea4b0c99567fb14558c508d2c0 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Thu, 19 May 2022 22:42:01 +0200 -Subject: [PATCH 11/17] tsi: allow hijacking sockets (tsi_hijack) +Subject: [PATCH 11/20] tsi: allow hijacking sockets (tsi_hijack) Add a kernel command line option (tsi_hijack) enabling users to request the kernel to hijack AF_INET(SOCK_STREAM || SOCK_DGRAM) @@ -69,5 +69,5 @@ index eda6c4ba7961..6cf01d7ce8f5 100644 int err; -- -2.46.0 +2.45.2 diff --git a/patches/0012-arm64-cpufeature-Unify-SCOPE_LOCAL_CPU-early-late-be.patch b/patches/0012-arm64-cpufeature-Unify-SCOPE_LOCAL_CPU-early-late-be.patch index c7eebf7..1a9f6b7 100644 --- a/patches/0012-arm64-cpufeature-Unify-SCOPE_LOCAL_CPU-early-late-be.patch +++ b/patches/0012-arm64-cpufeature-Unify-SCOPE_LOCAL_CPU-early-late-be.patch @@ -1,7 +1,7 @@ -From d5eb37359e9bf9c208f252ac01c345fb6947d74b Mon Sep 17 00:00:00 2001 +From 322fce4105e6a4570c6d1c9ac154d89c6c0b2029 Mon Sep 17 00:00:00 2001 From: Asahi Lina Date: Wed, 25 Sep 2024 16:35:34 +0200 -Subject: [PATCH 12/17] arm64: cpufeature: Unify SCOPE_LOCAL_CPU early & late +Subject: [PATCH 12/20] arm64: cpufeature: Unify SCOPE_LOCAL_CPU early & late behavior SCOPE_LOCAL_CPU is mostly used for CPU errata. The early feature logic @@ -81,5 +81,5 @@ index 7e9660455900..6802a8eeb6a6 100644 if (caps->desc) -- -2.46.0 +2.45.2 diff --git a/patches/0013-prctl-Introduce-PR_-SET-GET-_MEM_MODEL.patch b/patches/0013-prctl-Introduce-PR_-SET-GET-_MEM_MODEL.patch index edf5b72..f2d44cd 100644 --- a/patches/0013-prctl-Introduce-PR_-SET-GET-_MEM_MODEL.patch +++ b/patches/0013-prctl-Introduce-PR_-SET-GET-_MEM_MODEL.patch @@ -1,7 +1,7 @@ -From eda97730a842489f539f86f74f07495645a7c972 Mon Sep 17 00:00:00 2001 +From 61f6748465de43ae02b1e6ce78aa100ab9757d66 Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Thu, 11 Apr 2024 09:51:20 +0900 -Subject: [PATCH 13/17] prctl: Introduce PR_{SET,GET}_MEM_MODEL +Subject: [PATCH 13/20] prctl: Introduce PR_{SET,GET}_MEM_MODEL On some architectures, it is possible to query and/or change the CPU memory model. This allows userspace to switch to a stricter memory model @@ -119,5 +119,5 @@ index 44b575990333..2db751ce25a2 100644 error = -EINVAL; break; -- -2.46.0 +2.45.2 diff --git a/patches/0014-arm64-Implement-PR_-GET-SET-_MEM_MODEL-for-always-TS.patch b/patches/0014-arm64-Implement-PR_-GET-SET-_MEM_MODEL-for-always-TS.patch index d58fa12..fc60ff8 100644 --- a/patches/0014-arm64-Implement-PR_-GET-SET-_MEM_MODEL-for-always-TS.patch +++ b/patches/0014-arm64-Implement-PR_-GET-SET-_MEM_MODEL-for-always-TS.patch @@ -1,7 +1,7 @@ -From 55e5da0ad8c673f5f8e07524210bba70b5714ff3 Mon Sep 17 00:00:00 2001 +From a0a7db4f8927e5f8dda3c99b1f8e8bed15eaba03 Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Mon, 6 May 2024 16:47:51 +0200 -Subject: [PATCH 14/17] arm64: Implement PR_{GET,SET}_MEM_MODEL for always-TSO +Subject: [PATCH 14/20] arm64: Implement PR_{GET,SET}_MEM_MODEL for always-TSO CPUs Some ARM64 implementations are known to always use the TSO memory model. @@ -229,5 +229,5 @@ index c251ef3caae5..cedae062dbdd 100644 HAS_WFXT HW_DBM -- -2.46.0 +2.45.2 diff --git a/patches/0015-arm64-Introduce-scaffolding-to-add-ACTLR_EL1-to-thre.patch b/patches/0015-arm64-Introduce-scaffolding-to-add-ACTLR_EL1-to-thre.patch index 05a7eb4..7e751df 100644 --- a/patches/0015-arm64-Introduce-scaffolding-to-add-ACTLR_EL1-to-thre.patch +++ b/patches/0015-arm64-Introduce-scaffolding-to-add-ACTLR_EL1-to-thre.patch @@ -1,7 +1,7 @@ -From 0f5f434bc794b2a46105b8ae9aed8b99c7f9dea4 Mon Sep 17 00:00:00 2001 +From 411580c12e8dd196e525b71caebd4e847413747a Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Thu, 11 Apr 2024 09:51:22 +0900 -Subject: [PATCH 15/17] arm64: Introduce scaffolding to add ACTLR_EL1 to thread +Subject: [PATCH 15/20] arm64: Introduce scaffolding to add ACTLR_EL1 to thread state Some CPUs expose IMPDEF features in ACTLR_EL1 that can be meaningfully @@ -137,5 +137,5 @@ index c583d1f335f8..86e0631df0c1 100644 if (boot_args[1] || boot_args[2] || boot_args[3]) { pr_err("WARNING: x1-x3 nonzero in violation of boot protocol:\n" -- -2.46.0 +2.45.2 diff --git a/patches/0016-arm64-Implement-Apple-IMPDEF-TSO-memory-model-contro.patch b/patches/0016-arm64-Implement-Apple-IMPDEF-TSO-memory-model-contro.patch index 8daba8d..2e5317c 100644 --- a/patches/0016-arm64-Implement-Apple-IMPDEF-TSO-memory-model-contro.patch +++ b/patches/0016-arm64-Implement-Apple-IMPDEF-TSO-memory-model-contro.patch @@ -1,7 +1,7 @@ -From a32ac5f90f7acfa73651a6fa726d05a207333e3a Mon Sep 17 00:00:00 2001 +From b04f31204cda6ed6735f20138797ebd033558969 Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Thu, 11 Apr 2024 09:51:23 +0900 -Subject: [PATCH 16/17] arm64: Implement Apple IMPDEF TSO memory model control +Subject: [PATCH 16/20] arm64: Implement Apple IMPDEF TSO memory model control Apple CPUs may implement the TSO memory model as an optional configurable mode. This allows x86 emulators to simplify their @@ -207,5 +207,5 @@ index cedae062dbdd..cee02bfc4633 100644 HAS_VIRT_HOST_EXTN HAS_WFXT -- -2.46.0 +2.45.2 diff --git a/patches/0017-drm-virtio-Support-fence-passing-feature.patch b/patches/0017-drm-virtio-Support-fence-passing-feature.patch index 867df07..8ddbf13 100644 --- a/patches/0017-drm-virtio-Support-fence-passing-feature.patch +++ b/patches/0017-drm-virtio-Support-fence-passing-feature.patch @@ -1,7 +1,7 @@ -From 81c1338fa3e17c7fd327224ea2466a517a92d914 Mon Sep 17 00:00:00 2001 +From 9ec85361575b3936127e5f879dc3250e716eb452 Mon Sep 17 00:00:00 2001 From: Dmitry Osipenko Date: Sat, 7 Oct 2023 22:47:47 +0300 -Subject: [PATCH 17/17] drm/virtio: Support fence-passing feature +Subject: [PATCH 17/20] drm/virtio: Support fence-passing feature Support extended version of VIRTIO_GPU_CMD_SUBMIT_3D command that allows passing in-fence IDs to host for waiting, removing need to do expensive @@ -450,5 +450,5 @@ index f556fde07b76..c3182c8255cf 100644 #define VIRTIO_GPU_CAPSET_VIRGL 1 -- -2.46.0 +2.45.2 diff --git a/patches/0018-Enable-64-bit-processes-to-use-compat-input-syscalls.patch b/patches/0018-Enable-64-bit-processes-to-use-compat-input-syscalls.patch index 19fdecb..5bb311b 100644 --- a/patches/0018-Enable-64-bit-processes-to-use-compat-input-syscalls.patch +++ b/patches/0018-Enable-64-bit-processes-to-use-compat-input-syscalls.patch @@ -1,7 +1,7 @@ -From 897560fd00e1add63a9973c31fc437b006855680 Mon Sep 17 00:00:00 2001 +From a2a7742b033bd36460343555bcc9ddedac9ffb88 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Tue, 8 Oct 2024 11:24:25 +0200 -Subject: [PATCH] Enable 64 bit processes to use compat input syscalls +Subject: [PATCH 18/20] Enable 64 bit processes to use compat input syscalls The compat variant of input syscalls is only enabled for 32 bit tasks, but in some cases, such as userspace emulation, it's useful to @@ -120,5 +120,5 @@ index 2db751ce25a2..1be74620b0b6 100644 error = -EINVAL; break; -- -2.46.0 +2.45.2 diff --git a/patches/0019-dax-Allow-block-size-PAGE_SIZE.patch b/patches/0019-dax-Allow-block-size-PAGE_SIZE.patch index f2a6d9d..fd5afd6 100644 --- a/patches/0019-dax-Allow-block-size-PAGE_SIZE.patch +++ b/patches/0019-dax-Allow-block-size-PAGE_SIZE.patch @@ -1,7 +1,7 @@ -From ce899b86d685b28016cc27c505d1fdca468c9b2e Mon Sep 17 00:00:00 2001 +From 0d5513eeec3176ffdc62348f1fc52579f9daeebf Mon Sep 17 00:00:00 2001 From: Asahi Lina Date: Sun, 20 Oct 2024 01:23:41 +0900 -Subject: [PATCH 1/2] dax: Allow block size > PAGE_SIZE +Subject: [PATCH 19/20] dax: Allow block size > PAGE_SIZE For virtio-dax, the file/FS blocksize is irrelevant. FUSE always uses large DAX blocks (2MiB), which will work with all host page sizes. Since @@ -22,7 +22,7 @@ Signed-off-by: Asahi Lina 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/dax.c b/fs/dax.c -index becb4a6920c6..2ef3b50e8d7a 100644 +index 3380b43cb6bb..9a33625740c1 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1032,7 +1032,7 @@ int dax_writeback_mapping_range(struct address_space *mapping, @@ -35,5 +35,5 @@ index becb4a6920c6..2ef3b50e8d7a 100644 if (mapping_empty(mapping) || wbc->sync_mode != WB_SYNC_ALL) -- -2.47.0 +2.45.2 diff --git a/patches/0020-mm-Fix-__wp_page_copy_user-fallback-path-for-remote-.patch b/patches/0020-mm-Fix-__wp_page_copy_user-fallback-path-for-remote-.patch index 5d361ff..f7bc791 100644 --- a/patches/0020-mm-Fix-__wp_page_copy_user-fallback-path-for-remote-.patch +++ b/patches/0020-mm-Fix-__wp_page_copy_user-fallback-path-for-remote-.patch @@ -1,7 +1,7 @@ -From 9b1ab7cc1eb019d9e8ce1b63954c58eb0fbecd2c Mon Sep 17 00:00:00 2001 +From fb01e209f9058d7336d7966d49ff95726dccc643 Mon Sep 17 00:00:00 2001 From: Asahi Lina Date: Mon, 21 Oct 2024 23:21:16 +0900 -Subject: [PATCH 2/2] mm: Fix __wp_page_copy_user fallback path for remote mm +Subject: [PATCH 20/20] mm: Fix __wp_page_copy_user fallback path for remote mm If the source page is a PFN mapping, we copy back from userspace. However, if this fault is a remote access, we cannot use @@ -58,10 +58,10 @@ Signed-off-by: Asahi Lina 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mm/memory.c b/mm/memory.c -index ebfc9768f801..277079edd24b 100644 +index b6ddfe22c5d5..2e6238e72982 100644 --- a/mm/memory.c +++ b/mm/memory.c -@@ -3078,13 +3078,18 @@ static inline int __wp_page_copy_user(struct page *dst, struct page *src, +@@ -2871,13 +2871,18 @@ static inline int __wp_page_copy_user(struct page *dst, struct page *src, update_mmu_cache_range(vmf, vma, addr, vmf->pte, 1); } @@ -82,5 +82,5 @@ index ebfc9768f801..277079edd24b 100644 goto warn; -- -2.47.0 +2.45.2