[ovs-dev] [PATCH v4] ofproto: per-table statistics

2014-04-29 Thread Simon Horman
than all being credited to table 0. These problems were observed when running make check-ryu and this patch allows many of its tester.py match checks to pass. Reviewed-by: YAMAMOTO Takashi Signed-off-by: Simon Horman -- v4 * Rebase v3 * Add: Reviewed-by: YAMAMOTO Takashi * Rebase v2 * Use NULL

Re: [ovs-dev] [PATCH v2.56] datapath: Add basic MPLS support to kernel

2014-04-29 Thread Simon Horman
On Tue, Apr 29, 2014 at 11:41:57AM -0700, Jesse Gross wrote: > On Mon, Apr 28, 2014 at 5:13 PM, Simon Horman wrote: > > On Mon, Apr 28, 2014 at 02:37:47PM -0700, Jesse Gross wrote: > >> On Mon, Apr 28, 2014 at 12:00 AM, Simon Horman wrote: > >> > On Fri, Apr 25, 2

Re: [ovs-dev] [PATCH v3 07/16] ofproto-dpif: Bonding with in_port that isn't present in the datapath

2014-04-30 Thread Simon Horman
will clean it up and send it out soon. Thanks. > > Andy > > On Tue, Apr 29, 2014 at 1:55 AM, Simon Horman wrote: > > On Tue, Apr 29, 2014 at 12:40:18AM -0700, Andy Zhou wrote: > >> If p7 and p37 are now connected together as patch ports, would any > >> traffic

Re: [ovs-dev] [PATCH v3 07/16] ofproto-dpif: Bonding with in_port that isn't present in the datapath

2014-04-30 Thread Simon Horman
On Wed, Apr 30, 2014 at 02:22:24AM -0700, Andy Zhou wrote: > On Wed, Apr 30, 2014 at 1:35 AM, Simon Horman wrote: > > On Wed, Apr 30, 2014 at 01:10:02AM -0700, Andy Zhou wrote: > >> Simon, > >> > >> Thanks for explaining. It is now clear what the test is abou

Re: [ovs-dev] [PACKET_OUT v2] ofproto-dpif: treat non-datapath ports as local port for OFPT_PACKET_OUT

2014-04-30 Thread Simon Horman
use the post recirculation flow will not be set up by > Xlate layer that rejects up call without a valid datapath input port. > > This patch implements a reasonable solution by injecting packets' > in_port does not have a valid datapath port using LOCAL port's > datapath po

Re: [ovs-dev] [PACKET_OUT v2] ofproto-dpif: treat non-datapath ports as local port for OFPT_PACKET_OUT

2014-05-01 Thread Simon Horman
On Thu, May 01, 2014 at 03:59:20PM +0900, YAMAMOTO Takashi wrote: > >> Something like this (I have not tested either scenario): > >> > >> I think this will fail to match but that may not be obvious to users: > >> packet_out: in_port=CONTROLLER actions=goto_table:1 > >> table 1: match=in_port=

[ovs-dev] [PATCH v4] ofproto-dpif: Move recirc members from struct xlate_out to struct xlate_ctx

2014-05-01 Thread Simon Horman
There does not seem to be a reason to expose recirc members in struct xlate_out to move them to struct xlate_ctx. Signed-off-by: Simon Horman --- ofproto/ofproto-dpif-xlate.c | 20 ofproto/ofproto-dpif-xlate.h | 3 --- 2 files changed, 12 insertions(+), 11 deletions

[ovs-dev] [PATCH] ofproto-dpif: Correct check_recirc comment

2014-05-01 Thread Simon Horman
This is a proposed correction for what appears to be an editing error. Signed-off-by: Simon Horman --- ofproto/ofproto-dpif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 5eea5ab..ce73afe 100644 --- a/ofproto

[ovs-dev] [PATCH/RFC] ofproto-dpif: Make bonding balance test more robust

2014-05-01 Thread Simon Horman
its more likely to be a valid behaviour. I have found that by sending 256 packets instead of 91 the test passes more reliably: I am yet to see it fail. Signed-off-by: Simon Horman --- tests/ofproto-dpif.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ofproto-dpif.at b

Re: [ovs-dev] [PATCH v2.56] datapath: Add basic MPLS support to kernel

2014-05-01 Thread Simon Horman
On Wed, Apr 30, 2014 at 03:56:44PM -0700, Jesse Gross wrote: > On Tue, Apr 29, 2014 at 10:58 PM, Simon Horman wrote: > > On Tue, Apr 29, 2014 at 11:41:57AM -0700, Jesse Gross wrote: > >> On Mon, Apr 28, 2014 at 5:13 PM, Simon Horman wrote: > >> > On Mon, Apr 28, 2

Re: [ovs-dev] [PATCH v4] ofproto: per-table statistics

2014-05-01 Thread Simon Horman
On Wed, Apr 30, 2014 at 09:54:30AM +0900, YAMAMOTO Takashi wrote: > > On Tue, Apr 29, 2014 at 06:34:22PM +0900, Simon Horman wrote: > >> Add per-table counters. This resolves some short-comings > >> in the data provided in a table stats reply message. > >>

Re: [ovs-dev] [PATCH v3 04/16] dpif: Allow hash actions in dpif_execute_helper_cb()

2014-05-01 Thread Simon Horman
On Thu, May 01, 2014 at 08:44:29AM -0700, Ben Pfaff wrote: > On Tue, Apr 22, 2014 at 05:54:52PM +0900, Simon Horman wrote: > > Rather then prohibiting hash actions dpif_execute_helper_cb() > > execute them by passing them on to aux->dpif->dpif_class->execute() > &g

Re: [ovs-dev] [PATCH/RFC] ofproto-dpif: Make bonding balance test more robust

