Thanks Joe, I’ll issue a v2 with the comment fix and retain the acks, so it
should be good to go.
Jarno
> On Apr 20, 2017, at 11:53 AM, Joe Stringer wrote:
>
> On 19 April 2017 at 18:49, Jarno Rajahalme wrote:
>> Add a new optional conntrack action attribute OVS_CT_ATTR_EVEN
. However, if the system is
configured without support for events, the setting will be skipped due
to extension not being found.
Signed-off-by: Jarno Rajahalme
Reviewed-by: Greg Rose
Acked-by: Joe Stringer
---
include/uapi/linux/openvswitch.h | 12
net/openvswitch/conntrack.c
Fix typo in a comment.
Signed-off-by: Jarno Rajahalme
Acked-by: Greg Rose
---
net/openvswitch/conntrack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 7b2c2fc..58de4c2 100644
--- a/net/openvswitch
Sorry for the chatter, forgot to include “net-next” in the title, sending again.
Jarno
> On Apr 19, 2017, at 6:49 PM, Jarno Rajahalme wrote:
>
> Fix typo in a comment.
>
> Signed-off-by: Jarno Rajahalme
> ---
> net/openvswitch/conntrack.c | 2 +-
> 1 file changed, 1
Fix typo in a comment.
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 7b2c2fc..58de4c2 100644
--- a/net/openvswitch/conntrack.c
+++ b/net
. However, if the system is
configured without support for events, the setting will be skipped due
to extension not being found.
Signed-off-by: Jarno Rajahalme
---
include/uapi/linux/openvswitch.h | 12
net/openvswitch/conntrack.c | 27 +++
2 files changed
Fix typo in a comment.
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 7b2c2fc..58de4c2 100644
--- a/net/openvswitch/conntrack.c
+++ b/net
. However, if the system is
configured without support for events, the setting will be skipped due
to extension not being found.
Signed-off-by: Jarno Rajahalme
---
include/uapi/linux/openvswitch.h | 12
net/openvswitch/conntrack.c | 27 +++
2 files changed
ker_thread (a008592b)
=> kthread (a008bee2)
=> ret_from_fork (a071b67c)
Fixes: dd41d33f0b03 ("openvswitch: Add force commit.")
Reported-by: Yang Song
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 4 ++--
1 file changed, 2 insertions(+), 2 dele
turn value of
__nf_ct_expect_check() to 0 on success.
Signed-off-by: Jarno Rajahalme
---
net/netfilter/nf_conntrack_expect.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/nf_conntrack_expect.c
b/net/netfilter/nf_conntrack_expect.c
index d6ace69..4b2e1fb 10
he success code path.
Fixes: 4dee62b1 ("netfilter: nf_ct_expect: nf_ct_expect_insert() returns void")
Signed-off-by: Jarno Rajahalme
---
net/netfilter/nf_conntrack_expect.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/nf_conntrack_expec
conntrack events.
Fixes: 193e30967897 ("openvswitch: Do not trigger events for unconfirmed
connections.")
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/net/openvswitch/conntrack.c b/net/o
This patch fixes this by setting max_mtu to ETH_MAX_MTU after
ether_setup() call.
Fixes: 91572088e3fd ("net: use core MTU range checking in core net infra")
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/vport-internal_dev.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/n
> On Feb 9, 2017, at 8:44 AM, Pravin Shelar wrote:
>
> On Wed, Feb 8, 2017 at 5:30 PM, Jarno Rajahalme wrote:
>> This series improves the conntrack integration code in the openvswitch
>> module by fixing outdated comments (patch 1), bugs (patches 2, 3, and
>> 7), cl
> On Feb 8, 2017, at 2:47 PM, Joe Stringer wrote:
>
> On 8 February 2017 at 11:32, Jarno Rajahalme wrote:
>> Since 23014011ba42 ("netfilter: conntrack: support a fixed size of 128
>> distinct labels"), the size of conntrack labels extension has fixed to
>>
> On Feb 8, 2017, at 3:53 PM, Joe Stringer wrote:
>
> On 8 February 2017 at 11:32, Jarno Rajahalme wrote:
>> Stateful network admission policy may allow connections to one
>> direction and reject connections initiated in the other direction.
>> After policy change it
allows the conntrack labels size to be increased in the future
without breaking the build. In the event of conntrack labels
increasing in size OVS would still be able to deal with the 128 first
label bits.
Suggested-by: Joe Stringer
Signed-off-by: Jarno Rajahalme
Acked-by: Pravin B Shelar
Fix comments referring to skb 'nfct' and 'nfctinfo' fields now that
they are combined into '_nfct'.
Signed-off-by: Jarno Rajahalme
Acked-by: Pravin B Shelar
---
net/openvswitch/conntrack.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
Make the array of labels in struct ovs_key_ct_label an union, adding a
u32 array of the same byte size as the existing u8 array. It is
faster to loop through the labels 32 bits at the time, which is also
the alignment of netlink attributes.
Signed-off-by: Jarno Rajahalme
Acked-by: Joe Stringer
we must be careful to never use the
new key fields with ARP or ND packets. ARP is easy to distinguish and
keep mutually exclusive based on the ethernet type, but ND being an
ICMPv6 protocol requires a bit more attention.
Signed-off-by: Jarno Rajahalme
Acked-by: Joe Stringer
Acked-by: Pravi
struct sw_flow_key has two 16-bit holes. Move the most matched
conntrack match fields there. In some typical cases this reduces the
size of the key that needs to be hashed into half and into one cache
line.
Signed-off-by: Jarno Rajahalme
Acked-by: Joe Stringer
Acked-by: Pravin B Shelar
ck mark")
Fixes: c2ac66735870 ("openvswitch: Allow matching on conntrack label")
Signed-off-by: Jarno Rajahalme
Acked-by: Joe Stringer
Acked-by: Pravin B Shelar
---
net/openvswitch/conntrack.c | 28 ++--
1 file changed, 22 insertions(+), 6 deletions(-)
Joe.
v3: Rebase to the current net-next, add the comment only changing
patch 1 and reshuffle some of the patches as requested by Joe.
Jarno Rajahalme (10):
openvswitch: Fix comments for skb->_nfct
openvswitch: Use inverted tuple in ovs_ct_find_existing() if NATted.
openvswitch: Do
Refactoring conntrack labels initialization makes changes in later
patches easier to review.
Signed-off-by: Jarno Rajahalme
Acked-by: Pravin B Shelar
---
net/openvswitch/conntrack.c | 104 ++--
1 file changed, 62 insertions(+), 42 deletions(-)
diff
32 bits in
the connmark are not enough. Labels can still be set explicitly, so
this change only affects the default values of the labels in presense
of a master connection.
Fixes: 7f8a436eaa2c ("openvswitch: Add conntrack action")
Signed-off-by: Jarno Rajahalme
Acked-by: Pravin B Shelar
rent packet, the
existing conntrack entry is deleted and a new one is subsequently
created in the correct direction.
Signed-off-by: Jarno Rajahalme
Acked-by: Pravin B Shelar
---
include/uapi/linux/openvswitch.h | 5 +
net/openvswitch/conntrack.c | 26 --
2 files cha
from its input form as evidenced by one of
the NAT flags being set in the conntrack state metadata.
Fixes: 05752523e565 ("openvswitch: Interface with NAT.")
Signed-off-by: Jarno Rajahalme
Acked-by: Joe Stringer
Acked-by: Pravin B Shelar
---
net/openvswitch/conntr
> On Feb 8, 2017, at 3:06 PM, Joe Stringer wrote:
>
> On 8 February 2017 at 11:32, Jarno Rajahalme wrote:
>> Refactoring conntrack labels initialization makes chenges in later
>
> *changes
>
>> patches easier to review.
>>
>> Signed-off
> On Feb 8, 2017, at 3:25 PM, Joe Stringer wrote:
>
> On 8 February 2017 at 11:32, Jarno Rajahalme wrote:
>> We avoid calling into nf_conntrack_in() for expected connections, as
>> that would remove the expectation that we want to stick around until
>> we are rea
struct sw_flow_key has two 16-bit holes. Move the most matched
conntrack match fields there. In some typical cases this reduces the
size of the key that needs to be hashed into half and into one cache
line.
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c| 40
32 bits in
the connmark are not enough. Labels can still be set explicitly, so
this change only affects the default values of the labels in presense
of a master connection.
Fixes: 7f8a436eaa2c ("openvswitch: Add conntrack action")
Signed-off-by: Jarno Rajahalme
---
net/openvswi
Make the array of labels in struct ovs_key_ct_label an union, adding a
u32 array of the same byte size as the existing u8 array. It is
faster to loop through the labels 32 bits at the time, which is also
the alignment of netlink attributes.
Signed-off-by: Jarno Rajahalme
---
include/uapi/linux
Fix comments referring to skb 'nfct' and 'nfctinfo' fields now that
they are combined into '_nfct'.
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/net/openvswitch
allows the conntrack labels size to be increased in the future
without breaking the build. In the event of conntrack labels
increasing in size OVS would still be able to deal with the 128 first
label bits.
Suggested-by: Joe Stringer
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntr
policy to network configuration requested by user
communities (patches 8 and 9).
v3: Rebase to the current net-next, add the comment only changing
patch 1 and reshuffle some of the patches as requested by Joe.
Jarno Rajahalme (10):
openvswitch: Fix comments for skb->_nfct
openvswitch:
Refactoring conntrack labels initialization makes chenges in later
patches easier to review.
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 104 ++--
1 file changed, 62 insertions(+), 42 deletions(-)
diff --git a/net/openvswitch
ck mark")
Fixes: c2ac66735870 ("openvswitch: Allow matching on conntrack label")
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 28 ++--
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/net/openvswitch/conntrack.c b/net/openvsw
rent packet, the
existing conntrack entry is deleted and a new one is subsequently
created in the correct direction.
Signed-off-by: Jarno Rajahalme
---
include/uapi/linux/openvswitch.h | 5 +
net/openvswitch/conntrack.c | 26 --
2 files changed, 29 insertions(+), 2
from its input form as evidenced by one of
the NAT flags being set in the conntrack state metadata.
Fixes: 05752523e565 ("openvswitch: Interface with NAT.")
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 24 ++--
1 file changed, 22 insertions(+), 2
we must be careful to never use the
new key fields with ARP or ND packets. ARP is easy to distinguish and
keep mutually exclusive based on the ethernet type, but ND being an
ICMPv6 protocol requires a bit more attention.
Signed-off-by: Jarno Rajahalme
---
include/uapi/linux/openvswitch.h | 20 +
allows the conntrack labels size to be increased in the future
without breaking the build. In the event of conntrack labels
increasing in size OVS would still be able to deal with the 128 first
label bits.
Suggested-by: Joe Stringer
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntr
ck mark")
Fixes: c2ac66735870 ("openvswitch: Allow matching on conntrack label")
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 30 +++---
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/net/openvswitch/conntrack.c b/net/openvsw
requested by user communities (patches 7 and 8).
Jarno Rajahalme (9):
openvswitch: Use inverted tuple in ovs_ct_find_existing() if NATted.
openvswitch: Unionize ovs_key_ct_label with a u32 array.
openvswitch: Simplify labels length logic.
openvswitch: Do not trigger events for unconfirmed
from its input form as evidenced by one of
the NAT flags being set in the conntrack state metadata.
Fixes: 05752523e565 ("openvswitch: Interface with NAT.")
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 24 ++--
1 file changed, 22 insertions(+), 2
Make the array of labels in struct ovs_key_ct_label an union, adding a
u32 array of the same byte size as the existing u8 array. It is
faster to loop through the labels 32 bits at the time, which is also
the alignment of netlink attributes.
Signed-off-by: Jarno Rajahalme
---
include/uapi/linux
we must be careful to never use the
new key fields with ARP or ND packets. ARP is easy to distinguish and
keep mutually exclusive based on the ethernet type, but ND being an
ICMPv6 protocol requires a bit more attention.
Signed-off-by: Jarno Rajahalme
---
include/uapi/linux/openvswitch.h | 20 +
struct sw_flow_key has two 16-bit holes. Move the most matched
conntrack match fields there. In some typical cases this reduces the
size of the key that needs to be hashed into half and into one cache
line.
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c| 40
Refactoring conntrack labels initialization makes chenges in later
patches easier to review.
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 104 ++--
1 file changed, 62 insertions(+), 42 deletions(-)
diff --git a/net/openvswitch
32 bits in
the connmark are not enough. Labels can still be set explicitly, so
this change only affects the default values of the labels in presense
of a master connection.
Fixes: 7f8a436eaa2c ("openvswitch: Add conntrack action")
Signed-off-by: Jarno Rajahalme
---
net/openvswi
rent packet, the
existing conntrack entry is deleted and a new one is subsequently
created in the correct direction.
Signed-off-by: Jarno Rajahalme
---
include/uapi/linux/openvswitch.h | 5 +
net/openvswitch/conntrack.c | 27 +--
2 files changed, 30 insertions(+), 2
> On Feb 6, 2017, at 11:15 PM, Joe Stringer wrote:
>
> On 2 February 2017 at 17:10, Jarno Rajahalme wrote:
>> struct sw_flow_key has two 16-bit holes. Move the most matched
>> conntrack match fields there. In some typical cases this reduces the
>> size of the key t
> On Feb 7, 2017, at 2:15 PM, Joe Stringer wrote:
>
> On 2 February 2017 at 17:10, Jarno Rajahalme wrote:
>> Stateful network admission policy may allow connections to one
>> direction and reject connections initiated in the other direction.
>> After policy change it
> On Feb 6, 2017, at 1:53 PM, Joe Stringer wrote:
>
> On 2 February 2017 at 17:10, Jarno Rajahalme wrote:
>> We avoid calling into nf_conntrack_in() for expected connections, as
>> that would remove the expectation that we want to stick around until
>> we are rea
Thanks for the review! Comments below,
Jarno
> On Feb 6, 2017, at 1:46 PM, Joe Stringer wrote:
>
> On 2 February 2017 at 17:10, Jarno Rajahalme wrote:
>> Avoid triggering change events for setting conntrack mark or labels
>> before the conntrack entry has been confi
> On Feb 6, 2017, at 11:15 PM, Joe Stringer wrote:
>
> On 2 February 2017 at 17:10, Jarno Rajahalme wrote:
>> Add the fields of the conntrack original direction 5-tuple to struct
>> sw_flow_key. The new fields are initially zeroed, and are populated
>> whenever a c
> On Feb 6, 2017, at 9:07 AM, Pravin Shelar wrote:
>
> On Thu, Feb 2, 2017 at 5:10 PM, Jarno Rajahalme wrote:
>> When looking for an existing conntrack entry, the packet 5-tuple
>> must be inverted if NAT has already been applied, as the current
>> packet headers
> On Feb 6, 2017, at 11:15 PM, Joe Stringer wrote:
>
> On 2 February 2017 at 17:10, Jarno Rajahalme wrote:
>> struct sw_flow_key has two 16-bit holes. Move the most matched
>> conntrack match fields there. In some typical cases this reduces the
>> size of the key t
> On Feb 7, 2017, at 9:14 AM, Pravin Shelar wrote:
>
> On Mon, Feb 6, 2017 at 9:15 AM, David Miller wrote:
>> From: Pravin Shelar
>> Date: Mon, 6 Feb 2017 09:06:29 -0800
>>
>>> On Sun, Feb 5, 2017 at 2:28 PM, David Miller wrote:
>>>> From: Ja
ac66735870 ("openvswitch: Allow matching on conntrack label")
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 87 -
1 file changed, 63 insertions(+), 24 deletions(-)
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/connt
er use the
new key fields with ARP or ND packets. ARP is easy to distinguish and
keep mutually exclusive based on the ethernet type, but ND being an
ICMPv6 protocol requires a bit more attention.
Signed-off-by: Jarno Rajahalme
---
include/uapi/linux/openvswitch.h | 20 -
net/openvswitch
Make the array of labels in struct ovs_key_ct_label an union, adding a
u32 array of the same byte size as the existing u8 array. It is
faster to loop through the labels 32 bits at the time, which is also
the alignment of netlink attributes.
Signed-off-by: Jarno Rajahalme
---
include/uapi/linux
ting conntrack entry is deleted and a new one is subsequently
created in the correct direction.
Signed-off-by: Jarno Rajahalme
---
include/uapi/linux/openvswitch.h | 10 ++
net/openvswitch/conntrack.c | 27 +--
2 files changed, 35 insertions(+), 2 deletions(
ill
be set explicitly, so this change only affects the default values of
the labels in presense of a master connection.
Fixes: 7f8a436eaa2c ("openvswitch: Add conntrack action")
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 48 -
verse direction tuple the
direction of the packet must be reversed as well.
Fixes: 05752523e565 ("openvswitch: Interface with NAT.")
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 24 ++--
1 file changed, 22 insertions(+), 2 deletions(-)
d
struct sw_flow_key has two 16-bit holes. Move the most matched
conntrack match fields there. In some typical cases this reduces the
size of the key that needs to be hashed into half and into one cache
line.
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c| 42
Nice clean-up.
Acked-by: Jarno Rajahalme
> On Jan 25, 2017, at 9:24 PM, Andy Zhou wrote:
>
> do_execute_actions() implements a worthwhile optimization: in case
> an output action is the last action in an action list, skb_clone()
> can be avoided by outputing the current sk
> On Dec 19, 2016, at 5:06 PM, Jarno Rajahalme wrote:
>
> Add a break statement to prevent fall-through from
> OVS_KEY_ATTR_ETHERNET to OVS_KEY_ATTR_TUNNEL. Without the break
> actions setting ethernet addresses fail to validate with log messages
> complaining about invalid
> On Dec 13, 2016, at 9:07 PM, Pravin Shelar wrote:
>
> On Tue, Nov 29, 2016 at 3:30 PM, Jarno Rajahalme wrote:
>> Add a break statement to prevent fall-through from
>> OVS_KEY_ATTR_ETHERNET to OVS_KEY_ATTR_TUNNEL. Without the break
>> actions setting ethernet addr
ckets")
Signed-off-by: Jarno Rajahalme
Acked-by: Pravin B Shelar
Acked-by: Jiri Benc
---
net/openvswitch/flow_netlink.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index d19044f..c87d359 100644
--- a/net/openvswitch/flow
> On Nov 30, 2016, at 5:51 AM, Jiri Benc wrote:
>
> On Tue, 29 Nov 2016 15:30:52 -0800, Jarno Rajahalme wrote:
>> @@ -504,11 +485,20 @@ void ovs_vport_send(struct vport *vport, struct
>> sk_buff *skb, u8 mac_proto)
>> goto drop;
>> }
>>
> On Nov 28, 2016, at 11:21 PM, Pravin Shelar wrote:
>
> On Mon, Nov 28, 2016 at 6:41 PM, Jarno Rajahalme wrote:
>> Do not set skb->protocol to be the ethertype of the L3 header, unless
>> the packet only has the L3 header. For a non-hardware offloaded VLAN
>> f
packets")
Signed-off-by: Jarno Rajahalme
---
v3: New patch suggested by Pravin.
net/openvswitch/vport.c | 38 ++
1 file changed, 14 insertions(+), 24 deletions(-)
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index b6c8524..076b39f 100
ckets")
Signed-off-by: Jarno Rajahalme
Acked-by: Pravin B Shelar
Acked-by: Jiri Benc
---
v3: No change.
net/openvswitch/flow_netlink.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index d19044f..c87d359 100644
--- a/net/o
ded by userspace are non-accelerated, as are double tagged
VLAN packets.
Fixes: 018c1dda5f ("openvswitch: 802.1AD Flow handling, actions, vlan parsing,
netlink attributes")
Fixes: 5108bbaddc ("openvswitch: add processing of L3 packets")
Signed-off-by: Jarno Rajahalme
---
v3: Set skb-&
ckets")
Signed-off-by: Jarno Rajahalme
Acked-by: Pravin B Shelar
Acked-by: Jiri Benc
---
v2: No change.
net/openvswitch/flow_netlink.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index d19044f..c87d359 100644
--- a/net/o
uot;)
Signed-off-by: Jarno Rajahalme
---
v2: Set skb->protocol when an ETH_P_TEB frame is received via ARPHRD_NONE
interface.
net/openvswitch/datapath.c | 1 -
net/openvswitch/flow.c | 30 ++
2 files changed, 22 insertions(+), 9 deletions(-)
diff -
> On Nov 28, 2016, at 2:42 PM, Jiri Benc wrote:
>
> On Mon, 28 Nov 2016 14:29:39 -0800, Jarno Rajahalme wrote:
>> I’m not sure what you suggest here. Obviously the kernel ABI can not
>> be changed as existing userspace code expects upcalled packets to be
>> non-acce
> On Nov 24, 2016, at 8:10 AM, Jiri Benc wrote:
>
> On Tue, 22 Nov 2016 20:09:34 -0800, Jarno Rajahalme wrote:
>> Do not set skb->protocol to be the ethertype of the L3 header, unless
>> the packet only has the L3 header. For a non-hardware offloaded VLAN
>> frame
ckets")
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/flow_netlink.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index d19044f..c87d359 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
envswitch: add processing of L3 packets")
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/datapath.c | 1 -
net/openvswitch/flow.c | 20 +++-
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 2d4c
cells, i);
>
> __skb_queue_head_init(&cell->napi_skbs);
> +
> + set_bit(NAPI_STATE_NO_BUSY_POLL, &cell->napi.state);
> +
> netif_napi_add(dev, &cell->napi, gro_cell_poll, 64);
> napi_enable(&cell->napi);
> }
>
>
>
>
>
This fixes the problem for me, so for whatever it’s worth:
Tested-by: Jarno Rajahalme
virtio_net_hdr_from_skb() clears the memory for the header, so there
is no point for the callers to do the same.
Signed-off-by: Jarno Rajahalme
---
drivers/net/tun.c | 3 +--
include/linux/virtio_net.h | 2 +-
net/packet/af_packet.c | 2 --
3 files changed, 2 insertions(+), 5
skb notion of gso_type is zero when there is no gso.
Fixes: fd2a0437dc ("virtio_net: introduce virtio_net_hdr_{from,to}_skb")
Signed-off-by: Jarno Rajahalme
---
net/packet/af_packet.c | 51 +++---
1 file changed, 3 insertions(+), 48 deletio
Fix incorrent comment after the final #endif.
Signed-off-by: Jarno Rajahalme
---
include/linux/virtio_net.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
index 1c912f8..74f1e33 100644
--- a/include/linux/virtio_net.h
-off-by: Jarno Rajahalme
---
net/packet/af_packet.c | 16
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 1816b77..fab9bbf 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1967,15 +1967,6
No point storing the return value of virtio_net_hdr_to_skb() or
virtio_net_hdr_from_skb() to a variable when the value is used only
once as a boolean in an immediately following if statement.
Signed-off-by: Jarno Rajahalme
---
drivers/net/macvtap.c | 5 ++---
drivers/net/tun.c | 8
Sorry for my transgressions and wasting your time. I’ll send a v2 in a moment.
Jarno
> On Nov 18, 2016, at 8:35 AM, David Miller wrote:
>
> From: Jarno Rajahalme
> Date: Wed, 16 Nov 2016 18:06:42 -0800
>
>> Use the common virtio_net_hdr_to_skb() instead of open cod
> On Nov 14, 2016, at 3:09 PM, Eric Dumazet wrote:
>
> On Mon, 2016-11-14 at 14:46 -0800, Eric Dumazet wrote:
>> On Mon, 2016-11-14 at 16:12 -0600, Eric W. Biederman wrote:
>>
>>> synchronize_rcu_expidited is not enough if you have multiple network
>>> devices in play.
>>>
>>> Looking at the c
I worked on the same issue a few months back. I rebased my proof-of-concept
code to the current net-next and posted an RFC patch a moment ago.
I have zero experience on QEMU feature negotiation or extending the virtio_net
spec. Since the virtio_net handling code is now all done using shared code
offset) also needs to be passed as a new field. Control plane (QEMU)
also needs to be updated.
All testing was done using Geneve, but this should work for all UDP
tunnels the same.
Signed-off-by: Jarno Rajahalme
---
drivers/net/tun.c | 7 -
drivers/net/virtio_net.c| 16
oduce virtio_net_hdr_{from,to}_skb")
Signed-off-by: Jarno Rajahalme
---
drivers/net/macvtap.c | 5 ++---
drivers/net/tun.c | 12
include/linux/virtio_net.h | 2 +-
net/packet/af_packet.c | 44 +---
4 files changed, 8 inserti
oduce virtio_net_hdr_{from,to}_skb")
Signed-off-by: Jarno Rajahalme
---
drivers/net/macvtap.c | 5 ++---
drivers/net/tun.c | 12
include/linux/virtio_net.h | 2 +-
net/packet/af_packet.c | 44 +---
4 files changed, 8 inserti
somewhat confusing kernel log messages. This patch
removes this check and warning.
Fixes: 289f2253 ("openvswitch: Find existing conntrack entry after upcall.")
Suggested-by: Joe Stringer
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 8 +---
1 file changed, 1
Thanks for the review!
> On Jun 21, 2016, at 1:57 PM, Joe Stringer wrote:
>
> On 20 June 2016 at 17:19, Jarno Rajahalme wrote:
>> Only allow setting conntrack mark or labels when the commit flag is
>> specified. This makes sure we can not set them before the connection
Set conntrack mark and labels right before committing so that
the initial conntrack NEW event has the mark and labels.
Signed-off-by: Jarno Rajahalme
---
v2: Separate Kernel API change to an RFC patch (2/2).
net/openvswitch/conntrack.c | 33 ++---
1 file changed, 14
ct_mark and/or ct_labels. Validate for this in the kernel API.
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 76 ++---
1 file changed, 51 insertions(+), 25 deletions(-)
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch
accept setting
ct_mark and/or ct_labels. Validate for this on the kernel API.
Finally, set conntrack mark and labels right before committing so that
the initial conntrack NEW event has the mark and labels.
Signed-off-by: Jarno Rajahalme
---
net/openvswitch/conntrack.c | 72
The title should have been:
openvswitch: Only set mark and labels with a commit flag.
This reflects the fact that modifying the mark and/or labels of an existing
connection is allowed. The commit flag is still required to do that, though.
Jarno
> On Jun 20, 2016, at 5:19 PM, Jarno Rajaha
This would result in inconsistent helper assignment if a first CT action
assigns a helper and a further CT action tries to assign a different helper;
Typically the second helper assignment would be ignored, but if the unconfirmed
conntrack entry is lost due to an upcall the second helper assignm
The setting of the UDP tunnel GSO type is already performed by
udp[46]_gro_complete().
Signed-off-by: Jarno Rajahalme
---
drivers/net/geneve.c | 2 --
drivers/net/vxlan.c | 2 --
include/net/udp_tunnel.h | 9 -
net/ipv4/fou.c | 2 --
4 files changed, 15 deletions
1 - 100 of 205 matches
Mail list logo
