From: Alexander Duyck <aduyck@mirantis.com>
To: intel-wired-lan@osuosl.org
Subject: [Intel-wired-lan] [next PATCH v2 09/15] i40e/i40evf: Add exception handling for Tx checksum
Date: Thu, 21 Jan 2016 16:27:52 -0800 [thread overview]
Message-ID: <20160122002752.18278.51171.stgit@localhost.localdomain> (raw)
In-Reply-To: <20160122002407.18278.95721.stgit@localhost.localdomain>
Add exception handling to the Tx checksum path so that we can handle cases
of TSO where the frame is bad, or Tx checksum where we didn't recognize a
protocol
Signed-off-by: Alexander Duyck <aduyck@mirantis.com>
---
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 31 ++++++++++++++++--------
drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 32 +++++++++++++++++--------
2 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index a7f5df3c3c79..b13b637b97fe 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -2387,10 +2387,10 @@ static int i40e_tsyn(struct i40e_ring *tx_ring, struct sk_buff *skb,
* @tx_ring: Tx descriptor ring
* @cd_tunneling: ptr to context desc bits
**/
-static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
- u32 *td_cmd, u32 *td_offset,
- struct i40e_ring *tx_ring,
- u32 *cd_tunneling)
+static int i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
+ u32 *td_cmd, u32 *td_offset,
+ struct i40e_ring *tx_ring,
+ u32 *cd_tunneling)
{
union {
struct iphdr *v4;
@@ -2450,7 +2450,11 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
*tx_flags |= I40E_TX_FLAGS_TUNNEL;
break;
default:
- return;
+ if (*tx_flags & I40E_TX_FLAGS_TSO)
+ return -1;
+
+ skb_checksum_help(skb);
+ return 0;
}
/* compute tunnel header size */
@@ -2514,11 +2518,16 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
I40E_TX_DESC_LENGTH_L4_FC_LEN_SHIFT;
break;
default:
- break;
+ if (*tx_flags & I40E_TX_FLAGS_TSO)
+ return -1;
+ skb_checksum_help(skb);
+ return 0;
}
*td_cmd |= cmd;
*td_offset |= offset;
+
+ return 1;
}
/**
@@ -2956,10 +2965,12 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
/* Always offload the checksum, since it's in the data descriptor */
if (skb->ip_summed == CHECKSUM_PARTIAL) {
- tx_flags |= I40E_TX_FLAGS_CSUM;
-
- i40e_tx_enable_csum(skb, &tx_flags, &td_cmd, &td_offset,
- tx_ring, &cd_tunneling);
+ tso = i40e_tx_enable_csum(skb, &tx_flags, &td_cmd, &td_offset,
+ tx_ring, &cd_tunneling);
+ if (tso < 0)
+ goto out_drop;
+ else if (tso)
+ tx_flags |= I40E_TX_FLAGS_CSUM;
}
i40e_create_tx_ctx(tx_ring, cd_type_cmd_tso_mss,
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index bd990dc5b7c6..b9272234959b 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -1602,12 +1602,13 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
* @tx_flags: pointer to Tx flags currently set
* @td_cmd: Tx descriptor command bits to set
* @td_offset: Tx descriptor header offsets to set
+ * @tx_ring: Tx descriptor ring
* @cd_tunneling: ptr to context desc bits
**/
-static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
- u32 *td_cmd, u32 *td_offset,
- struct i40e_ring *tx_ring,
- u32 *cd_tunneling)
+static int i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
+ u32 *td_cmd, u32 *td_offset,
+ struct i40e_ring *tx_ring,
+ u32 *cd_tunneling)
{
union {
struct iphdr *v4;
@@ -1667,7 +1668,11 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
*tx_flags |= I40E_TX_FLAGS_TUNNEL;
break;
default:
- return;
+ if (*tx_flags & I40E_TX_FLAGS_TSO)
+ return -1;
+
+ skb_checksum_help(skb);
+ return 0;
}
/* compute tunnel header size */
@@ -1731,11 +1736,16 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
I40E_TX_DESC_LENGTH_L4_FC_LEN_SHIFT;
break;
default:
- break;
+ if (*tx_flags & I40E_TX_FLAGS_TSO)
+ return -1;
+ skb_checksum_help(skb);
+ return 0;
}
*td_cmd |= cmd;
*td_offset |= offset;
+
+ return 1;
}
/**
@@ -2152,10 +2162,12 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
/* Always offload the checksum, since it's in the data descriptor */
if (skb->ip_summed == CHECKSUM_PARTIAL) {
- tx_flags |= I40E_TX_FLAGS_CSUM;
-
- i40e_tx_enable_csum(skb, &tx_flags, &td_cmd, &td_offset,
- tx_ring, &cd_tunneling);
+ tso = i40e_tx_enable_csum(skb, &tx_flags, &td_cmd, &td_offset,
+ tx_ring, &cd_tunneling);
+ if (tso < 0)
+ goto out_drop;
+ else if (tso)
+ tx_flags |= I40E_TX_FLAGS_CSUM;
}
i40e_create_tx_ctx(tx_ring, cd_type_cmd_tso_mss,
next prev parent reply other threads:[~2016-01-22 0:27 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-22 0:26 [Intel-wired-lan] [next PATCH v2 00/15] TSO and checksum fixes for i40e Alexander Duyck
2016-01-22 0:27 ` [Intel-wired-lan] [next PATCH v2 01/15] i40e/i40evf: Drop outer checksum offload that was not requested Alexander Duyck
2016-01-22 0:27 ` [Intel-wired-lan] [next PATCH v2 02/15] i40e/i40evf: Use u64 values instead of casting them in TSO function Alexander Duyck
2016-01-22 0:27 ` [Intel-wired-lan] [next PATCH v2 03/15] i40e/i40evf: Factor out L4 header and checksum from L3 bits in TSO path Alexander Duyck
2016-01-22 0:27 ` [Intel-wired-lan] [next PATCH v2 04/15] i40e/i40evf: Consolidate all header changes into TSO function Alexander Duyck
2016-01-22 0:27 ` [Intel-wired-lan] [next PATCH v2 05/15] i40e/i40evf: Replace header pointers with unions of pointers in Tx checksum path Alexander Duyck
2016-01-22 0:27 ` [Intel-wired-lan] [next PATCH v2 06/15] i40e/i40evf: Add support for IPv4 encapsulated in IPv6 Alexander Duyck
2016-01-22 0:27 ` [Intel-wired-lan] [next PATCH v2 07/15] i40e/i40evf: Handle IPv6 extension headers in checksum offload Alexander Duyck
2016-01-22 0:27 ` [Intel-wired-lan] [next PATCH v2 08/15] i40e/i40evf: Do not write to descriptor unless we complete Alexander Duyck
2016-01-22 21:23 ` Singhai, Anjali
2016-01-22 21:26 ` Alexander Duyck
2016-01-22 21:28 ` Singhai, Anjali
2016-01-22 21:37 ` Alexander Duyck
2016-01-22 0:27 ` Alexander Duyck [this message]
2016-01-22 21:25 ` [Intel-wired-lan] [next PATCH v2 09/15] i40e/i40evf: Add exception handling for Tx checksum Singhai, Anjali
2016-01-22 0:27 ` [Intel-wired-lan] [next PATCH v2 10/15] i40e/i40evf: Clean-up Rx packet checksum handling Alexander Duyck
2016-01-22 0:28 ` [Intel-wired-lan] [next PATCH v2 11/15] i40e/i40evf: Enable support for SKB_GSO_UDP_TUNNEL_CSUM Alexander Duyck
2016-01-22 0:28 ` [Intel-wired-lan] [next PATCH v2 12/15] i40e: Fix ATR in relation to tunnels Alexander Duyck
2016-01-22 21:17 ` Singhai, Anjali
2016-01-22 0:28 ` [Intel-wired-lan] [next PATCH v2 13/15] i40e: Do not drop support for IPv6 VXLAN or GENEVE tunnels Alexander Duyck
2016-01-22 0:28 ` [Intel-wired-lan] [next PATCH v2 14/15] i40e: Update feature flags to reflect newly enabled features Alexander Duyck
2016-01-22 21:15 ` Singhai, Anjali
2016-01-22 21:34 ` Alexander Duyck
2016-01-22 0:28 ` [Intel-wired-lan] [next PATCH v2 15/15] i40evf: " Alexander Duyck
2016-01-22 21:27 ` Singhai, Anjali
2016-01-22 21:36 ` Alexander Duyck
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=20160122002752.18278.51171.stgit@localhost.localdomain \
--to=aduyck@mirantis.com \
--cc=intel-wired-lan@osuosl.org \
/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