2014-05-01 Thread Simon Horman
t; > > > YAMAMOTO Takashi > > > >> > >> It may be that failure indicates that the bonding code > >> needs improvement. But it seems to me that its more likely to > >> be a valid behaviour. > >> > >> I have found that by sending 2

Re: [ovs-dev] [PACKET_OUT v2] ofproto-dpif: treat non-datapath ports as local port for OFPT_PACKET_OUT

2014-05-01 Thread Simon Horman
On Thu, May 01, 2014 at 07:46:21AM -0700, Ben Pfaff wrote: > On Thu, May 01, 2014 at 02:03:05AM -0700, Andy Zhou wrote: > > On Thu, May 1, 2014 at 1:20 AM, Simon Horman wrote: > > > On Thu, May 01, 2014 at 03:59:20PM +0900, YAMAMOTO Takashi wrote: > > >> >> So

Re: [ovs-dev] [PACKET_OUT v2] ofproto-dpif: treat non-datapath ports as local port for OFPT_PACKET_OUT

2014-05-02 Thread Simon Horman
On Thu, May 01, 2014 at 10:50:49PM -0700, Andy Zhou wrote: > Thanks you for clarifying the need. Since there is no urgent need to > introduce a stop gap measure, I am happy to drop this patch for now. Thanks, I think that is the best approach for now. I'll should be able to send out a revised re

[ovs-dev] [PATCH v4 0/9] Flow-Based Recirculation for MPLS

2014-05-02 Thread Simon Horman
tests Unlike previous versions of this patch-set this version has no pre-requisites. To aid review this series and its dependencies are available in git https://github.com/horms/openvswitch devel/mpls-flow-based-recirculation-v4 Simon Horman (9): flow: Add mf_is_l3_or_higher() ofproto-dpif

[ovs-dev] [PATCH v4 6/9] ofproto-dpif: MPLS recirculation

2014-05-02 Thread Simon Horman
. Signed-off-by: Simon Horman --- v4 * Do not set ctx->out->has_recirc in compose_recirculate_action as the patch that adds that field is no longer in the series v3 * Changes to support recirculation in conjunction with packet_out have been moved out into separate patches * Changes to s

[ovs-dev] [PATCH v4 8/9] ofproto-dpif: Break out MPLS controller tests into their own test

2014-05-02 Thread Simon Horman
This makes maintaining the controller test slightly easier by splitting it in two. Based on a similar patch by Joe Stringer. Cc: Joe Stringer Signed-off-by: Simon Horman -- v3 * Rebase v2 * No change v1 * Taken from another patch-set and re-worked --- tests/ofproto-dpif.at | 353

[ovs-dev] [PATCH v4 7/9] ofp-actions: Allow pop_mpls on MPLS packets

2014-05-02 Thread Simon Horman
With recirculation in place this should be safe. XXX: What if recirculation is disabled??? Signed-off-by: Simon Horman --- lib/ofp-actions.c | 6 -- 1 file changed, 6 deletions(-) diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index ce14004..69d6505 100644 --- a/lib/ofp-actions.c

[ovs-dev] [PATCH v4 2/9] ofproto-dpif: Add table_is_internal() helper

2014-05-02 Thread Simon Horman
This will be used by a subsequent patch to add support for recirculation for MPLS. Signed-off-by: Simon Horman --- v4 * Rebase v3 * No change v2 * First post --- ofproto/ofproto-dpif.c | 7 +++ ofproto/ofproto-dpif.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/ofproto/ofproto

[ovs-dev] [PATCH v4 3/9] ofproto-dpif: Move RECIRC_RULE_PRIORITY to common header

2014-05-02 Thread Simon Horman
This is in preparation for using this value in ofproto-dpif-xlate.c when composing recirculation actions added as a result of processing (MPLS) actions. Signed-off-by: Simon Horman --- ofproto/bond.c | 1 - ofproto/ofproto-dpif.h | 3 +++ 2 files changed, 3 insertions(+), 1 deletion

[ovs-dev] [PATCH v4 1/9] flow: Add mf_is_l3_or_higher()

2014-05-02 Thread Simon Horman
recirculation to occur. Signed-off-by: Simon Horman --- lib/meta-flow.h | 8 1 file changed, 8 insertions(+) diff --git a/lib/meta-flow.h b/lib/meta-flow.h index 91dfecd..d02d320 100644 --- a/lib/meta-flow.h +++ b/lib/meta-flow.h @@ -89,6 +89,8 @@ enum OVS_PACKED_ENUM mf_field_id

[ovs-dev] [PATCH v4 5/9] ofproto-dpif: Add idle_timeout parameter to ofproto_dpif_add_internal_flow()

2014-05-02 Thread Simon Horman
recirculation. Signed-off-by: Simon Horman -- v3 * Rebase * Break back out into separate patch v2 * Erroneously squashed into "odp-util: Add odp_put_recirc_action() helper" --- ofproto/bond.c | 2 +- ofproto/ofproto-dpif.c | 10 ++ ofproto/ofproto-dpif.h | 1 + 3 fil

[ovs-dev] [PATCH v4 4/9] ofproto-dpif: Add recirc_id field to struct rule_dpif

2014-05-02 Thread Simon Horman
to be translated. Signed-off-by: Simon Horman --- v4 * Rebase v3 * Rebase * Add rule_set_recirc_id() v2 * No change --- ofproto/ofproto-dpif.c | 47 +++ ofproto/ofproto-dpif.h | 2 ++ 2 files changed, 49 insertions(+) diff --git a/ofproto/ofproto

Re: [ovs-dev] [PATCH v4 4/9] ofproto-dpif: Add recirc_id field to struct rule_dpif

