* [net-next PATCH 1/2] ip6_gre: Do not allow segmentation offloads GRE_CSUM is enabled with FOU/GUE
2016-05-18 17:44 [net-next PATCH 0/2] Follow-ups for GUEoIPv6 patches Alexander Duyck
@ 2016-05-18 17:44 ` Alexander Duyck
2016-05-18 17:44 ` [net-next PATCH 2/2] intel: Add support for IPv6 IP-in-IP offload Alexander Duyck
` (2 subsequent siblings)
3 siblings, 0 replies; 10+ messages in thread
From: Alexander Duyck @ 2016-05-18 17:44 UTC (permalink / raw)
To: tom, alexander.duyck, intel-wired-lan, jeffrey.t.kirsher, netdev,
kernel-team, davem
This patch addresses the same issue we had for IPv4 where enabling GRE with
an inner checksum cannot be supported with FOU/GUE due to the fact that
they will jump past the GRE header at it is treated like a tunnel header.
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
---
net/ipv6/ip6_gre.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 6fb1b89d0178..af503f518278 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -1355,11 +1355,15 @@ static int ip6gre_newlink(struct net *src_net, struct net_device *dev,
dev->hw_features |= GRE6_FEATURES;
if (!(nt->parms.o_flags & TUNNEL_SEQ)) {
- /* TCP segmentation offload is not supported when we
- * generate output sequences.
+ /* TCP offload with GRE SEQ is not supported, nor
+ * can we support 2 levels of outer headers requiring
+ * an update.
*/
- dev->features |= NETIF_F_GSO_SOFTWARE;
- dev->hw_features |= NETIF_F_GSO_SOFTWARE;
+ if (!(nt->parms.o_flags & TUNNEL_CSUM) ||
+ (nt->encap.type == TUNNEL_ENCAP_NONE)) {
+ dev->features |= NETIF_F_GSO_SOFTWARE;
+ dev->hw_features |= NETIF_F_GSO_SOFTWARE;
+ }
/* Can use a lockless transmit, unless we generate
* output sequences
^ permalink raw reply related [flat|nested] 10+ messages in thread* [net-next PATCH 2/2] intel: Add support for IPv6 IP-in-IP offload
2016-05-18 17:44 [net-next PATCH 0/2] Follow-ups for GUEoIPv6 patches Alexander Duyck
2016-05-18 17:44 ` [net-next PATCH 1/2] ip6_gre: Do not allow segmentation offloads GRE_CSUM is enabled with FOU/GUE Alexander Duyck
@ 2016-05-18 17:44 ` Alexander Duyck
2016-05-18 21:27 ` [net-next PATCH 0/2] Follow-ups for GUEoIPv6 patches Jeff Kirsher
2016-05-20 23:26 ` David Miller
3 siblings, 0 replies; 10+ messages in thread
From: Alexander Duyck @ 2016-05-18 17:44 UTC (permalink / raw)
To: tom, alexander.duyck, intel-wired-lan, jeffrey.t.kirsher, netdev,
kernel-team, davem
This patch adds support for offloading IPXIP6 type packets that represent
either IPv4 or IPv6 encapsulated inside of an IPv6 outer IP header. In
addition with this change we should also be able to support FOU
encapsulated traffic with outer IPv6 headers.
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 1 +
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 1 +
drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 1 +
drivers/net/ethernet/intel/i40evf/i40evf_main.c | 1 +
drivers/net/ethernet/intel/igb/igb_main.c | 1 +
drivers/net/ethernet/intel/igbvf/netdev.c | 1 +
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 1 +
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 1 +
8 files changed, 8 insertions(+)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 14e9c99e9d36..c059d09f3257 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -9113,6 +9113,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
NETIF_F_GSO_GRE |
NETIF_F_GSO_GRE_CSUM |
NETIF_F_GSO_IPXIP4 |
+ NETIF_F_GSO_IPXIP6 |
NETIF_F_GSO_UDP_TUNNEL |
NETIF_F_GSO_UDP_TUNNEL_CSUM |
NETIF_F_GSO_PARTIAL |
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 0a8122c00ae2..55f151fca1dc 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -2285,6 +2285,7 @@ static int i40e_tso(struct sk_buff *skb, u8 *hdr_len, u64 *cd_type_cmd_tso_mss)
if (skb_shinfo(skb)->gso_type & (SKB_GSO_GRE |
SKB_GSO_GRE_CSUM |
SKB_GSO_IPXIP4 |
+ SKB_GSO_IPXIP6 |
SKB_GSO_UDP_TUNNEL |
SKB_GSO_UDP_TUNNEL_CSUM)) {
if (!(skb_shinfo(skb)->gso_type & SKB_GSO_PARTIAL) &&
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index 2bbbbd0f9f15..be99189da925 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -1560,6 +1560,7 @@ static int i40e_tso(struct sk_buff *skb, u8 *hdr_len, u64 *cd_type_cmd_tso_mss)
if (skb_shinfo(skb)->gso_type & (SKB_GSO_GRE |
SKB_GSO_GRE_CSUM |
SKB_GSO_IPXIP4 |
+ SKB_GSO_IPXIP6 |
SKB_GSO_UDP_TUNNEL |
SKB_GSO_UDP_TUNNEL_CSUM)) {
if (!(skb_shinfo(skb)->gso_type & SKB_GSO_PARTIAL) &&
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 520c5b3b6cb4..eac057b88055 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -2231,6 +2231,7 @@ int i40evf_process_config(struct i40evf_adapter *adapter)
NETIF_F_GSO_GRE |
NETIF_F_GSO_GRE_CSUM |
NETIF_F_GSO_IPXIP4 |
+ NETIF_F_GSO_IPXIP6 |
NETIF_F_GSO_UDP_TUNNEL |
NETIF_F_GSO_UDP_TUNNEL_CSUM |
NETIF_F_GSO_PARTIAL |
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index b1a5cdb77088..ef3d642f5ff2 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2419,6 +2419,7 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
#define IGB_GSO_PARTIAL_FEATURES (NETIF_F_GSO_GRE | \
NETIF_F_GSO_GRE_CSUM | \
NETIF_F_GSO_IPXIP4 | \
+ NETIF_F_GSO_IPXIP6 | \
NETIF_F_GSO_UDP_TUNNEL | \
NETIF_F_GSO_UDP_TUNNEL_CSUM)
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 79b907f1a520..b0778ba65083 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -2764,6 +2764,7 @@ static int igbvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
#define IGBVF_GSO_PARTIAL_FEATURES (NETIF_F_GSO_GRE | \
NETIF_F_GSO_GRE_CSUM | \
NETIF_F_GSO_IPXIP4 | \
+ NETIF_F_GSO_IPXIP6 | \
NETIF_F_GSO_UDP_TUNNEL | \
NETIF_F_GSO_UDP_TUNNEL_CSUM)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 427084e7fbf4..e98affdb14b7 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -9544,6 +9544,7 @@ skip_sriov:
#define IXGBE_GSO_PARTIAL_FEATURES (NETIF_F_GSO_GRE | \
NETIF_F_GSO_GRE_CSUM | \
NETIF_F_GSO_IPXIP4 | \
+ NETIF_F_GSO_IPXIP6 | \
NETIF_F_GSO_UDP_TUNNEL | \
NETIF_F_GSO_UDP_TUNNEL_CSUM)
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index d86e51116384..acc24010cfe0 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -4063,6 +4063,7 @@ static int ixgbevf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
#define IXGBEVF_GSO_PARTIAL_FEATURES (NETIF_F_GSO_GRE | \
NETIF_F_GSO_GRE_CSUM | \
NETIF_F_GSO_IPXIP4 | \
+ NETIF_F_GSO_IPXIP6 | \
NETIF_F_GSO_UDP_TUNNEL | \
NETIF_F_GSO_UDP_TUNNEL_CSUM)
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [net-next PATCH 0/2] Follow-ups for GUEoIPv6 patches
2016-05-18 17:44 [net-next PATCH 0/2] Follow-ups for GUEoIPv6 patches Alexander Duyck
2016-05-18 17:44 ` [net-next PATCH 1/2] ip6_gre: Do not allow segmentation offloads GRE_CSUM is enabled with FOU/GUE Alexander Duyck
2016-05-18 17:44 ` [net-next PATCH 2/2] intel: Add support for IPv6 IP-in-IP offload Alexander Duyck
@ 2016-05-18 21:27 ` Jeff Kirsher
2016-05-18 23:19 ` Alexander Duyck
2016-05-19 4:10 ` David Miller
2016-05-20 23:26 ` David Miller
3 siblings, 2 replies; 10+ messages in thread
From: Jeff Kirsher @ 2016-05-18 21:27 UTC (permalink / raw)
To: Alexander Duyck, tom, alexander.duyck, intel-wired-lan, netdev,
kernel-team, davem
[-- Attachment #1: Type: text/plain, Size: 1167 bytes --]
On Wed, 2016-05-18 at 10:44 -0700, Alexander Duyck wrote:
> This patch series is meant to be applied after:
> [PATCH v7 net-next 00/16] ipv6: Enable GUEoIPv6 and more fixes for v6
> tunneling
>
> The first patch addresses an issue we already resolved in the GREv4 and
> is
> now present in GREv6 with the introduction of FOU/GUE for IPv6 based GRE
> tunnels.
>
> The second patch goes through and enables IPv6 tunnel offloads for the
> Intel
> NICs that already support the IPv4 based IP-in-IP tunnel offloads. I
> have
> only done a bit of touch testing but have seen ~20 Gb/s over an i40e
> interface using a v4-in-v6 tunnel, and I have verified IPv6 GRE is still
> passing traffic at around the same rate. I plan to do further testing
> but
> with these patches present it should enable a wider audience to be able
> to
> test the new features introduced in Tom's patchset with hardware
> offloads.
>
> ---
>
> Alexander Duyck (2):
> ip6_gre: Do not allow segmentation offloads GRE_CSUM is enabled
> with FOU/GUE
> intel: Add support for IPv6 IP-in-IP offload
Dave, I have this series added to my queue.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [net-next PATCH 0/2] Follow-ups for GUEoIPv6 patches
2016-05-18 21:27 ` [net-next PATCH 0/2] Follow-ups for GUEoIPv6 patches Jeff Kirsher
@ 2016-05-18 23:19 ` Alexander Duyck
2016-05-18 23:31 ` Jeff Kirsher
2016-05-19 4:10 ` David Miller
1 sibling, 1 reply; 10+ messages in thread
From: Alexander Duyck @ 2016-05-18 23:19 UTC (permalink / raw)
To: Jeff Kirsher
Cc: Alexander Duyck, Tom Herbert, intel-wired-lan, Netdev,
Kernel Team, David Miller
On Wed, May 18, 2016 at 2:27 PM, Jeff Kirsher
<jeffrey.t.kirsher@intel.com> wrote:
> On Wed, 2016-05-18 at 10:44 -0700, Alexander Duyck wrote:
>> This patch series is meant to be applied after:
>> [PATCH v7 net-next 00/16] ipv6: Enable GUEoIPv6 and more fixes for v6
>> tunneling
>>
>> The first patch addresses an issue we already resolved in the GREv4 and
>> is
>> now present in GREv6 with the introduction of FOU/GUE for IPv6 based GRE
>> tunnels.
>>
>> The second patch goes through and enables IPv6 tunnel offloads for the
>> Intel
>> NICs that already support the IPv4 based IP-in-IP tunnel offloads. I
>> have
>> only done a bit of touch testing but have seen ~20 Gb/s over an i40e
>> interface using a v4-in-v6 tunnel, and I have verified IPv6 GRE is still
>> passing traffic at around the same rate. I plan to do further testing
>> but
>> with these patches present it should enable a wider audience to be able
>> to
>> test the new features introduced in Tom's patchset with hardware
>> offloads.
>>
>> ---
>>
>> Alexander Duyck (2):
>> ip6_gre: Do not allow segmentation offloads GRE_CSUM is enabled
>> with FOU/GUE
>> intel: Add support for IPv6 IP-in-IP offload
>
> Dave, I have this series added to my queue.
Jeff,
If Tom's patches make it in for 4.7, then I would like to see if we
could push these patches for "net" since essentially the first patch
is a fix for Tom's earlier patches and the second is needed in order
to really be able to test Tom's patches with a driver that actually
supports a hardware offload.
Thanks.
- Alex
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [net-next PATCH 0/2] Follow-ups for GUEoIPv6 patches
2016-05-18 23:19 ` Alexander Duyck
@ 2016-05-18 23:31 ` Jeff Kirsher
0 siblings, 0 replies; 10+ messages in thread
From: Jeff Kirsher @ 2016-05-18 23:31 UTC (permalink / raw)
To: Alexander Duyck
Cc: Alexander Duyck, Tom Herbert, intel-wired-lan, Netdev,
Kernel Team, David Miller
[-- Attachment #1: Type: text/plain, Size: 2049 bytes --]
On Wed, 2016-05-18 at 16:19 -0700, Alexander Duyck wrote:
> On Wed, May 18, 2016 at 2:27 PM, Jeff Kirsher
> <jeffrey.t.kirsher@intel.com> wrote:
> > On Wed, 2016-05-18 at 10:44 -0700, Alexander Duyck wrote:
> >> This patch series is meant to be applied after:
> >> [PATCH v7 net-next 00/16] ipv6: Enable GUEoIPv6 and more fixes for v6
> >> tunneling
> >>
> >> The first patch addresses an issue we already resolved in the GREv4
> and
> >> is
> >> now present in GREv6 with the introduction of FOU/GUE for IPv6 based
> GRE
> >> tunnels.
> >>
> >> The second patch goes through and enables IPv6 tunnel offloads for the
> >> Intel
> >> NICs that already support the IPv4 based IP-in-IP tunnel offloads. I
> >> have
> >> only done a bit of touch testing but have seen ~20 Gb/s over an i40e
> >> interface using a v4-in-v6 tunnel, and I have verified IPv6 GRE is
> still
> >> passing traffic at around the same rate. I plan to do further testing
> >> but
> >> with these patches present it should enable a wider audience to be
> able
> >> to
> >> test the new features introduced in Tom's patchset with hardware
> >> offloads.
> >>
> >> ---
> >>
> >> Alexander Duyck (2):
> >> ip6_gre: Do not allow segmentation offloads GRE_CSUM is enabled
> >> with FOU/GUE
> >> intel: Add support for IPv6 IP-in-IP offload
> >
> > Dave, I have this series added to my queue.
>
> Jeff,
>
> If Tom's patches make it in for 4.7, then I would like to see if we
> could push these patches for "net" since essentially the first patch
> is a fix for Tom's earlier patches and the second is needed in order
> to really be able to test Tom's patches with a driver that actually
> supports a hardware offload.
Yeah, I was thinking that very same thing. I will wait to see if Dave
sucks this into 4.7 or not and plan accordingly. I also figured out that
your two patch series needs to have Tom's series applied before hand, so I
will be adding Tom's series to my tree just for testing purposes.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [net-next PATCH 0/2] Follow-ups for GUEoIPv6 patches
2016-05-18 21:27 ` [net-next PATCH 0/2] Follow-ups for GUEoIPv6 patches Jeff Kirsher
2016-05-18 23:19 ` Alexander Duyck
@ 2016-05-19 4:10 ` David Miller
2016-05-24 17:14 ` Jeff Kirsher
1 sibling, 1 reply; 10+ messages in thread
From: David Miller @ 2016-05-19 4:10 UTC (permalink / raw)
To: jeffrey.t.kirsher
Cc: aduyck, tom, alexander.duyck, intel-wired-lan, netdev,
kernel-team
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Wed, 18 May 2016 14:27:58 -0700
> On Wed, 2016-05-18 at 10:44 -0700, Alexander Duyck wrote:
>> This patch series is meant to be applied after:
>> [PATCH v7 net-next 00/16] ipv6: Enable GUEoIPv6 and more fixes for v6
>> tunneling
>>
>> The first patch addresses an issue we already resolved in the GREv4 and
>> is
>> now present in GREv6 with the introduction of FOU/GUE for IPv6 based GRE
>> tunnels.
>>
>> The second patch goes through and enables IPv6 tunnel offloads for the
>> Intel
>> NICs that already support the IPv4 based IP-in-IP tunnel offloads. I
>> have
>> only done a bit of touch testing but have seen ~20 Gb/s over an i40e
>> interface using a v4-in-v6 tunnel, and I have verified IPv6 GRE is still
>> passing traffic at around the same rate. I plan to do further testing
>> but
>> with these patches present it should enable a wider audience to be able
>> to
>> test the new features introduced in Tom's patchset with hardware
>> offloads.
>>
>> ---
>>
>> Alexander Duyck (2):
>> ip6_gre: Do not allow segmentation offloads GRE_CSUM is enabled
>> with FOU/GUE
>> intel: Add support for IPv6 IP-in-IP offload
>
> Dave, I have this series added to my queue.
Why would you if it depends upon Tom's series, as mentioned above, which
isn't even in my tree yet?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [net-next PATCH 0/2] Follow-ups for GUEoIPv6 patches
2016-05-19 4:10 ` David Miller
@ 2016-05-24 17:14 ` Jeff Kirsher
2016-05-24 17:46 ` Alex Duyck
0 siblings, 1 reply; 10+ messages in thread
From: Jeff Kirsher @ 2016-05-24 17:14 UTC (permalink / raw)
To: David Miller
Cc: aduyck, tom, alexander.duyck, intel-wired-lan, netdev,
kernel-team
[-- Attachment #1: Type: text/plain, Size: 1746 bytes --]
On Wed, 2016-05-18 at 21:10 -0700, David Miller wrote:
> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Wed, 18 May 2016 14:27:58 -0700
>
> > On Wed, 2016-05-18 at 10:44 -0700, Alexander Duyck wrote:
> >> This patch series is meant to be applied after:
> >> [PATCH v7 net-next 00/16] ipv6: Enable GUEoIPv6 and more fixes for v6
> >> tunneling
> >>
> >> The first patch addresses an issue we already resolved in the GREv4
> and
> >> is
> >> now present in GREv6 with the introduction of FOU/GUE for IPv6 based
> GRE
> >> tunnels.
> >>
> >> The second patch goes through and enables IPv6 tunnel offloads for the
> >> Intel
> >> NICs that already support the IPv4 based IP-in-IP tunnel offloads. I
> >> have
> >> only done a bit of touch testing but have seen ~20 Gb/s over an i40e
> >> interface using a v4-in-v6 tunnel, and I have verified IPv6 GRE is
> still
> >> passing traffic at around the same rate. I plan to do further testing
> >> but
> >> with these patches present it should enable a wider audience to be
> able
> >> to
> >> test the new features introduced in Tom's patchset with hardware
> >> offloads.
> >>
> >> ---
> >>
> >> Alexander Duyck (2):
> >> ip6_gre: Do not allow segmentation offloads GRE_CSUM is enabled
> >> with FOU/GUE
> >> intel: Add support for IPv6 IP-in-IP offload
> >
> > Dave, I have this series added to my queue.
>
> Why would you if it depends upon Tom's series, as mentioned above, which
> isn't even in my tree yet?
I was not able to apply his patches to my dev-queue due to conflicts and
from discussion with Alex, I made the mistake in assuming the issues I saw
was because it did not have Tom's driver changes.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [net-next PATCH 0/2] Follow-ups for GUEoIPv6 patches
2016-05-24 17:14 ` Jeff Kirsher
@ 2016-05-24 17:46 ` Alex Duyck
0 siblings, 0 replies; 10+ messages in thread
From: Alex Duyck @ 2016-05-24 17:46 UTC (permalink / raw)
To: Jeff Kirsher
Cc: David Miller, Tom Herbert, Alexander Duyck, intel-wired-lan,
Linux Kernel Network Developers, kernel-team
On Tue, May 24, 2016 at 10:14 AM, Jeff Kirsher
<jeffrey.t.kirsher@intel.com> wrote:
> On Wed, 2016-05-18 at 21:10 -0700, David Miller wrote:
>> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Wed, 18 May 2016 14:27:58 -0700
>>
>> > On Wed, 2016-05-18 at 10:44 -0700, Alexander Duyck wrote:
>> >> This patch series is meant to be applied after:
>> >> [PATCH v7 net-next 00/16] ipv6: Enable GUEoIPv6 and more fixes for v6
>> >> tunneling
>> >>
>> >> The first patch addresses an issue we already resolved in the GREv4
>> and
>> >> is
>> >> now present in GREv6 with the introduction of FOU/GUE for IPv6 based
>> GRE
>> >> tunnels.
>> >>
>> >> The second patch goes through and enables IPv6 tunnel offloads for the
>> >> Intel
>> >> NICs that already support the IPv4 based IP-in-IP tunnel offloads. I
>> >> have
>> >> only done a bit of touch testing but have seen ~20 Gb/s over an i40e
>> >> interface using a v4-in-v6 tunnel, and I have verified IPv6 GRE is
>> still
>> >> passing traffic at around the same rate. I plan to do further testing
>> >> but
>> >> with these patches present it should enable a wider audience to be
>> able
>> >> to
>> >> test the new features introduced in Tom's patchset with hardware
>> >> offloads.
>> >>
>> >> ---
>> >>
>> >> Alexander Duyck (2):
>> >> ip6_gre: Do not allow segmentation offloads GRE_CSUM is enabled
>> >> with FOU/GUE
>> >> intel: Add support for IPv6 IP-in-IP offload
>> >
>> > Dave, I have this series added to my queue.
>>
>> Why would you if it depends upon Tom's series, as mentioned above, which
>> isn't even in my tree yet?
>
> I was not able to apply his patches to my dev-queue due to conflicts and
> from discussion with Alex, I made the mistake in assuming the issues I saw
> was because it did not have Tom's driver changes.
I thought Dave had already applied the patches to his tree? If so
there shouldn't be a need for you to pull them in and apply them.
That might also be the source of the conflicts if they are already in
the tree.
- Alex
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [net-next PATCH 0/2] Follow-ups for GUEoIPv6 patches
2016-05-18 17:44 [net-next PATCH 0/2] Follow-ups for GUEoIPv6 patches Alexander Duyck
` (2 preceding siblings ...)
2016-05-18 21:27 ` [net-next PATCH 0/2] Follow-ups for GUEoIPv6 patches Jeff Kirsher
@ 2016-05-20 23:26 ` David Miller
3 siblings, 0 replies; 10+ messages in thread
From: David Miller @ 2016-05-20 23:26 UTC (permalink / raw)
To: aduyck
Cc: tom, alexander.duyck, intel-wired-lan, jeffrey.t.kirsher, netdev,
kernel-team
From: Alexander Duyck <aduyck@mirantis.com>
Date: Wed, 18 May 2016 10:44:40 -0700
> This patch series is meant to be applied after:
> [PATCH v7 net-next 00/16] ipv6: Enable GUEoIPv6 and more fixes for v6 tunneling
>
> The first patch addresses an issue we already resolved in the GREv4 and is
> now present in GREv6 with the introduction of FOU/GUE for IPv6 based GRE
> tunnels.
>
> The second patch goes through and enables IPv6 tunnel offloads for the Intel
> NICs that already support the IPv4 based IP-in-IP tunnel offloads. I have
> only done a bit of touch testing but have seen ~20 Gb/s over an i40e
> interface using a v4-in-v6 tunnel, and I have verified IPv6 GRE is still
> passing traffic at around the same rate. I plan to do further testing but
> with these patches present it should enable a wider audience to be able to
> test the new features introduced in Tom's patchset with hardware offloads.
Series applied, thanks Alex.
^ permalink raw reply [flat|nested] 10+ messages in thread