diff mbox series

[ovs-dev,branch-2.17,1/2] conntrack: simplify cleanup path

Message ID 20230926122034.418115-1-aconole@redhat.com
State Changes Requested
Headers show
Series [ovs-dev,branch-2.17,1/2] conntrack: simplify cleanup path | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test fail github build: failed
ovsrobot/intel-ovs-compilation success test: success

Commit Message

Aaron Conole Sept. 26, 2023, 12:20 p.m. UTC 
The conntrack cleanup and allocation code is spread across multiple
list invocations.  This was changed in mainline code when the timeout
expiration lists were refactored, but backporting those fixes would
be a rather large effort.  Instead, take only the changes we need
to backport "contrack: Remove nat_conn introducing key directionality"
into branch-2.17.

Signed-off-by: Aaron Conole <aconole@redhat.com>
Co-authored-by: Paolo Valerio <pvalerio@redhat.com>
Signed-off-by: Paolo Valerio <pvalerio@redhat.com>
---
 lib/conntrack.c | 59 +++++++++++++++----------------------------------
 1 file changed, 18 insertions(+), 41 deletions(-)

Comments

Aaron Conole Sept. 26, 2023, 2:43 p.m. UTC | #1 
0-day Robot <robot@bytheb.org> writes:

> From: robot@bytheb.org
>
> Test-Label: github-robot: Build and Test
> Test-Status: fail
> http://patchwork.ozlabs.org/api/patches/1839668/

Apologies - I thought I made the symbol change in this patch.  I'll post
a v2 shortly with this corrected.

