From 96f2dd73d46ffdaf28afbaecf0a44adc8cca9c49 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Apr 03 2025 22:10:19 +0000 Subject: Import openvswitch3.3-3.3.4-106 from Fast DataPath --- diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch index 8142b55..81a6c44 100644 --- a/SOURCES/openvswitch-3.3.0.patch +++ b/SOURCES/openvswitch-3.3.0.patch @@ -815,7 +815,7 @@ index a21bb2b5de..07bdc29465 100644 All kernel devices that use the raw socket interface (veth, for example) require the kernel commit 9d2f67e43b73 ("net/packet: fix packet drop as of diff --git a/Makefile.am b/Makefile.am -index 94f488d183..23c3417a70 100644 +index 94f488d183..44cf13d447 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,8 @@ @@ -835,8 +835,11 @@ index 94f488d183..23c3417a70 100644 -e 's,[@]localstatedir[@],$(localstatedir),g' \ -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ -e 's,[@]sysconfdir[@],$(sysconfdir),g' \ -@@ -400,16 +403,10 @@ ALL_LOCAL += flake8-check +@@ -398,18 +401,13 @@ ALL_LOCAL += flake8-check + # W504 line break after binary operator + # F*** -- warnings native to flake8 # F811 redefinition of unused from line (only from flake8 v2.0) ++# F824 a `global` or `nonlocal` statement where the name is never reassigned # D*** -- warnings from flake8-docstrings plugin # H*** -- warnings from flake8 hacking plugin (custom style checks beyond PEP8) -# H231 Python 3.x incompatible 'except x,y:' construct @@ -844,7 +847,8 @@ index 94f488d183..23c3417a70 100644 -# H233 Python 3.x incompatible use of print operator -# H238 old style class declaration, use new style (inherit from `object`) -FLAKE8_SELECT = H231,H232,H233,H238 - FLAKE8_IGNORE = E121,E123,E125,E126,E127,E128,E129,E131,E203,E722,W503,W504,F811,D,H,I +-FLAKE8_IGNORE = E121,E123,E125,E126,E127,E128,E129,E131,E203,E722,W503,W504,F811,D,H,I ++FLAKE8_IGNORE = E121,E123,E125,E126,E127,E128,E129,E131,E203,E722,W503,W504,F811,F824,D,H,I flake8-check: $(FLAKE8_PYFILES) $(FLAKE8_WERROR)$(AM_V_GEN) \ src='$^' && \ @@ -5234,9 +5238,36 @@ index 1cf4d5f7c9..818ef3a011 100644 } return; diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c -index f59d69c4d1..ea02cd3a7a 100644 +index f59d69c4d1..da4cbbc076 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c +@@ -100,7 +100,7 @@ struct ofbundle { + * NULL if all VLANs are trunked. */ + unsigned long *cvlans; + struct lacp *lacp; /* LACP if LACP is enabled, otherwise NULL. */ +- struct bond *bond; /* Nonnull iff more than one port. */ ++ struct bond *bond; /* Nonnull if more than one port. */ + enum port_priority_tags_mode use_priority_tags; + /* Use 802.1p tag for frames in VLAN 0? */ + +@@ -1455,7 +1455,7 @@ check_max_dp_hash_alg(struct dpif_backer *backer) + ofpbuf_use_stack(&key, &keybuf, sizeof keybuf); + odp_flow_key_from_flow(&odp_parms, &key); + +- /* All datapaths support algortithm 0 (OVS_HASH_ALG_L4). */ ++ /* All datapaths support algorithm 0 (OVS_HASH_ALG_L4). */ + for (int alg = 1; alg < __OVS_HASH_MAX; alg++) { + struct ofpbuf actions; + bool ok; +@@ -3468,7 +3468,7 @@ bundle_set(struct ofproto *ofproto_, void *aux, + bundle->bond = NULL; + } + +- /* Set proteced port mode */ ++ /* Set protected port mode. */ + if (s->protected != bundle->protected) { + bundle->protected = s->protected; + need_flush = true; @@ -3669,6 +3669,16 @@ mirror_set__(struct ofproto *ofproto_, void *aux, s->n_dsts, s->src_vlans, bundle_lookup(ofproto, s->out_bundle), @@ -5282,6 +5313,15 @@ index f59d69c4d1..ea02cd3a7a 100644 ofproto_port->ofp_port = ofport ? ofport->ofp_port : OFPP_NONE; ofproto_port->name = xstrdup(devname); ofproto_port->type = xstrdup(type); +@@ -4418,7 +4434,7 @@ ofproto_dpif_credit_table_stats(struct ofproto_dpif *ofproto, uint8_t table_id, + + /* Look up 'flow' in 'ofproto''s classifier version 'version', starting from + * table '*table_id'. Returns the rule that was found, which may be one of the +- * special rules according to packet miss hadling. If 'may_packet_in' is ++ * special rules according to packet miss handling. If 'may_packet_in' is + * false, returning of the miss_rule (which issues packet ins for the + * controller) is avoided. Updates 'wc', if nonnull, to reflect the fields + * that were used during the lookup. @@ -5150,8 +5166,10 @@ group_setup_dp_hash_table(struct group_dpif *group, size_t max_hash) min_weight, total_weight); @@ -5333,7 +5373,69 @@ index f59d69c4d1..ea02cd3a7a 100644 static enum ofperr group_get_stats(const struct ofgroup *group_, struct ofputil_group_stats *ogs) { -@@ -6970,7 +7003,7 @@ const struct ofproto_class ofproto_dpif_class = { +@@ -6272,7 +6305,7 @@ struct dpif_support_field { + enum dpif_support_field_type type; + }; + +-#define DPIF_SUPPORT_FIELD_INTIALIZER(RT_PTR, BT_PTR, TITLE, TYPE) \ ++#define DPIF_SUPPORT_FIELD_INITIALIZER(RT_PTR, BT_PTR, TITLE, TYPE) \ + (struct dpif_support_field) {RT_PTR, BT_PTR, TITLE, TYPE} + + static void +@@ -6327,26 +6360,26 @@ dpif_set_support(struct dpif_backer_support *rt_support, + struct shash_node *node; + bool changed = false; + +-#define DPIF_SUPPORT_FIELD(TYPE, NAME, TITLE) \ +- {\ +- struct dpif_support_field *f = xmalloc(sizeof *f); \ +- *f = DPIF_SUPPORT_FIELD_INTIALIZER(&rt_support->NAME, \ +- &bt_support->NAME, \ +- TITLE, \ +- DPIF_SUPPORT_FIELD_##TYPE);\ +- shash_add_once(&all_fields, #NAME, f); \ ++#define DPIF_SUPPORT_FIELD(TYPE, NAME, TITLE) \ ++ { \ ++ struct dpif_support_field *f = xmalloc(sizeof *f); \ ++ *f = DPIF_SUPPORT_FIELD_INITIALIZER(&rt_support->NAME, \ ++ &bt_support->NAME, \ ++ TITLE, \ ++ DPIF_SUPPORT_FIELD_##TYPE); \ ++ shash_add_once(&all_fields, #NAME, f); \ + } + DPIF_SUPPORT_FIELDS; + #undef DPIF_SUPPORT_FIELD + +-#define ODP_SUPPORT_FIELD(TYPE, NAME, TITLE) \ +- {\ +- struct dpif_support_field *f = xmalloc(sizeof *f); \ +- *f = DPIF_SUPPORT_FIELD_INTIALIZER(&rt_support->odp.NAME, \ +- &bt_support->odp.NAME, \ +- TITLE, \ +- DPIF_SUPPORT_FIELD_##TYPE);\ +- shash_add_once(&all_fields, #NAME, f); \ ++#define ODP_SUPPORT_FIELD(TYPE, NAME, TITLE) \ ++ { \ ++ struct dpif_support_field *f = xmalloc(sizeof *f); \ ++ *f = DPIF_SUPPORT_FIELD_INITIALIZER(&rt_support->odp.NAME, \ ++ &bt_support->odp.NAME, \ ++ TITLE, \ ++ DPIF_SUPPORT_FIELD_##TYPE); \ ++ shash_add_once(&all_fields, #NAME, f); \ + } + ODP_SUPPORT_FIELDS; + #undef ODP_SUPPORT_FIELD +@@ -6376,7 +6409,8 @@ dpif_set_support(struct dpif_backer_support *rt_support, + *(bool *)field->rt_ptr = true; + changed = true; + } else { +- ds_put_cstr(ds, "Can not enable features not supported by the datapth"); ++ ds_put_cstr(ds, ++ "Can not enable features not supported by the datapath"); + } + } else if (!strcasecmp(value, "false")) { + *(bool *)field->rt_ptr = false; +@@ -6970,7 +7004,7 @@ const struct ofproto_class ofproto_dpif_class = { group_construct, /* group_construct */ group_destruct, /* group_destruct */ group_dealloc, /* group_dealloc */ @@ -6568,10 +6670,20 @@ index 92dad44f93..a4bf475d0c 100644 ExecStop=/usr/share/openvswitch/scripts/ovs-ctl stop-ovs-ipsec diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service -index 49dc06e38c..558632320c 100644 +index 49dc06e38c..43ea3a5703 100644 --- a/rhel/usr_lib_systemd_system_ovsdb-server.service +++ b/rhel/usr_lib_systemd_system_ovsdb-server.service -@@ -29,3 +29,4 @@ ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd stop +@@ -18,7 +18,8 @@ EnvironmentFile=-/run/openvswitch.useropts + # OVS_USER_ID from default.conf or sysconfig. + ExecStartPre=/usr/bin/rm -f /run/openvswitch.useropts + +-ExecStartPre=-/usr/bin/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch ++ExecStartPre=-/usr/bin/chown -R ${OVS_USER_ID} \ ++ /etc/openvswitch /run/openvswitch /var/log/openvswitch + ExecStartPre=/bin/sh -c '/usr/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts' + ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /usr/bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi' + ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ +@@ -29,3 +30,4 @@ ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd stop ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd \ ${OVS_USER_OPT} \ --no-monitor restart $OPTIONS @@ -6662,6 +6774,122 @@ index f321bae55f..1c3d4891a7 100644 + *) HAVE_PYTEST=no + echo "$0: unexpected error probing Python unit test requirements" >&2 ;; esac +diff --git a/tests/checkpatch.at b/tests/checkpatch.at +index caab2817bd..8e1a56efb0 100755 +--- a/tests/checkpatch.at ++++ b/tests/checkpatch.at +@@ -29,13 +29,40 @@ Subject: Patch this is. + fi + + if test -s expout; then +- AT_CHECK([$PYTHON3 $top_srcdir/utilities/checkpatch.py $3 -q test.patch], ++ AT_CHECK([OVS_SRC_DIR=$top_srcdir $PYTHON3 \ ++ $top_srcdir/utilities/checkpatch.py $3 -q test.patch], + [1], [stdout]) + AT_CHECK([sed '/^Lines checked:/,$d' stdout], [0], [expout]) + else +- AT_CHECK([$PYTHON3 $top_srcdir/utilities/checkpatch.py $3 -q test.patch]) ++ AT_CHECK([OVS_SRC_DIR=$top_srcdir $PYTHON3 \ ++ $top_srcdir/utilities/checkpatch.py $3 -q test.patch]) + fi + } ++ ++# try_checkpatch_c_file SOURCE [ERRORS] [CHECKPATCH-ARGS] ++# ++# Runs checkpatch against test SOURCE expecting the set of specified ++# ERRORS (and warnings). Optionally, sets [CHECKPATCH-ARGS] ++try_checkpatch_c_file() { ++ echo "$1" | sed 's/^ //' > test.c ++ ++ # Take expected output from $2. ++ if test -n "$2"; then ++ echo "$2" | sed 's/^ //' > expout ++ else ++ : > expout ++ fi ++ ++ if test -s expout; then ++ AT_CHECK([OVS_SRC_DIR=$top_srcdir $PYTHON3 \ ++ $top_srcdir/utilities/checkpatch.py $3 -q -f test.c], ++ [1], [stdout]) ++ AT_CHECK([sed '/^Lines checked:/,$d' stdout], [0], [expout]) ++ else ++ AT_CHECK([OVS_SRC_DIR=$top_srcdir $PYTHON3 \ ++ $top_srcdir/utilities/checkpatch.py $3 -q -f test.c]) ++ fi ++} + OVS_END_SHELL_HELPERS + + AT_SETUP([checkpatch - sign-offs]) +@@ -609,3 +636,68 @@ try_checkpatch \ + "--skip-committer-signoff" + + AT_CLEANUP ++ ++AT_SETUP([checkpatch - AUTHORS.rst existence]) ++ ++try_checkpatch \ ++ "Author: A ++ Commit: A ++ Subject: netdev: Subject. ++ ++ Signed-off-by: A " \ ++ "" ++ ++try_checkpatch \ ++ "Author: A ++ Commit: A ++ Subject: netdev: Subject. ++ ++ Signed-off-by: A " \ ++ "WARNING: Author 'A ' is not in the AUTHORS.rst file!" \ ++ "-a" ++ ++AT_CLEANUP ++ ++AT_SETUP([checkpatch - file contents checks - bare return]) ++try_checkpatch_c_file \ ++ "#include ++ #include ++ ++ void foo() { ++ return; ++ }" \ ++ "WARNING: Empty return followed by brace, consider omitting ++ test.c:6: ++ } ++ " ++AT_CLEANUP ++ ++AT_SETUP([checkpatch - file contents checks - parenthesized constructs]) ++ ++for ctr in 'if' 'while' 'switch' 'HMAP_FOR_EACH' 'BITMAP_FOR_EACH_1'; do ++try_checkpatch_c_file \ ++ "#include ++ #include ++ ++ void foo() { ++ $ctr (check_node) { ++ something(check_node); ++ } ++ } ++ " ++ ++try_checkpatch_c_file \ ++ "#include ++ #include ++ ++ void foo() { ++ $ctr ( first_run) { ++ something(check_node); ++ } ++ }" \ ++ "ERROR: Improper whitespace around control block ++ test.c:5: ++ $ctr ( first_run) { ++ " ++done ++AT_CLEANUP diff --git a/tests/classifier.at b/tests/classifier.at index 93a13f32b1..05e82ea968 100644 --- a/tests/classifier.at @@ -11859,6 +12087,207 @@ index 785014956e..2768c07400 100644 stderr_log], [0], [dnl 0 | module_0 | EMER | emergency 1 | module_0 | ERR | error +diff --git a/utilities/checkpatch.py b/utilities/checkpatch.py +index e0cab6b9f8..fbaa9ffdf8 100755 +--- a/utilities/checkpatch.py ++++ b/utilities/checkpatch.py +@@ -18,6 +18,7 @@ import email + import getopt + import os + import re ++import subprocess + import sys + + RETURN_CHECK_INITIAL_STATE = 0 +@@ -28,12 +29,14 @@ __errors = 0 + __warnings = 0 + empty_return_check_state = 0 + print_file_name = None ++check_authors_file = False + checking_file = False + total_line = 0 + colors = False + spellcheck = False + quiet = False + spell_check_dict = None ++missing_authors = [] + + + def open_spell_check_dict(): +@@ -650,6 +653,10 @@ checks = [ + 'check': lambda x: has_efgrep(x), + 'print': + lambda: print_error("grep -E/-F should be used instead of egrep/fgrep")}, ++ ++ {'regex': 'AUTHORS.rst$', 'match_name': None, ++ 'check': lambda x: update_missing_authors(x), ++ 'print': None}, + ] + + +@@ -844,9 +851,57 @@ def run_subject_checks(subject, spellcheck=False): + return warnings + + ++def get_top_directory(): ++ result = subprocess.run('git rev-parse --show-toplevel', ++ stdout=subprocess.PIPE, ++ stderr=subprocess.DEVNULL, shell=True) ++ ++ if result and result.returncode == 0: ++ return result.stdout.decode('utf-8').strip() ++ ++ return os.getenv('OVS_SRC_DIR', '.') ++ ++ ++def update_missing_authors(diffed_line): ++ global missing_authors ++ for author in missing_authors: ++ m = re.search(r'<(.*?)>', author) ++ if not m: ++ continue ++ pattern = r'\b' + re.escape(m.group(1)) + r'\b' ++ if re.search(pattern, diffed_line) is None: ++ continue ++ else: ++ missing_authors.remove(author) ++ ++ return False ++ ++ ++def do_authors_exist(authors): ++ authors = list(set(authors)) ++ missing_authors = [] ++ ++ try: ++ with open(get_top_directory() + "/AUTHORS.rst", "r") as file: ++ file_content = file.read() ++ for author in authors: ++ m = re.search(r'<(.*?)>', author) ++ if not m: ++ continue ++ pattern = r'\b' + re.escape(m.group(1)) + r'\b' ++ if re.search(pattern, file_content) is None: ++ missing_authors.append(author) ++ ++ except FileNotFoundError: ++ print_error("Could not open AUTHORS.rst in '%s/'!" % ++ get_top_directory()) ++ ++ return missing_authors ++ ++ + def ovs_checkpatch_parse(text, filename, author=None, committer=None): + global print_file_name, total_line, checking_file, \ +- empty_return_check_state ++ empty_return_check_state, missing_authors + + PARSE_STATE_HEADING = 0 + PARSE_STATE_DIFF_HEADER = 1 +@@ -961,6 +1016,11 @@ def ovs_checkpatch_parse(text, filename, author=None, committer=None): + "who are not authors or co-authors or " + "committers: %s" + % ", ".join(extra_sigs)) ++ ++ if check_authors_file: ++ missing_authors = do_authors_exist(missing_authors + ++ co_authors + [author]) ++ + elif is_committer.match(line): + committer = is_committer.match(line).group(2) + elif is_author.match(line): +@@ -1051,6 +1111,8 @@ Input options: + + Check options: + -h|--help This help message ++-a|--check-authors-file Check AUTHORS file for existence of the authors. ++ Should be used by commiters only! + -b|--skip-block-whitespace Skips the if/while/for whitespace tests + -l|--skip-leading-whitespace Skips the leading whitespace test + -q|--quiet Only print error and warning information +@@ -1073,6 +1135,19 @@ def ovs_checkpatch_print_result(): + print("Lines checked: %d, no obvious problems found\n" % (total_line)) + + ++def ovs_checkpatch_print_missing_authors(): ++ if missing_authors: ++ if len(missing_authors) == 1: ++ print_warning("Author '%s' is not in the AUTHORS.rst file!" ++ % missing_authors[0]) ++ else: ++ print_warning("Authors '%s' are not in the AUTHORS.rst file!" ++ % ', '.join(missing_authors)) ++ return True ++ ++ return False ++ ++ + def ovs_checkpatch_file(filename): + try: + mail = email.message_from_file(open(filename, 'r', encoding='utf8')) +@@ -1093,13 +1168,17 @@ def ovs_checkpatch_file(filename): + else: + mail.add_header('Subject', sys.argv[-1]) + +- print("Subject missing! Your provisional subject is", +- mail['Subject']) ++ if not checking_file: ++ print("Subject missing! Your provisional subject is", ++ mail['Subject']) + +- if run_subject_checks('Subject: ' + mail['Subject'], spellcheck): ++ if not checking_file and run_subject_checks('Subject: ' + mail['Subject'], ++ spellcheck): + result = True + + ovs_checkpatch_print_result() ++ if ovs_checkpatch_print_missing_authors(): ++ result = True + return result + + +@@ -1122,9 +1201,10 @@ if __name__ == '__main__': + sys.argv[1:]) + n_patches = int(numeric_options[-1][1:]) if numeric_options else 0 + +- optlist, args = getopt.getopt(args, 'bhlstfSq', ++ optlist, args = getopt.getopt(args, 'abhlstfSq', + ["check-file", + "help", ++ "check-authors-file", + "skip-block-whitespace", + "skip-leading-whitespace", + "skip-signoff-lines", +@@ -1141,6 +1221,8 @@ if __name__ == '__main__': + if o in ("-h", "--help"): + usage() + sys.exit(0) ++ elif o in ("-a", "--check-authors-file"): ++ check_authors_file = True + elif o in ("-b", "--skip-block-whitespace"): + skip_block_whitespace_check = True + elif o in ("-l", "--skip-leading-whitespace"): +@@ -1191,9 +1273,10 @@ Subject: %s + if not quiet: + print('== Checking %s ("%s") ==' % (revision[0:12], name)) + result = ovs_checkpatch_parse(patch, revision) +- ovs_checkpatch_print_result() + if result: + status = EXIT_FAILURE ++ if ovs_checkpatch_print_missing_authors(): ++ status = EXIT_FAILURE + sys.exit(status) + + if not args: +@@ -1202,6 +1285,8 @@ Subject: %s + sys.exit(EXIT_FAILURE) + result = ovs_checkpatch_parse(sys.stdin.read(), '-') + ovs_checkpatch_print_result() ++ if ovs_checkpatch_print_missing_authors(): ++ result = EXIT_FAILURE + sys.exit(result) + + status = 0 diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in index 0b2820c361..46cdecf46f 100644 --- a/utilities/ovs-ctl.in diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec index 569d5d0..260aeb6 100644 --- a/SPECS/openvswitch3.3.spec +++ b/SPECS/openvswitch3.3.spec @@ -59,7 +59,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.3.4 -Release: 105%{?dist} +Release: 106%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -794,6 +794,17 @@ exit 0 %endif %changelog +* Thu Apr 03 2025 Open vSwitch CI - 3.3.0-106 +- Merging upstream branch-3.3 [RH git: acaac7359f] + Commit list: + 9f1d6a88e6 python: Disable check for globals with never reassigned names (F824). + 62fe0da5bf checkpatch: Fix checkpatch's check-authors-file option in CirrusCI. + feef9b8cbe ofproto-dpif: Fix spelling in comments and the support field macro. + 088677365e checkpatch.py: Don't run subject checks in source-file mode. + d532f6bfa8 checkpatch: Add new check-authors-file option to checkpatch.py. + 752e78e776 rhel/systemd: Change owner recursively and also on /etc/openvswitch. + + * Wed Mar 26 2025 Open vSwitch CI - 3.3.0-105 - Merging upstream branch-3.3 [RH git: bac0388826] Commit list: