sky2: Account for VLAN tag in tx_le_req
Subsystems (2)
PATCH RESEND 1/1 sky2: Account for VLAN tag in tx_le_req
With VLAN enabled, tx_le_req could return fewer list elements than required,
leading to a potential wrap around of the transmit ring buffer.
Signed-off-by Mike McCormack <[email protected]>
--- drivers/net/sky2.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)
drivers/net/sky2.c +11 -3
@@ -1563,7 +1563,7 @@ static inline int tx_avail(const struct sky2_port *sky2) }/* Estimate of number of transmit list elements required */ -static unsigned tx_le_req (const struct sk_buff *skb) +static unsigned tx_le_req (const struct sk_buff *skb,int vlan_tag) {unsigned count;
@@ -1573,6 +1573,9 @@ static unsigned tx_le_req(const struct sk_buff *skb)if (skb_is_gso (skb)) ++count; +else if (sizeof (dma_addr_t) ==sizeof (u32) && vlan_tag) + ++count; +if (skb->ip_summed ==CHECKSUM_PARTIAL ) ++count;
@@ -1611,8 +1614,13 @@ static netdev_tx_t sky2_xmit_frame(struct sk_buff *skb,u16 slot;u16 mss;u8 ctrl; +unsigned vlan_tag =0 ; + +#ifdef SKY2_VLAN_TAG_USED + vlan_tag = sky2->vlgrp &&vlan_tx_tag_present (skb); +#endif -if (unlikely (tx_avail (sky2) <tx_le_req (skb))) +if (unlikely (tx_avail (sky2) <tx_le_req (skb, vlan_tag)))return NETDEV_TX_BUSY ; len =skb_headlen (skb);
@@ -1657,7 +1665,7 @@ static netdev_tx_t sky2_xmit_frame(struct sk_buff *skb, ctrl =0 ;#ifdef SKY2_VLAN_TAG_USED /* Add VLAN tag, can piggyback on LRGLEN or ADDR64 */ -if (sky2->vlgrp &&vlan_tx_tag_present (skb)) { +if (vlan_tag) {if (!le) { le =get_tx_le (sky2, &slot); le->addr =0 ;
Signature · 1 line
1.5.6.5
PATCH 1/1 sky2: transmit ring accounting
Be more accurate about number of transmit list elements required.
Signed-off-by Stephen Hemminger <[email protected]>
---
Note: this is an optimization, the old code guaranteed more space than necessary (MAX_SKB_TX_LE was always bigger than needed).
drivers/net/sky2.c +6 -4
@@ -65,8 +65,8 @@#define RX_DEF_PENDING RX_MAX_PENDING/* This is the worst case number of transmit list elements for a single skb: -VLAN + TSO + CKSUM + Data + skb_frags * DMA */ -#define MAX_SKB_TX_LE (4 + (sizeof(dma_addr_t)/sizeof(u32))*MAX_SKB_FRAGS) +VLAN:GSO + CKSUM + Data + skb_frags * DMA */ +#define MAX_SKB_TX_LE (2 + (sizeof(dma_addr_t)/sizeof(u32))*(MAX_SKB_FRAGS+1))#define TX_MIN_PENDING (MAX_SKB_TX_LE+1)#define TX_MAX_PENDING 4096#define TX_DEF_PENDING 127
@@ -1567,11 +1567,13 @@ static unsigned tx_le_req(const struct s {unsigned count; - count =sizeof (dma_addr_t) /sizeof (u32); - count +=skb_shinfo (skb)->nr_frags * count; + count = (skb_shinfo (skb)->nr_frags +1 ) + * (sizeof (dma_addr_t) /sizeof (u32));if (skb_is_gso (skb)) ++count; +else if (sizeof (dma_addr_t) ==sizeof (u32)) + ++count;/* possible vlan */ if (skb->ip_summed ==CHECKSUM_PARTIAL ) ++count;
Re: [PATCH alt] sky2: transmit ring accounting
From: Stephen Hemminger <[email protected]>
Date: Mon, 14 Sep 2009 09:12:55 -0700
Quoted 3 lines
Be more accurate about number of transmit list elements required.
Signed-off-by Stephen Hemminger <[email protected]>
Applied.