: Simplify jump labels in dccp_v{4,6}_rcv
PATCH 7/17 : Simplify jump labels in dccp_v{4,6}_rcv
[DCCP]: Simplify jump labels in dccp_v{4,6}_rcv
This is a code simplification and was singled out from
http://www.mail-archive.com/[email protected]/msg00600.html
The patch reduces the complexity and number of goto jump labels in
dccp_v4_rcv
dccp_v6_rcvand further makes the code consistent (same handling in both functions).
------------------------------------------------------------------------------
net/dccp/ipv4.c | 21 ++++++--------------- net/dccp/ipv6.c | 30 +++++++++++++----------------- 2 files changed, 19 insertions(+), 32 deletions(-)
------------------------------------------------------------------------------
net/dccp/ipv4.c +6 -15
@@ -911,8 +911,7 @@ static int dccp_v4_rcv(struct sk_buff *sdccp_pr_debug_cat ("\n" ); }else {DCCP_SKB_CB (skb)->dccpd_ack_seq =dccp_hdr_ack_seq (skb); -dccp_pr_debug_cat (", ack=%llu\n" , - (unsigned long long ) +dccp_pr_debug_cat (", ack=%llu\n" , (unsigned long long )DCCP_SKB_CB (skb)->dccpd_ack_seq); }
@@ -941,11 +940,11 @@ static int dccp_v4_rcv(struct sk_buff *s* Generate Reset(No Connection) unless P.type = Reset * Drop packet and return */ -if (sk->sk_state =DCCP_TIME_WAIT ) {dccp_pr_debug ("sk->sk_state = DCCP_TIME_WAIT: " "do_time_wait\n" ); - goto do_time_wait; +inet_twsk_put (inet_twsk (sk)); + goto no_dccp_socket; }if (!xfrm4_policy_check (sk,XFRM_POLICY_IN , skb))
@@ -986,19 +985,11 @@ no_dccp_socket:DCCP_RESET_CODE_NO_CONNECTION ;dccp_v4_ctl_send_reset (skb); } - -discard_it: -/* Discard frame. */ -kfree_skb (skb); -return 0 ; - discard_and_relse:sock_put (sk); - goto discard_it; - -do_time_wait: -inet_twsk_put (inet_twsk (sk)); - goto no_dccp_socket; +discard_it: +kfree_skb (skb); +return ret; }static struct inet_connection_sock_af_ops dccp_ipv4_af_ops = {
net/dccp/ipv6.c +13 -17
@@ -1072,8 +1072,11 @@ static int dccp_v6_rcv(struct sk_buff *** Generate Reset(No Connection) unless P.type = Reset * Drop packet and return */ -if (sk =NULL ) +if (sk =NULL ) { +dccp_pr_debug ("failed to look up flow ID in table and " +"get corresponding socket\n" ); goto no_dccp_socket; + }/* * Step 2:
@@ -1081,8 +1084,12 @@ static int dccp_v6_rcv(struct sk_buff *** Generate Reset(No Connection) unless P.type = Reset * Drop packet and return */ -if (sk->sk_state =DCCP_TIME_WAIT ) - goto do_time_wait; +if (sk->sk_state =DCCP_TIME_WAIT ) { +dccp_pr_debug ("sk->sk_state = DCCP_TIME_WAIT: " +"do_time_wait\n" ); +inet_twsk_put (inet_twsk (sk)); + goto no_dccp_socket; + }if (!xfrm6_policy_check (sk,XFRM_POLICY_IN , skb)) goto discard_and_relse;
@@ -1118,22 +1125,11 @@ no_dccp_socket:DCCP_RESET_CODE_NO_CONNECTION ;dccp_v6_ctl_send_reset (skb); } -discard_it: - -/* -* Discard frame -*/ - -kfree_skb (skb); -return 0 ; - discard_and_relse:sock_put (sk); - goto discard_it; - -do_time_wait: -inet_twsk_put (inet_twsk (sk)); - goto no_dccp_socket; +discard_it: +kfree_skb (skb); +return ret; }static struct inet_connection_sock_af_ops dccp_ipv6_af_ops = {
I have verified this patch again and discovered a stupid mistake/bug in the posting:
* control goes from: no_dccp_socket: => discard_and_relse: => sock_put(sk)
* BOOM! (no socket)
I therefore re-send the corrected patch, put it online as
http://www.erg.abdn.ac.uk/users/gerrit/dccp/patch-backlog/07a_1_simplify_vX_rcv.diff
Apart from the bug fix, the patch is now
* much smaller therefore easier to read/review
* effectively boils down to format changes / removal of do_time_wait label
I have updated the repository on http://www.erg.abdn.ac.uk/users/gerrit/dccp/patch-backlog/,
all other patches have been refreshed relative to this one.
Gerrit
[DCCP]: Simplify jump labels in dccp_v{4,6}_rcv
This is a code simplification and was singled out from the DCCPv6 Oops patch on
http://www.mail-archive.com/[email protected]/msg00600.html
It mainly makes the code consistent between ipv{4,6}.c for the functions
dccp_v4_rcv
dccp_v6_rcvand removes the do_time_wait label to simplify code somewhat.
--- net/dccp/ipv4.c | 17 +++++------------ net/dccp/ipv6.c | 24 +++++++++++------------- 2 files changed, 16 insertions(+), 25 deletions(-)
net/dccp/ipv4.c +5 -12
@@ -910,8 +910,7 @@ static int dccp_v4_rcv(struct sk_buff *sdccp_pr_debug_cat ("\n" ); }else {DCCP_SKB_CB (skb)->dccpd_ack_seq =dccp_hdr_ack_seq (skb); -dccp_pr_debug_cat (", ack=%llu\n" , - (unsigned long long ) +dccp_pr_debug_cat (", ack=%llu\n" , (unsigned long long )DCCP_SKB_CB (skb)->dccpd_ack_seq); }
@@ -940,11 +939,10 @@ static int dccp_v4_rcv(struct sk_buff *s* Generate Reset(No Connection) unless P.type == Reset * Drop packet and return */ -if (sk->sk_state ==DCCP_TIME_WAIT ) { -dccp_pr_debug ("sk->sk_state == DCCP_TIME_WAIT: " -"do_time_wait\n" ); - goto do_time_wait; +dccp_pr_debug ("sk->sk_state == DCCP_TIME_WAIT: do_time_wait\n" ); +inet_twsk_put (inet_twsk (sk)); + goto no_dccp_socket; }if (!xfrm4_policy_check (sk,XFRM_POLICY_IN , skb))
@@ -968,17 +966,12 @@ no_dccp_socket: } discard_it: -/* Discard frame. */ kfree_skb (skb); -return 0 ; +return ret; discard_and_relse:sock_put (sk); goto discard_it; - -do_time_wait: -inet_twsk_put (inet_twsk (sk)); - goto no_dccp_socket; }static struct inet_connection_sock_af_ops dccp_ipv4_af_ops = {
net/dccp/ipv6.c +11 -13
@@ -1071,8 +1071,11 @@ static int dccp_v6_rcv(struct sk_buff *** Generate Reset(No Connection) unless P.type == Reset * Drop packet and return */ -if (sk ==NULL ) +if (sk ==NULL ) { +dccp_pr_debug ("failed to look up flow ID in table and " +"get corresponding socket\n" ); goto no_dccp_socket; + }/* * Step 2:
@@ -1080,8 +1083,11 @@ static int dccp_v6_rcv(struct sk_buff *** Generate Reset(No Connection) unless P.type == Reset * Drop packet and return */ -if (sk->sk_state ==DCCP_TIME_WAIT ) - goto do_time_wait; +if (sk->sk_state ==DCCP_TIME_WAIT ) { +dccp_pr_debug ("sk->sk_state == DCCP_TIME_WAIT: do_time_wait\n" ); +inet_twsk_put (inet_twsk (sk)); + goto no_dccp_socket; + }if (!xfrm6_policy_check (sk,XFRM_POLICY_IN , skb)) goto discard_and_relse;
@@ -1101,22 +1107,14 @@ no_dccp_socket:DCCP_RESET_CODE_NO_CONNECTION ;dccp_v6_ctl_send_reset (skb); } -discard_it: - -/* -* Discard frame -*/ +discard_it:kfree_skb (skb); -return 0 ; +return ret; discard_and_relse:sock_put (sk); goto discard_it; - -do_time_wait: -inet_twsk_put (inet_twsk (sk)); - goto no_dccp_socket; }static struct inet_connection_sock_af_ops dccp_ipv6_af_ops = {