Skip to contentSkip to conversation

: Fix logfile overflow by Ian McDonald

PATCH In review Gerrit Renker 2 participants 3 messages Oct 24, 2006 – Oct 25, 2006 Networking

lore
Share & tools
lore
#0 lore raw

PATCH 14/17 : Fix logfile overflow by Ian McDonald

This bug-fix is a re-sent from today, the patch is by Ian McDonald and the original commit message is:

This patch fixes data being spewed into the logs continually. As the code stood if there was a large queue and long delays timeo would go down to zero and never get reset.

This fixes it by resetting timeo. Put constant into header as well.

------------------------------------------------------------------------------

 net/dccp/dccp.h   |    2 ++
 net/dccp/output.c |    8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

------------------------------------------------------------------------------

net/dccp/dccp.h +2 -0
index f294b89..ab0e5b1 100644
@@ -61,6 +61,8 @@ #define DCCP_RESOURCE_PROBE_INTERVAL ((u
 
 #define DCCP_RTO_MAX ((unsigned)(120 * HZ)) /* FIXME: using TCP value */
 
+#define DCCP_XMIT_TIMEO 30000 /* Time/msecs for blocking transmit per packet */
+
 /* is seq1 < seq2 ? */
 static inline int before48(const u64 seq1, const u64 seq2)
 {
net/dccp/output.c +5 -3
index 728255b..1478ace 100644
@@ -249,8 +249,8 @@ void dccp_write_xmit(struct sock *sk, in
 {
 	struct dccp_sock *dp = dccp_sk(sk);
 	struct sk_buff *skb;
-	long timeo = 30000; 	/* If a packet is taking longer than 2 secs
-				   we have other issues */
+	long timeo = DCCP_XMIT_TIMEO; 	/* If a packet is taking longer than
+					   this we have other issues */
 
 	while ((skb = skb_peek(&sk->sk_write_queue))) {
 		int err = ccid_hc_tx_send_packet(dp->dccps_hc_tx_ccid, sk, skb,
@@ -261,8 +261,10 @@ void dccp_write_xmit(struct sock *sk, in
 				sk_reset_timer(sk, &dp->dccps_xmit_timer,
 						msecs_to_jiffies(err)+jiffies);
 				break;
-			} else
+			} else {
 				err = dccp_wait_for_ccid(sk, skb, &timeo);
+				timeo = DCCP_XMIT_TIMEO;
+			}
 			if (err) {
 				printk(KERN_CRIT "%s:err at dccp_wait_for_ccid"
 						 " %d\n", __FUNCTION__, err);
#1 lore raw
Quoted 11 lines · Gerrit Renker

This bug-fix is a re-sent from today, the patch is by Ian McDonald and the original commit message is:

This patch fixes data being spewed into the logs continually. As the code stood if there was a large queue and long delays timeo would go down to zero and never get reset.

This fixes it by resetting timeo. Put constant into header as well.

------------------------------------------------------------------------------

Can you please keep in my signed off lines in my patches please?

Thanks,

Ian

Signature · 7 lines
Ian McDonald
Web: http://wand.net.nz/~iam4
Blog: http://imcdnzl.blogspot.com
WAND Network Research Group
Department of Computer Science
University of Waikato
New Zealand
#2 lore raw
In reply to Gerrit Renker
|  > This fixes it by resetting timeo. Put constant into header as well.
|  >
|  > Signed-off-by: Gerrit Renker  <[email protected]>
|  > ------------------------------------------------------------------------------
|  
|  Can you please keep in my signed off lines in my patches please?

Apologies for this sin of omission. In all other patches (yours and Andreas) I have inserted a link to the web page but your posting was not yet online at the time (it is now, http://www.mail-archive.com/[email protected]/msg00612.html ) but will do in future.

Gerrit