Merge branch 'tg3-next'
Michael Chan says: ==================== tg3: TSO related enhancements to prevent memory allocation failure Michael Chan (3): tg3: Don't modify ip header fields when doing GSO tg3: Prevent page allocation failure during TSO workaround tg3: Update copyright and version to 3.137 ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
1e1c77bfde
|
@ -4,7 +4,7 @@
|
|||
* Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)
|
||||
* Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com)
|
||||
* Copyright (C) 2004 Sun Microsystems Inc.
|
||||
* Copyright (C) 2005-2013 Broadcom Corporation.
|
||||
* Copyright (C) 2005-2014 Broadcom Corporation.
|
||||
*
|
||||
* Firmware is:
|
||||
* Derived from proprietary unpublished source code,
|
||||
|
@ -94,10 +94,10 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits)
|
|||
|
||||
#define DRV_MODULE_NAME "tg3"
|
||||
#define TG3_MAJ_NUM 3
|
||||
#define TG3_MIN_NUM 136
|
||||
#define TG3_MIN_NUM 137
|
||||
#define DRV_MODULE_VERSION \
|
||||
__stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM)
|
||||
#define DRV_MODULE_RELDATE "Jan 03, 2014"
|
||||
#define DRV_MODULE_RELDATE "May 11, 2014"
|
||||
|
||||
#define RESET_KIND_SHUTDOWN 0
|
||||
#define RESET_KIND_INIT 1
|
||||
|
@ -7871,9 +7871,7 @@ tg3_tso_bug_end:
|
|||
return NETDEV_TX_OK;
|
||||
}
|
||||
|
||||
/* hard_start_xmit for devices that have the 4G bug and/or 40-bit bug and
|
||||
* support TG3_FLAG_HW_TSO_1 or firmware TSO only.
|
||||
*/
|
||||
/* hard_start_xmit for all devices */
|
||||
static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
struct tg3 *tp = netdev_priv(dev);
|
||||
|
@ -7884,6 +7882,10 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
struct tg3_napi *tnapi;
|
||||
struct netdev_queue *txq;
|
||||
unsigned int last;
|
||||
struct iphdr *iph = NULL;
|
||||
struct tcphdr *tcph = NULL;
|
||||
__sum16 tcp_csum = 0, ip_csum = 0;
|
||||
__be16 ip_tot_len = 0;
|
||||
|
||||
txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb));
|
||||
tnapi = &tp->napi[skb_get_queue_mapping(skb)];
|
||||
|
@ -7915,7 +7917,6 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
|
||||
mss = skb_shinfo(skb)->gso_size;
|
||||
if (mss) {
|
||||
struct iphdr *iph;
|
||||
u32 tcp_opt_len, hdr_len;
|
||||
|
||||
if (skb_cow_head(skb, 0))
|
||||
|
@ -7927,27 +7928,31 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb) - ETH_HLEN;
|
||||
|
||||
if (!skb_is_gso_v6(skb)) {
|
||||
if (unlikely((ETH_HLEN + hdr_len) > 80) &&
|
||||
tg3_flag(tp, TSO_BUG))
|
||||
return tg3_tso_bug(tp, skb);
|
||||
|
||||
ip_csum = iph->check;
|
||||
ip_tot_len = iph->tot_len;
|
||||
iph->check = 0;
|
||||
iph->tot_len = htons(mss + hdr_len);
|
||||
}
|
||||
|
||||
if (unlikely((ETH_HLEN + hdr_len) > 80) &&
|
||||
tg3_flag(tp, TSO_BUG))
|
||||
return tg3_tso_bug(tp, skb);
|
||||
|
||||
base_flags |= (TXD_FLAG_CPU_PRE_DMA |
|
||||
TXD_FLAG_CPU_POST_DMA);
|
||||
|
||||
tcph = tcp_hdr(skb);
|
||||
tcp_csum = tcph->check;
|
||||
|
||||
if (tg3_flag(tp, HW_TSO_1) ||
|
||||
tg3_flag(tp, HW_TSO_2) ||
|
||||
tg3_flag(tp, HW_TSO_3)) {
|
||||
tcp_hdr(skb)->check = 0;
|
||||
tcph->check = 0;
|
||||
base_flags &= ~TXD_FLAG_TCPUDP_CSUM;
|
||||
} else
|
||||
tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
|
||||
iph->daddr, 0,
|
||||
IPPROTO_TCP,
|
||||
0);
|
||||
} else {
|
||||
tcph->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
|
||||
0, IPPROTO_TCP, 0);
|
||||
}
|
||||
|
||||
if (tg3_flag(tp, HW_TSO_3)) {
|
||||
mss |= (hdr_len & 0xc) << 12;
|
||||
|
@ -8047,6 +8052,18 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
if (would_hit_hwbug) {
|
||||
tg3_tx_skb_unmap(tnapi, tnapi->tx_prod, i);
|
||||
|
||||
if (mss) {
|
||||
/* If it's a TSO packet, do GSO instead of
|
||||
* allocating and copying to a large linear SKB
|
||||
*/
|
||||
if (ip_tot_len) {
|
||||
iph->check = ip_csum;
|
||||
iph->tot_len = ip_tot_len;
|
||||
}
|
||||
tcph->check = tcp_csum;
|
||||
return tg3_tso_bug(tp, skb);
|
||||
}
|
||||
|
||||
/* If the workaround fails due to memory/mapping
|
||||
* failure, silently drop this packet.
|
||||
*/
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* Copyright (C) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)
|
||||
* Copyright (C) 2001 Jeff Garzik (jgarzik@pobox.com)
|
||||
* Copyright (C) 2004 Sun Microsystems Inc.
|
||||
* Copyright (C) 2007-2013 Broadcom Corporation.
|
||||
* Copyright (C) 2007-2014 Broadcom Corporation.
|
||||
*/
|
||||
|
||||
#ifndef _T3_H
|
||||
|
|
Loading…
Reference in a new issue