> _github build: failed_
> Build URL: https://github.com/ovsrobot/ovs/actions/runs/6312723064
> Build Logs:
> -----------------------Summary of failed steps-----------------------
> "osx clang --disable-ssl" failed at step build
> "linux gcc --disable-ssl" failed at step build
> "linux clang --disable-ssl" failed at step build
> "linux gcc c99" failed at step build
> "linux clang c99" failed at step build
> "linux gcc test 3.16" failed at step build
> "linux clang test 3.16 asan" failed at step build
> "linux gcc test --enable-shared" failed at step build
> "linux clang test --enable-shared" failed at step build
> "linux gcc test dpdk" failed at step build
> "linux clang test dpdk" failed at step build
> "linux gcc test -ljemalloc" failed at step build
> "linux clang test -ljemalloc" failed at step build
> "linux gcc afxdp 5.3" failed at step build
> "linux clang afxdp 5.3" failed at step build
> "linux gcc dpdk --enable-shared" failed at step build
> "linux clang dpdk --enable-shared" failed at step build
> "linux gcc dpdk-shared" failed at step build
> "linux clang dpdk-shared" failed at step build
> "linux gcc dpdk-shared --enable-shared" failed at step build
> "linux clang dpdk-shared --enable-shared" failed at step build
> "linux gcc m32 --disable-ssl" failed at step build
> ----------------------End summary of failed steps--------------------
>
> -------------------------------BEGIN LOGS----------------------------
> ####################################################################################
> #### [Begin job log] "osx clang --disable-ssl" at step build
> ####################################################################################
> libtool: compile:  clang -DHAVE_CONFIG_H -I. -I ./include -I ./include -I ./lib -I ./lib -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers -Wthread-safety -fno-strict-aliasing -Wswitch-bool -Wlogical-not-parentheses -Wsizeof-array-argument -Wshift-negative-value -Qunused-arguments -Wshadow -Wno-null-pointer-arithmetic -Warray-bounds-pointer-arithmetic -Werror -Wno-error=unused-command-line-argument -MT lib/conntrack-icmp.lo -MD -MP -MF lib/.deps/conntrack-icmp.Tpo -c lib/conntrack-icmp.c -o lib/conntrack-icmp.o
> depbase=`echo lib/conntrack-tcp.lo | sed 's|[^/]*$|.deps/&|;s|\.lo$||'`;\
> 	/bin/sh ./libtool  --tag=CC   --mode=compile clang -DHAVE_CONFIG_H -I.    -I ./include -I ./include -I ./lib -I ./lib    -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers -Wthread-safety -fno-strict-aliasing -Wswitch-bool -Wlogical-not-parentheses -Wsizeof-array-argument -Wshift-negative-value -Qunused-arguments -Wshadow -Wno-null-pointer-arithmetic -Warray-bounds-pointer-arithmetic    -Werror  -Wno-error=unused-command-line-argument -MT lib/conntrack-tcp.lo -MD -MP -MF $depbase.Tpo -c -o lib/conntrack-tcp.lo lib/conntrack-tcp.c &&\
> 	mv -f $depbase.Tpo $depbase.Plo
> libtool: compile:  clang -DHAVE_CONFIG_H -I. -I ./include -I ./include -I ./lib -I ./lib -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers -Wthread-safety -fno-strict-aliasing -Wswitch-bool -Wlogical-not-parentheses -Wsizeof-array-argument -Wshift-negative-value -Qunused-arguments -Wshadow -Wno-null-pointer-arithmetic -Warray-bounds-pointer-arithmetic -Werror -Wno-error=unused-command-line-argument -MT lib/conntrack-tcp.lo -MD -MP -MF lib/.deps/conntrack-tcp.Tpo -c lib/conntrack-tcp.c -o lib/conntrack-tcp.o
> depbase=`echo lib/conntrack-tp.lo | sed 's|[^/]*$|.deps/&|;s|\.lo$||'`;\
> 	/bin/sh ./libtool  --tag=CC   --mode=compile clang -DHAVE_CONFIG_H -I.    -I ./include -I ./include -I ./lib -I ./lib    -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers -Wthread-safety -fno-strict-aliasing -Wswitch-bool -Wlogical-not-parentheses -Wsizeof-array-argument -Wshift-negative-value -Qunused-arguments -Wshadow -Wno-null-pointer-arithmetic -Warray-bounds-pointer-arithmetic    -Werror  -Wno-error=unused-command-line-argument -MT lib/conntrack-tp.lo -MD -MP -MF $depbase.Tpo -c -o lib/conntrack-tp.lo lib/conntrack-tp.c &&\
> 	mv -f $depbase.Tpo $depbase.Plo
> libtool: compile:  clang -DHAVE_CONFIG_H -I. -I ./include -I ./include -I ./lib -I ./lib -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers -Wthread-safety -fno-strict-aliasing -Wswitch-bool -Wlogical-not-parentheses -Wsizeof-array-argument -Wshift-negative-value -Qunused-arguments -Wshadow -Wno-null-pointer-arithmetic -Warray-bounds-pointer-arithmetic -Werror -Wno-error=unused-command-line-argument -MT lib/conntrack-tp.lo -MD -MP -MF lib/.deps/conntrack-tp.Tpo -c lib/conntrack-tp.c -o lib/conntrack-tp.o
> depbase=`echo lib/conntrack-other.lo | sed 's|[^/]*$|.deps/&|;s|\.lo$||'`;\
> 	/bin/sh ./libtool  --tag=CC   --mode=compile clang -DHAVE_CONFIG_H -I.    -I ./include -I ./include -I ./lib -I ./lib    -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers -Wthread-safety -fno-strict-aliasing -Wswitch-bool -Wlogical-not-parentheses -Wsizeof-array-argument -Wshift-negative-value -Qunused-arguments -Wshadow -Wno-null-pointer-arithmetic -Warray-bounds-pointer-arithmetic    -Werror  -Wno-error=unused-command-line-argument -MT lib/conntrack-other.lo -MD -MP -MF $depbase.Tpo -c -o lib/conntrack-other.lo lib/conntrack-other.c &&\
> 	mv -f $depbase.Tpo $depbase.Plo
> libtool: compile:  clang -DHAVE_CONFIG_H -I. -I ./include -I ./include -I ./lib -I ./lib -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers -Wthread-safety -fno-strict-aliasing -Wswitch-bool -Wlogical-not-parentheses -Wsizeof-array-argument -Wshift-negative-value -Qunused-arguments -Wshadow -Wno-null-pointer-arithmetic -Warray-bounds-pointer-arithmetic -Werror -Wno-error=unused-command-line-argument -MT lib/conntrack-other.lo -MD -MP -MF lib/.deps/conntrack-other.Tpo -c lib/conntrack-other.c -o lib/conntrack-other.o
> depbase=`echo lib/conntrack.lo | sed 's|[^/]*$|.deps/&|;s|\.lo$||'`;\
> 	/bin/sh ./libtool  --tag=CC   --mode=compile clang -DHAVE_CONFIG_H -I.    -I ./include -I ./include -I ./lib -I ./lib    -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers -Wthread-safety -fno-strict-aliasing -Wswitch-bool -Wlogical-not-parentheses -Wsizeof-array-argument -Wshift-negative-value -Qunused-arguments -Wshadow -Wno-null-pointer-arithmetic -Warray-bounds-pointer-arithmetic    -Werror  -Wno-error=unused-command-line-argument -MT lib/conntrack.lo -MD -MP -MF $depbase.Tpo -c -o lib/conntrack.lo lib/conntrack.c &&\
> 	mv -f $depbase.Tpo $depbase.Plo
> libtool: compile:  clang -DHAVE_CONFIG_H -I. -I ./include -I ./include -I ./lib -I ./lib -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers -Wthread-safety -fno-strict-aliasing -Wswitch-bool -Wlogical-not-parentheses -Wsizeof-array-argument -Wshift-negative-value -Qunused-arguments -Wshadow -Wno-null-pointer-arithmetic -Warray-bounds-pointer-arithmetic -Werror -Wno-error=unused-command-line-argument -MT lib/conntrack.lo -MD -MP -MF lib/.deps/conntrack.Tpo -c lib/conntrack.c -o lib/conntrack.o
> lib/conntrack.c:99:13: error: unused function 'delete_conn_one' [-Werror,-Wunused-function]
> static void delete_conn_one(struct conn *conn);
>             ^
> 1 error generated.
> make[2]: *** [lib/conntrack.lo] Error 1
> make[1]: *** [all-recursive] Error 1
> make: *** [all] Error 2
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "osx clang --disable-ssl" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux gcc --disable-ssl" at step build
> ####################################################################################
> dumping search index in English (code: en)... done
> dumping object inventory... done
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ./Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[2]: Leaving directory '/home/runner/work/ovs/ovs'
> make[1]: *** [Makefile:5410: all-recursive] Error 1
> make[1]: Leaving directory '/home/runner/work/ovs/ovs'
> make: *** [Makefile:3080: all] Error 2
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux gcc --disable-ssl" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux clang --disable-ssl" at step build
> ####################################################################################
> dumping search index in English (code: en)... done
> dumping object inventory... done
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ./Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[2]: Leaving directory '/home/runner/work/ovs/ovs'
> make[1]: *** [Makefile:5410: all-recursive] Error 1
> make[1]: Leaving directory '/home/runner/work/ovs/ovs'
> make: *** [Makefile:3080: all] Error 2
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux clang --disable-ssl" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux gcc c99" at step build
> ####################################################################################
> dumping search index in English (code: en)... done
> dumping object inventory... done
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ./Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[2]: Leaving directory '/home/runner/work/ovs/ovs'
> make[1]: *** [Makefile:5410: all-recursive] Error 1
> make[1]: Leaving directory '/home/runner/work/ovs/ovs'
> make: *** [Makefile:3080: all] Error 2
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux gcc c99" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux clang c99" at step build
> ####################################################################################
> dumping search index in English (code: en)... done
> dumping object inventory... done
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ./Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[2]: Leaving directory '/home/runner/work/ovs/ovs'
> make[1]: *** [Makefile:5410: all-recursive] Error 1
> make[1]: Leaving directory '/home/runner/work/ovs/ovs'
> make: *** [Makefile:3080: all] Error 2
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux clang c99" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux gcc test 3.16" at step build
> ####################################################################################
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ../../Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[3]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[2]: *** [Makefile:5410: all-recursive] Error 1
> make[2]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[1]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[1]: *** [Makefile:3080: all] Error 2
> make: *** [Makefile:5627: distcheck] Error 1
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux gcc test 3.16" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux clang test 3.16 asan" at step build
> ####################################################################################
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ../../Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[3]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[2]: *** [Makefile:5410: all-recursive] Error 1
> make[1]: *** [Makefile:3080: all] Error 2
> make[2]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make: *** [Makefile:5627: distcheck] Error 1
> make[1]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux clang test 3.16 asan" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux gcc test --enable-shared" at step build
> ####################################################################################
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ../../Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[3]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[2]: *** [Makefile:5410: all-recursive] Error 1
> make[2]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[1]: *** [Makefile:3080: all] Error 2
> make[1]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make: *** [Makefile:5627: distcheck] Error 1
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux gcc test --enable-shared" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux clang test --enable-shared" at step build
> ####################################################################################
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ../../Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[3]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[2]: *** [Makefile:5410: all-recursive] Error 1
> make[2]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[1]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[1]: *** [Makefile:3080: all] Error 2
> make: *** [Makefile:5627: distcheck] Error 1
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux clang test --enable-shared" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux gcc test dpdk" at step build
> ####################################################################################
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ../../Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[3]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[2]: *** [Makefile:5410: all-recursive] Error 1
> make[1]: *** [Makefile:3080: all] Error 2
> make[2]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[1]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make: *** [Makefile:5627: distcheck] Error 1
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux gcc test dpdk" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux clang test dpdk" at step build
> ####################################################################################
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ../../Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[3]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[2]: *** [Makefile:5410: all-recursive] Error 1
> make[2]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[1]: *** [Makefile:3080: all] Error 2
> make[1]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make: *** [Makefile:5627: distcheck] Error 1
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux clang test dpdk" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux gcc test -ljemalloc" at step build
> ####################################################################################
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ../../Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[3]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[2]: *** [Makefile:5410: all-recursive] Error 1
> make[2]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[1]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[1]: *** [Makefile:3080: all] Error 2
> make: *** [Makefile:5627: distcheck] Error 1
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux gcc test -ljemalloc" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux clang test -ljemalloc" at step build
> ####################################################################################
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ../../Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[3]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[2]: *** [Makefile:5410: all-recursive] Error 1
> make[2]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[1]: Leaving directory '/home/runner/work/ovs/ovs/openvswitch-2.17.8/_build/sub'
> make[1]: *** [Makefile:3080: all] Error 2
> make: *** [Makefile:5627: distcheck] Error 1
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux clang test -ljemalloc" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux gcc afxdp 5.3" at step build
> ####################################################################################
> dumping search index in English (code: en)... done
> dumping object inventory... done
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ./Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[2]: Leaving directory '/home/runner/work/ovs/ovs'
> make[1]: *** [Makefile:5410: all-recursive] Error 1
> make[1]: Leaving directory '/home/runner/work/ovs/ovs'
> make: *** [Makefile:3080: all] Error 2
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux gcc afxdp 5.3" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux clang afxdp 5.3" at step build
> ####################################################################################
> dumping search index in English (code: en)... done
> dumping object inventory... done
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ./Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[2]: Leaving directory '/home/runner/work/ovs/ovs'
> make[1]: *** [Makefile:5410: all-recursive] Error 1
> make: *** [Makefile:3080: all] Error 2
> make[1]: Leaving directory '/home/runner/work/ovs/ovs'
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux clang afxdp 5.3" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux gcc dpdk --enable-shared" at step build
> ####################################################################################
> dumping object inventory... done
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> libtool: compile:  env REAL_CC=gcc "CHECK=sparse -Wsparse-error -I ./include/sparse -I ./include -m64 -I /usr/local/include -I /usr/include/x86_64-linux-gnu  " cgcc -target=x86_64 -target=host_os_specs -D__MMX__=1 -D__SSE2_MATH__=1 -D__SSE_MATH__=1 -D__SSE2__=1 -D__SSE__=1 -DHAVE_CONFIG_H -I. -I ./include -I ./include -I ./lib -I ./lib -Wstrict-prototypes -Wall -Wextra -Wno-sign-compare -Wpointer-arith -Wformat -Wformat-security -Wswitch-enum -Wunused-parameter -Wbad-function-cast -Wcast-align -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-field-initializers -fno-strict-aliasing -Wswitch-bool -Wlogical-not-parentheses -Wsizeof-array-argument -Wbool-compare -Wshift-negative-value -Wduplicated-cond -Wshadow -Wmultistatement-macros -Wcast-align=strict -mssse3 -include rte_config.h -I/home/runner/work/ovs/ovs/dpdk-dir/build/include -Werror -Werror -D_FILE_OFFSET_BITS=64 -g -O2 -MT lib/ct-dpif.lo -MD -MP -MF lib/.deps/ct-dpif.Tpo -c lib/ct-dpif.c -o lib/ct-dpi
 f.o >/dev/null 2>&1
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ./Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[2]: Leaving directory '/home/runner/work/ovs/ovs'
> make[1]: *** [Makefile:5410: all-recursive] Error 1
> make: *** [Makefile:3080: all] Error 2
> make[1]: Leaving directory '/home/runner/work/ovs/ovs'
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux gcc dpdk --enable-shared" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux clang dpdk --enable-shared" at step build
> ####################################################################################
> dumping search index in English (code: en)... done
> dumping object inventory... done
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ./Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[2]: Leaving directory '/home/runner/work/ovs/ovs'
> make[1]: *** [Makefile:5410: all-recursive] Error 1
> make: *** [Makefile:3080: all] Error 2
> make[1]: Leaving directory '/home/runner/work/ovs/ovs'
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux clang dpdk --enable-shared" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux gcc dpdk-shared" at step build
> ####################################################################################
> dumping search index in English (code: en)... done
> dumping object inventory... done
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ./Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[2]: Leaving directory '/home/runner/work/ovs/ovs'
> make[1]: *** [Makefile:5410: all-recursive] Error 1
> make[1]: Leaving directory '/home/runner/work/ovs/ovs'
> make: *** [Makefile:3080: all] Error 2
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux gcc dpdk-shared" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux clang dpdk-shared" at step build
> ####################################################################################
> dumping search index in English (code: en)... done
> dumping object inventory... done
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ./Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[2]: Leaving directory '/home/runner/work/ovs/ovs'
> make[1]: *** [Makefile:5410: all-recursive] Error 1
> make[1]: Leaving directory '/home/runner/work/ovs/ovs'
> make: *** [Makefile:3080: all] Error 2
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux clang dpdk-shared" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux gcc dpdk-shared --enable-shared" at step build
> ####################################################################################
> dumping search index in English (code: en)... done
> dumping object inventory... done
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ./Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[2]: Leaving directory '/home/runner/work/ovs/ovs'
> make[1]: *** [Makefile:5410: all-recursive] Error 1
> make[1]: Leaving directory '/home/runner/work/ovs/ovs'
> make: *** [Makefile:3080: all] Error 2
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux gcc dpdk-shared --enable-shared" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux clang dpdk-shared --enable-shared" at step build
> ####################################################################################
> dumping search index in English (code: en)... done
> dumping object inventory... done
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ./Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[2]: Leaving directory '/home/runner/work/ovs/ovs'
> make[1]: *** [Makefile:5410: all-recursive] Error 1
> make[1]: Leaving directory '/home/runner/work/ovs/ovs'
> make: *** [Makefile:3080: all] Error 2
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux clang dpdk-shared --enable-shared" at step build
> ####################################################################################
>
>
>
>
> ####################################################################################
> #### [Begin job log] "linux gcc m32 --disable-ssl" at step build
> ####################################################################################
> dumping search index in English (code: en)... done
> dumping object inventory... done
> build succeeded.
>
> The HTML pages are in Documentation/_build/html.
> sphinx-build  -b man -W -n -d ./Documentation/_build/doctrees  ./Documentation ./Documentation/_build/man && touch docs-check
> Running Sphinx v7.2.6
> Cannot find 'ovs-sphinx-theme' package. Falling back to default theme.
> making output directory... done
> loading pickled environment... done
> building [mo]: targets for 0 po files that are out of date
> writing output... 
> building [man]: all manpages
> updating environment: 0 added, 0 changed, 0 removed
> reading sources... 
> looking for now-outdated files... none found
> writing... ovs-actions.7 { } ovs-appctl.8 { } ovs-ctl.8 { } ovs-l3ping.8 { } ovs-parse-backtrace.8 { } ovs-pki.8 { } ovs-sim.1 { } ovs-tcpdump.8 { } ovs-tcpundump.1 { } ovs-test.8 { } ovs-vlan-test.8 { } ovsdb-server.7 { } ovsdb.5 { } ovsdb.7 { } done
> build succeeded.
>
> The manual pages are in Documentation/_build/man.
> make[1]: *** [Makefile:5410: all-recursive] Error 1
> make: *** [Makefile:3080: all] Error 2
> make[2]: Leaving directory '/home/runner/work/ovs/ovs'
> make[1]: Leaving directory '/home/runner/work/ovs/ovs'
> ##[error]Process completed with exit code 2.
> ####################################################################################
> #### [End job log] "linux gcc m32 --disable-ssl" at step build
> ####################################################################################
> --------------------------------END LOGS-----------------------------
diff mbox series

