diff mbox series

[ovs-dev,1/4] ovs: Include ovs-vswitchd segfault fixes.

Message ID 20210603150518.32741.79189.stgit@dceara.remote.csb
State Changes Requested
Headers show
Series Handle DNAT/no-NAT conntrack tuple collisions if possible. | expand

Commit Message

Dumitru Ceara June 3, 2021, 3:05 p.m. UTC
Bump the OVS submodule to include the following patches:
  dd0f59783e39 ("ofproto: Fix p otential NULL dereference in ofproto_get_datapath_cap().")
  a4b04276ab59 ("ofproto: Fix potential NULL dereference in ofproto_ct_*_zone_timeout_policy().")

The two commits above fix crashes in ovs-vswitchd when OVS datapath
types are configured with unsupported values and OVSDB Datapath tables
exist for those datapath types.  OVN self tests actually test with
invalid datapath types and an upcoming commit will update the
ovn-controller code to always create OVSDB Datapath tables.  Without
the two OVS fixes, ovs-vswitchd would crash, causing the OVN tests to
fail.

Signed-off-by: Dumitru Ceara <dceara@redhat.com>
---
 ovs |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Gray June 4, 2021, 2:51 p.m. UTC | #1
On 03/06/2021 16:05, Dumitru Ceara wrote:
> Bump the OVS submodule to include the following patches:
>   dd0f59783e39 ("ofproto: Fix p otential NULL dereference in ofproto_get_datapath_cap().")
>   a4b04276ab59 ("ofproto: Fix potential NULL dereference in ofproto_ct_*_zone_timeout_policy().")
> 
> The two commits above fix crashes in ovs-vswitchd when OVS datapath
> types are configured with unsupported values and OVSDB Datapath tables
> exist for those datapath types.  OVN self tests actually test with
> invalid datapath types and an upcoming commit will update the
> ovn-controller code to always create OVSDB Datapath tables.  Without
> the two OVS fixes, ovs-vswitchd would crash, causing the OVN tests to
> fail.

Two tests failed for me until I updated and recompiled ovs in the
submodule. I presume this is the crash you were talking about?

make check TESTSUITEFLAGS="892 893"

ovn-controller - Chassis other_config -- ovn-northd -- dp-groups=yes
ovn-controller - Chassis other_config -- ovn-northd -- dp-groups=no

hv: clean up vswitch
./ovn-controller.at:132: test -e $OVS_RUNDIR/ovs-vswitchd.pid
./ovn-controller.at:132: ovs-appctl --timeout=10 -t ovs-vswitchd exit
--cleanup
--- /dev/null   2021-06-03 05:56:40.475021721 -0400
+++ ./ovn/tests/testsuite.dir/at-groups/893/stderr   2021-06-04
08:50:41.478727978 -0400
@@ -0,0 +1 @@
+ovs-appctl: cannot read pidfile
"./ovn/tests/testsuite.dir/893/hv/ovs-vswitchd.pid" (No such process)
./ovn-controller.at:132: exit code was 1, expected 0
./ovn/tests/testsuite.dir/893/cleanup: line 2: kill: (2850550) - No such
process



> 
> Signed-off-by: Dumitru Ceara <dceara@redhat.com>
> ---
>  ovs |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/ovs b/ovs
> index b5bb044fb..a4b04276a 160000
> --- a/ovs
> +++ b/ovs
> @@ -1 +1 @@
> -Subproject commit b5bb044fbe4c1395dcde5cc7d5081ef0099bb8b3
> +Subproject commit a4b04276ab5934d087669ff2d191a23931335c87
> 
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> 

Acked-by: Mark D. Gray <mark.d.gray@redhat.com>
Dumitru Ceara June 4, 2021, 2:59 p.m. UTC | #2
On 6/4/21 4:51 PM, Mark Gray wrote:
> On 03/06/2021 16:05, Dumitru Ceara wrote:
>> Bump the OVS submodule to include the following patches:
>>   dd0f59783e39 ("ofproto: Fix p otential NULL dereference in ofproto_get_datapath_cap().")
>>   a4b04276ab59 ("ofproto: Fix potential NULL dereference in ofproto_ct_*_zone_timeout_policy().")
>>
>> The two commits above fix crashes in ovs-vswitchd when OVS datapath
>> types are configured with unsupported values and OVSDB Datapath tables
>> exist for those datapath types.  OVN self tests actually test with
>> invalid datapath types and an upcoming commit will update the
>> ovn-controller code to always create OVSDB Datapath tables.  Without
>> the two OVS fixes, ovs-vswitchd would crash, causing the OVN tests to
>> fail.
> 
> Two tests failed for me until I updated and recompiled ovs in the
> submodule. I presume this is the crash you were talking about?

Exactly.

> 
> make check TESTSUITEFLAGS="892 893"
> 
> ovn-controller - Chassis other_config -- ovn-northd -- dp-groups=yes
> ovn-controller - Chassis other_config -- ovn-northd -- dp-groups=no
> 
> hv: clean up vswitch
> ./ovn-controller.at:132: test -e $OVS_RUNDIR/ovs-vswitchd.pid
> ./ovn-controller.at:132: ovs-appctl --timeout=10 -t ovs-vswitchd exit
> --cleanup
> --- /dev/null   2021-06-03 05:56:40.475021721 -0400
> +++ ./ovn/tests/testsuite.dir/at-groups/893/stderr   2021-06-04
> 08:50:41.478727978 -0400
> @@ -0,0 +1 @@
> +ovs-appctl: cannot read pidfile
> "./ovn/tests/testsuite.dir/893/hv/ovs-vswitchd.pid" (No such process)
> ./ovn-controller.at:132: exit code was 1, expected 0
> ./ovn/tests/testsuite.dir/893/cleanup: line 2: kill: (2850550) - No such
> process
> 
> 
> 
>>
>> Signed-off-by: Dumitru Ceara <dceara@redhat.com>
>> ---
>>  ovs |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/ovs b/ovs
>> index b5bb044fb..a4b04276a 160000
>> --- a/ovs
>> +++ b/ovs
>> @@ -1 +1 @@
>> -Subproject commit b5bb044fbe4c1395dcde5cc7d5081ef0099bb8b3
>> +Subproject commit a4b04276ab5934d087669ff2d191a23931335c87
>>
>> _______________________________________________
>> dev mailing list
>> dev@openvswitch.org
>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>>
> 
> Acked-by: Mark D. Gray <mark.d.gray@redhat.com>
> 

Thanks,
Dumitru
diff mbox series

Patch

diff --git a/ovs b/ovs
index b5bb044fb..a4b04276a 160000
--- a/ovs
+++ b/ovs
@@ -1 +1 @@ 
-Subproject commit b5bb044fbe4c1395dcde5cc7d5081ef0099bb8b3
+Subproject commit a4b04276ab5934d087669ff2d191a23931335c87