Skip to contentSkip to conversation

Clean up netfilter cache on xmit-to-self.

PATCH In review Ben Greear 2 participants 8 messages Jul 22, 2010 – Aug 5, 2010

Subsystems (2)
lore
Share & tools
lore

Ben Greear

author
#0 lore raw

cover Clean up netfilter cache on xmit-to-self.

These patches are against 2.6.34.1. The first one may be worth submitting to stable. The second one is less critical and should probably just go in the development tree.

author
#1 lore raw

PATCH 1/2 net: dev_forward_skb should call nf_reset

With conn-track zones and probably with different network namespaces, the netfilter logic needs to be re-calculated on packet receive. If the netfilter logic is not reset, it will not be recalculated properly. This patch adds the nf_reset logic to dev_forward_skb.

---
:100644 100644 7ac33e5... 22eee4e... M net/core/dev.c

 net/core/dev.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
net/core/dev.c +1 -0
index 7ac33e5..22eee4e 100644
@@ -1482,6 +1482,7 @@ static inline void net_timestamp(struct sk_buff *skb)
 int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
 {
 	skb_orphan(skb);
+	nf_reset(skb);
 
 	if (!(dev->flags & IFF_UP) ||
 	    (skb->len > (dev->mtu + dev->hard_header_len))) {
Signature · 1 line
1.6.2.5
author
#2 lore raw

PATCH 2/2 veth: Remove redundant timestamp assignment.

In reply to Ben Greear

The timestamp is already cleared in the dev_forward_skb logic.

---
:100644 100644 0cfbb3d... 161ee02... M drivers/net/veth.c

 drivers/net/veth.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
drivers/net/veth.c +0 -5
index 0cfbb3d..161ee02 100644
@@ -181,11 +181,6 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
 	if (dev->features & NETIF_F_NO_CSUM)
 		skb->ip_summed = rcv_priv->ip_summed;
 
-	/* Zero out the time-stamp so that receiving code is forced
-	 * to recalculate it.
-	 */
-	skb->tstamp.tv64 = 0;
-
 	length = skb->len + ETH_HLEN;
 	if (dev_forward_skb(rcv, skb) != NET_RX_SUCCESS)
 		goto rx_drop;
Signature · 1 line
1.6.2.5
maintainer
#3 lore raw
In reply to Ben Greear

From: Ben Greear <[email protected]>
Date: Thu, 22 Jul 2010 12:54:46 -0700

Quoted 3 lines

These patches are against 2.6.34.1. The first one may be worth submitting to stable. The second one is less critical and should probably just go in the development tree.

I'll apply the first one to net-2.6 and queue up for -stable

The second one will go to net-next-2.6

Thanks.

maintainer
#4 lore raw

From: David Miller <[email protected]>
Date: Sun, 25 Jul 2010 21:59:12 -0700 (PDT)

Quoted 10 lines

From: Ben Greear <[email protected]>
Date: Thu, 22 Jul 2010 12:54:46 -0700

Quoted 3 lines

These patches are against 2.6.34.1. The first one may be worth submitting to stable. The second one is less critical and should probably just go in the development tree.

I'll apply the first one to net-2.6 and queue up for -stable

The second one will go to net-next-2.6

Actually it appears net-next-2.6 already has this change.

author
#5 lore raw
Quoted 11 lines · David Miller

From: David Miller<[email protected]>
Date: Sun, 25 Jul 2010 21:59:12 -0700 (PDT)

Quoted 8 lines

From: Ben Greear<[email protected]>
Date: Thu, 22 Jul 2010 12:54:46 -0700

Quoted 3 lines

These patches are against 2.6.34.1. The first one may be worth submitting to stable. The second one is less critical and should probably just go in the development tree.

I'll apply the first one to net-2.6 and queue up for -stable

As far as I can tell, this didn't make it into -stable yet?

Thanks,
Ben

Signature · 2 lines
Ben Greear <[email protected]>
Candela Technologies Inc  http://www.candelatech.com
maintainer
#6 lore raw

From: Ben Greear <[email protected]>
Date: Thu, 05 Aug 2010 11:43:37 -0700

Quoted 7 lines · David Miller
Quoted 6 lines

From: David Miller<[email protected]>
Date: Sun, 25 Jul 2010 21:59:12 -0700 (PDT)

Quoted 3 lines

From: Ben Greear<[email protected]>
Date: Thu, 22 Jul 2010 12:54:46 -0700

Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
Quoted 3 lines

These patches are against 2.6.34.1. The first one may be worth submitting to stable. The second one is less critical and should probably just go in the development tree.

I'll apply the first one to net-2.6 and queue up for -stable

As far as I can tell, this didn't make it into -stable yet?

It's sitting in my queue, I will send it out once 2.6.35 has been out for about 1 week more just to double make sure there aren't any unwanted side effects.

I never submit changes to -stable immediately unless the change is painfully obvious and has no possible unwanted side effects. I always wait a week or even more sometimes.

author
#7 lore raw
Quoted 18 lines · David Miller

From: Ben Greear<[email protected]>
Date: Thu, 05 Aug 2010 11:43:37 -0700

Quoted 7 lines · David Miller
Quoted 6 lines

From: David Miller<[email protected]>
Date: Sun, 25 Jul 2010 21:59:12 -0700 (PDT)

Quoted 3 lines

From: Ben Greear<[email protected]>
Date: Thu, 22 Jul 2010 12:54:46 -0700

Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
Quoted 3 lines

These patches are against 2.6.34.1. The first one may be worth submitting to stable. The second one is less critical and should probably just go in the development tree.

I'll apply the first one to net-2.6 and queue up for -stable

As far as I can tell, this didn't make it into -stable yet?

Quoted 7 lines

It's sitting in my queue, I will send it out once 2.6.35 has been out for about 1 week more just to double make sure there aren't any unwanted side effects.

I never submit changes to -stable immediately unless the change is painfully obvious and has no possible unwanted side effects. I always wait a week or even more sometimes.

Ok, no problem. I just wanted to make sure it hadn't been lost.

Thanks,
Ben

Signature · 2 lines
Ben Greear <[email protected]>
Candela Technologies Inc  http://www.candelatech.com