From 74590de2e9d7d581410c38ba2cb99d8dbd80a8e2 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Mar 2023 09:13:48 +0000 Subject: [PATCH] import libteam-1.31-16.el9_1 --- ...-remove-the-ports-on-shutdown-with-N.patch | 46 ++++++++ ...ting-callbacks-when-a-loop-restart-i.patch | 105 ++++++++++++++++++ SPECS/libteam.spec | 21 +++- 3 files changed, 166 insertions(+), 6 deletions(-) create mode 100644 SOURCES/0008-teamd-do-no-remove-the-ports-on-shutdown-with-N.patch create mode 100644 SOURCES/0009-teamd-stop-iterating-callbacks-when-a-loop-restart-i.patch diff --git a/SOURCES/0008-teamd-do-no-remove-the-ports-on-shutdown-with-N.patch b/SOURCES/0008-teamd-do-no-remove-the-ports-on-shutdown-with-N.patch new file mode 100644 index 0000000..8bf65e7 --- /dev/null +++ b/SOURCES/0008-teamd-do-no-remove-the-ports-on-shutdown-with-N.patch @@ -0,0 +1,46 @@ +From dbb2cfca35d2cd15125eb84e8f3940f8cc3ea860 Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Mon, 10 Oct 2022 18:33:53 +0200 +Subject: [PATCH] teamd: do no remove the ports on shutdown with -N + +With -N, teamd currently leaves the team device in place on shutdown, +as it's supposed to, but it removes all the ports. This severely limits +usefullness of the option, because it's still impossible to replace +the daemon with another one without disrupting connectivity. + +One use case where this is important is the handover from initrd to real +root, when a team device was used to provide connectivity to a network +root filesystem: + +Systemd's isolation of switch-root.target stops NetworkManager.service and +then terminates its kids, including teamd. The real NetworkManager.service +would eventually catch up and restart it, but there's a short period when +team ports are removed which is not great if we're booting off that device. +Also, it may be that ports come up in different order, causing team to get +a different MAC address, which will invalidate the DHCP lease we got +beforehands and screwing up L3 addressing. + +Let's not flush the ports when -N is used. + +Suggested-by: Jiri Pirko +Signed-off-by: Lubomir Rintel +Signed-off-by: Jiri Pirko +--- + teamd/teamd_per_port.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/teamd/teamd_per_port.c b/teamd/teamd_per_port.c +index d429753..9689df4 100644 +--- a/teamd/teamd_per_port.c ++++ b/teamd/teamd_per_port.c +@@ -217,7 +217,6 @@ static void port_obj_remove(struct teamd_context *ctx, + struct teamd_port *tdport = _port(port_obj); + + teamd_event_port_removed(ctx, tdport); +- teamd_port_remove(ctx, tdport); + port_obj_destroy(ctx, port_obj); + port_obj_free(port_obj); + } +-- +2.31.1 + diff --git a/SOURCES/0009-teamd-stop-iterating-callbacks-when-a-loop-restart-i.patch b/SOURCES/0009-teamd-stop-iterating-callbacks-when-a-loop-restart-i.patch new file mode 100644 index 0000000..064c2f1 --- /dev/null +++ b/SOURCES/0009-teamd-stop-iterating-callbacks-when-a-loop-restart-i.patch @@ -0,0 +1,105 @@ +From ffc6a52bd285a476b547312012078af69220574b Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Mon, 10 Oct 2022 18:37:31 +0200 +Subject: [PATCH] teamd: stop iterating callbacks when a loop restart is + requested + +A crash was observed: + + Added loop callback: dbus_watch, 0x560d279e4530 + Added loop callback: dbus_watch, 0x560d279e4580 + ... + Removed loop callback: dbus_watch, 0x560d279e4580 + Removed loop callback: dbus_watch, 0x560d279e4530 + Aug 31 11:54:11 holaprdel kernel: traps: teamd[557] general protection fault ip:560d26469a55 sp:7ffd43ca9650 error:0 in teamd[560d26463000+16000] + +Traceback (from a different run than above): + + Core was generated by `/usr/bin/teamd -o -n -U -D -N -t team0 -gg'. + Program terminated with signal SIGSEGV, Segmentation fault. + #0 0x00005600ac090a55 in teamd_run_loop_do_callbacks (ctx=0x5600ad9bac70, fds=0x7fff40861250, lcb_list=0x5600ad9bad58) at /usr/src/debug/libteam-1.31-14.el9.x86_64/teamd/teamd.c:321 + 321 list_for_each_node_entry_safe(lcb, tmp, lcb_list, list) { + (gdb) bt + #0 0x00005600ac090a55 in teamd_run_loop_do_callbacks (ctx=0x5600ad9bac70, fds=0x7fff40861250, lcb_list=0x5600ad9bad58) at /usr/src/debug/libteam-1.31-14.el9.x86_64/teamd/teamd.c:321 + #1 teamd_run_loop_run (ctx=0x5600ad9bac70) at /usr/src/debug/libteam-1.31-14.el9.x86_64/teamd/teamd.c:415 + #2 0x00005600ac08d8cb in teamd_start (p_ret=, ctx=) at /usr/src/debug/libteam-1.31-14.el9.x86_64/teamd/teamd.c:1557 + #3 main (argc=, argv=) at /usr/src/debug/libteam-1.31-14.el9.x86_64/teamd/teamd.c:1876 + (gdb) print *lcb + Cannot access memory at address 0x9dd29944fb7e97fc + (gdb) print *tmp + Cannot access memory at address 0x9dd29944fb7e9804 + (gdb) + +What has happened is that libdbus called the remove_watch callback twice +in a single go, causing two callbacks being destroyed in one iteration +of teamd_run_loop_do_callbacks()'s list_for_each_node_entry_safe(). + +This basically turns the _safe() variant of the macro unhelpful, as tmp +points to stale data anyway. + +Let's use the unsafe variant then, and terminate the loop once +teamd_loop_callback_del() asks for main loop's attention via +teamd_run_loop_restart(). If there are other callbacks pending an action, +they will get their turn in the next main loop iteration. + +Signed-off-by: Lubomir Rintel +Signed-off-by: Jiri Pirko +--- + teamd/teamd.c | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) + +diff --git a/teamd/teamd.c b/teamd/teamd.c +index b310140..a89b702 100644 +--- a/teamd/teamd.c ++++ b/teamd/teamd.c +@@ -309,16 +309,28 @@ static void teamd_run_loop_set_fds(struct list_item *lcb_list, + } + } + ++static int teamd_check_ctrl(struct teamd_context *ctx) ++{ ++ int ctrl_fd = ctx->run_loop.ctrl_pipe_r; ++ struct timeval tv; ++ fd_set rfds; ++ ++ FD_ZERO(&rfds); ++ FD_SET(ctrl_fd, &rfds); ++ tv.tv_sec = tv.tv_usec = 0; ++ ++ return select(ctrl_fd + 1, &rfds, NULL, NULL, &tv); ++} ++ + static int teamd_run_loop_do_callbacks(struct list_item *lcb_list, fd_set *fds, + struct teamd_context *ctx) + { + struct teamd_loop_callback *lcb; +- struct teamd_loop_callback *tmp; + int i; + int events; + int err; + +- list_for_each_node_entry_safe(lcb, tmp, lcb_list, list) { ++ list_for_each_node_entry(lcb, lcb_list, list) { + for (i = 0; i < 3; i++) { + if (!(lcb->fd_event & (1 << i))) + continue; +@@ -339,6 +351,16 @@ static int teamd_run_loop_do_callbacks(struct list_item *lcb_list, fd_set *fds, + teamd_log_dbg(ctx, "Failed loop callback: %s, %p", + lcb->name, lcb->priv); + } ++ ++ /* ++ * If there's a control byte ready, it's possible that ++ * one or more entries have been removed from the ++ * callback list and restart has been requested. In any ++ * case, let the main loop deal with it first so that ++ * we know we're safe to proceed. ++ */ ++ if (teamd_check_ctrl(ctx)) ++ return 0; + } + } + return 0; +-- +2.31.1 + diff --git a/SPECS/libteam.spec b/SPECS/libteam.spec index 548b7d8..17570cc 100644 --- a/SPECS/libteam.spec +++ b/SPECS/libteam.spec @@ -1,6 +1,6 @@ Name: libteam Version: 1.31 -Release: 14%{?dist} +Release: 16%{?dist} Summary: Library for controlling team network device License: LGPLv2+ URL: http://www.libteam.org @@ -13,6 +13,8 @@ Patch4: 0004-man-add-team2bond-man-doc.patch Patch5: 0005-Revert-teamd-Disregard-current-state-when-considerin.patch Patch6: 0006-utils-team2bond-do-not-add-miimon-if-already-exist.patch Patch7: 0007-utils-team2bond-do-not-add-updelay-downdelay-if-alre.patch +Patch8: 0008-teamd-do-no-remove-the-ports-on-shutdown-with-N.patch +Patch9: 0009-teamd-stop-iterating-callbacks-when-a-loop-restart-i.patch BuildRequires: gcc BuildRequires: jansson-devel @@ -34,27 +36,27 @@ to control team network devices. %package devel Summary: Libraries and header files for libteam development -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libteam = %{version}-%{release} %package doc Summary: API documentation for libteam and libteamd -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libteam = %{version}-%{release} %description doc This package contains libteam and libteamd API documentation %package -n teamd Summary: Team network device control daemon -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libteam = %{version}-%{release} %package -n teamd-devel Summary: Libraries and header files for teamd development -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: teamd = %{version}-%{release} %package -n network-scripts-teamd Summary: teamd legacy network service support Requires: network-scripts -Supplements: (%{name} and network-scripts) +Supplements: (teamd and network-scripts) %description devel The libteam-devel package contains the header files and libraries @@ -145,6 +147,13 @@ install -p -m 755 utils/team2bond $RPM_BUILD_ROOT%{_bindir}/team2bond %{_sysconfdir}/sysconfig/network-scripts/ifdown-TeamPort %changelog +* Tue Dec 06 2022 Long Xin - 1.31-16 +- fix the Requires package name for teamd-devel +- teamd: stop iterating callbacks when a loop restart is requested (rhbz#2148852) + +* Mon Dec 05 2022 Long Xin - 1.31-15 +- teamd: do no remove the ports on shutdown with -N (rhbz#2148854) + * Mon Jun 13 2022 Long Xin - 1.31-14 - Rebuilt with a new version to pass the fixed gating test (rhbz#2060445)