2014-05-06 Thread Simon Horman
Hi Ben, On Fri, May 02, 2014 at 07:34:58AM -0700, Ben Pfaff wrote: > On Fri, May 02, 2014 at 05:41:35PM +0900, Simon Horman wrote: > > This is to allow a recirculation id to be associated with a rule > > in the case that its actions cause recirculation. > > > > In s

Re: [ovs-dev] [PATCH v4] ofproto: per-table statistics

2014-05-06 Thread Simon Horman
On Thu, May 01, 2014 at 08:02:32AM -0700, Ben Pfaff wrote: > On Thu, May 01, 2014 at 05:58:00PM +0900, Simon Horman wrote: > > On Wed, Apr 30, 2014 at 09:54:30AM +0900, YAMAMOTO Takashi wrote: > > > > On Tue, Apr 29, 2014 at 06:34:22PM +0900, Simon Horman wrote: > >

Re: [ovs-dev] [PACKET_OUT v2] ofproto-dpif: treat non-datapath ports as local port for OFPT_PACKET_OUT

2014-05-06 Thread Simon Horman
On Fri, May 02, 2014 at 08:06:16AM -0700, Ben Pfaff wrote: > On Fri, May 02, 2014 at 02:10:19PM +0900, Simon Horman wrote: > > I would be happy to do without this stopgap measure if > > (a rebased version of) the recirculation MPLS would be considered > > with the caveat

Re: [ovs-dev] [PATCH] [RFC] flow: Do not clear L3+ fields of flow in flow_push_mpls()

2014-05-06 Thread Simon Horman
te: > > >> > > >>> On Mar 20, 2014, at 10:05 AM, Ben Pfaff wrote: > > >>> > > >>>> On Fri, Mar 14, 2014 at 04:19:52PM +0900, Simon Horman wrote: > > >>>> When creating a flow in the datapath as the result of an upcal

[ovs-dev] [PATCH v2 2/2] datapath: sample action without side effects

2014-05-11 Thread Simon Horman
The sample action is rather generic, allowing arbitrary actions to be executed based on a probability. However its use, within the Open vSwitch code-base is limited: only a single user-space action is ever nested. A consequence of the current implementation of sample actions is that depending on w

[ovs-dev] [PATCH v2 0/2] datapath: sample action without side effects

2014-05-11 Thread Simon Horman
). Simon Horman (2): datapath: Free skb(s) on recirculation error datapath: sample action without side effects datapath/actions.c | 52 1 file changed, 36 insertions(+), 16 deletions(-) -- 1.8.4

Re: [ovs-dev] [PATCH v4 4/9] ofproto-dpif: Add recirc_id field to struct rule_dpif

2014-05-11 Thread Simon Horman
On Wed, May 07, 2014 at 04:58:59PM +1200, Simon Horman wrote: > Hi Ben, > > On Fri, May 02, 2014 at 07:34:58AM -0700, Ben Pfaff wrote: > > On Fri, May 02, 2014 at 05:41:35PM +0900, Simon Horman wrote: > > > This is to allow a recirculation id to be associated with a rul

[ovs-dev] [PATCH v2 1/2] datapath: Free skb(s) on recirculation error

