Re: [ovs-dev] [PATCH v2] Fix a bug in conversion between flow/mask and flow key

2013-09-10 Thread Ben Pfaff
Applied, thanks. On Tue, Sep 10, 2013 at 01:51:52PM -0700, Andy Zhou wrote: > Sorry, I attached a wrong file. Try again. > > > On Wed, Sep 4, 2013 at 3:37 PM, Ben Pfaff wrote: > > > The code that this changes checks for two values in icmpv6_type. The > > new version of the code checks for one

Re: [ovs-dev] [PATCH v2] Fix a bug in conversion between flow/mask and flow key

2013-09-10 Thread Andy Zhou
Sorry, I attached a wrong file. Try again. On Wed, Sep 4, 2013 at 3:37 PM, Ben Pfaff wrote: > The code that this changes checks for two values in icmpv6_type. The > new version of the code checks for one value in tp_src or a different > value in tp_dst. Should it check for two values in tp_sr

Re: [ovs-dev] [PATCH v2] Fix a bug in conversion between flow/mask and flow key

2013-09-04 Thread Ben Pfaff
The code that this changes checks for two values in icmpv6_type. The new version of the code checks for one value in tp_src or a different value in tp_dst. Should it check for two values in tp_src (or in tp_dst?), or is the new code correct as-is? Thanks, Ben. On Fri, Aug 30, 2013 at 03:06:12P

Re: [ovs-dev] [PATCH v2] Fix a bug in conversion between flow/mask and flow key

2013-08-30 Thread Andy Zhou
Patch for branch 1.11 is attached. On Fri, Aug 30, 2013 at 1:27 PM, Ben Pfaff wrote: > That's perfect, thanks a lot! > > On Fri, Aug 30, 2013 at 01:26:44PM -0700, Andy Zhou wrote: > > It will be simpler if we just fix the bug instead of pulling in more > > patches. I will derive a patch and sen

Re: [ovs-dev] [PATCH v2] Fix a bug in conversion between flow/mask and flow key

2013-08-30 Thread Ben Pfaff
That's perfect, thanks a lot! On Fri, Aug 30, 2013 at 01:26:44PM -0700, Andy Zhou wrote: > It will be simpler if we just fix the bug instead of pulling in more > patches. I will derive a patch and send it out. > > > On Fri, Aug 30, 2013 at 1:19 PM, Ben Pfaff wrote: > > > I still get conflicts:

Re: [ovs-dev] [PATCH v2] Fix a bug in conversion between flow/mask and flow key

2013-08-30 Thread Andy Zhou
It will be simpler if we just fix the bug instead of pulling in more patches. I will derive a patch and send it out. On Fri, Aug 30, 2013 at 1:19 PM, Ben Pfaff wrote: > I still get conflicts: > > blp@sigsegv:~/ovs$ git checkout openvswitch/branch-1.11 > HEAD is now at 37f9d3a... Set rel

Re: [ovs-dev] [PATCH v2] Fix a bug in conversion between flow/mask and flow key

2013-08-30 Thread Ben Pfaff
I still get conflicts: blp@sigsegv:~/ovs$ git checkout openvswitch/branch-1.11 HEAD is now at 37f9d3a... Set release date for 1.11.0. blp@sigsegv:~/ovs$ git cherry-pick 4a2216156e6e168 error: could not apply 4a22161... odp-util: New function odp_flow_key_to_mask(). hint: after

Re: [ovs-dev] [PATCH v2] Fix a bug in conversion between flow/mask and flow key

2013-08-30 Thread Andy Zhou
May be it caused by missing commit 4a2216156e6e168 ? On Fri, Aug 30, 2013 at 11:11 AM, Ben Pfaff wrote: > It doesn't apply directly to branch-1.11. Can you take a look and see > whether there's some other commit we're missing there? > > Thanks, > > Ben. > > On Fri, Aug 30, 2013 at 11:09:21AM -

Re: [ovs-dev] [PATCH v2] Fix a bug in conversion between flow/mask and flow key

2013-08-30 Thread Andy Zhou
Yes, this patch fixes a bug. On Fri, Aug 30, 2013 at 11:06 AM, Ben Pfaff wrote: > On Fri, Aug 30, 2013 at 11:03:24AM -0700, Andy Zhou wrote: > > On Fri, Aug 30, 2013 at 11:01 AM, Ben Pfaff wrote: > > > > > On Fri, Aug 30, 2013 at 09:57:13AM -0700, gy...@nicira.com wrote: > > > > @@ -2981,7 +29

Re: [ovs-dev] [PATCH v2] Fix a bug in conversion between flow/mask and flow key

2013-08-30 Thread Ben Pfaff
On Fri, Aug 30, 2013 at 09:57:13AM -0700, gy...@nicira.com wrote: > @@ -2981,7 +2986,8 @@ parse_l2_5_onward(const struct nlattr > *attrs[OVS_KEY_ATTR_MAX + 1], > if (is_mask) { > if (!is_all_zeros((const uint8_t *) nd_key, >

Re: [ovs-dev] [PATCH v2] Fix a bug in conversion between flow/mask and flow key

2013-08-30 Thread Andy Zhou
On Fri, Aug 30, 2013 at 11:01 AM, Ben Pfaff wrote: > On Fri, Aug 30, 2013 at 09:57:13AM -0700, gy...@nicira.com wrote: > > @@ -2981,7 +2986,8 @@ parse_l2_5_onward(const struct nlattr > *attrs[OVS_KEY_ATTR_MAX + 1], > > if (is_mask) { > > if (!is_all_z

Re: [ovs-dev] [PATCH v2] Fix a bug in conversion between flow/mask and flow key

2013-08-30 Thread Ben Pfaff
On Fri, Aug 30, 2013 at 11:03:24AM -0700, Andy Zhou wrote: > On Fri, Aug 30, 2013 at 11:01 AM, Ben Pfaff wrote: > > > On Fri, Aug 30, 2013 at 09:57:13AM -0700, gy...@nicira.com wrote: > > > @@ -2981,7 +2986,8 @@ parse_l2_5_onward(const struct nlattr > > *attrs[OVS_KEY_ATTR_MAX + 1], > > >

Re: [ovs-dev] [PATCH v2] Fix a bug in conversion between flow/mask and flow key

2013-08-30 Thread Ben Pfaff
It doesn't apply directly to branch-1.11. Can you take a look and see whether there's some other commit we're missing there? Thanks, Ben. On Fri, Aug 30, 2013 at 11:09:21AM -0700, Andy Zhou wrote: > Yes, this patch fixes a bug. > > > On Fri, Aug 30, 2013 at 11:06 AM, Ben Pfaff wrote: > > >

Re: [ovs-dev] [PATCH v2] Fix a bug in conversion between flow/mask and flow key

2013-08-30 Thread Andy Zhou
Looks good to me. Thanks for the revision. Acked-by: Andy Zhou On Fri, Aug 30, 2013 at 9:57 AM, wrote: > From: Guolin Yang > > In odp_flow_key_from_flow__(), when converting ICMPv6 flow/mask > to flow/mask key, we should always use flow to check for whether > ND informaition is present or no

[ovs-dev] [PATCH v2] Fix a bug in conversion between flow/mask and flow key

2013-08-30 Thread gyang
From: Guolin Yang In odp_flow_key_from_flow__(), when converting ICMPv6 flow/mask to flow/mask key, we should always use flow to check for whether ND informaition is present or not. In mask case, both type and code field should be masked, otherwise ND fields can be masked. Similarly in reverse c