From 8164957461ea5890aa2b6b8f397babd8840f8804 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 12 Aug 2022 03:02:04 +0900 Subject: [PATCH] test: do not fill up receiver buffer If a system has many devices, then the receiver buffer may be filled up. Hopefully fixes https://bugzilla.redhat.com/show_bug.cgi?id=2095750 --- .../sd-device/test-sd-device-monitor.c | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/libsystemd/sd-device/test-sd-device-monitor.c b/src/libsystemd/sd-device/test-sd-device-monitor.c index 82c2b55e369..0b4c5d51aa7 100644 --- a/src/libsystemd/sd-device/test-sd-device-monitor.c +++ b/src/libsystemd/sd-device/test-sd-device-monitor.c @@ -10,6 +10,7 @@ #include "device-private.h" #include "device-util.h" #include "macro.h" +#include "path-util.h" #include "stat-util.h" #include "string-util.h" #include "tests.h" @@ -169,13 +170,12 @@ static void test_tag_filter(sd_device *device) { static void test_sysattr_filter(sd_device *device, const char *sysattr) { _cleanup_(sd_device_monitor_unrefp) sd_device_monitor *monitor_server = NULL, *monitor_client = NULL; _cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL; - const char *syspath, *subsystem, *sysattr_value; + const char *syspath, *sysattr_value; sd_device *d; log_device_info(device, "/* %s(%s) */", __func__, sysattr); assert_se(sd_device_get_syspath(device, &syspath) >= 0); - assert_se(sd_device_get_subsystem(device, &subsystem) >= 0); assert_se(sd_device_get_sysattr_value(device, sysattr, &sysattr_value) >= 0); assert_se(device_monitor_new_full(&monitor_server, MONITOR_GROUP_NONE, -1) >= 0); @@ -184,9 +184,6 @@ static void test_sysattr_filter(sd_device *device, const char *sysattr) { assert_se(device_monitor_new_full(&monitor_client, MONITOR_GROUP_NONE, -1) >= 0); assert_se(device_monitor_allow_unicast_sender(monitor_client, monitor_server) >= 0); - /* The sysattr filter is not implemented in BPF yet, so the below device_monito_send_device() - * may cause EAGAIN. So, let's also filter devices with subsystem. */ - assert_se(sd_device_monitor_filter_add_match_subsystem_devtype(monitor_client, subsystem, NULL) >= 0); assert_se(sd_device_monitor_filter_add_match_sysattr(monitor_client, sysattr, sysattr_value, true) >= 0); assert_se(sd_device_monitor_start(monitor_client, monitor_handler, (void *) syspath) >= 0); assert_se(sd_event_source_set_description(sd_device_monitor_get_event_source(monitor_client), "receiver") >= 0); @@ -203,6 +200,11 @@ static void test_sysattr_filter(sd_device *device, const char *sysattr) { log_device_debug(d, "Sending device syspath:%s", p); assert_se(device_monitor_send_device(monitor_server, monitor_client, d) >= 0); + + /* The sysattr filter is not implemented in BPF yet. So, sending multiple devices may fills up + * buffer and device_monitor_send_device() may return EAGAIN. Let's send one device here, + * which should be filtered out by the receiver. */ + break; } log_device_info(device, "Sending device syspath:%s", syspath); @@ -214,17 +216,17 @@ static void test_sysattr_filter(sd_device *device, const char *sysattr) { static void test_parent_filter(sd_device *device) { _cleanup_(sd_device_monitor_unrefp) sd_device_monitor *monitor_server = NULL, *monitor_client = NULL; _cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL; - const char *syspath, *subsystem; + const char *syspath, *parent_syspath; sd_device *parent, *d; int r; log_device_info(device, "/* %s */", __func__); assert_se(sd_device_get_syspath(device, &syspath) >= 0); - assert_se(sd_device_get_subsystem(device, &subsystem) >= 0); r = sd_device_get_parent(device, &parent); if (r < 0) return (void) log_device_info(device, "Device does not have parent, skipping."); + assert_se(sd_device_get_syspath(parent, &parent_syspath) >= 0); assert_se(device_monitor_new_full(&monitor_server, MONITOR_GROUP_NONE, -1) >= 0); assert_se(sd_device_monitor_start(monitor_server, NULL, NULL) >= 0); @@ -232,9 +234,6 @@ static void test_parent_filter(sd_device *device) { assert_se(device_monitor_new_full(&monitor_client, MONITOR_GROUP_NONE, -1) >= 0); assert_se(device_monitor_allow_unicast_sender(monitor_client, monitor_server) >= 0); - /* The parent filter is not implemented in BPF yet, so the below device_monito_send_device() - * may cause EAGAIN. So, let's also filter devices with subsystem. */ - assert_se(sd_device_monitor_filter_add_match_subsystem_devtype(monitor_client, subsystem, NULL) >= 0); assert_se(sd_device_monitor_filter_add_match_parent(monitor_client, parent, true) >= 0); assert_se(sd_device_monitor_start(monitor_client, monitor_handler, (void *) syspath) >= 0); assert_se(sd_event_source_set_description(sd_device_monitor_get_event_source(monitor_client), "receiver") >= 0); @@ -244,12 +243,19 @@ static void test_parent_filter(sd_device *device) { const char *p; assert_se(sd_device_get_syspath(d, &p) >= 0); + if (path_startswith(p, parent_syspath)) + continue; assert_se(device_add_property(d, "ACTION", "add") >= 0); assert_se(device_add_property(d, "SEQNUM", "10") >= 0); log_device_debug(d, "Sending device syspath:%s", p); assert_se(device_monitor_send_device(monitor_server, monitor_client, d) >= 0); + + /* The parent filter is not implemented in BPF yet. So, sending multiple devices may fills up + * buffer and device_monitor_send_device() may return EAGAIN. Let's send one device here, + * which should be filtered out by the receiver. */ + break; } log_device_info(device, "Sending device syspath:%s", syspath); -- 2.47.3