From: Alexander Duyck <aduyck@mirantis.com>
To: talal@mellanox.com, netdev@vger.kernel.org,
michael.chan@broadcom.com, alexander.duyck@gmail.com,
davem@davemloft.net, galp@mellanox.com, ogerlitz@mellanox.com,
eranbe@mellanox.com
Subject: [net-next PATCH v3 2/8] gso: Only allow GSO_PARTIAL if we can checksum the inner protocol
Date: Mon, 02 May 2016 09:38:18 -0700 [thread overview]
Message-ID: <20160502163818.11809.37649.stgit@ahduyck-xeon-server> (raw)
In-Reply-To: <20160502162828.11809.92444.stgit@ahduyck-xeon-server>
This patch addresses a possible issue that can occur if we get into any odd
corner cases where we support TSO for a given protocol but not the checksum
or scatter-gather offload. There are few drivers floating around that
setup their tunnels this way and by enforcing the checksum piece we can
avoid mangling any frames.
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
---
net/core/skbuff.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index b8dd2d2e2256..5586be93632f 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3080,8 +3080,7 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
unsigned int headroom;
unsigned int len = head_skb->len;
__be16 proto;
- bool csum;
- int sg = !!(features & NETIF_F_SG);
+ bool csum, sg;
int nfrags = skb_shinfo(head_skb)->nr_frags;
int err = -ENOMEM;
int i = 0;
@@ -3093,13 +3092,14 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
if (unlikely(!proto))
return ERR_PTR(-EINVAL);
+ sg = !!(features & NETIF_F_SG);
csum = !!can_checksum_protocol(features, proto);
/* GSO partial only requires that we trim off any excess that
* doesn't fit into an MSS sized block, so take care of that
* now.
*/
- if (features & NETIF_F_GSO_PARTIAL) {
+ if (sg && csum && (features & NETIF_F_GSO_PARTIAL)) {
partial_segs = len / mss;
if (partial_segs > 1)
mss *= partial_segs;
next prev parent reply other threads:[~2016-05-02 16:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-02 16:38 [net-next PATCH v3 0/8] Fix Tunnel features and enable GSO partial for several drivers Alexander Duyck
2016-05-02 16:38 ` [net-next PATCH v3 1/8] gso: Do not perform partial GSO if number of partial segments is 1 or less Alexander Duyck
2016-05-02 16:38 ` Alexander Duyck [this message]
2016-05-02 16:38 ` [net-next PATCH v3 3/8] net: Fix netdev_fix_features so that TSO_MANGLEID is only available with TSO Alexander Duyck
2016-05-02 16:38 ` [net-next PATCH v3 4/8] net/mlx4_en: Add support for UDP tunnel segmentation with outer checksum offload Alexander Duyck
2016-05-02 16:38 ` [net-next PATCH v3 5/8] net/mlx4_en: Add support for inner IPv6 checksum offloads and TSO Alexander Duyck
2016-05-02 16:38 ` [net-next PATCH v3 6/8] net/mlx5e: Add support for UDP tunnel segmentation with outer checksum offload Alexander Duyck
2016-05-02 16:38 ` [net-next PATCH v3 7/8] net/mlx5e: Fix IPv6 tunnel " Alexander Duyck
2016-05-02 16:38 ` [net-next PATCH v3 8/8] bnxt: Add support for segmentation of tunnels with outer checksums Alexander Duyck
2016-05-03 20:01 ` [net-next PATCH v3 0/8] Fix Tunnel features and enable GSO partial for several drivers David Miller
2016-05-04 17:32 ` David Miller
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=20160502163818.11809.37649.stgit@ahduyck-xeon-server \
--to=aduyck@mirantis.com \
--cc=alexander.duyck@gmail.com \
--cc=davem@davemloft.net \
--cc=eranbe@mellanox.com \
--cc=galp@mellanox.com \
--cc=michael.chan@broadcom.com \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=talal@mellanox.com \
/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 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).