Patch

diff --git a/lib/conntrack.c b/lib/conntrack.c
index fff8e77db1..e5bf27a321 100644
--- a/lib/conntrack.c
+++ b/lib/conntrack.c
@@ -94,7 +94,7 @@  static bool valid_new(struct dp_packet *pkt, struct conn_key *);
 static struct conn *new_conn(struct conntrack *ct, struct dp_packet *pkt,
                              struct conn_key *, long long now,
                              uint32_t tp_id);
-static void delete_conn_cmn(struct conn *);
+static void delete_conn__(struct conn *);
 static void delete_conn(struct conn *);
 static void delete_conn_one(struct conn *conn);
 static enum ct_update_res conn_update(struct conntrack *ct, struct conn *conn,
@@ -444,9 +444,11 @@  zone_limit_delete(struct conntrack *ct, uint16_t zone)
 }
 
 static void
-conn_clean_cmn(struct conntrack *ct, struct conn *conn)
+conn_clean(struct conntrack *ct, struct conn *conn)
     OVS_REQUIRES(ct->ct_lock)
 {
+    ovs_assert(conn->conn_type == CT_CONN_TYPE_DEFAULT);
+
     if (conn->alg) {
         expectation_clean(ct, &conn->key);
     }
@@ -458,19 +460,9 @@  conn_clean_cmn(struct conntrack *ct, struct conn *conn)
     if (zl && zl->czl.zone_limit_seq == conn->zone_limit_seq) {
         zl->czl.count--;
     }
-}
 
