[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1235208488.22598.40.camel@pohly-MOBL>
Date: Sat, 21 Feb 2009 10:28:08 +0100
From: Patrick Ohly <patrick.ohly@...el.com>
To: David Miller <davem@...emloft.net>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>
Cc: "Tantilov, Emil S" <emil.s.tantilov@...el.com>,
"Ronciak, John" <john.ronciak@...el.com>,
"Brandeburg, Jesse" <jesse.brandeburg@...el.com>,
"Kirsher, Jeffrey T" <jeffrey.t.kirsher@...el.com>
Subject: [BUG PATCH NET-NEXT-2.6] kernel panic in dev_hard_start_xmit:
remove faulty software TX time stamping
The current implementation of the TX software time stamping fallback is
faulty because it accesses the skb after ndo_start_xmit() returns
successfully. This patch removes the fallback, which fixes kernel panics
seen during stress tests. Hardware time stamping is not affected by this
removal.
Signed-Off: Patrick Ohly <patrick.ohly@...el.com>
Signed-Off: Emil Tantilov <emil.s.tantilov@...el.com>
diff --git a/net/core/dev.c b/net/core/dev.c
index d393fc9..1dcace3 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1672,16 +1672,6 @@ static int dev_gso_segment(struct sk_buff *skb)
return 0;
}
-static void tstamp_tx(struct sk_buff *skb)
-{
- union skb_shared_tx *shtx =
- skb_tx(skb);
- if (unlikely(shtx->software &&
- !shtx->in_progress)) {
- skb_tstamp_tx(skb, NULL);
- }
-}
-
int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
struct netdev_queue *txq)
{
@@ -1715,8 +1705,6 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
* the skb destructor before the call and restoring it
* afterwards, then doing the skb_orphan() ourselves?
*/
- if (likely(!rc))
- tstamp_tx(skb);
return rc;
}
@@ -1732,7 +1720,6 @@ gso:
skb->next = nskb;
return rc;
}
- tstamp_tx(skb);
if (unlikely(netif_tx_queue_stopped(txq) && skb->next))
return NETDEV_TX_BUSY;
} while (skb->next);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists