mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-22 09:58:01 +00:00
Code Issues Releases Wiki Activity

ofproto: Move group-modify to mod_start instead of mod_finish.

Browse Source 
Upon modifying a group, the following steps occur:
1. ofproto_group_mod_start()->modify_group_start():
   Find an old group object, create a new one.
2. ofproto_bump_tables_version()
3. ofproto_group_mod_finish():
   Modify the new group object with buckets etc.

At step #3, the new group object is already in use by revalidators,
that may read incorrect data while being modified.

Instead, move the group modification of the new object to step #1.

Fixes: 0a8f6beb54ab ("ofproto-dpif: Fix dp_hash mapping after select group modification.")
Acked-by: Gaetan Rivet <gaetanr@nvidia.com>
Acked-by: Roi Dayan <roid@nvidia.com>
Signed-off-by: Eli Britstein <elibr@nvidia.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
This commit is contained in:
Eli Britstein 2025-07-14 14:29:06 +03:00 committed by Ilya Maximets
parent f8d457ea28
commit 270de5dfb8
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ofproto/ofproto.c
View File

@ -7820,6 +7820,12 @@ modify_group_start(struct ofproto *ofproto, struct ofproto_group_mod *ogm)
ofproto->n_groups[old_group->type]--; ofproto->n_groups[old_group->type]--;
ofproto->n_groups[new_group->type]++; ofproto->n_groups[new_group->type]++;
} }
if (ofproto->ofproto_class->group_modify) {
/* XXX: OK to lose old group's stats? */
ofproto->ofproto_class->group_modify(new_group);
}
return 0; return 0;
out: out:
@ -7985,15 +7991,6 @@ ofproto_group_mod_finish(struct ofproto *ofproto,
struct ofgroup *new_group = ogm->new_group; struct ofgroup *new_group = ogm->new_group;
struct ofgroup *old_group; struct ofgroup *old_group;
if (new_group && group_collection_n(&ogm->old_groups) &&
ofproto->ofproto_class->group_modify) {
/* Modify a group. */
ovs_assert(group_collection_n(&ogm->old_groups) == 1);
/* XXX: OK to lose old group's stats? */
ofproto->ofproto_class->group_modify(new_group);
}
/* Delete old groups. */ /* Delete old groups. */
GROUP_COLLECTION_FOR_EACH(old_group, &ogm->old_groups) { GROUP_COLLECTION_FOR_EACH(old_group, &ogm->old_groups) {
delete_group_finish(ofproto, old_group); delete_group_finish(ofproto, old_group);