| Message ID | 1475887304-10984-1-git-send-email-jarno@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
Should we also reserve some range of NXM_NX numbers after 114 for potential future registers, say 115-118 at least? Other register types do not have this problem as they have their own classes of numbers. Jarno > On Oct 7, 2016, at 5:41 PM, Jarno Rajahalme <jarno@ovn.org> wrote: > > xxreg2 and xxreg3 had the same NXM_NX_* names as xxreg0 and xxreg1, > correspondingly. > > Found by inspection. > > CC: Justin Pettit <jpettit@ovn.org> > Fixes: b23ada8eecfd ("Introduce 128-bit xxregs.") > Signed-off-by: Jarno Rajahalme <jarno@ovn.org> > --- > include/openvswitch/meta-flow.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/openvswitch/meta-flow.h b/include/openvswitch/meta-flow.h > index 966ff7f..ef07561 100644 > --- a/include/openvswitch/meta-flow.h > +++ b/include/openvswitch/meta-flow.h > @@ -940,8 +940,8 @@ enum OVS_PACKED_ENUM mf_field_id { > * Access: read/write. > * NXM: NXM_NX_XXREG0(111) since v2.6. <0> > * NXM: NXM_NX_XXREG1(112) since v2.6. <1> > - * NXM: NXM_NX_XXREG0(113) since v2.6. <2> > - * NXM: NXM_NX_XXREG1(114) since v2.6. <3> > + * NXM: NXM_NX_XXREG2(113) since v2.6. <2> > + * NXM: NXM_NX_XXREG3(114) since v2.6. <3> > * OXM: none. > */ > MFF_XXREG0, > -- > 2.1.4 >
> On Oct 7, 2016, at 5:41 PM, Jarno Rajahalme <jarno@ovn.org> wrote: > > xxreg2 and xxreg3 had the same NXM_NX_* names as xxreg0 and xxreg1, > correspondingly. > > Found by inspection. > > CC: Justin Pettit <jpettit@ovn.org> > Fixes: b23ada8eecfd ("Introduce 128-bit xxregs.") > Signed-off-by: Jarno Rajahalme <jarno@ovn.org> Thanks! Acked-by: Justin Pettit <jpettit@ovn.org> --Justin
That seems like a reasonable idea to me. It's obviously not strictly necessary, but it's nice to be able to deal with contiguous ranges. --Justin > On Oct 7, 2016, at 5:44 PM, Jarno Rajahalme <jarno@ovn.org> wrote: > > Should we also reserve some range of NXM_NX numbers after 114 for potential future registers, say 115-118 at least? Other register types do not have this problem as they have their own classes of numbers. > > Jarno > >> On Oct 7, 2016, at 5:41 PM, Jarno Rajahalme <jarno@ovn.org> wrote: >> >> xxreg2 and xxreg3 had the same NXM_NX_* names as xxreg0 and xxreg1, >> correspondingly. >> >> Found by inspection. >> >> CC: Justin Pettit <jpettit@ovn.org> >> Fixes: b23ada8eecfd ("Introduce 128-bit xxregs.") >> Signed-off-by: Jarno Rajahalme <jarno@ovn.org> >> --- >> include/openvswitch/meta-flow.h | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/include/openvswitch/meta-flow.h b/include/openvswitch/meta-flow.h >> index 966ff7f..ef07561 100644 >> --- a/include/openvswitch/meta-flow.h >> +++ b/include/openvswitch/meta-flow.h >> @@ -940,8 +940,8 @@ enum OVS_PACKED_ENUM mf_field_id { >> * Access: read/write. >> * NXM: NXM_NX_XXREG0(111) since v2.6. <0> >> * NXM: NXM_NX_XXREG1(112) since v2.6. <1> >> - * NXM: NXM_NX_XXREG0(113) since v2.6. <2> >> - * NXM: NXM_NX_XXREG1(114) since v2.6. <3> >> + * NXM: NXM_NX_XXREG2(113) since v2.6. <2> >> + * NXM: NXM_NX_XXREG3(114) since v2.6. <3> >> * OXM: none. >> */ >> MFF_XXREG0, >> -- >> 2.1.4 >> >
> On Oct 7, 2016, at 5:54 PM, Justin Pettit <jpettit@ovn.org> wrote: > > >> On Oct 7, 2016, at 5:41 PM, Jarno Rajahalme <jarno@ovn.org> wrote: >> >> xxreg2 and xxreg3 had the same NXM_NX_* names as xxreg0 and xxreg1, >> correspondingly. >> >> Found by inspection. >> >> CC: Justin Pettit <jpettit@ovn.org> >> Fixes: b23ada8eecfd ("Introduce 128-bit xxregs.") >> Signed-off-by: Jarno Rajahalme <jarno@ovn.org> > > Thanks! > > Acked-by: Justin Pettit <jpettit@ovn.org> > Thanks for the speedy review! Pushed to master and branch-2.6 with placeholders for four more xxregs. Jarno
On Mon, Oct 10, 2016 at 11:38:21AM -0700, Jarno Rajahalme wrote: > > > On Oct 7, 2016, at 5:54 PM, Justin Pettit <jpettit@ovn.org> wrote: > > > > > >> On Oct 7, 2016, at 5:41 PM, Jarno Rajahalme <jarno@ovn.org> wrote: > >> > >> xxreg2 and xxreg3 had the same NXM_NX_* names as xxreg0 and xxreg1, > >> correspondingly. > >> > >> Found by inspection. > >> > >> CC: Justin Pettit <jpettit@ovn.org> > >> Fixes: b23ada8eecfd ("Introduce 128-bit xxregs.") > >> Signed-off-by: Jarno Rajahalme <jarno@ovn.org> > > > > Thanks! > > > > Acked-by: Justin Pettit <jpettit@ovn.org> > > Thanks for the speedy review! Pushed to master and branch-2.6 with > placeholders for four more xxregs. Thanks for fixing this. It didn't seem to have made it to branch-2.6, so I did the backport myself.
> On Oct 11, 2016, at 8:33 AM, Ben Pfaff <blp@ovn.org> wrote: > > On Mon, Oct 10, 2016 at 11:38:21AM -0700, Jarno Rajahalme wrote: >> >>> On Oct 7, 2016, at 5:54 PM, Justin Pettit <jpettit@ovn.org> wrote: >>> >>> >>>> On Oct 7, 2016, at 5:41 PM, Jarno Rajahalme <jarno@ovn.org> wrote: >>>> >>>> xxreg2 and xxreg3 had the same NXM_NX_* names as xxreg0 and xxreg1, >>>> correspondingly. >>>> >>>> Found by inspection. >>>> >>>> CC: Justin Pettit <jpettit@ovn.org> >>>> Fixes: b23ada8eecfd ("Introduce 128-bit xxregs.") >>>> Signed-off-by: Jarno Rajahalme <jarno@ovn.org> >>> >>> Thanks! >>> >>> Acked-by: Justin Pettit <jpettit@ovn.org> >> >> Thanks for the speedy review! Pushed to master and branch-2.6 with >> placeholders for four more xxregs. > > Thanks for fixing this. > > It didn't seem to have made it to branch-2.6, so I did the backport > myself. It appears I forgot to push after the cherry-pick on the local branch-2.6, duh! Jarno
diff --git a/include/openvswitch/meta-flow.h b/include/openvswitch/meta-flow.h index 966ff7f..ef07561 100644 --- a/include/openvswitch/meta-flow.h +++ b/include/openvswitch/meta-flow.h @@ -940,8 +940,8 @@ enum OVS_PACKED_ENUM mf_field_id { * Access: read/write. * NXM: NXM_NX_XXREG0(111) since v2.6. <0> * NXM: NXM_NX_XXREG1(112) since v2.6. <1> - * NXM: NXM_NX_XXREG0(113) since v2.6. <2> - * NXM: NXM_NX_XXREG1(114) since v2.6. <3> + * NXM: NXM_NX_XXREG2(113) since v2.6. <2> + * NXM: NXM_NX_XXREG3(114) since v2.6. <3> * OXM: none. */ MFF_XXREG0,
xxreg2 and xxreg3 had the same NXM_NX_* names as xxreg0 and xxreg1, correspondingly. Found by inspection. CC: Justin Pettit <jpettit@ovn.org> Fixes: b23ada8eecfd ("Introduce 128-bit xxregs.") Signed-off-by: Jarno Rajahalme <jarno@ovn.org> --- include/openvswitch/meta-flow.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)