net: dccp: Convert timers to use timer_setup()
Subsystems (2)
PATCH 1/1 net: dccp: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Adds a pointer back to the sock.
Cc Gerrit Renker <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Soheil Hassas Yeganeh <[email protected]>
Cc Hannes Frederic Sowa <[email protected]>
Cc Eric Dumazet <[email protected]>
Signed-off-by Kees Cook <[email protected]>
--- net/dccp/ccids/ccid2.c | 10 +++++----- net/dccp/ccids/ccid2.h | 1 + net/dccp/ccids/ccid3.c | 11 ++++++----- net/dccp/ccids/ccid3.h | 1 + net/dccp/timer.c | 12 +++++++----- 5 files changed, 20 insertions(+), 15 deletions(-)
net/dccp/ccids/ccid2.c +5 -5
@@ -126,10 +126,10 @@ static void ccid2_change_l_seq_window(struct sock *sk, u64 val) DCCPF_SEQ_WMAX)); } -static void ccid2_hc_tx_rto_expire (unsigned long data) +static void ccid2_hc_tx_rto_expire (struct timer_list *t) { -struct sock *sk = (struct sock *)data; -struct ccid2_hc_tx_sock *hc =ccid2_hc_tx_sk (sk); +struct ccid2_hc_tx_sock *hc =from_timer (hc, t, tx_rtotimer); +struct sock *sk = hc->sk;const bool sender_was_blocked =ccid2_cwnd_network_limited (hc);bh_lock_sock (sk);
@@ -733,8 +733,8 @@ static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk) hc->tx_rpdupack =-1 ; hc->tx_last_cong = hc->tx_lsndtime = hc->tx_cwnd_stamp = ccid2_jiffies32; hc->tx_cwnd_used =0 ; -setup_timer (&hc->tx_rtotimer, ccid2_hc_tx_rto_expire, - (unsigned long )sk); + hc->sk = sk; +timer_setup (&hc->tx_rtotimer, ccid2_hc_tx_rto_expire,0 );INIT_LIST_HEAD (&hc->tx_av_chunks);return 0 ; }
net/dccp/ccids/ccid2.h +1 -0
@@ -85,6 +85,7 @@ struct ccid2_hc_tx_sock {tx_rto ; u64 tx_rtt_seq:48;struct timer_list tx_rtotimer; +struct sock *sk;/* Congestion Window validation (optional, RFC 2861) */ u32 tx_cwnd_used,
net/dccp/ccids/ccid3.c +6 -5
@@ -195,10 +195,10 @@ static inline void ccid3_hc_tx_update_win_count(struct ccid3_hc_tx_sock *hc, } } -static void ccid3_hc_tx_no_feedback_timer (unsigned long data) +static void ccid3_hc_tx_no_feedback_timer (struct timer_list *t) { -struct sock *sk = (struct sock *)data; -struct ccid3_hc_tx_sock *hc =ccid3_hc_tx_sk (sk); +struct ccid3_hc_tx_sock *hc =from_timer (hc, t, tx_no_feedback_timer); +struct sock *sk = hc->sk;unsigned long t_nfb =USEC_PER_SEC /5 ;bh_lock_sock (sk);
@@ -505,8 +505,9 @@ static int ccid3_hc_tx_init(struct ccid *ccid, struct sock *sk) hc->tx_state =TFRC_SSTATE_NO_SENT ; hc->tx_hist =NULL ; -setup_timer (&hc->tx_no_feedback_timer, - ccid3_hc_tx_no_feedback_timer, (unsigned long )sk); + hc->sk = sk; +timer_setup (&hc->tx_no_feedback_timer, + ccid3_hc_tx_no_feedback_timer,0 );return 0 ; }
net/dccp/ccids/ccid3.h +1 -0
@@ -106,6 +106,7 @@ struct ccid3_hc_tx_sock {u8 tx_last_win_count;ktime_t tx_t_last_win_count;struct timer_list tx_no_feedback_timer; +struct sock *sk;ktime_t tx_t_ld;ktime_t tx_t_nom;struct tfrc_tx_hist_entry *tx_hist;
net/dccp/timer.c +7 -5
@@ -234,10 +234,13 @@ static void dccp_write_xmitlet(unsigned long data)bh_unlock_sock (sk); } -static void dccp_write_xmit_timer (unsigned long data) +static void dccp_write_xmit_timer (struct timer_list *t) { -dccp_write_xmitlet (data); -sock_put ((struct sock *)data); +struct dccp_sock *dp =from_timer (dp, t, dccps_xmit_timer); +struct sock *sk = &dp->dccps_inet_connection.icsk_inet.sk; + +dccp_write_xmitlet ((unsigned long )sk); +sock_put (sk); }void dccp_init_xmit_timers (struct sock *sk)
@@ -245,8 +248,7 @@ void dccp_init_xmit_timers(struct sock *sk)struct dccp_sock *dp =dccp_sk (sk);tasklet_init (&dp->dccps_xmitlet, dccp_write_xmitlet, (unsigned long )sk); -setup_timer (&dp->dccps_xmit_timer, dccp_write_xmit_timer, - (unsigned long )sk); +timer_setup (&dp->dccps_xmit_timer, dccp_write_xmit_timer,0 );inet_csk_init_xmit_timers (sk, &dccp_write_timer, &dccp_delack_timer, &dccp_keepalive_timer); }
Signature · 6 lines
2.7.4 -- Kees Cook Pixel Security
From: Kees Cook <[email protected]>
Date: Tue, 24 Oct 2017 01:46:09 -0700
Quoted 4 lines
In preparation for unconditionally passing the struct
timer_listpointer to all timer callbacks, switch to using the newtimer_setup()andfrom_timer()to pass the timer pointer explicitly. Adds a pointer back to the sock.
Quoted 8 lines
Cc Gerrit Renker <[email protected]>Cc "David S. Miller" <[email protected]>Cc Soheil Hassas Yeganeh <[email protected]>Cc Hannes Frederic Sowa <[email protected]>Cc Eric Dumazet <[email protected]>Signed-off-by Kees Cook <[email protected]>
Applied.