2014-05-11 Thread Simon Horman
-off-by: Simon Horman --- datapath/actions.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datapath/actions.c b/datapath/actions.c index 7fe2f54..56d 100644 --- a/datapath/actions.c +++ b/datapath/actions.c @@ -596,8 +596,8 @@ static int do_execute_actions(struct

Re: [ovs-dev] [PATCH v2.56] datapath: Add basic MPLS support to kernel

2014-05-11 Thread Simon Horman
On Thu, May 01, 2014 at 09:45:12AM -0700, Jesse Gross wrote: > On Thu, May 1, 2014 at 1:54 AM, Simon Horman wrote: > > On Wed, Apr 30, 2014 at 03:56:44PM -0700, Jesse Gross wrote: > >> On Tue, Apr 29, 2014 at 10:58 PM, Simon Horman wrote: > >> > On Tue, Apr 29, 2

[ovs-dev] [PATCH v5] ofproto: per-table statistics

2014-05-11 Thread Simon Horman
than all being credited to table 0. These problems were observed when running make check-ryu and this patch allows many of its tester.py match checks to pass. Reviewed-by: YAMAMOTO Takashi Signed-off-by: Simon Horman -- v5 * As suggested by Ben Pfaff - Use atomic_ulong instead of atomic_uint64_t

[ovs-dev] [PATCH 2/2] ovs-atomic: Remove atomic_{u,}int64_t

2014-05-11 Thread Simon Horman
Takashi Signed-off-by: Simon Horman --- tests/test-atomic.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test-atomic.c b/tests/test-atomic.c index b1a5d9d..24456d8 100644 --- a/tests/test-atomic.c +++ b/tests/test-atomic.c @@ -99,8 +99,6 @@ test_atomic_main(int argc OVS_UNUSED, char

[ovs-dev] [PATCH 1/2] ofproto-dpif-upcall: Use atomic_long in struct udpif

2014-05-11 Thread Simon Horman
Some concern has been raised by Ben Pfaff that atomic_uint64_t may not be portable. Accordingly, use atomic_ulong instead of atomic_uint64_t in struct ofproto. This is in preparation for removing atomic_uint64_t entirely. Cc: YAMAMOTO Takashi Signed-off-by: Simon Horman --- ofproto/ofproto

[ovs-dev] [PATCH 0/2] ovs-atomic: Remove atomic_{u,}int64_t

2014-05-11 Thread Simon Horman
Some concern has been raised by Ben Pfaff that atomic_uint64_t may not be portable. In particular on 32bit platforms that do not have atomic 64bit integers. This series removes the users of atomic_uint64_t. It then removes atomic_uint64_t and atomic_int64_t themselves. Simon Horman (2

Re: [ovs-dev] [PATCH v2 1/2] datapath: Free skb(s) on recirculation error

2014-05-12 Thread Simon Horman
ttempt at resolving this problem. I will defer reposting the second patch of this series until we have ironed out this one. From: Simon Horman [PATCH v2.1] datapath: Free skb(s) on recirculation error This patch attempts to ensure that skb(s) are always freed (once) if if an error occ

Re: [ovs-dev] [PATCH 1/2] ofproto-dpif-upcall: Use atomic_long in struct udpif

2014-05-12 Thread Simon Horman
On Mon, May 12, 2014 at 08:52:52AM -0700, Ben Pfaff wrote: > On Mon, May 12, 2014 at 08:56:36AM +0900, Simon Horman wrote: > > Some concern has been raised by Ben Pfaff that atomic_uint64_t may not > > be portable. Accordingly, use atomic_ulong instead of atomic_uint64_t > &

Re: [ovs-dev] [PATCH 2/2] ovs-atomic: Remove atomic_{u,}int64_t

2014-05-13 Thread Simon Horman
On Mon, May 12, 2014 at 08:51:49AM -0700, Ben Pfaff wrote: > On Mon, May 12, 2014 at 08:56:37AM +0900, Simon Horman wrote: > > Some concern has been raised by Ben Pfaff that atomic_uint64_t may not > > be portable. In particular on 32bit platforms that do not have atomic >

Re: [ovs-dev] [PATCH] [RFC] flow: Do not clear L3+ fields of flow in flow_push_mpls()

2014-05-13 Thread Simon Horman
On Wed, May 07, 2014 at 05:02:06PM +1200, Simon Horman wrote: > On Thu, May 01, 2014 at 08:24:21AM -0700, Ben Pfaff wrote: > > On Thu, May 01, 2014 at 08:21:36AM -0700, Jarno Rajahalme wrote: > > > > > > > On May 1, 2014, at 7:53 AM, Ben Pfaff wrote: > > >

[ovs-dev] [PATCH v2 0/2] ovs-atomic: Remove atomic_{u,}int64_t

2014-05-14 Thread Simon Horman
Some concern has been raised by Ben Pfaff that atomic_uint64_t may not be portable. In particular on 32bit platforms that do not have atomic 64bit integers. This series removes the users of atomic_uint64_t. It then removes atomic_uint64_t and atomic_int64_t themselves. Simon Horman (2

[ovs-dev] [PATCH v2 2/2] ovs-atomic: Remove atomic_{u,}int64_t

2014-05-14 Thread Simon Horman
Takashi Signed-off-by: Simon Horman v2 * As suggested by Ben Pfaff - Actually remove atomic_uint64_t and atomic_int64_t rather than just removing their test --- lib/ovs-atomic.h| 4 tests/test-atomic.c | 2 -- 2 files changed, 6 deletions(-) diff --git a/lib/ovs-atomic.h b/lib/ovs

[ovs-dev] [PATCH v2 1/2] ofproto-dpif-upcall: Use atomic_long in struct udpif

2014-05-14 Thread Simon Horman
Some concern has been raised by Ben Pfaff that atomic_uint64_t may not be portable. Accordingly, use atomic_ulong instead of atomic_uint64_t in struct ofproto. This is in preparation for removing atomic_uint64_t entirely. Cc: YAMAMOTO Takashi Signed-off-by: Simon Horman --- v2 * As suggested

Re: [ovs-dev] [PATCH v2 1/2] datapath: Free skb(s) on recirculation error

2014-05-14 Thread Simon Horman
On Tue, May 13, 2014 at 01:42:47PM -0700, Jesse Gross wrote: > On Mon, May 12, 2014 at 10:46 PM, Simon Horman wrote: > > On Mon, May 12, 2014 at 04:32:29PM -0700, Daniele Di Proietto wrote: > >> You’re right, of course. > >> > >> Sorry I didn’t see it the first

[ovs-dev] [PATCH v3] datapath: sample action without side effects

2014-05-14 Thread Simon Horman
The sample action is rather generic, allowing arbitrary actions to be executed based on a probability. However its use, within the Open vSwitch code-base is limited: only a single user-space action is ever nested. A consequence of the current implementation of sample actions is that depending on w

Re: [ovs-dev] [PATCH v3] datapath: sample action without side effects

2014-05-14 Thread Simon Horman
On Wed, May 14, 2014 at 05:22:21PM -0700, Jesse Gross wrote: > On Wed, May 14, 2014 at 5:05 PM, Simon Horman wrote: > > The sample action is rather generic, allowing arbitrary actions to be > > executed based on a probability. However its use, within the Open vSwitch > >

[ovs-dev] [PATCH v2.57] datapath: Add basic MPLS support to kernel

2014-05-15 Thread Simon Horman
: Simon Horman --- v2.57 * The sample action has been changed such that its nested actions no longer have side affects. Accordingly remove the complex logic to verify multiple possible ethtype changes resulting from MPLS actions inside the nested actions of a sample action. Instead provide much

[ovs-dev] [PATCH v2.57] datapath: Add basic MPLS support to kernel

2014-05-15 Thread Simon Horman
effects. This has allowed complex verification code in this patch to be replaced with something significantly simpler and smaller. Simon Horman (1): datapath: Add basic MPLS support to kernel OPENFLOW-1.1+ | 4 - datapath/Modules.mk

[ovs-dev] [PATCH v5 0/7] Flow-Based Recirculation for MPLS

2014-05-15 Thread Simon Horman
Key changes between v1 and v2 * Support for: packet_out and patch ports * More tests To aid review this series and its dependencies are available in git https://github.com/horms/openvswitch devel/mpls-flow-based-recirculation-v5 Simon Horman (7): ofproto-dpif: Move RECIRC_RULE_PRIORITY to

[ovs-dev] [PATCH v5 4/7] ofproto-dpif: MPLS recirculation

2014-05-15 Thread Simon Horman
. Signed-off-by: Simon Horman --- v5 * No change v4 * Do not set ctx->out->has_recirc in compose_recirculate_action as the patch that adds that field is no longer in the series v3 * Changes to support recirculation in conjunction with packet_out have been moved out into separate p

[ovs-dev] [PATCH v5 2/7] ofproto-dpif: Add recirc_id field to struct rule_dpif

2014-05-15 Thread Simon Horman
to be translated. Signed-off-by: Simon Horman --- v5 * Rebase v4 * No change v3 * Rebase * Add rule_set_recirc_id() v2 * No change --- ofproto/ofproto-dpif.c | 47 +++ ofproto/ofproto-dpif.h | 2 ++ 2 files changed, 49 insertions(+) diff --git a

[ovs-dev] [PATCH v5 1/7] ofproto-dpif: Move RECIRC_RULE_PRIORITY to common header

2014-05-15 Thread Simon Horman
This is in preparation for using this value in ofproto-dpif-xlate.c when composing recirculation actions added as a result of processing (MPLS) actions. Signed-off-by: Simon Horman --- v3 - v5 * No change v2 * First post --- ofproto/bond.c | 1 - ofproto/ofproto-dpif.h | 3 +++ 2

[ovs-dev] [PATCH v5 3/7] ofproto-dpif: Add idle_timeout parameter to ofproto_dpif_add_internal_flow()

2014-05-15 Thread Simon Horman
recirculation. Signed-off-by: Simon Horman -- v5 * No change v4 * Rebase v3 * Rebase * Break back out into separate patch v2 * Erroneously squashed into "odp-util: Add odp_put_recirc_action() helper" --- ofproto/bond.c | 2 +- ofproto/ofproto-dpif.c | 10 ++ ofpro

[ovs-dev] [PATCH v5 5/7] ofp-actions: Allow pop_mpls on MPLS packets

2014-05-15 Thread Simon Horman
With recirculation in place this should be safe. Signed-off-by: Simon Horman --- v2 - v5 * No change --- lib/ofp-actions.c | 6 -- 1 file changed, 6 deletions(-) diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index cc1f9a0..119677e 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp

[ovs-dev] [PATCH v5 6/7] ofproto-dpif: Break out MPLS controller tests into their own test

2014-05-15 Thread Simon Horman
This makes maintaining the controller test slightly easier by splitting it in two. Based on a similar patch by Joe Stringer. Cc: Joe Stringer Signed-off-by: Simon Horman -- v4 - v5 * No change v3 * Rebase v2 * No change v1 * Taken from another patch-set and re-worked --- tests/ofproto

Re: [ovs-dev] [PATCH v2.57] datapath: Add basic MPLS support to kernel

2014-05-16 Thread Simon Horman
On Fri, May 16, 2014 at 08:07:07AM +0900, Simon Horman wrote: > Allow datapath to recognize and extract MPLS labels into flow keys > and execute actions which push, pop, and set labels on packets. [snip] > diff --git a/datapath/linux/compat/gso.h b/datapath/linux/compat/gso.h > i

Re: [ovs-dev] [PATCH v5 4/7] ofproto-dpif: MPLS recirculation

2014-05-16 Thread Simon Horman
On Fri, May 16, 2014 at 08:55:12AM -0700, Ben Pfaff wrote: > On Fri, May 16, 2014 at 11:30:23AM +0900, Simon Horman wrote: > > In some cases an pop MPLS action changes a packet to be a non-mpls packet. > > In this case subsequent any L3+ actions require access to portions > >

Re: [ovs-dev] [PATCH v2.57] datapath: Add basic MPLS support to kernel

2014-05-16 Thread Simon Horman
On Fri, May 16, 2014 at 03:17:18PM -0700, Jesse Gross wrote: > On Fri, May 16, 2014 at 2:48 PM, Thomas Graf wrote: > > On 05/16/14 at 02:29pm, Jesse Gross wrote: > >> On Fri, May 16, 2014 at 1:48 AM, Simon Horman wrote: > >> > On Fri, May 16, 2014 at 08:07:

Re: [ovs-dev] [PATCH v2.57] datapath: Add basic MPLS support to kernel

2014-05-19 Thread Simon Horman
On Sat, May 17, 2014 at 10:32:24AM +0900, Simon Horman wrote: > On Fri, May 16, 2014 at 03:17:18PM -0700, Jesse Gross wrote: > > On Fri, May 16, 2014 at 2:48 PM, Thomas Graf wrote: > > > On 05/16/14 at 02:29pm, Jesse Gross wrote: > > >> On Fri, May 16, 2014 a

[ovs-dev] [PATCH] ofproto-dpif: Remove unused flows.txt from fin_timeout test

2014-05-20 Thread Simon Horman
Signed-off-by: Simon Horman --- tests/ofproto-dpif.at | 4 1 file changed, 4 deletions(-) diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index 59d3c1b..6b90346 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -4501,10 +4501,6 @@ AT_CLEANUP AT_SETUP([ofproto

[ovs-dev] [PATCH v6 3/6] ofproto-dpif: Add idle_timeout parameter to ofproto_dpif_add_internal_flow()

2014-05-20 Thread Simon Horman
recirculation. Signed-off-by: Simon Horman -- v6 * Rebase v5 * No change v4 * Rebase v3 * Rebase * Break back out into separate patch v2 * Erroneously squashed into "odp-util: Add odp_put_recirc_action() helper" --- ofproto/bond.c | 2 +- ofproto/ofproto-d

[ovs-dev] [PATCH v6 5/6] ofp-actions: Allow pop_mpls on MPLS packets

2014-05-20 Thread Simon Horman
With recirculation in place this should be safe. Signed-off-by: Simon Horman --- v2 - v5 * No change --- lib/ofp-actions.c | 6 -- 1 file changed, 6 deletions(-) diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index cc1f9a0..119677e 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp

[ovs-dev] [PATCH v6 0/6] Flow-Based Recirculation for MPLS

2014-05-20 Thread Simon Horman
-recirculation-v5 Simon Horman (6): ofproto-dpif: Move RECIRC_RULE_PRIORITY to common header ofproto-dpif: Add recirc_id field to struct rule_dpif ofproto-dpif: Add idle_timeout parameter to ofproto_dpif_add_internal_flow() ofproto-dpif: MPLS recirculation ofp-actions: Allow pop_mpls on

[ovs-dev] [PATCH v6 1/6] ofproto-dpif: Move RECIRC_RULE_PRIORITY to common header

2014-05-20 Thread Simon Horman
This is in preparation for using this value in ofproto-dpif-xlate.c when composing recirculation actions added as a result of processing (MPLS) actions. Signed-off-by: Simon Horman --- v3 - v5 * No change v2 * First post --- ofproto/bond.c | 1 - ofproto/ofproto-dpif.h | 3 +++ 2

[ovs-dev] [PATCH v6 4/6] ofproto-dpif: MPLS recirculation

2014-05-20 Thread Simon Horman
. Signed-off-by: Simon Horman --- v6 * Rename may_xlate_l3_actions as was_mpls. The use-cases for this flag have grown over time and the old name had become misleading. * Also move was_mpls into struct xlate_ctx. This allows this state to be accessed when translating the action set. And

[ovs-dev] [PATCH v6 2/6] ofproto-dpif: Add recirc_id field to struct rule_dpif

2014-05-20 Thread Simon Horman
to be translated. Signed-off-by: Simon Horman --- v5 * Rebase v4 * No change v3 * Rebase * Add rule_set_recirc_id() v2 * No change --- ofproto/ofproto-dpif.c | 47 +++ ofproto/ofproto-dpif.h | 2 ++ 2 files changed, 49 insertions(+) diff --git a

[ovs-dev] [PATCH] datapath: 16bit inner_network_header field in struct ovs_gso_cb

2014-05-20 Thread Simon Horman
rt'' for additional details." This patch is based on suggestions by Thomas Graf and Jesse Gross. Cc: Thomas Graf Cc: Jesse Gross Signed-off-by: Simon Horman --- datapath/linux/compat/gso.h | 22 +- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git

Re: [ovs-dev] [PATCH v2.57] datapath: Add basic MPLS support to kernel

2014-05-20 Thread Simon Horman
On Mon, May 19, 2014 at 06:34:05PM -0700, Jesse Gross wrote: > I have some miscellaneous comments on things that I noticed, all of > which are pretty small. I will probably have a few more tomorrow but > my hope is that we can get this in soon. > > On Thu, May 15, 2014 at 4:07 P

Re: [ovs-dev] [PATCH] datapath: 16bit inner_network_header field in struct ovs_gso_cb

2014-05-20 Thread Simon Horman
On Tue, May 20, 2014 at 12:54:32PM -0700, Jesse Gross wrote: > On Tue, May 20, 2014 at 3:41 AM, Simon Horman wrote: > > diff --git a/datapath/linux/compat/gso.h b/datapath/linux/compat/gso.h > > index b83a4c3..f459c18 100644 > > --- a/datapath/linux/compat/gso.h > >

Re: [ovs-dev] [PATCH] datapath: 16bit inner_network_header field in struct ovs_gso_cb

2014-05-20 Thread Simon Horman
On Tue, May 20, 2014 at 05:14:25PM -0700, Jesse Gross wrote: > On Tue, May 20, 2014 at 4:31 PM, Simon Horman wrote: > > On Tue, May 20, 2014 at 12:54:32PM -0700, Jesse Gross wrote: > >> On Tue, May 20, 2014 at 3:41 AM, Simon Horman wrote: > >> > diff --git a

Re: [ovs-dev] [PATCH v2.57] datapath: Add basic MPLS support to kernel

2014-05-21 Thread Simon Horman
On Tue, May 20, 2014 at 07:05:28PM -0700, Jesse Gross wrote: > On Tue, May 20, 2014 at 3:48 AM, Simon Horman wrote: > > On Mon, May 19, 2014 at 06:34:05PM -0700, Jesse Gross wrote: > >> On Thu, May 15, 2014 at 4:07 PM, Simon Horman wrote: > >> > diff --git a

Re: [ovs-dev] [PATCH v2.57] datapath: Add basic MPLS support to kernel

2014-05-21 Thread Simon Horman
On Tue, May 20, 2014 at 07:30:38PM -0700, Jesse Gross wrote: > On Thu, May 15, 2014 at 4:07 PM, Simon Horman wrote: > > diff --git a/datapath/linux/compat/gso.c b/datapath/linux/compat/gso.c > > index 9ded17c..d9b4485 100644 > > --- a/datapath/linux/compat/gso.c > >

Re: [ovs-dev] [PATCH v2.57] datapath: Add basic MPLS support to kernel

2014-05-21 Thread Simon Horman
On Wed, May 21, 2014 at 01:31:55PM -0700, Jesse Gross wrote: > On Wed, May 21, 2014 at 8:31 AM, Simon Horman wrote: > > On Tue, May 20, 2014 at 07:30:38PM -0700, Jesse Gross wrote: > >> On Thu, May 15, 2014 at 4:07 PM, Simon Horman wrote: > >> > diff --git a/datap

[ovs-dev] [PATCH v6] ofproto: per-table statistics

2014-05-21 Thread Simon Horman
than all being credited to table 0. These problems were observed when running make check-ryu and this patch allows many of its tester.py match checks to pass. Reviewed-by: YAMAMOTO Takashi Signed-off-by: Simon Horman -- v6 * Rebase v5 * As suggested by Ben Pfaff - Use atomic_ulong instead of

Re: [ovs-dev] [PATCH v6] ofproto: per-table statistics

2014-05-22 Thread Simon Horman
On Thu, May 22, 2014 at 11:25:12AM -0700, Ben Pfaff wrote: > On Thu, May 22, 2014 at 02:44:36PM +0900, Simon Horman wrote: > > Add per-table counters. This resolves some short-comings > > in the data provided in a table stats reply message. > > > > * Lookups and matc

[ovs-dev] [PATCH/RFC net-next] MPLS: Use mpls_features to activate software MPLS GSO segmentation

2014-05-23 Thread Simon Horman
Gross for prompting me to investigate this. Cc: Jesse Gross Signed-off-by: Simon Horman --- net/core/dev.c | 36 1 file changed, 36 insertions(+) diff --git a/net/core/dev.c b/net/core/dev.c index 867adb2..ade6029 100644 --- a/net/core/dev.c +++ b/net/core

[ovs-dev] [PATCH v2 net-next] MPLS: Use mpls_features to activate software MPLS GSO segmentation

2014-05-25 Thread Simon Horman
for prompting me to investigate this. Acked-by: Jesse Gross Signed-off-by: Simon Horman --- v2 * Added Ack from Jesse Gross * Removed duplicate 'Thus' from changelog --- net/core/dev.c | 36 1 file changed, 36 insertions(+) diff --git a/net/core/d

[ovs-dev] [PATCH v2.58] datapath: Add basic MPLS support to kernel

2014-05-25 Thread Simon Horman
: Simon Horman --- v2.58 * Make ovs_gso_cb small enough to fit in skb->cb * As suggested by Jesse Gross - Do not free skb on error in push_mpls. Instead let the caller's regular error handling do so. - Remove handling of impossible error case for too-short skb in pop_mpls()

[ovs-dev] [PATCH 0/4] Initial multipart request support

2014-05-27 Thread Simon Horman
the previous patches an bring things together in a useful though limited form. I have not extended it to other messages as first I would like to reach some consensus on the approach to be taken when implementing support for multipart requests. In particular patches 3 and 4. Simon

[ovs-dev] [PATCH 3/4] connmgr: buffer multipart requests

2014-05-27 Thread Simon Horman
handle_openflow__() as no messages handlers can deal with them. In the short term I plan to address this for a limited number of messages. In the longer term I would like to extend coverage to all multipart requests. Signed-off-by: Simon Horman --- ofproto/connmgr.c | 162

[ovs-dev] [PATCH 2/4] ofp-print: Merge ofp_print_stats_{reply, request}()

2014-05-27 Thread Simon Horman
the more flag is now printed as present. Previously ***unknown flags 0x0001*** was printed. Signed-off-by: Simon Horman --- lib/ofp-print.c | 55 +++ 1 file changed, 23 insertions(+), 32 deletions(-) diff --git a/lib/ofp-print.c b/lib/ofp

[ovs-dev] [PATCH 1/4] ofproto: Further factor out handling of port requests

2014-05-27 Thread Simon Horman
callback. Signed-off-by: Simon Horman --- ofproto/ofproto.c | 37 ++--- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 63f65c3..e3e1db9 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -3194,9

[ovs-dev] [PATCH 4/4] ofproto: Support multipart port stats and port desc stats requests

2014-05-27 Thread Simon Horman
Signed-off-by: Simon Horman --- OPENFLOW-1.1+ | 6 ++- ofproto/ofproto.c | 74 +--- tests/ofproto-macros.at | 1 + tests/ofproto.at| 109 4 files changed, 163 insertions(+), 27 deletions

Re: [ovs-dev] [PATCH 3/4] connmgr: buffer multipart requests

2014-05-27 Thread Simon Horman
On Tue, May 27, 2014 at 09:57:09AM -0700, Ben Pfaff wrote: > On Tue, May 27, 2014 at 06:05:38PM +0900, Simon Horman wrote: > > Buffer a multi-part requests until all its parts are received. > > > > This is achieved by initialising the list_node field of messages &g

Re: [ovs-dev] [PATCH 1/4] ofproto: Further factor out handling of port requests

2014-05-27 Thread Simon Horman
On Tue, May 27, 2014 at 09:36:12AM -0700, Ben Pfaff wrote: > On Tue, May 27, 2014 at 06:05:36PM +0900, Simon Horman wrote: > > handle_port_request() already provides common code to handle > > both port desc and port stats request messages once they have been decoded > >

[ovs-dev] [PATCH] odp-util: Do not set port mask of non-IP packets

2014-05-28 Thread Simon Horman
to one of the existing MPLS tests. This illustrates that the problem exists for the user-space datapath whereas I had previously incorrectly assumed it only manifested when using the kernel datapath because I had only observed it there. Signed-off-by: Simon Horman --- lib/odp-util.c| 5

[ovs-dev] [PATCH v2 net-next repost] MPLS: Use mpls_features to activate software MPLS GSO segmentation

2014-05-29 Thread Simon Horman
for prompting me to investigate this. Acked-by: Jesse Gross Signed-off-by: Simon Horman --- v2 * Added Ack from Jesse Gross * Removed duplicate 'Thus' from changelog --- net/core/dev.c | 36 1 file changed, 36 insertions(+) diff --git a/net/core/d

[ovs-dev] [PATCH v2.58 repost] datapath: Add basic MPLS support to kernel

2014-05-29 Thread Simon Horman
: Simon Horman --- v2.58 * Make ovs_gso_cb small enough to fit in skb->cb * As suggested by Jesse Gross - Do not free skb on error in push_mpls. Instead let the caller's regular error handling do so. - Remove handling of impossible error case for too-short skb in pop_mpls()

[ovs-dev] [PATCH/RFC] ofproto: Use OFPRR_GROUP_DELETE

2014-05-30 Thread Simon Horman
(). Signed-off-by: Simon Horman --- lib/ofp-util.c| 3 +++ lib/ofp-util.h| 3 +++ ofproto/ofproto.c | 8 ++-- tests/ofproto.at | 9 + 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/lib/ofp-util.c b/lib/ofp-util.c index 09e4438..03fc978 100644 --- a/lib/ofp-util.c

[ovs-dev] [PATCH/RFC] connmgr: Do not use OFPRR_METER_DELETE before OF1.4

2014-05-30 Thread Simon Horman
controllers connected using OF1.3 map OFPRR_METER_DELETE to OFPRR_DELETE which exists in that version. Signed-off-by: Simon Horman --- It is not clear to me how to test this change --- ofproto/connmgr.c | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ofproto/connmgr.c

[ovs-dev] [PATCH/RFC] openflow: OFPRR_METER_DELETE is used

2014-05-30 Thread Simon Horman
My reading of handle_delete_meter() is that OFPRR_METER_DELETE is used. Accordingly delete the entry relating to it from OPENFLOW-1.1+. Signed-off-by: Simon Horman --- OPENFLOW-1.1+ | 5 - 1 file changed, 5 deletions(-) diff --git a/OPENFLOW-1.1+ b/OPENFLOW-1.1+ index 4d7f836..9763a39

Re: [ovs-dev] [PATCH v2 net-next repost] MPLS: Use mpls_features to activate software MPLS GSO segmentation

2014-06-01 Thread Simon Horman
On Fri, May 30, 2014 at 03:43:18PM -0700, David Miller wrote: > From: Simon Horman > Date: Fri, 30 May 2014 14:35:19 +0900 > > > If an MPLS packet requires segmentation then use mpls_features > > to determine if the software implementation should be used. > > >

[ovs-dev] [PATCH v3 net-next] MPLS: Use mpls_features to activate software MPLS GSO segmentation

2014-06-01 Thread Simon Horman
for prompting me to investigate this. Acked-by: Jesse Gross Signed-off-by: Simon Horman --- v3 * As requested by David Miller - Do not mark net_mpls_features as inline - Correct alignment of parameters v2 * Added Ack from Jesse Gross * Removed duplicate 'Thus' from changelog ---

Re: [ovs-dev] [PATCH v3 net-next] MPLS: Use mpls_features to activate software MPLS GSO segmentation

2014-06-01 Thread Simon Horman
d does not advertise NETIF_F_FRAGLIST (which seems to be the > > case for most drivers). Thus software segmentation was activated by > > skb_gso_ok(). > > > > Thanks to Jesse Gross for prompting me to investigate this. > > > > Acked-by: Jesse Gross > > S

[ovs-dev] [PATCH v4 net-next] MPLS: Use mpls_features to activate software MPLS GSO segmentation

2014-06-01 Thread Simon Horman
for prompting me to investigate this. Acked-by: Jesse Gross Acked-by: YAMAMOTO Takashi Signed-off-by: Simon Horman --- v4 * Correct typos in comment * Added Ack from YAMAMOTO Takashi v3 * As requested by David Miller - Do not mark net_mpls_features as inline - Correct alignment of parameters

[ovs-dev] [PATCH/RFC] ofp-errors: Duplicate instruction error

2014-06-02 Thread Simon Horman
ction.". Previously ONFBIC_DUP_INSTRUCTION was used for OpenFlow1.3+. Signed-off-by: Simon Horman --- OPENFLOW-1.1+| 5 - lib/ofp-actions.c| 2 +- lib/ofp-errors.h | 4 ++-- tests/ofp-actions.at | 4 ++-- tests/ofp-errors.at | 10 ++ 5 files changed, 15 inserti

Re: [ovs-dev] [PATCH v4 net-next] MPLS: Use mpls_features to activate software MPLS GSO segmentation

2014-06-02 Thread Simon Horman
On Mon, Jun 02, 2014 at 05:21:45PM +0100, Thomas Graf wrote: > On 06/02/14 at 01:43pm, Simon Horman wrote: > > +#ifdef CONFIG_NET_MPLS_GSO > > +static netdev_features_t net_mpls_features(struct sk_buff *skb, > > + s

Re: [ovs-dev] [PATCH v4 net-next] MPLS: Use mpls_features to activate software MPLS GSO segmentation

2014-06-02 Thread Simon Horman
On Mon, Jun 02, 2014 at 05:45:22PM -0700, Jesse Gross wrote: > On Mon, Jun 2, 2014 at 5:16 PM, Simon Horman wrote: > > On Mon, Jun 02, 2014 at 05:21:45PM +0100, Thomas Graf wrote: > >> On 06/02/14 at 01:43pm, Simon Horman wrote: > >> > +#ifdef CONFIG_NET_MPLS_GSO &g

Re: [ovs-dev] [PATCH v2.58] datapath: Add basic MPLS support to kernel

2014-06-02 Thread Simon Horman
Hi Jesse, thanks for your feedback. On Mon, Jun 02, 2014 at 05:58:10PM -0700, Jesse Gross wrote: > On Sun, May 25, 2014 at 5:22 PM, Simon Horman wrote: > > diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c > > index 803a94c..8ce596c 100644 > > --- a/da

<    1   2   3   4   5   6   7   8   9   10   >