From: vyasevich@gmail.com
To: netdev@vger.kernel.org
Cc: Vladislav Yasevich <vyasevic@redhat.com>,
Shahed Shaikh <shahed.shaikh@qlogic.com>,
Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>,
Ron Mercer <ron.mercer@qlogic.com>,
linux-driver@qlogic.com
Subject: [PATCH 8/8] qlge: Fix TSO for non-accelerated vlan traffic
Date: Fri, 22 Aug 2014 22:17:10 -0400 [thread overview]
Message-ID: <1408760230-7457-9-git-send-email-vysevich@gmail.com> (raw)
In-Reply-To: <1408760230-7457-1-git-send-email-vysevich@gmail.com>
From: Vladislav Yasevich <vyasevic@redhat.com>
This device claims TSO support for vlans. It also allows a user to
control vlan acceleration offloading. As such, it is possible to turn
off vlan acceleration and configure a vlan which will continue to send
TSO traffic.
In such situation the packet passed down the the device will contain
a vlan header and skb->protocol will be set to ETH_P_8021Q.
The device assumes that skb->protocol contains network protocol
value and uses that value to set up TSO information.
This results in corrupted frames sent on the wire.
This patch extracts the protocol value correctly by using a
vlan_get_protocol() helper and corrects corrupt TSO frames.
CC: Shahed Shaikh <shahed.shaikh@qlogic.com>
CC: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
CC: Ron Mercer <ron.mercer@qlogic.com>
CC: linux-driver@qlogic.com
Signed-off-by: Vladislav Yasevich <vyasevic@redhat.com>
---
drivers/net/ethernet/qlogic/qlge/qlge_main.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index 188626e..3e96f26 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -2556,6 +2556,7 @@ static int ql_tso(struct sk_buff *skb, struct ob_mac_tso_iocb_req *mac_iocb_ptr)
if (skb_is_gso(skb)) {
int err;
+ __be16 l3_proto = vlan_get_protocol(skb);
err = skb_cow_head(skb, 0);
if (err < 0)
@@ -2572,7 +2573,7 @@ static int ql_tso(struct sk_buff *skb, struct ob_mac_tso_iocb_req *mac_iocb_ptr)
<< OB_MAC_TRANSPORT_HDR_SHIFT);
mac_iocb_ptr->mss = cpu_to_le16(skb_shinfo(skb)->gso_size);
mac_iocb_ptr->flags2 |= OB_MAC_TSO_IOCB_LSO;
- if (likely(skb->protocol == htons(ETH_P_IP))) {
+ if (likely(l3_proto == htons(ETH_P_IP))) {
struct iphdr *iph = ip_hdr(skb);
iph->check = 0;
mac_iocb_ptr->flags1 |= OB_MAC_TSO_IOCB_IP4;
@@ -2580,7 +2581,7 @@ static int ql_tso(struct sk_buff *skb, struct ob_mac_tso_iocb_req *mac_iocb_ptr)
iph->daddr, 0,
IPPROTO_TCP,
0);
- } else if (skb->protocol == htons(ETH_P_IPV6)) {
+ } else if (l3_proto == htons(ETH_P_IPV6)) {
mac_iocb_ptr->flags1 |= OB_MAC_TSO_IOCB_IP6;
tcp_hdr(skb)->check =
~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
--
1.9.3
prev parent reply other threads:[~2014-08-23 2:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-23 2:17 [PATCH 0/8] Fix TSO and checksum issues with non-accelerated vlan traffic vyasevich
2014-08-23 2:17 ` [PATCH 1/8] e1000e: Fix TSO with non-accelerated vlans vyasevich
2014-08-23 2:17 ` [PATCH 2/8] e1000: Fix TSO for non-accelerated vlan traffic vyasevich
2014-08-23 2:17 ` [PATCH 3/8] bna: Support TSO and partial checksum with non-accelerated vlans vyasevich
2014-08-23 2:17 ` [PATCH 4/8] ehea: Fix TSO and hw checksums with non-accelerated vlan packets vyasevich
2014-08-23 2:17 ` [PATCH 5/8] i40e: Fix TSO and hw checksums for " vyasevich
2014-08-23 18:43 ` David Miller
2014-08-24 1:13 ` Vlad Yasevich
2014-08-23 2:17 ` [PATCH 6/8] i40evf: " vyasevich
2014-08-23 2:17 ` [PATCH 7/8] mvneta: Fix TSO and checksum for non-acceleration vlan traffic vyasevich
2014-08-23 2:17 ` vyasevich [this message]
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=1408760230-7457-9-git-send-email-vysevich@gmail.com \
--to=vyasevich@gmail.com \
--cc=jitendra.kalsaria@qlogic.com \
--cc=linux-driver@qlogic.com \
--cc=netdev@vger.kernel.org \
--cc=ron.mercer@qlogic.com \
--cc=shahed.shaikh@qlogic.com \
--cc=vyasevic@redhat.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).