: DCCP_WARN() wrapper
PATCH 6/7 : DCCP_WARN() wrapper
[DCCP]: DCCP_WARN() wrapper
This introduces a rate-limited DCCP_WARN() wrapper for non-critical DCCP warning messages.
For CCID 3/TFRC it also adds warning messages whenever the RTT is estimated at 0.
Signed-off-by Gerrit Renker <[email protected]>
--- net/dccp/ccids/ccid3.c | 67 ++++++++++++++++--------------------- net/dccp/ccids/lib/loss_interval.c | 2 - net/dccp/ccids/lib/tfrc_equation.c | 4 +- net/dccp/feat.c | 8 ++-- net/dccp/input.c | 25 ++++++------- net/dccp/ipv4.c | 24 ++++--------- net/dccp/ipv6.c | 4 -- net/dccp/minisocks.c | 3 - net/dccp/options.c | 5 +- 9 files changed, 62 insertions(+), 80 deletions(-)
net/dccp/ccids/lib/loss_interval.c +1 -1
@@ -109,7 +109,7 @@ u32 dccp_li_hist_calc_i_mean(struct list i_tot =max (i_tot0, i_tot1);if (!w_tot) { -LIMIT_NETDEBUG (KERN_WARNING "%s: w_tot = 0\n" , __FUNCTION__); +DCCP_WARN ("w_tot = 0\n" );return 1 ; }
net/dccp/ccids/ccid3.c +30 -37
141 lines not on this page · raw message
net/dccp/feat.c +4 -4
@@ -25,11 +25,11 @@ int dccp_feat_change(struct dccp_minisocdccp_feat_debug (type, feature, *val);if (!dccp_feat_is_valid_type (type)) { -pr_info ("option type %d invalid in negotiation\n" , type); +DCCP_WARN ("option type %d invalid in negotiation\n" , type);return 1 ; }if (!dccp_feat_is_valid_length (type, feature, len)) { -pr_info ("invalid length %d\n" , len); +DCCP_WARN ("invalid length %d\n" , len);return 1 ; }/* XXX add further sanity checks */
@@ -330,7 +330,7 @@ static void dccp_feat_empty_confirm(struswitch (type) {case DCCPO_CHANGE_L : opt->dccpop_type =DCCPO_CONFIRM_R ;break ;case DCCPO_CHANGE_R : opt->dccpop_type =DCCPO_CONFIRM_L ;break ; -default :pr_info ("invalid type %d\n" , type);return ; +default :DCCP_WARN ("invalid type %d\n" , type);return ; } opt->dccpop_feat = feature;
@@ -428,7 +428,7 @@ int dccp_feat_confirm_recv(struct sock *switch (type) {case DCCPO_CONFIRM_L : t =DCCPO_CHANGE_R ;break ;case DCCPO_CONFIRM_R : t =DCCPO_CHANGE_L ;break ; -default :pr_info ("invalid type %d\n" , type); +default :DCCP_WARN ("invalid type %d\n" , type);return 1 ; }
net/dccp/input.c +11 -14
@@ -128,21 +128,18 @@ static int dccp_check_seqno(struct sock DCCP_PKT_WITHOUT_ACK_SEQ)) dp->dccps_gar = DCCP_SKB_CB(skb)->dccpd_ack_seq; }else { -LIMIT_NETDEBUG (KERN_WARNING "DCCP: Step 6 failed for %s packet, " -"(LSWL(%llu) <= P.seqno(%llu) <= S.SWH(%llu)) and " -"(P.ackno %s or LAWL(%llu) <= P.ackno(%llu) <= S.AWH(%llu), " -"sending SYNC...\n" , -dccp_packet_name (dh->dccph_type), - (unsigned long long ) lswl, - (unsigned long long ) -DCCP_SKB_CB (skb)->dccpd_seq, - (unsigned long long ) dp->dccps_swh, - (DCCP_SKB_CB (skb)->dccpd_ack_seq = +DCCP_WARN ("DCCP: Step 6 failed for %s packet, " +"(LSWL(%llu) <= P.seqno(%llu) <= S.SWH(%llu)) and " +"(P.ackno %s or LAWL(%llu) <= P.ackno(%llu) <= S.AWH(%llu), " +"sending SYNC...\n" ,dccp_packet_name (dh->dccph_type), + (unsigned long long ) lswl, + (unsigned long long )DCCP_SKB_CB (skb)->dccpd_seq, + (unsigned long long ) dp->dccps_swh, + (DCCP_SKB_CB (skb)->dccpd_ack_seq =DCCP_PKT_WITHOUT_ACK_SEQ ) ?"doesn't exist" :"exists" , - (unsigned long long ) lawl, - (unsigned long long ) -DCCP_SKB_CB (skb)->dccpd_ack_seq, - (unsigned long long ) dp->dccps_awh); + (unsigned long long ) lawl, + (unsigned long long )DCCP_SKB_CB (skb)->dccpd_ack_seq, + (unsigned long long ) dp->dccps_awh);dccp_send_sync (sk,DCCP_SKB_CB (skb)->dccpd_seq,DCCP_PKT_SYNC );return -1 ; }
net/dccp/ipv4.c +9 -15
@@ -747,7 +747,7 @@ int dccp_invalid_packet(struct sk_buff */* If the packet is shorter than 12 bytes, drop packet and return */ if (!pskb_may_pull (skb,sizeof (struct dccp_hdr ))) { -LIMIT_NETDEBUG (KERN_WARNING "DCCP: pskb_may_pull failed\n" ); +DCCP_WARN ("pskb_may_pull failed\n" );return 1 ; }
@@ -755,7 +755,7 @@ int dccp_invalid_packet(struct sk_buff */* If P.type is not understood, drop packet and return */ if (dh->dccph_type >=DCCP_PKT_INVALID ) { -LIMIT_NETDEBUG (KERN_WARNING "DCCP: invalid packet type\n" ); +DCCP_WARN ("invalid packet type\n" );return 1 ; }
@@ -763,16 +763,14 @@ int dccp_invalid_packet(struct sk_buff ** If P.Data Offset is too small for packet type, drop packet and return */ if (dh->dccph_doff <dccp_hdr_len (skb) /sizeof (u32)) { -LIMIT_NETDEBUG (KERN_WARNING "DCCP: P.Data Offset(%u) " -"too small\n" , dh->dccph_doff); +DCCP_WARN ("P.Data Offset(%u) too small\n" , dh->dccph_doff);return 1 ; }/* * If P.Data Offset is too too large for packet, drop packet and return */ if (!pskb_may_pull (skb, dh->dccph_doff *sizeof (u32))) { -LIMIT_NETDEBUG (KERN_WARNING "DCCP: P.Data Offset(%u) " -"too large\n" , dh->dccph_doff); +DCCP_WARN ("P.Data Offset(%u) too large\n" , dh->dccph_doff);return 1 ; }
@@ -782,9 +780,8 @@ int dccp_invalid_packet(struct sk_buff **/ if (dh->dccph_type >=DCCP_PKT_DATA && dh->dccph_type <=DCCP_PKT_DATAACK && dh->dccph_x =0 ) { -LIMIT_NETDEBUG (KERN_WARNING "DCCP: P.type (%s) not Data||Ack||" -"DataAck, while P.X = 0\n" , -dccp_packet_name (dh->dccph_type)); +DCCP_WARN ("P.type (%s) not Data || [Data]Ack, while P.X = 0\n" , +dccp_packet_name (dh->dccph_type));return 1 ; }
@@ -794,9 +791,8 @@ int dccp_invalid_packet(struct sk_buff **/ cscov =dccp_csum_coverage (skb);if (cscov > skb->len) { -LIMIT_NETDEBUG (KERN_WARNING -"DCCP: P.CsCov %u exceeds packet length %d\n" , - dh->dccph_cscov, skb->len); +DCCP_WARN ("P.CsCov %u exceeds packet length %d\n" , + dh->dccph_cscov, skb->len);return 1 ; }
@@ -823,9 +819,7 @@ static int dccp_v4_rcv(struct sk_buff *s/* Step 1: If header checksum is incorrect, drop packet and return */ if (dccp_v4_csum_finish (skb, skb->nh.iph->saddr, skb->nh.iph->daddr)) { -LIMIT_NETDEBUG (KERN_WARNING -"%s: dropped packet with invalid checksum\n" , - __FUNCTION__); +DCCP_WARN ("dropped packet with invalid checksum\n" ); goto discard_it; }
net/dccp/ipv6.c +1 -3
@@ -828,9 +828,7 @@ static int dccp_v6_rcv(struct sk_buff **/* Step 1: If header checksum is incorrect, drop packet and return. */ if (dccp_v6_csum_finish (skb, &skb->nh.ipv6h->saddr, &skb->nh.ipv6h->daddr)) { -LIMIT_NETDEBUG (KERN_WARNING -"%s: dropped packet with invalid checksum\n" , - __FUNCTION__); +DCCP_WARN ("dropped packet with invalid checksum\n" ); goto discard_it; }
net/dccp/options.c +2 -3
@@ -257,7 +257,7 @@ int dccp_parse_options(struct sock *sk, out_invalid_option:DCCP_INC_STATS_BH (DCCP_MIB_INVALIDOPT );DCCP_SKB_CB (skb)->dccpd_reset_code =DCCP_RESET_CODE_OPTION_ERROR ; -pr_info ("DCCP(%p): invalid option %d, len=%d\n" , sk, opt, len); +DCCP_WARN ("DCCP(%p): invalid option %d, len=%d" , sk, opt, len);return -1 ; }
@@ -447,8 +447,7 @@ static int dccp_insert_feat_opt(struct su8 *to;if (DCCP_SKB_CB (skb)->dccpd_opt_len + len +3 >DCCP_MAX_OPT_LEN ) { -LIMIT_NETDEBUG (KERN_INFO "DCCP: packet too small" -" to insert feature %d option!\n" , feat); +DCCP_WARN ("packet too small for feature %d option!\n" , feat);return -1 ; }
net/dccp/ccids/lib/tfrc_equation.c +3 -1
@@ -587,8 +587,10 @@ u32 tfrc_calc_x(u16 s, u32 R, u32 p)/* p should be 0 unless there is a bug in my code */ index =0 ; -if (R =0 ) +if (R =0 ) { +DCCP_WARN ("RTT=0, setting to 1\n" );R =1 ;/* RTT can't be zero or else divide by zero */ + }DCCP_BUG_ON (index >=TFRC_CALC_X_ARRSIZE );
net/dccp/minisocks.c +1 -2
@@ -84,8 +84,7 @@ void dccp_time_wait(struct sock *sk, int* socket up. We've got bigger problems than * non-graceful socket closings. */ -LIMIT_NETDEBUG (KERN_INFO "DCCP: time wait bucket " -"table overflow\n" ); +DCCP_WARN ("time wait bucket table overflow\n" ); }dccp_done (sk);