From: Simon Horman <horms@verge.net.au>
To: dev@openvswitch.org, netdev@vger.kernel.org
Cc: Ravi K <rkerur@gmail.com>,
Isaku Yamahata <yamahata@valinux.co.jp>,
Jesse Gross <jesse@nicira.com>,
Pravin B Shelar <pshelar@nicira.com>,
Joe Stringer <joe@wand.net.nz>
Subject: Re: [PATCH v2.39 0/7] MPLS actions and matches
Date: Mon, 9 Sep 2013 16:25:14 +0900 [thread overview]
Message-ID: <20130909072512.GA30283@verge.net.au> (raw)
In-Reply-To: <1378711207-29890-1-git-send-email-horms@verge.net.au>
On Mon, Sep 09, 2013 at 04:20:00PM +0900, Simon Horman wrote:
> Hi,
>
> This series implements MPLS actions and matches based on work by
> Ravi K, Leo Alterman, Yamahata-san and Joe Stringer.
>
> This series provides two changes
>
> * Provide user-space support for the VLAN/MPLS tag insertion order
> up to and including OpenFlow 1.2, and the different ordering
> specified from OpenFlow 1.3. In a nutshell the datapath always
> uses the OpenFlow 1.3 ordering, which is to always insert tags
> immediately after the L2 header, regardless of the presence of other
> tags. And ovs-vswtichd provides compatibility for the behaviour up
> to OpenFlow 1.2, which is that MPLS tags should follow VLAN tags
> if present.
>
> * Adding basic MPLS action and match support to the kernel datapath
>
>
> Differences between v2.39 and v2.38:
>
> * Rebase for removal of vlan, checksum and skb->mark compat code
> - This includes adding adding a new patch,
> "[PATCH v2.39 6/7] datapath: Break out deacceleration portion of
> vlan_push" to allow re-use of some existing code.
>
>
> Differences between v2.38 and v2.37:
>
> * Rebase for SCTP support
> * Refactor validate_tp_port() to iterate over eth_types rather
> than open-coding the loop. With the addition of SCTP this logic
> is now used three times.
>
>
> Differences between v2.37 and v2.36:
>
> * Rebase
>
>
> Differences between v2.36 and v2.35:
>
> * Rebase
>
> * Do not add set_ethertype() to datapath/actions.c.
> As this patch has evolved this function had devolved into
> to sets of functionality wrapped into a single function with
> only one line of common code. Refactor things to simply
> open-code setting the ether type in the two locations where
> set_ethertype() was previously used. The aim here is to improve
> readability.
>
> * Update setting skb->ethertype after mpls push and pop.
> - In the case of push_mpls it should be set unconditionally
> as in v2.35 the behaviour of this function to always push
> an MPLS LSE before any VLAN tags.
> - In the case of mpls_pop eth_p_mpls(skb->protocol) is a better
> test than skb->protocol != htons(ETH_P_8021Q) as it will give the
> correct behaviour in the presence of other VLAN ethernet types,
> for example 0x88a8 which is used by 802.1ad. Moreover, it seems
> correct to update the ethernet type if it was previously set
> according to the top-most MPLS LSE.
>
> * Deaccelerate VLANs when pushing MPLS tags the
> - Since v2.35 MPLS push will insert an MPLS LSE before any VLAN tags.
> This means that if an accelerated tag is present it should be
> deaccelerated to ensure it ends up in the correct position.
>
> * Update skb->mac_len in push_mpls() so that it will be correct
> when used by a subsequent call to pop_mpls().
>
> As things stand I do not believe this is strictly necessary as
> ovs-vswitchd will not send a pop MPLS action after a push MPLS action.
> However, I have added this in order to code more defensively as I believe
> that if such a sequence did occur it would be rather unobvious why
> it didn't work.
>
> * Do not add skb_cow_head() call in push_mpls().
> It is unnecessary as there is a make_writable() call.
> This change was also made in v2.30 but some how the
> code regressed between then and v2.35.
>
>
> Differences between v2.35 and v2.34:
>
> * Add support for the tag ordering specified up until OpenFlow 1.2 and
> the ordering specified from OpenFlow 1.3.
>
> * Correct error in datapath patch's handling of GSO in the presence
> of MPLS and absence of VLANs.
I forgot to update the trailing portion of this cover letter.
It should read as follows:
Patch overview:
* The first 5 patches add support for different tag ordering
to user-space.
* The 6th patch breaks out kernel datapath some code to allow
it to be re-used by the last patch.
* The last patch is a revised version of the patch to add MPLS support
to the kernel datapath.
To aid review this series is available in git at:
git://github.com/horms/openvswitch.git devel/mpls-v2.39
Patch list and overall diffstat:
Joe Stringer (5):
odp: Only pass vlan_tci to commit_vlan_action()
odp: Allow VLAN actions after MPLS actions
ofp-actions: Add OFPUTIL_OFPAT13_PUSH_MPLS
ofp-actions: Add separate OpenFlow 1.3 action parser
lib: Push MPLS tags in the OpenFlow 1.3 ordering
Simon Horman (2):
datapath: Break out deacceleration portion of vlan_push
datapath: Add basic MPLS support to kernel
datapath/Modules.mk | 1 +
datapath/actions.c | 154 +++++++-
datapath/datapath.c | 259 ++++++++++++--
datapath/datapath.h | 9 +
datapath/flow.c | 58 ++-
datapath/flow.h | 17 +-
datapath/linux/compat/gso.c | 50 ++-
datapath/linux/compat/gso.h | 39 +++
datapath/linux/compat/include/linux/netdevice.h | 12 -
datapath/linux/compat/netdevice.c | 28 --
datapath/mpls.h | 15 +
datapath/vport-lisp.c | 1 +
datapath/vport-netdev.c | 47 ++-
include/linux/openvswitch.h | 7 +-
lib/flow.c | 2 +-
lib/odp-util.c | 22 +-
lib/odp-util.h | 4 +-
lib/ofp-actions.c | 68 +++-
lib/ofp-parse.c | 1 +
lib/ofp-util.c | 3 +
lib/ofp-util.h | 1 +
lib/packets.c | 10 +-
lib/packets.h | 2 +-
ofproto/ofproto-dpif-xlate.c | 103 ++++--
ofproto/ofproto-dpif-xlate.h | 5 +
tests/ofproto-dpif.at | 446 ++++++++++++++++++++++++
26 files changed, 1225 insertions(+), 139 deletions(-)
create mode 100644 datapath/mpls.h
--
1.8.4
next prev parent reply other threads:[~2013-09-09 7:25 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-09 7:20 [PATCH v2.39 0/7] MPLS actions and matches Simon Horman
[not found] ` <1378711207-29890-1-git-send-email-horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
2013-09-09 7:20 ` [PATCH v2.39 1/7] odp: Only pass vlan_tci to commit_vlan_action() Simon Horman
2013-09-09 7:20 ` [PATCH v2.39 3/7] ofp-actions: Add OFPUTIL_OFPAT13_PUSH_MPLS Simon Horman
2013-09-09 7:20 ` [PATCH v2.39 2/7] odp: Allow VLAN actions after MPLS actions Simon Horman
2013-09-09 7:20 ` [PATCH v2.39 4/7] ofp-actions: Add separate OpenFlow 1.3 action parser Simon Horman
2013-09-09 7:20 ` [PATCH v2.39 5/7] lib: Push MPLS tags in the OpenFlow 1.3 ordering Simon Horman
2013-09-09 7:20 ` [PATCH v2.39 6/7] datapath: Break out deacceleration portion of vlan_push Simon Horman
2013-09-13 22:07 ` Jesse Gross
[not found] ` <CAEP_g=_ZQ6hNpxoHm6t3N=PxA+3WTrvNegL514j0R3GDM5C92A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-09-15 16:32 ` Simon Horman
2013-09-19 14:56 ` Simon Horman
2013-09-09 7:20 ` [PATCH v2.39 7/7] datapath: Add basic MPLS support to kernel Simon Horman
[not found] ` <1378711207-29890-8-git-send-email-horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
2013-09-16 20:38 ` Jesse Gross
[not found] ` <CAEP_g=8FBQPZ=C6G39YdHRzG57m5MqfXSZFAX2S_KLHRwfzc2w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-09-16 20:46 ` Ben Pfaff
2013-09-17 23:47 ` Simon Horman
2013-09-18 0:05 ` Ben Pfaff
2013-09-19 15:57 ` Simon Horman
2013-09-19 17:21 ` Jesse Gross
2013-09-22 5:34 ` Simon Horman
[not found] ` <20130922053156.GA4849-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
2013-09-23 21:17 ` Jesse Gross
2013-09-24 1:32 ` Simon Horman
2013-09-24 1:38 ` Jesse Gross
2013-09-24 2:49 ` Simon Horman
2013-09-17 18:38 ` Pravin Shelar
2013-09-18 22:07 ` Simon Horman
2013-09-19 17:31 ` Jesse Gross
2013-09-22 5:38 ` Simon Horman
2013-09-23 19:47 ` Pravin Shelar
[not found] ` <CALnjE+o_bcNbU6kv2eUBaNS4tincV+BmrFyJtZZRTaMPMVv8gw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-09-23 21:24 ` Jesse Gross
2013-09-24 1:33 ` Simon Horman
[not found] ` <20130918220756.GA24919-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
2013-09-19 20:45 ` Simon Horman
2013-09-20 1:31 ` [ovs-dev] " Pravin Shelar
2013-09-22 3:54 ` Simon Horman
2013-09-09 7:25 ` Simon Horman [this message]
2013-09-12 19:06 ` [ovs-dev] [PATCH v2.39 0/7] MPLS actions and matches Ben Pfaff
[not found] ` <20130912190636.GL16044-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
2013-09-12 22:56 ` Simon Horman
[not found] ` <20130912225614.GB30229-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
2013-09-12 22:54 ` Ben Pfaff
2013-09-13 22:15 ` [ovs-dev] " Jesse Gross
2013-09-15 16:39 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130909072512.GA30283@verge.net.au \
--to=horms@verge.net.au \
--cc=dev@openvswitch.org \
--cc=jesse@nicira.com \
--cc=joe@wand.net.nz \
--cc=netdev@vger.kernel.org \
--cc=pshelar@nicira.com \
--cc=rkerur@gmail.com \
--cc=yamahata@valinux.co.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.