-/* Must be called with 'conn' of 'conn_type' CT_CONN_TYPE_DEFAULT.  Also
- * removes the associated nat 'conn' from the lookup datastructures. */
-static void
-conn_clean(struct conntrack *ct, struct conn *conn)
-    OVS_REQUIRES(ct->ct_lock)
-{
-    ovs_assert(conn->conn_type == CT_CONN_TYPE_DEFAULT);
-
-    conn_clean_cmn(ct, conn);
     if (conn->nat_conn) {
-        uint32_t hash = conn_key_hash(&conn->nat_conn->key, ct->hash_basis);
+        hash = conn_key_hash(&conn->nat_conn->key, ct->hash_basis);
         cmap_remove(&ct->conns, &conn->nat_conn->cm_node, hash);
     }
     ovs_list_remove(&conn->exp_node);
@@ -479,19 +471,6 @@  conn_clean(struct conntrack *ct, struct conn *conn)
     atomic_count_dec(&ct->n_conn);
 }
 
-static void
-conn_clean_one(struct conntrack *ct, struct conn *conn)
-    OVS_REQUIRES(ct->ct_lock)
-{
-    conn_clean_cmn(ct, conn);
-    if (conn->conn_type == CT_CONN_TYPE_DEFAULT) {
-        ovs_list_remove(&conn->exp_node);
-        conn->cleaned = true;
-        atomic_count_dec(&ct->n_conn);
-    }
-    ovsrcu_postpone(delete_conn_one, conn);
-}
-
 /* Destroys the connection tracker 'ct' and frees all the allocated memory.
  * The caller of this function must already have shut down packet input
  * and PMD threads (which would have been quiesced).  */
