| Message ID | 1570207797-17344-1-git-send-email-gvrose8192@gmail.com |
|---|---|
| State | Accepted |
| Commit | ae05d68139e44820155d55c685f127066d340c50 |
| Headers | show |
| Series | [ovs-dev] tests: Only run test on kernel datapath | expand |
On Fri, Oct 04, 2019 at 09:49:57AM -0700, Greg Rose wrote: > The recently added test to check for the correct L3 L4 protocol > information after conntrack reassembles a packet should not run > in the userspace datapath. It is specific to a kernel datapath > regression. > > Also change the name of the test to make it more informativeand > less redundant and add comments with a short explanation. > > Fixes: d7fd61a ("tests: Add check for correct l3l4 conntrack frag reassembly") > Suggested-by: Darrell Ball <dlu998@gmail.com> > Signed-off-by: Greg Rose <gvrose8192@gmail.com> Applied to master, thanks Greg and Darrell! Greg, I noticed that you didn't CC Darrell on the patch. You might find it helpful to add the following to your ~/.gitconfig [sendemail] ccCmd = extract-ccs and install the following in your $PATH as extract-ccs (marked executable): #! /bin/sed -nf s/^[A-Z][-a-z]*-by: \(.*@.*\)/\1/p
On 10/4/2019 10:30 AM, Ben Pfaff wrote: > On Fri, Oct 04, 2019 at 09:49:57AM -0700, Greg Rose wrote: >> The recently added test to check for the correct L3 L4 protocol >> information after conntrack reassembles a packet should not run >> in the userspace datapath. It is specific to a kernel datapath >> regression. >> >> Also change the name of the test to make it more informativeand >> less redundant and add comments with a short explanation. >> >> Fixes: d7fd61a ("tests: Add check for correct l3l4 conntrack frag reassembly") >> Suggested-by: Darrell Ball <dlu998@gmail.com> >> Signed-off-by: Greg Rose <gvrose8192@gmail.com> > Applied to master, thanks Greg and Darrell! > > Greg, I noticed that you didn't CC Darrell on the patch. You might find > it helpful to add the following to your ~/.gitconfig > > [sendemail] > ccCmd = extract-ccs > > and install the following in your $PATH as extract-ccs (marked > executable): > > #! /bin/sed -nf > s/^[A-Z][-a-z]*-by: \(.*@.*\)/\1/p My git send-email will extract CC's from 'Cc:' type fields but not Suggested-by as you say. However, I did CC Darrell in the git send-email command itself: git send-email --to=dev@openvswitch.org --cc=dlu998@gmail.com 0001-tests-Only-run-test-on-kernel-datapath.patch Which is generally what I do when I want someone to see the patch but they're not on the 'Cc:' line. I like your suggestion though since I wouldn't have to take that manual step. Thanks! - Greg
On Fri, Oct 04, 2019 at 10:43:02AM -0700, Gregory Rose wrote: > > On 10/4/2019 10:30 AM, Ben Pfaff wrote: > > On Fri, Oct 04, 2019 at 09:49:57AM -0700, Greg Rose wrote: > > > The recently added test to check for the correct L3 L4 protocol > > > information after conntrack reassembles a packet should not run > > > in the userspace datapath. It is specific to a kernel datapath > > > regression. > > > > > > Also change the name of the test to make it more informativeand > > > less redundant and add comments with a short explanation. > > > > > > Fixes: d7fd61a ("tests: Add check for correct l3l4 conntrack frag reassembly") > > > Suggested-by: Darrell Ball <dlu998@gmail.com> > > > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > > Applied to master, thanks Greg and Darrell! > > > > Greg, I noticed that you didn't CC Darrell on the patch. You might find > > it helpful to add the following to your ~/.gitconfig > > > > [sendemail] > > ccCmd = extract-ccs > > > > and install the following in your $PATH as extract-ccs (marked > > executable): > > > > #! /bin/sed -nf > > s/^[A-Z][-a-z]*-by: \(.*@.*\)/\1/p > > My git send-email will extract CC's from 'Cc:' type fields but not > Suggested-by as you say. However, I did CC Darrell in the git > send-email command itself: > > git send-email --to=dev@openvswitch.org --cc=dlu998@gmail.com > 0001-tests-Only-run-test-on-kernel-datapath.patch Oh, that's odd, the CC does not show in the copy that reached me. Puzzling.
On 10/4/2019 10:52 AM, Ben Pfaff wrote: > On Fri, Oct 04, 2019 at 10:43:02AM -0700, Gregory Rose wrote: >> On 10/4/2019 10:30 AM, Ben Pfaff wrote: >>> On Fri, Oct 04, 2019 at 09:49:57AM -0700, Greg Rose wrote: >>>> The recently added test to check for the correct L3 L4 protocol >>>> information after conntrack reassembles a packet should not run >>>> in the userspace datapath. It is specific to a kernel datapath >>>> regression. >>>> >>>> Also change the name of the test to make it more informativeand >>>> less redundant and add comments with a short explanation. >>>> >>>> Fixes: d7fd61a ("tests: Add check for correct l3l4 conntrack frag reassembly") >>>> Suggested-by: Darrell Ball <dlu998@gmail.com> >>>> Signed-off-by: Greg Rose <gvrose8192@gmail.com> >>> Applied to master, thanks Greg and Darrell! >>> >>> Greg, I noticed that you didn't CC Darrell on the patch. You might find >>> it helpful to add the following to your ~/.gitconfig >>> >>> [sendemail] >>> ccCmd = extract-ccs >>> >>> and install the following in your $PATH as extract-ccs (marked >>> executable): >>> >>> #! /bin/sed -nf >>> s/^[A-Z][-a-z]*-by: \(.*@.*\)/\1/p >> My git send-email will extract CC's from 'Cc:' type fields but not >> Suggested-by as you say. However, I did CC Darrell in the git >> send-email command itself: >> >> git send-email --to=dev@openvswitch.org --cc=dlu998@gmail.com >> 0001-tests-Only-run-test-on-kernel-datapath.patch > Oh, that's odd, the CC does not show in the copy that reached me. > Puzzling. Really? I see he's not on the replies in this thread. That is weird but I do see him on the CC line in my email. Of course, I sent it... ??? I've added Darrell back in here. Darrell, did you get copied? - Greg
On Fri, Oct 4, 2019 at 11:03 AM Gregory Rose <gvrose8192@gmail.com> wrote: > > On 10/4/2019 10:52 AM, Ben Pfaff wrote: > > On Fri, Oct 04, 2019 at 10:43:02AM -0700, Gregory Rose wrote: > >> On 10/4/2019 10:30 AM, Ben Pfaff wrote: > >>> On Fri, Oct 04, 2019 at 09:49:57AM -0700, Greg Rose wrote: > >>>> The recently added test to check for the correct L3 L4 protocol > >>>> information after conntrack reassembles a packet should not run > >>>> in the userspace datapath. It is specific to a kernel datapath > >>>> regression. > >>>> > >>>> Also change the name of the test to make it more informativeand > >>>> less redundant and add comments with a short explanation. > >>>> > >>>> Fixes: d7fd61a ("tests: Add check for correct l3l4 conntrack frag > reassembly") > >>>> Suggested-by: Darrell Ball <dlu998@gmail.com> > >>>> Signed-off-by: Greg Rose <gvrose8192@gmail.com> > >>> Applied to master, thanks Greg and Darrell! > >>> > >>> Greg, I noticed that you didn't CC Darrell on the patch. You might > find > >>> it helpful to add the following to your ~/.gitconfig > >>> > >>> [sendemail] > >>> ccCmd = extract-ccs > >>> > >>> and install the following in your $PATH as extract-ccs (marked > >>> executable): > >>> > >>> #! /bin/sed -nf > >>> s/^[A-Z][-a-z]*-by: \(.*@.*\)/\1/p > >> My git send-email will extract CC's from 'Cc:' type fields but not > >> Suggested-by as you say. However, I did CC Darrell in the git > >> send-email command itself: > >> > >> git send-email --to=dev@openvswitch.org --cc=dlu998@gmail.com > >> 0001-tests-Only-run-test-on-kernel-datapath.patch > > Oh, that's odd, the CC does not show in the copy that reached me. > > Puzzling. > Really? I see he's not on the replies in this thread. That is weird > but I do see him on the CC line in my email. Of course, I sent it... > > ??? > > I've added Darrell back in here. Darrell, did you get copied? > No, but it does not matter since I would not respond while driving anyways :-) > > - Greg >
On 10/4/2019 11:20 AM, Darrell Ball wrote: > > I've added Darrell back in here. Darrell, did you get copied? > > No, but it does not matter since I would not respond while driving > anyways :-) > Good man! I went to check my client mail logs on the system I use for sending patches and found my postfix setting for logging client emails was off. :-/ I've implemented Ben's suggestion the git send-email hook and turned on logging, we'll see if it happens again. Thanks, - Greg
diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 283898f..9e89aec 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -204,3 +204,10 @@ m4_define([VSCTL_ADD_DATAPATH_TABLE], AT_CHECK([ovs-vsctl -- --id=@m create Datapath datapath_version=0 -- set Open_vSwitch . datapaths:"system"=@m], [0], [stdout]) DP_TYPE=$(echo "system") ]) + +# CHECK_L3L4_CONNTRACK_REASM() +# +# Only allow this test to run on the kernel datapath - it is not useful +# or necessary for the userspace datapath as it is checking for a kernel +# specific regression. +m4_define([CHECK_L3L4_CONNTRACK_REASM]) diff --git a/tests/system-traffic.at b/tests/system-traffic.at index f53002f..870a05e 100644 --- a/tests/system-traffic.at +++ b/tests/system-traffic.at @@ -3263,8 +3263,11 @@ AT_CHECK([ovs-appctl dpctl/dump-conntrack | FORMAT_CT(10.1.1.2)], [0], [dnl OVS_TRAFFIC_VSWITCHD_STOP AT_CLEANUP -AT_SETUP([conntrack - fragment reassembly test]) +dnl Check kernel datapath to make sure conntrack fills in L3 and L4 +dnl protocol information +AT_SETUP([conntrack - fragment reassembly with L3 L4 protocol information]) CHECK_CONNTRACK() +CHECK_L3L4_CONNTRACK_REASM() OVS_TRAFFIC_VSWITCHD_START() AT_DATA([flows.txt], [dnl diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at index 5d3b8b8..a419f30 100644 --- a/tests/system-userspace-macros.at +++ b/tests/system-userspace-macros.at @@ -312,3 +312,14 @@ m4_define([VSCTL_ADD_DATAPATH_TABLE], AT_CHECK([ovs-vsctl -- --id=@m create Datapath datapath_version=0 -- set Open_vSwitch . datapaths:"netdev"=@m], [0], [stdout]) DP_TYPE=$(echo "netdev") ]) + + +# CHECK_L3L4_CONNTRACK_REASM() +# +# Only allow this test to run on the kernel datapath - it is not useful +# or necessary for the userspace datapath as it is checking for a kernel +# specific regression. +m4_define([CHECK_L3L4_CONNTRACK_REASM], +[ + AT_SKIP_IF([:]) +])
The recently added test to check for the correct L3 L4 protocol information after conntrack reassembles a packet should not run in the userspace datapath. It is specific to a kernel datapath regression. Also change the name of the test to make it more informative and less redundant and add comments with a short explanation. Fixes: d7fd61a ("tests: Add check for correct l3l4 conntrack frag reassembly") Suggested-by: Darrell Ball <dlu998@gmail.com> Signed-off-by: Greg Rose <gvrose8192@gmail.com> --- tests/system-kmod-macros.at | 7 +++++++ tests/system-traffic.at | 5 ++++- tests/system-userspace-macros.at | 11 +++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-)