From c1f62cba4d5d0a5ab619b86a9187fa117beb4023 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 19 Oct 2024 08:03:42 +1100 Subject: [PATCH] Rebase against 3a6e9365336304b4d7eb4d66aef959f67361cc1f. --- ...ject-operation-to-grab-the-esync-fil.patch | 103 +++++++++++------- staging/upstream-commit | 2 +- 2 files changed, 63 insertions(+), 42 deletions(-) diff --git a/patches/eventfd_synchronization/0011-server-Add-an-object-operation-to-grab-the-esync-fil.patch b/patches/eventfd_synchronization/0011-server-Add-an-object-operation-to-grab-the-esync-fil.patch index 80f86964..eadc8e33 100644 --- a/patches/eventfd_synchronization/0011-server-Add-an-object-operation-to-grab-the-esync-fil.patch +++ b/patches/eventfd_synchronization/0011-server-Add-an-object-operation-to-grab-the-esync-fil.patch @@ -1,4 +1,4 @@ -From e222dd363cf419eecb0d5c97390b60de15f37951 Mon Sep 17 00:00:00 2001 +From 0c97689e30108869e0ffc5fb7a13edcb42de7450 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 8 Jun 2018 18:51:40 -0500 Subject: [PATCH] server: Add an object operation to grab the esync file @@ -25,6 +25,7 @@ Split off to decrease patch size. server/mapping.c | 3 +++ server/mutex.c | 1 + server/named_pipe.c | 5 +++++ + server/object.c | 2 ++ server/object.h | 2 ++ server/process.c | 3 +++ server/queue.c | 2 ++ @@ -40,13 +41,13 @@ Split off to decrease patch size. server/token.c | 1 + server/window.c | 1 + server/winstation.c | 2 ++ - 34 files changed, 68 insertions(+) + 35 files changed, 70 insertions(+) diff --git a/server/async.c b/server/async.c -index 9cb251df5ce..337bba8631b 100644 +index 749c547af4f..2377c737e98 100644 --- a/server/async.c +++ b/server/async.c -@@ -77,6 +77,7 @@ static const struct object_ops async_ops = +@@ -78,6 +78,7 @@ static const struct object_ops async_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ async_signaled, /* signaled */ @@ -54,7 +55,7 @@ index 9cb251df5ce..337bba8631b 100644 async_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -676,6 +677,7 @@ static const struct object_ops iosb_ops = +@@ -698,6 +699,7 @@ static const struct object_ops iosb_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -75,7 +76,7 @@ index ff0799f5880..d9824de8eac 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/change.c b/server/change.c -index 7a806abc017..e080511bb23 100644 +index f42ce066340..d0a90a99261 100644 --- a/server/change.c +++ b/server/change.c @@ -112,6 +112,7 @@ static const struct object_ops dir_ops = @@ -87,7 +88,7 @@ index 7a806abc017..e080511bb23 100644 no_signal, /* signal */ dir_get_fd, /* get_fd */ diff --git a/server/clipboard.c b/server/clipboard.c -index 8118a467dd8..8b265f2dcea 100644 +index 91f159bc7c9..0df7fd2f18e 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -76,6 +76,7 @@ static const struct object_ops clipboard_ops = @@ -171,7 +172,7 @@ index b64283baf4a..1cc9eea6a50 100644 no_signal, /* signal */ console_connection_get_fd, /* get_fd */ diff --git a/server/debugger.c b/server/debugger.c -index 48adb244b09..d85a2000684 100644 +index c59a0abea77..ca04d4c71ce 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -86,6 +86,7 @@ static const struct object_ops debug_event_ops = @@ -227,7 +228,7 @@ index 436dac6bfe9..f730fa81afa 100644 no_signal, /* signal */ device_file_get_fd, /* get_fd */ diff --git a/server/directory.c b/server/directory.c -index 23d7eb0a2b7..bc161b9ab7e 100644 +index b37ec969a9e..a6c0e292071 100644 --- a/server/directory.c +++ b/server/directory.c @@ -69,6 +69,7 @@ static const struct object_ops object_type_ops = @@ -279,7 +280,7 @@ index f1b79b1b35e..c727bfdd1ba 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/fd.c b/server/fd.c -index 74ad95fd4d1..4ce498ec0ef 100644 +index 16328063df6..4ce78db5b33 100644 --- a/server/fd.c +++ b/server/fd.c @@ -172,6 +172,7 @@ static const struct object_ops fd_ops = @@ -315,7 +316,7 @@ index 74ad95fd4d1..4ce498ec0ef 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/file.c b/server/file.c -index b4f99ddc93b..1b4efb04bc5 100644 +index 2a839968c25..cbef0c63383 100644 --- a/server/file.c +++ b/server/file.c @@ -94,6 +94,7 @@ static const struct object_ops file_ops = @@ -327,7 +328,7 @@ index b4f99ddc93b..1b4efb04bc5 100644 no_signal, /* signal */ file_get_fd, /* get_fd */ diff --git a/server/handle.c b/server/handle.c -index 0595fdb403b..d41c7e86454 100644 +index e65831b3b22..e6c5707556f 100644 --- a/server/handle.c +++ b/server/handle.c @@ -126,6 +126,7 @@ static const struct object_ops handle_table_ops = @@ -339,10 +340,10 @@ index 0595fdb403b..d41c7e86454 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/hook.c b/server/hook.c -index 5abdf39ad37..da351d6791f 100644 +index c2d2823cd61..ab4d0e9dd31 100644 --- a/server/hook.c +++ b/server/hook.c -@@ -80,6 +80,7 @@ static const struct object_ops hook_table_ops = +@@ -81,6 +81,7 @@ static const struct object_ops hook_table_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -351,10 +352,10 @@ index 5abdf39ad37..da351d6791f 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/mailslot.c b/server/mailslot.c -index 2d8697ec9bd..4cf9b73f784 100644 +index 61eceec94e2..92fe938d3b9 100644 --- a/server/mailslot.c +++ b/server/mailslot.c -@@ -74,6 +74,7 @@ static const struct object_ops mailslot_ops = +@@ -81,6 +81,7 @@ static const struct object_ops mailslot_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -362,7 +363,7 @@ index 2d8697ec9bd..4cf9b73f784 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ mailslot_get_fd, /* get_fd */ -@@ -133,6 +134,7 @@ static const struct object_ops mail_writer_ops = +@@ -142,6 +143,7 @@ static const struct object_ops mail_writer_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -370,7 +371,7 @@ index 2d8697ec9bd..4cf9b73f784 100644 NULL, /* satisfied */ no_signal, /* signal */ mail_writer_get_fd, /* get_fd */ -@@ -196,6 +198,7 @@ static const struct object_ops mailslot_device_ops = +@@ -207,6 +209,7 @@ static const struct object_ops mailslot_device_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -378,7 +379,7 @@ index 2d8697ec9bd..4cf9b73f784 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -226,6 +229,7 @@ static const struct object_ops mailslot_device_file_ops = +@@ -237,6 +240,7 @@ static const struct object_ops mailslot_device_file_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -387,7 +388,7 @@ index 2d8697ec9bd..4cf9b73f784 100644 no_signal, /* signal */ mailslot_device_file_get_fd, /* get_fd */ diff --git a/server/mapping.c b/server/mapping.c -index 2d0a0b783e2..1acfb032bfd 100644 +index 2bf45780375..b84bb08a77b 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -67,6 +67,7 @@ static const struct object_ops ranges_ops = @@ -427,7 +428,7 @@ index af0efe72132..4785a830e92 100644 mutex_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/named_pipe.c b/server/named_pipe.c -index f3404a33c3b..f28cb14cb45 100644 +index dd8c14b30a9..5880b601d3a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -119,6 +119,7 @@ static const struct object_ops named_pipe_ops = @@ -470,8 +471,28 @@ index f3404a33c3b..f28cb14cb45 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ named_pipe_device_file_get_fd, /* get_fd */ +diff --git a/server/object.c b/server/object.c +index b1665fb5372..0a4d1bede06 100644 +--- a/server/object.c ++++ b/server/object.c +@@ -108,6 +108,7 @@ static const struct object_ops apc_reserve_ops = + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ ++ NULL, /* get_esync_fd */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ +@@ -132,6 +133,7 @@ static const struct object_ops completion_reserve_ops = + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ ++ NULL, /* get_esync_fd */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ diff --git a/server/object.h b/server/object.h -index dfdd691601f..711af54b579 100644 +index 6222e3352ed..0a65d0e3892 100644 --- a/server/object.h +++ b/server/object.h @@ -78,6 +78,8 @@ struct object_ops @@ -484,7 +505,7 @@ index dfdd691601f..711af54b579 100644 void (*satisfied)(struct object *,struct wait_queue_entry *); /* signal an object */ diff --git a/server/process.c b/server/process.c -index a0d5ea64d97..777bf7c2fe2 100644 +index 49f5c75005f..dc83a089655 100644 --- a/server/process.c +++ b/server/process.c @@ -105,6 +105,7 @@ static const struct object_ops process_ops = @@ -512,10 +533,10 @@ index a0d5ea64d97..777bf7c2fe2 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/queue.c b/server/queue.c -index 348fdac3214..2cd8949a252 100644 +index 984d466b66e..8a95055db40 100644 --- a/server/queue.c +++ b/server/queue.c -@@ -174,6 +174,7 @@ static const struct object_ops msg_queue_ops = +@@ -165,6 +165,7 @@ static const struct object_ops msg_queue_ops = msg_queue_add_queue, /* add_queue */ msg_queue_remove_queue, /* remove_queue */ msg_queue_signaled, /* signaled */ @@ -523,7 +544,7 @@ index 348fdac3214..2cd8949a252 100644 msg_queue_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ -@@ -211,6 +212,7 @@ static const struct object_ops thread_input_ops = +@@ -202,6 +203,7 @@ static const struct object_ops thread_input_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -532,7 +553,7 @@ index 348fdac3214..2cd8949a252 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/registry.c b/server/registry.c -index 629d67c832f..d6b39b99b22 100644 +index cc9a33fff1d..c19e92c9750 100644 --- a/server/registry.c +++ b/server/registry.c @@ -180,6 +180,7 @@ static const struct object_ops key_ops = @@ -544,7 +565,7 @@ index 629d67c832f..d6b39b99b22 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/request.c b/server/request.c -index 7021741c765..ca83fdbd2af 100644 +index dabcea68309..832a33917b4 100644 --- a/server/request.c +++ b/server/request.c @@ -90,6 +90,7 @@ static const struct object_ops master_socket_ops = @@ -568,10 +589,10 @@ index 53b42a886df..e3889f24601 100644 semaphore_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/serial.c b/server/serial.c -index d665eb7fa35..11e204e4419 100644 +index 209f2e9174e..0d49a996c2a 100644 --- a/server/serial.c +++ b/server/serial.c -@@ -85,6 +85,7 @@ static const struct object_ops serial_ops = +@@ -91,6 +91,7 @@ static const struct object_ops serial_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -592,10 +613,10 @@ index 19b76d44c16..55cd6aa037e 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/sock.c b/server/sock.c -index 52175b08987..77b41716cd1 100644 +index d2ec882554f..44a4e3b7b15 100644 --- a/server/sock.c +++ b/server/sock.c -@@ -451,6 +451,7 @@ static const struct object_ops sock_ops = +@@ -471,6 +471,7 @@ static const struct object_ops sock_ops = add_queue, /* add_queue */ remove_queue, /* remove_queue */ default_fd_signaled, /* signaled */ @@ -603,7 +624,7 @@ index 52175b08987..77b41716cd1 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ sock_get_fd, /* get_fd */ -@@ -3481,6 +3482,7 @@ static const struct object_ops ifchange_ops = +@@ -3599,6 +3600,7 @@ static const struct object_ops ifchange_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -611,7 +632,7 @@ index 52175b08987..77b41716cd1 100644 no_satisfied, /* satisfied */ no_signal, /* signal */ ifchange_get_fd, /* get_fd */ -@@ -3702,6 +3704,7 @@ static const struct object_ops socket_device_ops = +@@ -3820,6 +3822,7 @@ static const struct object_ops socket_device_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -620,7 +641,7 @@ index 52175b08987..77b41716cd1 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/symlink.c b/server/symlink.c -index 27d48e2f994..8cb24b4ff6e 100644 +index dd28efd3a75..c7f34412317 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -71,6 +71,7 @@ static const struct object_ops symlink_ops = @@ -632,7 +653,7 @@ index 27d48e2f994..8cb24b4ff6e 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/thread.c b/server/thread.c -index 0d5bdcf21d9..9dc38d4cce9 100644 +index cf69b3b53c3..4b537586e31 100644 --- a/server/thread.c +++ b/server/thread.c @@ -96,6 +96,7 @@ static const struct object_ops thread_apc_ops = @@ -672,10 +693,10 @@ index 96dc9d00ca1..f59902d5607 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/token.c b/server/token.c -index 4df8d2e0c6e..8b4d2f0c1b1 100644 +index 48ee1eca8fe..479596bdbfa 100644 --- a/server/token.c +++ b/server/token.c -@@ -143,6 +143,7 @@ static const struct object_ops token_ops = +@@ -145,6 +145,7 @@ static const struct object_ops token_ops = no_add_queue, /* add_queue */ NULL, /* remove_queue */ NULL, /* signaled */ @@ -684,7 +705,7 @@ index 4df8d2e0c6e..8b4d2f0c1b1 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/window.c b/server/window.c -index 242e93f303a..3aa7ad4ad79 100644 +index 412592fbc71..94a70ce890f 100644 --- a/server/window.c +++ b/server/window.c @@ -107,6 +107,7 @@ static const struct object_ops window_ops = @@ -696,7 +717,7 @@ index 242e93f303a..3aa7ad4ad79 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ diff --git a/server/winstation.c b/server/winstation.c -index 5903497d61e..7692fbe3ed2 100644 +index e5f4bfec357..50fe34aa9ce 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -76,6 +76,7 @@ static const struct object_ops winstation_ops = @@ -716,5 +737,5 @@ index 5903497d61e..7692fbe3ed2 100644 no_signal, /* signal */ no_get_fd, /* get_fd */ -- -2.42.0 +2.45.2 diff --git a/staging/upstream-commit b/staging/upstream-commit index 1e4a4572..50b969d9 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -7ee99608f469723bafadb28ef0ebd20631f86e9d +3a6e9365336304b4d7eb4d66aef959f67361cc1f