@@ -505,7 +484,11 @@  conntrack_destroy(struct conntrack *ct)
 
     ovs_mutex_lock(&ct->ct_lock);
     CMAP_FOR_EACH (conn, cm_node, &ct->conns) {
-        conn_clean_one(ct, conn);
+        if (conn->conn_type != CT_CONN_TYPE_DEFAULT) {
+            continue;
+        }
+
+        conn_clean(ct, conn);
     }
     cmap_destroy(&ct->conns);
 
@@ -1009,7 +992,7 @@  conn_not_found(struct conntrack *ct, struct dp_packet *pkt,
 nat_res_exhaustion:
     free(nat_conn);
     ovs_list_remove(&nc->exp_node);
-    delete_conn_cmn(nc);
+    delete_conn__(nc);
     static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 5);
     VLOG_WARN_RL(&rl, "Unable to NAT due to tuple space exhaustion - "
                  "if DoS attack, use firewalling and/or zone partitioning.");
@@ -2475,7 +2458,7 @@  new_conn(struct conntrack *ct, struct dp_packet *pkt, struct conn_key *key,
 }
 
 static void
-delete_conn_cmn(struct conn *conn)
+delete_conn__(struct conn *conn)
 {
     free(conn->alg);
     free(conn);
@@ -2487,17 +2470,7 @@  delete_conn(struct conn *conn)
     ovs_assert(conn->conn_type == CT_CONN_TYPE_DEFAULT);
     ovs_mutex_destroy(&conn->lock);
     free(conn->nat_conn);
-    delete_conn_cmn(conn);
-}
-
-/* Only used by conn_clean_one(). */
-static void
-delete_conn_one(struct conn *conn)
-{
-    if (conn->conn_type == CT_CONN_TYPE_DEFAULT) {
-        ovs_mutex_destroy(&conn->lock);
-    }
-    delete_conn_cmn(conn);
+    delete_conn__(conn);
 }
 
 /* Convert a conntrack address 'a' into an IP address 'b' based on 'dl_type'.
@@ -2673,8 +2646,12 @@  conntrack_flush(struct conntrack *ct, const uint16_t *zone)
 
     ovs_mutex_lock(&ct->ct_lock);
     CMAP_FOR_EACH (conn, cm_node, &ct->conns) {
+        if (conn->conn_type != CT_CONN_TYPE_DEFAULT) {
+            continue;
+        }
+
         if (!zone || *zone == conn->key.zone) {
-            conn_clean_one(ct, conn);
+            conn_clean(ct, conn);
         }
     }
     ovs_mutex_unlock(&ct->ct_lock);