From 39e1db963f85992caf277aa06e4d4110b7a68e07 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Nov 11 2024 16:48:44 +0000 Subject: Import openvswitch3.3-3.3.0-59 from Fast DataPath --- diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch index fa5bfe6..c479d55 100644 --- a/SOURCES/openvswitch-3.3.0.patch +++ b/SOURCES/openvswitch-3.3.0.patch @@ -63,10 +63,10 @@ index d8a9722809..d73154a971 100644 memory: 4G diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml -index fc75581486..fba2d16031 100644 +index fc75581486..abda9549bf 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml -@@ -2,13 +2,16 @@ name: Build and Test +@@ -2,17 +2,23 @@ name: Build and Test on: [push, pull_request] @@ -75,9 +75,12 @@ index fc75581486..fba2d16031 100644 + jobs: build-dpdk: ++ strategy: ++ matrix: ++ runner: [ubuntu-24.04] env: - dependencies: gcc libbpf-dev libnuma-dev libpcap-dev ninja-build pkgconf -+ dependencies: gcc libbpf-dev libnuma-dev ninja-build pkgconf ++ dependencies: gcc libnuma-dev libxdp-dev ninja-build pkgconf CC: gcc - DPDK_GIT: https://dpdk.org/git/dpdk - DPDK_VER: 23.11 @@ -86,7 +89,22 @@ index fc75581486..fba2d16031 100644 name: dpdk gcc outputs: dpdk_key: ${{ steps.gen_dpdk_key.outputs.key }} -@@ -54,7 +57,7 @@ jobs: +- runs-on: ubuntu-22.04 ++ runs-on: ${{ matrix.runner }} + timeout-minutes: 30 + + steps: +@@ -30,7 +36,8 @@ jobs: + # This also allows us to use cache from any branch as long as version + # and a way we're building DPDK stays the same. + run: | +- cat .ci/dpdk-* > dpdk-ci-signature ++ echo ${{ matrix.runner }} > dpdk-ci-signature ++ cat .ci/dpdk-* >> dpdk-ci-signature + grep -rwE 'DPDK_GIT|DPDK_VER' .github/ >> dpdk-ci-signature + if [ "${DPDK_VER##refs/*/}" != "${DPDK_VER}" ]; then + git ls-remote --heads $DPDK_GIT $DPDK_VER >> dpdk-ci-signature +@@ -54,7 +61,7 @@ jobs: if: steps.dpdk_cache.outputs.cache-hit != 'true' uses: actions/setup-python@v5 with: @@ -95,17 +113,26 @@ index fc75581486..fba2d16031 100644 - name: update APT cache if: steps.dpdk_cache.outputs.cache-hit != 'true' -@@ -76,8 +79,7 @@ jobs: +@@ -76,8 +83,7 @@ jobs: env: dependencies: | automake libtool gcc bc libjemalloc2 libjemalloc-dev libssl-dev \ - llvm-dev libnuma-dev libpcap-dev selinux-policy-dev libbpf-dev \ - lftp libreswan -+ llvm-dev libnuma-dev selinux-policy-dev libbpf-dev lftp libreswan ++ llvm-dev libnuma-dev selinux-policy-dev libxdp-dev lftp libreswan CC: ${{ matrix.compiler }} DPDK: ${{ matrix.dpdk }} DPDK_SHARED: ${{ matrix.dpdk_shared }} -@@ -217,7 +219,7 @@ jobs: +@@ -90,7 +96,7 @@ jobs: + TEST_RANGE: ${{ matrix.test_range }} + + name: linux ${{ join(matrix.*, ' ') }} +- runs-on: ubuntu-22.04 ++ runs-on: ubuntu-24.04 + timeout-minutes: 30 + + strategy: +@@ -217,7 +223,7 @@ jobs: - name: set up python uses: actions/setup-python@v5 with: @@ -114,18 +141,24 @@ index fc75581486..fba2d16031 100644 - name: cache if: matrix.dpdk != '' || matrix.dpdk_shared != '' -@@ -268,8 +270,8 @@ jobs: +@@ -268,13 +274,13 @@ jobs: needs: build-dpdk env: dependencies: | - automake bc clang-tools libbpf-dev libnuma-dev libpcap-dev \ - libunbound-dev libunwind-dev libssl-dev libtool llvm-dev -+ automake bc clang-tools libbpf-dev libnuma-dev libunbound-dev \ -+ libunwind-dev libssl-dev libtool llvm-dev ++ automake bc clang-tools libnuma-dev libunbound-dev libunwind-dev \ ++ libssl-dev libtool libxdp-dev llvm-dev CC: clang DPDK: dpdk CLANG_ANALYZE: true -@@ -346,7 +348,7 @@ jobs: + name: clang-analyze +- runs-on: ubuntu-22.04 ++ runs-on: ubuntu-24.04 + timeout-minutes: 30 + + steps: +@@ -346,7 +352,7 @@ jobs: - name: set up python uses: actions/setup-python@v5 with: @@ -134,7 +167,7 @@ index fc75581486..fba2d16031 100644 - name: get cached dpdk-dir uses: actions/cache/restore@v4 -@@ -399,7 +401,7 @@ jobs: +@@ -399,7 +405,7 @@ jobs: - name: set up python uses: actions/setup-python@v5 with: @@ -143,6 +176,15 @@ index fc75581486..fba2d16031 100644 - name: install dependencies run: brew install automake libtool - name: prepare +@@ -421,7 +427,7 @@ jobs: + DPDK: ${{ matrix.dpdk }} + + name: linux deb ${{ matrix.dpdk }} dpdk +- runs-on: ubuntu-22.04 ++ runs-on: ubuntu-24.04 + timeout-minutes: 30 + + strategy: diff --git a/AUTHORS.rst b/AUTHORS.rst index aa9284fb16..fe4064ca71 100644 --- a/AUTHORS.rst @@ -1785,10 +1827,18 @@ index 34ee7d0e2d..cdff4206e2 100644 if (n < 0) { dpctl_error(dpctl_p, -n, "parsing flow ufid"); diff --git a/lib/dpdk.c b/lib/dpdk.c -index d76d53f8f1..940c43c070 100644 +index d76d53f8f1..b7516257c5 100644 --- a/lib/dpdk.c +++ b/lib/dpdk.c -@@ -337,7 +337,9 @@ dpdk_init__(const struct smap *ovs_other_config) +@@ -323,7 +323,6 @@ dpdk_init__(const struct smap *ovs_other_config) + if (log_stream == NULL) { + VLOG_ERR("Can't redirect DPDK log: %s.", ovs_strerror(errno)); + } else { +- setbuf(log_stream, NULL); + rte_openlog_stream(log_stream); + } + +@@ -337,7 +336,9 @@ dpdk_init__(const struct smap *ovs_other_config) } #endif diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec index 41d7000..76398a6 100644 --- a/SPECS/openvswitch3.3.spec +++ b/SPECS/openvswitch3.3.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.3.0 -Release: 58%{?dist} +Release: 59%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -769,6 +769,13 @@ exit 0 %endif %changelog +* Mon Nov 11 2024 Open vSwitch CI - 3.3.0-59 +- Merging upstream branch-3.3 [RH git: 4bd7df7dc6] + Commit list: + c51063b552 ci: Update GitHub actions runner from Ubuntu 22.04 to 24.04. + 9944e864ea dpdk: Fix dpdk logs being split over multiple lines. + + * Mon Nov 04 2024 Open vSwitch CI - 3.3.0-58 - Merging upstream branch-3.3 [RH git: a7940d36e8] Commit list: