Skip to contentSkip to conversation

IPv4: unresolved multicast route cleanup

PATCH In review Andreas Meißner 2 participants 4 messages May 3, 2010 – May 10, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 IPv4: unresolved multicast route cleanup

from: Andreas Meissner <[email protected]>

Fixes the expiration timer for unresolved multicast route entries.
In case new multicast routing requests come in faster than the expiration timeout occurs (e.g. zap through multicast TV streams), the timer is prevented from being called at time for already existing entries.

Signed-off by: Andreas Meissner <[email protected]>
---
As the single timer is resetted to default whenever a new entry is made, the timeout for existing unresolved entires are missed and/or not updated. As a consequence new requests are denied when the limit of unresolved entries has been reached because old entries live longer than they are supposed to. The solution is to reset the timer only for the first unresolved entry in the multicast routing cache. All other timers are already set and updated correctly within the timer function itself by now.
---
ipv4/ipmr.c | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)
ipv4/ipmr.c 2010-05-03 10:58:30.000000000 +0200 renamed from ipv4/ipmr.c.orig 2010-05-03 10:55:06.000000000 +0200 +2 -1
@@ -753,7 +753,8 @@ ipmr_cache_unresolved(struct net *net, v
        c->next = mfc_unres_queue;
        mfc_unres_queue = c;
 
-        mod_timer(&ipmr_expire_timer, c->mfc_un.unres.expires);
+        if (atomic_read(&net->ipv4.cache_resolve_queue_len) == 1)
+            mod_timer(&ipmr_expire_timer, c->mfc_un.unres.expires);
    }
 
    /*
maintainer
#1 lore raw

From: Andreas Meißner <[email protected]>
Date: Mon, 03 May 2010 11:47:55 +0200

ipv4/ipmr.c 2010-05-03 10:58:30.000000000 +0200 ipmr_cache_unresolved(struct net *net, v · line 758

Quoted 10 lines
ipv4/ipmr.c 2010-05-03 10:58:30.000000000 +0200 renamed from ipv4/ipmr.c.orig 2010-05-03 10:55:06.000000000 +0200 +2 -1
@@ -753,7 +753,8 @@ ipmr_cache_unresolved(struct net *net, v
        c->next = mfc_unres_queue;
        mfc_unres_queue = c;
 
-        mod_timer(&ipmr_expire_timer, c->mfc_un.unres.expires);
+        if (atomic_read(&net->ipv4.cache_resolve_queue_len) == 1)
+            mod_timer(&ipmr_expire_timer, c->mfc_un.unres.expires);
    }

Your email client has corrupted tabs into space characters, and the new code in your patch is not indented properly.

Please read Documentation/SubmittingPatches and
Documentation/email-clients.txt for help.

Thanks.

#2 lore raw
Quoted 4 lines · David Miller

Your email client has corrupted tabs into space characters, and the new code in your patch is not indented properly.

2nd try. Indentation should be ok now, hopefully.

---
 ipmr.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
ipv4/ipmr.c renamed from ipv4/ipmr.c.orig +2 -1
@@ -753,7 +753,8 @@
 		c->next = mfc_unres_queue;
 		mfc_unres_queue = c;
 
-		mod_timer(&ipmr_expire_timer, c->mfc_un.unres.expires);
+		if (atomic_read(&net->ipv4.cache_resolve_queue_len) == 1)
+			mod_timer(&ipmr_expire_timer, c->mfc_un.unres.expires);
 	}
 
 	/*
maintainer
#3 lore raw

From: Andreas Meissner <[email protected]>
Date: Mon, 10 May 2010 10:40:47 +0200

Quoted 7 lines
Quoted 4 lines · David Miller

Your email client has corrupted tabs into space characters, and the new code in your patch is not indented properly.

2nd try. Indentation should be ok now, hopefully.

Please don't resubmit patches this way. I have to now scour the mailing list archives to get your commit message, and you also haven't specifically signed off on this specific new patch so I couldn't use it anyways.

Always make full, clean resubmissions of your patch, with the original subject line and full commit message cleanly included as in your original posting.