* [GIT net-next] Open vSwitch
@ 2012-07-20 22:26 Jesse Gross
[not found] ` <1342823210-3308-1-git-send-email-jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 14+ messages in thread
From: Jesse Gross @ 2012-07-20 22:26 UTC (permalink / raw)
To: David Miller; +Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA
A few bug fixes and small enhancements for net-next/3.6.
The following changes since commit bf32fecdc1851ad9ca960f56771b798d17c26cf1:
openvswitch: Add length check when retrieving TCP flags. (2012-04-02 14:28:57 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch.git master
for you to fetch changes up to efaac3bf087b1a6cec28f2a041e01c874d65390c:
openvswitch: Fix typo in documentation. (2012-07-20 14:51:07 -0700)
----------------------------------------------------------------
Ansis Atteka (1):
openvswitch: Do not send notification if ovs_vport_set_options() failed
Ben Pfaff (1):
openvswitch: Check gso_type for correct sk_buff in queue_gso_packets().
Jesse Gross (2):
openvswitch: Enable retrieval of TCP flags from IPv6 traffic.
openvswitch: Reset upper layer protocol info on internal devices.
Leo Alterman (1):
openvswitch: Fix typo in documentation.
Pravin B Shelar (1):
openvswitch: Check currect return value from skb_gso_segment()
Raju Subramanian (1):
openvswitch: Replace Nicira Networks.
Documentation/networking/openvswitch.txt | 2 +-
net/openvswitch/actions.c | 2 +-
net/openvswitch/datapath.c | 13 ++++++++-----
net/openvswitch/datapath.h | 2 +-
net/openvswitch/dp_notify.c | 2 +-
net/openvswitch/flow.c | 5 +++--
net/openvswitch/flow.h | 2 +-
net/openvswitch/vport-internal_dev.c | 10 +++++++++-
net/openvswitch/vport-internal_dev.h | 2 +-
net/openvswitch/vport-netdev.c | 2 +-
net/openvswitch/vport-netdev.h | 2 +-
net/openvswitch/vport.c | 2 +-
net/openvswitch/vport.h | 2 +-
13 files changed, 30 insertions(+), 18 deletions(-)
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH net-next 1/7] openvswitch: Enable retrieval of TCP flags from IPv6 traffic.
[not found] ` <1342823210-3308-1-git-send-email-jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
@ 2012-07-20 22:26 ` Jesse Gross
2012-07-20 22:26 ` [PATCH net-next 2/7] openvswitch: Do not send notification if ovs_vport_set_options() failed Jesse Gross
` (6 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Jesse Gross @ 2012-07-20 22:26 UTC (permalink / raw)
To: David Miller
Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA,
Michael Mao
We currently check that a packet is IPv4 and TCP before fetching the
TCP flags. This enables fetching from IPv6 packets as well.
Reported-by: Michael Mao <mmao-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
---
net/openvswitch/flow.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index 2a11ec2..c6e1dae 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -182,7 +182,8 @@ void ovs_flow_used(struct sw_flow *flow, struct sk_buff *skb)
{
u8 tcp_flags = 0;
- if (flow->key.eth.type == htons(ETH_P_IP) &&
+ if ((flow->key.eth.type == htons(ETH_P_IP) ||
+ flow->key.eth.type == htons(ETH_P_IPV6)) &&
flow->key.ip.proto == IPPROTO_TCP &&
likely(skb->len >= skb_transport_offset(skb) + sizeof(struct tcphdr))) {
u8 *tcp = (u8 *)tcp_hdr(skb);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH net-next 2/7] openvswitch: Do not send notification if ovs_vport_set_options() failed
[not found] ` <1342823210-3308-1-git-send-email-jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
2012-07-20 22:26 ` [PATCH net-next 1/7] openvswitch: Enable retrieval of TCP flags from IPv6 traffic Jesse Gross
@ 2012-07-20 22:26 ` Jesse Gross
2012-07-20 22:26 ` [PATCH net-next 3/7] openvswitch: Replace Nicira Networks Jesse Gross
` (5 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Jesse Gross @ 2012-07-20 22:26 UTC (permalink / raw)
To: David Miller; +Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA
From: Ansis Atteka <aatteka-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
There is no need to send a notification if ovs_vport_set_options() failed
and ovs_vport_cmd_set() did not change anything.
Signed-off-by: Ansis Atteka <aatteka-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
---
net/openvswitch/datapath.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index e44e631..4813d95 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -1635,7 +1635,9 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
if (!err && a[OVS_VPORT_ATTR_OPTIONS])
err = ovs_vport_set_options(vport, a[OVS_VPORT_ATTR_OPTIONS]);
- if (!err && a[OVS_VPORT_ATTR_UPCALL_PID])
+ if (err)
+ goto exit_unlock;
+ if (a[OVS_VPORT_ATTR_UPCALL_PID])
vport->upcall_pid = nla_get_u32(a[OVS_VPORT_ATTR_UPCALL_PID]);
reply = ovs_vport_cmd_build_info(vport, info->snd_pid, info->snd_seq,
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH net-next 3/7] openvswitch: Replace Nicira Networks.
[not found] ` <1342823210-3308-1-git-send-email-jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
2012-07-20 22:26 ` [PATCH net-next 1/7] openvswitch: Enable retrieval of TCP flags from IPv6 traffic Jesse Gross
2012-07-20 22:26 ` [PATCH net-next 2/7] openvswitch: Do not send notification if ovs_vport_set_options() failed Jesse Gross
@ 2012-07-20 22:26 ` Jesse Gross
2012-07-20 22:26 ` [PATCH net-next 4/7] openvswitch: Reset upper layer protocol info on internal devices Jesse Gross
` (4 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Jesse Gross @ 2012-07-20 22:26 UTC (permalink / raw)
To: David Miller
Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA,
Raju Subramanian
From: Raju Subramanian <rsubramanian-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
Replaced all instances of Nicira Networks(, Inc) to Nicira, Inc.
Signed-off-by: Raju Subramanian <rsubramanian-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Ben Pfaff <blp-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
---
net/openvswitch/actions.c | 2 +-
net/openvswitch/datapath.c | 2 +-
net/openvswitch/datapath.h | 2 +-
net/openvswitch/dp_notify.c | 2 +-
net/openvswitch/flow.c | 2 +-
net/openvswitch/flow.h | 2 +-
net/openvswitch/vport-internal_dev.c | 2 +-
net/openvswitch/vport-internal_dev.h | 2 +-
net/openvswitch/vport-netdev.c | 2 +-
net/openvswitch/vport-netdev.h | 2 +-
net/openvswitch/vport.c | 2 +-
net/openvswitch/vport.h | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 48badff..f3f96ba 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 4813d95..b512cb8 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h
index c73370c..c1105c1 100644
--- a/net/openvswitch/datapath.h
+++ b/net/openvswitch/datapath.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
diff --git a/net/openvswitch/dp_notify.c b/net/openvswitch/dp_notify.c
index 4673651..36dcee8 100644
--- a/net/openvswitch/dp_notify.c
+++ b/net/openvswitch/dp_notify.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index c6e1dae..1115dcf 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h
index 2747dc2..9b75617 100644
--- a/net/openvswitch/flow.h
+++ b/net/openvswitch/flow.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
index b6b1d7d..de509d3 100644
--- a/net/openvswitch/vport-internal_dev.c
+++ b/net/openvswitch/vport-internal_dev.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
diff --git a/net/openvswitch/vport-internal_dev.h b/net/openvswitch/vport-internal_dev.h
index 3454447..9a7d30e 100644
--- a/net/openvswitch/vport-internal_dev.h
+++ b/net/openvswitch/vport-internal_dev.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c
index c1068ae..54a456d 100644
--- a/net/openvswitch/vport-netdev.c
+++ b/net/openvswitch/vport-netdev.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
diff --git a/net/openvswitch/vport-netdev.h b/net/openvswitch/vport-netdev.h
index fd9b008..f7072a2 100644
--- a/net/openvswitch/vport-netdev.h
+++ b/net/openvswitch/vport-netdev.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2011 Nicira, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index 6c066ba..6140336 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
index 1960962..aac680c 100644
--- a/net/openvswitch/vport.h
+++ b/net/openvswitch/vport.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH net-next 4/7] openvswitch: Reset upper layer protocol info on internal devices.
[not found] ` <1342823210-3308-1-git-send-email-jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
` (2 preceding siblings ...)
2012-07-20 22:26 ` [PATCH net-next 3/7] openvswitch: Replace Nicira Networks Jesse Gross
@ 2012-07-20 22:26 ` Jesse Gross
[not found] ` <1342823210-3308-5-git-send-email-jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
2012-07-20 22:26 ` [PATCH net-next 5/7] openvswitch: Check currect return value from skb_gso_segment() Jesse Gross
` (3 subsequent siblings)
7 siblings, 1 reply; 14+ messages in thread
From: Jesse Gross @ 2012-07-20 22:26 UTC (permalink / raw)
To: David Miller; +Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA
It's possible that packets that are sent on internal devices (from
the OVS perspective) have already traversed the local IP stack.
After they go through the internal device, they will again travel
through the IP stack which may get confused by the presence of
existing information in the skb. The problem can be observed
when switching between namespaces. This clears out that information
to avoid problems but deliberately leaves other metadata alone.
This is to provide maximum flexibility in chaining together OVS
and other Linux components.
Signed-off-by: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
---
net/openvswitch/vport-internal_dev.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
index de509d3..4061b9e 100644
--- a/net/openvswitch/vport-internal_dev.c
+++ b/net/openvswitch/vport-internal_dev.c
@@ -24,6 +24,9 @@
#include <linux/ethtool.h>
#include <linux/skbuff.h>
+#include <net/dst.h>
+#include <net/xfrm.h>
+
#include "datapath.h"
#include "vport-internal_dev.h"
#include "vport-netdev.h"
@@ -209,6 +212,11 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
int len;
len = skb->len;
+
+ skb_dst_drop(skb);
+ nf_reset(skb);
+ secpath_reset(skb);
+
skb->dev = netdev;
skb->pkt_type = PACKET_HOST;
skb->protocol = eth_type_trans(skb, netdev);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH net-next 5/7] openvswitch: Check currect return value from skb_gso_segment()
[not found] ` <1342823210-3308-1-git-send-email-jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
` (3 preceding siblings ...)
2012-07-20 22:26 ` [PATCH net-next 4/7] openvswitch: Reset upper layer protocol info on internal devices Jesse Gross
@ 2012-07-20 22:26 ` Jesse Gross
2012-07-20 22:26 ` [PATCH net-next 6/7] openvswitch: Check gso_type for correct sk_buff in queue_gso_packets() Jesse Gross
` (2 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Jesse Gross @ 2012-07-20 22:26 UTC (permalink / raw)
To: David Miller; +Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA
From: Pravin B Shelar <pshelar-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
Fix return check typo.
Signed-off-by: Pravin B Shelar <pshelar-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
---
net/openvswitch/datapath.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index b512cb8..670e630 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -269,8 +269,8 @@ static int queue_gso_packets(int dp_ifindex, struct sk_buff *skb,
int err;
segs = skb_gso_segment(skb, NETIF_F_SG | NETIF_F_HW_CSUM);
- if (IS_ERR(skb))
- return PTR_ERR(skb);
+ if (IS_ERR(segs))
+ return PTR_ERR(segs);
/* Queue all of the segments. */
skb = segs;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH net-next 6/7] openvswitch: Check gso_type for correct sk_buff in queue_gso_packets().
[not found] ` <1342823210-3308-1-git-send-email-jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
` (4 preceding siblings ...)
2012-07-20 22:26 ` [PATCH net-next 5/7] openvswitch: Check currect return value from skb_gso_segment() Jesse Gross
@ 2012-07-20 22:26 ` Jesse Gross
2012-07-20 22:26 ` [PATCH net-next 7/7] openvswitch: Fix typo in documentation Jesse Gross
2012-07-20 23:17 ` [GIT net-next] Open vSwitch David Miller
7 siblings, 0 replies; 14+ messages in thread
From: Jesse Gross @ 2012-07-20 22:26 UTC (permalink / raw)
To: David Miller; +Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA
From: Ben Pfaff <blp-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
At the point where it was used, skb_shinfo(skb)->gso_type referred to a
post-GSO sk_buff. Thus, it would always be 0. We want to know the pre-GSO
gso_type, so we need to obtain it before segmenting.
Before this change, the kernel would pass inconsistent data to userspace:
packets for UDP fragments with nonzero offset would be passed along with
flow keys that indicate a zero offset (that is, the flow key for "later"
fragments claimed to be "first" fragments). This inconsistency tended
to confuse Open vSwitch userspace, causing it to log messages about
"failed to flow_del" the flows with "later" fragments.
Signed-off-by: Ben Pfaff <blp-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
---
net/openvswitch/datapath.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 670e630..29dbfcb 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -263,6 +263,7 @@ err:
static int queue_gso_packets(int dp_ifindex, struct sk_buff *skb,
const struct dp_upcall_info *upcall_info)
{
+ unsigned short gso_type = skb_shinfo(skb)->gso_type;
struct dp_upcall_info later_info;
struct sw_flow_key later_key;
struct sk_buff *segs, *nskb;
@@ -279,7 +280,7 @@ static int queue_gso_packets(int dp_ifindex, struct sk_buff *skb,
if (err)
break;
- if (skb == segs && skb_shinfo(skb)->gso_type & SKB_GSO_UDP) {
+ if (skb == segs && gso_type & SKB_GSO_UDP) {
/* The initial flow key extracted by ovs_flow_extract()
* in this case is for a first fragment, so we need to
* properly mark later fragments.
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH net-next 7/7] openvswitch: Fix typo in documentation.
[not found] ` <1342823210-3308-1-git-send-email-jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
` (5 preceding siblings ...)
2012-07-20 22:26 ` [PATCH net-next 6/7] openvswitch: Check gso_type for correct sk_buff in queue_gso_packets() Jesse Gross
@ 2012-07-20 22:26 ` Jesse Gross
2012-07-20 23:17 ` [GIT net-next] Open vSwitch David Miller
7 siblings, 0 replies; 14+ messages in thread
From: Jesse Gross @ 2012-07-20 22:26 UTC (permalink / raw)
To: David Miller; +Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA
From: Leo Alterman <lalterman-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Leo Alterman <lalterman-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
---
Documentation/networking/openvswitch.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/networking/openvswitch.txt b/Documentation/networking/openvswitch.txt
index b8a048b..8fa2dd1 100644
--- a/Documentation/networking/openvswitch.txt
+++ b/Documentation/networking/openvswitch.txt
@@ -118,7 +118,7 @@ essentially like this, ignoring metadata:
Naively, to add VLAN support, it makes sense to add a new "vlan" flow
key attribute to contain the VLAN tag, then continue to decode the
encapsulated headers beyond the VLAN tag using the existing field
-definitions. With this change, an TCP packet in VLAN 10 would have a
+definitions. With this change, a TCP packet in VLAN 10 would have a
flow key much like this:
eth(...), vlan(vid=10, pcp=0), eth_type(0x0800), ip(proto=6, ...), tcp(...)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [GIT net-next] Open vSwitch
[not found] ` <1342823210-3308-1-git-send-email-jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
` (6 preceding siblings ...)
2012-07-20 22:26 ` [PATCH net-next 7/7] openvswitch: Fix typo in documentation Jesse Gross
@ 2012-07-20 23:17 ` David Miller
7 siblings, 0 replies; 14+ messages in thread
From: David Miller @ 2012-07-20 23:17 UTC (permalink / raw)
To: jesse-l0M0P4e3n4LQT0dZR+AlfA
Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA
From: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
Date: Fri, 20 Jul 2012 15:26:43 -0700
> A few bug fixes and small enhancements for net-next/3.6.
>
> The following changes since commit bf32fecdc1851ad9ca960f56771b798d17c26cf1:
>
> openvswitch: Add length check when retrieving TCP flags. (2012-04-02 14:28:57 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch.git master
Pulled, thanks Jesse.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH net-next 4/7] openvswitch: Reset upper layer protocol info on internal devices.
[not found] ` <1342823210-3308-5-git-send-email-jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
@ 2012-09-04 0:57 ` Jesse Gross
[not found] ` <CAEP_g=-giF74zveQgLsrAwS0kp2P3cj_O7mHaKKLVfKwQCNBag-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 14+ messages in thread
From: Jesse Gross @ 2012-09-04 0:57 UTC (permalink / raw)
To: David Miller
Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA,
Chris Wright
On Fri, Jul 20, 2012 at 3:26 PM, Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org> wrote:
> It's possible that packets that are sent on internal devices (from
> the OVS perspective) have already traversed the local IP stack.
> After they go through the internal device, they will again travel
> through the IP stack which may get confused by the presence of
> existing information in the skb. The problem can be observed
> when switching between namespaces. This clears out that information
> to avoid problems but deliberately leaves other metadata alone.
> This is to provide maximum flexibility in chaining together OVS
> and other Linux components.
>
> Signed-off-by: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
It was recently discovered that the bug that this patch fixes is
causing problems in the real world. Can you please queue this for
stable in 3.4/3.5? It's currently in Linus's tree as
7fe99e2d434eafeac0c57b279a77e5de39212636.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH net-next 4/7] openvswitch: Reset upper layer protocol info on internal devices.
[not found] ` <CAEP_g=-giF74zveQgLsrAwS0kp2P3cj_O7mHaKKLVfKwQCNBag-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2012-09-04 1:00 ` David Miller
[not found] ` <20120903.210055.1839817610578900310.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
0 siblings, 1 reply; 14+ messages in thread
From: David Miller @ 2012-09-04 1:00 UTC (permalink / raw)
To: jesse-l0M0P4e3n4LQT0dZR+AlfA
Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA,
chrisw-H+wXaHxf7aLQT0dZR+AlfA
From: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
Date: Mon, 3 Sep 2012 17:57:39 -0700
> On Fri, Jul 20, 2012 at 3:26 PM, Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org> wrote:
>> It's possible that packets that are sent on internal devices (from
>> the OVS perspective) have already traversed the local IP stack.
>> After they go through the internal device, they will again travel
>> through the IP stack which may get confused by the presence of
>> existing information in the skb. The problem can be observed
>> when switching between namespaces. This clears out that information
>> to avoid problems but deliberately leaves other metadata alone.
>> This is to provide maximum flexibility in chaining together OVS
>> and other Linux components.
>>
>> Signed-off-by: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
>
> It was recently discovered that the bug that this patch fixes is
> causing problems in the real world. Can you please queue this for
> stable in 3.4/3.5? It's currently in Linus's tree as
> 7fe99e2d434eafeac0c57b279a77e5de39212636.
>
What vendor is shipping openvswitch enabled and requires the fix to
be in -stable before they'll ship it to customers?
That goes into what is 'real world'
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH net-next 4/7] openvswitch: Reset upper layer protocol info on internal devices.
[not found] ` <20120903.210055.1839817610578900310.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
@ 2012-09-04 1:07 ` Jesse Gross
[not found] ` <CAEP_g=_+Q4Axi0vH8nce6zVZgs++62PbiTWum_z+s_PbpwzgOA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 14+ messages in thread
From: Jesse Gross @ 2012-09-04 1:07 UTC (permalink / raw)
To: David Miller
Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA,
chrisw-H+wXaHxf7aLQT0dZR+AlfA
On Mon, Sep 3, 2012 at 6:00 PM, David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> wrote:
> From: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
> Date: Mon, 3 Sep 2012 17:57:39 -0700
>
>> On Fri, Jul 20, 2012 at 3:26 PM, Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org> wrote:
>>> It's possible that packets that are sent on internal devices (from
>>> the OVS perspective) have already traversed the local IP stack.
>>> After they go through the internal device, they will again travel
>>> through the IP stack which may get confused by the presence of
>>> existing information in the skb. The problem can be observed
>>> when switching between namespaces. This clears out that information
>>> to avoid problems but deliberately leaves other metadata alone.
>>> This is to provide maximum flexibility in chaining together OVS
>>> and other Linux components.
>>>
>>> Signed-off-by: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
>>
>> It was recently discovered that the bug that this patch fixes is
>> causing problems in the real world. Can you please queue this for
>> stable in 3.4/3.5? It's currently in Linus's tree as
>> 7fe99e2d434eafeac0c57b279a77e5de39212636.
>>
>
> What vendor is shipping openvswitch enabled and requires the fix to
> be in -stable before they'll ship it to customers?
>
> That goes into what is 'real world'
Fedora is running into it I believe. Chris Wright asked for it so he
might be able to elaborate more on their plans.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH net-next 4/7] openvswitch: Reset upper layer protocol info on internal devices.
[not found] ` <CAEP_g=_+Q4Axi0vH8nce6zVZgs++62PbiTWum_z+s_PbpwzgOA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2012-09-04 18:22 ` David Miller
2012-09-04 18:23 ` Chris Wright
1 sibling, 0 replies; 14+ messages in thread
From: David Miller @ 2012-09-04 18:22 UTC (permalink / raw)
To: jesse-l0M0P4e3n4LQT0dZR+AlfA
Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA,
chrisw-H+wXaHxf7aLQT0dZR+AlfA
From: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
Date: Mon, 3 Sep 2012 18:07:29 -0700
> On Mon, Sep 3, 2012 at 6:00 PM, David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> wrote:
>> From: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
>> Date: Mon, 3 Sep 2012 17:57:39 -0700
>>
>>> On Fri, Jul 20, 2012 at 3:26 PM, Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org> wrote:
>>>> It's possible that packets that are sent on internal devices (from
>>>> the OVS perspective) have already traversed the local IP stack.
>>>> After they go through the internal device, they will again travel
>>>> through the IP stack which may get confused by the presence of
>>>> existing information in the skb. The problem can be observed
>>>> when switching between namespaces. This clears out that information
>>>> to avoid problems but deliberately leaves other metadata alone.
>>>> This is to provide maximum flexibility in chaining together OVS
>>>> and other Linux components.
>>>>
>>>> Signed-off-by: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
>>>
>>> It was recently discovered that the bug that this patch fixes is
>>> causing problems in the real world. Can you please queue this for
>>> stable in 3.4/3.5? It's currently in Linus's tree as
>>> 7fe99e2d434eafeac0c57b279a77e5de39212636.
>>>
>>
>> What vendor is shipping openvswitch enabled and requires the fix to
>> be in -stable before they'll ship it to customers?
>>
>> That goes into what is 'real world'
>
> Fedora is running into it I believe. Chris Wright asked for it so he
> might be able to elaborate more on their plans.
Anyways, I've meanwhile queued it up for -stable, thanks.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH net-next 4/7] openvswitch: Reset upper layer protocol info on internal devices.
[not found] ` <CAEP_g=_+Q4Axi0vH8nce6zVZgs++62PbiTWum_z+s_PbpwzgOA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-09-04 18:22 ` David Miller
@ 2012-09-04 18:23 ` Chris Wright
1 sibling, 0 replies; 14+ messages in thread
From: Chris Wright @ 2012-09-04 18:23 UTC (permalink / raw)
To: Jesse Gross
Cc: dev-yBygre7rU0TnMu66kgdUjQ, netdev-u79uwXL29TY76Z2rM5mHXA,
chrisw-H+wXaHxf7aLQT0dZR+AlfA, David Miller
* Jesse Gross (jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org) wrote:
> On Mon, Sep 3, 2012 at 6:00 PM, David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> wrote:
> > From: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
> > Date: Mon, 3 Sep 2012 17:57:39 -0700
> >
> >> On Fri, Jul 20, 2012 at 3:26 PM, Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org> wrote:
> >>> It's possible that packets that are sent on internal devices (from
> >>> the OVS perspective) have already traversed the local IP stack.
> >>> After they go through the internal device, they will again travel
> >>> through the IP stack which may get confused by the presence of
> >>> existing information in the skb. The problem can be observed
> >>> when switching between namespaces. This clears out that information
> >>> to avoid problems but deliberately leaves other metadata alone.
> >>> This is to provide maximum flexibility in chaining together OVS
> >>> and other Linux components.
> >>>
> >>> Signed-off-by: Jesse Gross <jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
> >>
> >> It was recently discovered that the bug that this patch fixes is
> >> causing problems in the real world. Can you please queue this for
> >> stable in 3.4/3.5? It's currently in Linus's tree as
> >> 7fe99e2d434eafeac0c57b279a77e5de39212636.
> >>
> >
> > What vendor is shipping openvswitch enabled and requires the fix to
> > be in -stable before they'll ship it to customers?
> >
> > That goes into what is 'real world'
>
> Fedora is running into it I believe. Chris Wright asked for it so he
> might be able to elaborate more on their plans.
I've not hit the bug myself, but been made aware of the issue from
OpenStack/Quantum folks.
There's a testing scenario that hits this as described in this launchpad
bug:
https://bugs.launchpad.net/quantum/+bug/1044318
thanks,
-chris
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-09-04 18:23 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-20 22:26 [GIT net-next] Open vSwitch Jesse Gross
[not found] ` <1342823210-3308-1-git-send-email-jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
2012-07-20 22:26 ` [PATCH net-next 1/7] openvswitch: Enable retrieval of TCP flags from IPv6 traffic Jesse Gross
2012-07-20 22:26 ` [PATCH net-next 2/7] openvswitch: Do not send notification if ovs_vport_set_options() failed Jesse Gross
2012-07-20 22:26 ` [PATCH net-next 3/7] openvswitch: Replace Nicira Networks Jesse Gross
2012-07-20 22:26 ` [PATCH net-next 4/7] openvswitch: Reset upper layer protocol info on internal devices Jesse Gross
[not found] ` <1342823210-3308-5-git-send-email-jesse-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>
2012-09-04 0:57 ` Jesse Gross
[not found] ` <CAEP_g=-giF74zveQgLsrAwS0kp2P3cj_O7mHaKKLVfKwQCNBag-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-09-04 1:00 ` David Miller
[not found] ` <20120903.210055.1839817610578900310.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2012-09-04 1:07 ` Jesse Gross
[not found] ` <CAEP_g=_+Q4Axi0vH8nce6zVZgs++62PbiTWum_z+s_PbpwzgOA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-09-04 18:22 ` David Miller
2012-09-04 18:23 ` Chris Wright
2012-07-20 22:26 ` [PATCH net-next 5/7] openvswitch: Check currect return value from skb_gso_segment() Jesse Gross
2012-07-20 22:26 ` [PATCH net-next 6/7] openvswitch: Check gso_type for correct sk_buff in queue_gso_packets() Jesse Gross
2012-07-20 22:26 ` [PATCH net-next 7/7] openvswitch: Fix typo in documentation Jesse Gross
2012-07-20 23:17 ` [GIT net-next] Open vSwitch David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).