Skip to contentSkip to conversation

ipv4: delete the statements limit icmp message in ip_error()

PATCH In review Duan Jiong 2 participants 2 messages Jan 12, 2014 – Jan 15, 2014

Subsystems (3)
Networking Network drivers IPv4/IPv6
lore
Share & tools
lore

Duan Jiong

author
#0 lore raw

PATCH 1/1 ipv4: delete the statements limit icmp message in ip_error()

Because after the icmp_send() is called, the icmpv4_xrlim_allow() will be called to limit the icmp message too.

Signed-off-by Duan Jiong <[email protected]>
---
 net/ipv4/route.c | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)
net/ipv4/route.c +1 -20
index f8da282..e521de1 100644
@@ -900,10 +900,7 @@ static int ip_error(struct sk_buff *skb)
 {
 	struct in_device *in_dev = __in_dev_get_rcu(skb->dev);
 	struct rtable *rt = skb_rtable(skb);
-	struct inet_peer *peer;
-	unsigned long now;
 	struct net *net;
-	bool send;
 	int code;
 
 	net = dev_net(rt->dst.dev);

@@ -936,23 +933,7 @@ static int ip_error(struct sk_buff *skb)
 		break;
 	}
 
-	peer = inet_getpeer_v4(net->ipv4.peers, ip_hdr(skb)->saddr, 1);
-
-	send = true;
-	if (peer) {
-		now = jiffies;
-		peer->rate_tokens += now - peer->rate_last;
-		if (peer->rate_tokens > ip_rt_error_burst)
-			peer->rate_tokens = ip_rt_error_burst;
-		peer->rate_last = now;
-		if (peer->rate_tokens >= ip_rt_error_cost)
-			peer->rate_tokens -= ip_rt_error_cost;
-		else
-			send = false;
-		inet_putpeer(peer);
-	}
-	if (send)
-		icmp_send(skb, ICMP_DEST_UNREACH, code, 0);
+	icmp_send(skb, ICMP_DEST_UNREACH, code, 0);
 
 out:	kfree_skb(skb);
 	return 0;
Signature · 1 line
1.8.3.1
maintainer
#1 lore raw

From: Duan Jiong <[email protected]>
Date: Sun, 12 Jan 2014 17:52:20 +0800

Quoted 4 lines

Because after the icmp_send() is called, the icmpv4_xrlim_allow() will be called to limit the icmp message too.

Signed-off-by Duan Jiong <[email protected]>

icmpv4_xrlim_allow() is different from what this code is doing.

There are seperate controls for ip_error() reporting, namely:

Quoted 1 line
net/ipv4/route.c +0 -1
-		if (peer->rate_tokens > ip_rt_error_burst)

...

net/ipv4/route.c static int ip_error(struct sk_buff *skb) · line 948

Quoted 1 line
net/ipv4/route.c +0 -1
-		if (peer->rate_tokens >= ip_rt_error_cost)

And this is the only place where that is taken into account.

The icmpv4_xrlim_allow() is a top level limiting on all ICMPs, this function is limiting specific kinds.

I am not applying this patch, sorry.