net: dccp: convert tasklets to use new tasklet_setup() API
Subsystems (11)
PATCH 1/8 net: dccp: convert tasklets to use new tasklet_setup() API
From: Allen Pais <[email protected]>
In preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- net/dccp/timer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/dccp/timer.c +5 -5
@@ -220,9 +220,10 @@ static void dccp_delack_timer(struct timer_list *t)* * See the comments above %ccid_dequeueing_decision for supported modes. */ -static void dccp_write_xmitlet (unsigned long data) +static void dccp_write_xmitlet (struct tasklet_struct *t) { -struct sock *sk = (struct sock *)data; +struct dccp_sock *dp =from_tasklet (dp, t, dccps_xmitlet); +struct sock *sk = &dp->dccps_inet_connection.icsk_inet.sk;bh_lock_sock (sk);if (sock_owned_by_user (sk))
@@ -236,16 +237,15 @@ static void dccp_write_xmitlet(unsigned long data)static void dccp_write_xmit_timer (struct timer_list *t) {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); +dccp_write_xmitlet (&dp->dccps_xmitlet); }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); +tasklet_setup (&dp->dccps_xmitlet, dccp_write_xmitlet);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 · 1 line
2.17.1
PATCH 2/8 net: ipv4: convert tasklets to use new tasklet_setup() API
From: Allen Pais <[email protected]>
In preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- net/ipv4/tcp_output.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
net/ipv4/tcp_output.c +3 -5
@@ -883,9 +883,9 @@ static void tcp_tsq_handler(struct sock *sk)* transferring tsq->head because tcp_wfree() might * interrupt us (non NAPI drivers) */ -static void tcp_tasklet_func (unsigned long data) +static void tcp_tasklet_func (struct tasklet_struct *t) { -struct tsq_tasklet *tsq = (struct tsq_tasklet *)data; +struct tsq_tasklet *tsq =from_tasklet (tsq, t, tasklet);LIST_HEAD (list);unsigned long flags;struct list_head *q, *n;
@@ -970,9 +970,7 @@ void __init tcp_tasklet_init(void)struct tsq_tasklet *tsq = &per_cpu (tsq_tasklet, i);INIT_LIST_HEAD (&tsq->head); -tasklet_init (&tsq->tasklet, - tcp_tasklet_func, - (unsigned long )tsq); +tasklet_setup (&tsq->tasklet, tcp_tasklet_func); } }
Signature · 1 line
2.17.1
PATCH 3/8 net: mac80211: convert tasklets to use new tasklet_setup() API
In reply to Allen PaisFrom: Allen Pais <[email protected]>
In preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- net/mac80211/ieee80211_i.h | 4 ++-- net/mac80211/main.c | 14 +++++--------- net/mac80211/tx.c | 5 +++-- net/mac80211/util.c | 5 +++-- 4 files changed, 13 insertions(+), 15 deletions(-)
net/mac80211/ieee80211_i.h +2 -2
@@ -1775,7 +1775,7 @@ static inline bool ieee80211_sdata_running(struct ieee80211_sub_if_data *sdata)/* tx handling */ void ieee80211_clear_tx_pending (struct ieee80211_local *local); -void ieee80211_tx_pending (unsigned long data); +void ieee80211_tx_pending (struct tasklet_struct *t);netdev_tx_t ieee80211_monitor_start_xmit (struct sk_buff *skb,struct net_device *dev); netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
@@ -2125,7 +2125,7 @@ void ieee80211_txq_remove_vlan(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata);void ieee80211_fill_txq_stats (struct cfg80211_txq_stats *txqstats,struct txq_info *txqi); -void ieee80211_wake_txqs (unsigned long data); +void ieee80211_wake_txqs (struct tasklet_struct *t); void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata, u16 transaction, u16 auth_alg, u16 status, const u8 *extra, size_t extra_len, const u8 *bssid,
net/mac80211/main.c +5 -9
@@ -220,9 +220,9 @@ u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata)BSS_CHANGED_ERP_SLOT ; } -static void ieee80211_tasklet_handler (unsigned long data) +static void ieee80211_tasklet_handler (struct tasklet_struct *t) { -struct ieee80211_local *local = (struct ieee80211_local *) data; +struct ieee80211_local *local =from_tasklet (local, t, tasklet);struct sk_buff *skb; while ((skb = skb_dequeue(&local->skb_queue)) ||
@@ -733,16 +733,12 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len,skb_queue_head_init (&local->pending[i]);atomic_set (&local->agg_queue_stop[i],0 ); } -tasklet_init (&local->tx_pending_tasklet, ieee80211_tx_pending, - (unsigned long )local); +tasklet_setup (&local->tx_pending_tasklet, ieee80211_tx_pending);if (ops->wake_tx_queue) -tasklet_init (&local->wake_txqs_tasklet, ieee80211_wake_txqs, - (unsigned long )local); +tasklet_setup (&local->wake_txqs_tasklet, ieee80211_wake_txqs); -tasklet_init (&local->tasklet, - ieee80211_tasklet_handler, - (unsigned long ) local); +tasklet_setup (&local->tasklet, ieee80211_tasklet_handler);skb_queue_head_init (&local->skb_queue);skb_queue_head_init (&local->skb_queue_unreliable);
net/mac80211/tx.c +3 -2
@@ -4401,9 +4401,10 @@ static bool ieee80211_tx_pending_skb(struct ieee80211_local *local,/* * Transmit all pending packets. Called from tasklet. */ -void ieee80211_tx_pending (unsigned long data) +void ieee80211_tx_pending (struct tasklet_struct *t) { -struct ieee80211_local *local = (struct ieee80211_local *)data; +struct ieee80211_local *local =from_tasklet (local, t, + tx_pending_tasklet);unsigned long flags;int i;bool txok;
net/mac80211/util.c +3 -2
@@ -334,9 +334,10 @@ _ieee80211_wake_txqs(struct ieee80211_local *local, unsigned long *flags)rcu_read_unlock (); } -void ieee80211_wake_txqs (unsigned long data) +void ieee80211_wake_txqs (struct tasklet_struct *t) { -struct ieee80211_local *local = (struct ieee80211_local *)data; +struct ieee80211_local *local =from_tasklet (local, t, + wake_txqs_tasklet);unsigned long flags;spin_lock_irqsave (&local->queue_stop_reason_lock, flags);
Signature · 1 line
2.17.1
Re: [PATCH 3/8] net: mac80211: convert tasklets to use new tasklet_setup() API
net/mac80211/main.c u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata) · line 225
Quoted 6 lines · Allen Pais
net/mac80211/main.c +2
-2-static void ieee80211_tasklet_handler (unsigned long data) +static void ieee80211_tasklet_handler (struct tasklet_struct *t) { -struct ieee80211_local *local = (struct ieee80211_local *) data; +struct ieee80211_local *local =from_tasklet (local, t, tasklet);
Yay, thank you!
Dave, if you want to take this patch, I have no objections - I have nothing in my mac80211-next tree (yet).
johannes
PATCH 4/8 net: mac802154: convert tasklets to use new tasklet_setup() API
In reply to Allen PaisFrom: Allen Pais <[email protected]>
In preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- net/mac802154/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
net/mac802154/main.c +3 -5
@@ -20,9 +20,9 @@#include "ieee802154_i.h" #include "cfg.h" -static void ieee802154_tasklet_handler (unsigned long data) +static void ieee802154_tasklet_handler (struct tasklet_struct *t) { -struct ieee802154_local *local = (struct ieee802154_local *)data; +struct ieee802154_local *local =from_tasklet (local, t, tasklet);struct sk_buff *skb;while ((skb =skb_dequeue (&local->skb_queue))) {
@@ -91,9 +91,7 @@ ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops)INIT_LIST_HEAD (&local->interfaces);mutex_init (&local->iflist_mtx); -tasklet_init (&local->tasklet, - ieee802154_tasklet_handler, - (unsigned long )local); +tasklet_setup (&local->tasklet, ieee802154_tasklet_handler);skb_queue_head_init (&local->skb_queue);
Signature · 1 line
2.17.1
Re: [PATCH 4/8] net: mac802154: convert tasklets to use new tasklet_setup() API
Hello.
Quoted 31 lines · Allen Pais
From: Allen Pais <[email protected]>
In preparation for unconditionally passing the struct
tasklet_structpointer to all tasklet callbacks, switch to using the newtasklet_setup()andfrom_tasklet()to pass the tasklet pointer explicitly.Signed-off-by Romain Perier <[email protected]>Signed-off-by Allen Pais <[email protected]>--- net/mac802154/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)net/mac802154/main.c +2
-2@@ -20,9 +20,9 @@#include "ieee802154_i.h" #include "cfg.h" -static void ieee802154_tasklet_handler (unsigned long data) +static void ieee802154_tasklet_handler (struct tasklet_struct *t) { -struct ieee802154_local *local = (struct ieee802154_local *)data; +struct ieee802154_local *local =from_tasklet (local, t, tasklet);struct sk_buff *skb;while ((skb =skb_dequeue (&local->skb_queue))) {
net/mac802154/main.c ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops) · line 97
Quoted 10 lines
net/mac802154/main.c +1
-3@@ -91,9 +91,7 @@ ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops)INIT_LIST_HEAD (&local->interfaces);mutex_init (&local->iflist_mtx); -tasklet_init (&local->tasklet, - ieee802154_tasklet_handler, - (unsigned long )local); +tasklet_setup (&local->tasklet, ieee802154_tasklet_handler);skb_queue_head_init (&local->skb_queue);
regards
Stefan Schmidt
PATCH 5/8 net: rds: convert tasklets to use new tasklet_setup() API
In reply to Allen PaisFrom: Allen Pais <[email protected]>
In preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- net/rds/ib_cm.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
net/rds/ib_cm.c +6 -8
@@ -314,9 +314,9 @@ static void poll_scq(struct rds_ib_connection *ic, struct ib_cq *cq, } } -static void rds_ib_tasklet_fn_send (unsigned long data) +static void rds_ib_tasklet_fn_send (struct tasklet_struct *t) { -struct rds_ib_connection *ic = (struct rds_ib_connection *)data; +struct rds_ib_connection *ic =from_tasklet (ic, t, i_send_tasklet);struct rds_connection *conn = ic->conn;rds_ib_stats_inc (s_ib_tasklet_call);
@@ -354,9 +354,9 @@ static void poll_rcq(struct rds_ib_connection *ic, struct ib_cq *cq, } } -static void rds_ib_tasklet_fn_recv (unsigned long data) +static void rds_ib_tasklet_fn_recv (struct tasklet_struct *t) { -struct rds_ib_connection *ic = (struct rds_ib_connection *)data; +struct rds_ib_connection *ic =from_tasklet (ic, t, i_recv_tasklet);struct rds_connection *conn = ic->conn;struct rds_ib_device *rds_ibdev = ic->rds_ibdev;struct rds_ib_ack_state state;
@@ -1218,10 +1218,8 @@ int rds_ib_conn_alloc(struct rds_connection *conn, gfp_t gfp) }INIT_LIST_HEAD (&ic->ib_node); -tasklet_init (&ic->i_send_tasklet, rds_ib_tasklet_fn_send, - (unsigned long )ic); -tasklet_init (&ic->i_recv_tasklet, rds_ib_tasklet_fn_recv, - (unsigned long )ic); +tasklet_setup (&ic->i_send_tasklet, rds_ib_tasklet_fn_send); +tasklet_setup (&ic->i_recv_tasklet, rds_ib_tasklet_fn_recv);mutex_init (&ic->i_recv_mutex);#ifndef KERNEL_HAS_ATOMIC64 spin_lock_init (&ic->i_ack_lock);
Signature · 1 line
2.17.1
PATCH 6/8 net: sched: convert tasklets to use new tasklet_setup() API
In reply to Allen PaisFrom: Allen Pais <[email protected]>
In preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- net/sched/sch_atm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
net/sched/sch_atm.c +5 -4
@@ -466,10 +466,11 @@ drop: __maybe_unused* non-ATM interfaces. */ -static void sch_atm_dequeue (unsigned long data) +static void sch_atm_dequeue (struct tasklet_struct *t) { -struct Qdisc *sch = (struct Qdisc *)data; -struct atm_qdisc_data *p =qdisc_priv (sch); +struct atm_qdisc_data *p =from_tasklet (p, t, task); +struct Qdisc *sch = (struct Qdisc *)((char *) p - +QDISC_ALIGN (sizeof (struct Qdisc )));struct atm_flow_data *flow;struct sk_buff *skb;
@@ -563,7 +564,7 @@ static int atm_tc_init(struct Qdisc *sch, struct nlattr *opt,if (err)return err; -tasklet_init (&p->task, sch_atm_dequeue, (unsigned long )sch); +tasklet_setup (&p->task, sch_atm_dequeue);return 0 ; }
Signature · 1 line
2.17.1
PATCH 7/8 net: smc: convert tasklets to use new tasklet_setup() API
In reply to Allen PaisFrom: Allen Pais <[email protected]>
In preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- net/smc/smc_cdc.c | 6 +++--- net/smc/smc_wr.c | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-)
net/smc/smc_cdc.c +3 -3
@@ -389,9 +389,9 @@ static void smc_cdc_msg_recv(struct smc_sock *smc, struct smc_cdc_msg *cdc)* Context: * - tasklet context */ -static void smcd_cdc_rx_tsklet (unsigned long data) +static void smcd_cdc_rx_tsklet (struct tasklet_struct *t) { -struct smc_connection *conn = (struct smc_connection *)data; +struct smc_connection *conn =from_tasklet (conn, t, rx_tsklet);struct smcd_cdc_msg *data_cdc;struct smcd_cdc_msg cdc;struct smc_sock *smc;
@@ -411,7 +411,7 @@ static void smcd_cdc_rx_tsklet(unsigned long data)*/ void smcd_cdc_rx_init (struct smc_connection *conn) { -tasklet_init (&conn->rx_tsklet, smcd_cdc_rx_tsklet, (unsigned long )conn); +tasklet_setup (&conn->rx_tsklet, smcd_cdc_rx_tsklet); }/***************************** init, exit, misc ******************************/
net/smc/smc_wr.c +6 -8
@@ -131,9 +131,9 @@ static inline void smc_wr_tx_process_cqe(struct ib_wc *wc)wake_up (&link->wr_tx_wait); } -static void smc_wr_tx_tasklet_fn (unsigned long data) +static void smc_wr_tx_tasklet_fn (struct tasklet_struct *t) { -struct smc_ib_device *dev = (struct smc_ib_device *)data; +struct smc_ib_device *dev =from_tasklet (dev, t, send_tasklet);struct ib_wc wc[SMC_WR_MAX_POLL_CQE ];int i =0 , rc;int polled =0 ;
@@ -435,9 +435,9 @@ static inline void smc_wr_rx_process_cqes(struct ib_wc wc[], int num) } } -static void smc_wr_rx_tasklet_fn (unsigned long data) +static void smc_wr_rx_tasklet_fn (struct tasklet_struct *t) { -struct smc_ib_device *dev = (struct smc_ib_device *)data; +struct smc_ib_device *dev =from_tasklet (dev, t, recv_tasklet);struct ib_wc wc[SMC_WR_MAX_POLL_CQE ];int polled =0 ;int rc;
@@ -698,10 +698,8 @@ void smc_wr_remove_dev(struct smc_ib_device *smcibdev)void smc_wr_add_dev (struct smc_ib_device *smcibdev) { -tasklet_init (&smcibdev->recv_tasklet, smc_wr_rx_tasklet_fn, - (unsigned long )smcibdev); -tasklet_init (&smcibdev->send_tasklet, smc_wr_tx_tasklet_fn, - (unsigned long )smcibdev); +tasklet_setup (&smcibdev->recv_tasklet, smc_wr_rx_tasklet_fn); +tasklet_setup (&smcibdev->send_tasklet, smc_wr_tx_tasklet_fn); }int smc_wr_create_link (struct smc_link *lnk)
Signature · 1 line
2.17.1
PATCH 8/8 net: xfrm: convert tasklets to use new tasklet_setup() API
In reply to Allen PaisFrom: Allen Pais <[email protected]>
In preparation for unconditionally passing the struct tasklet_struct pointer to all tasklet callbacks, switch to using the new tasklet_setup() and from_tasklet() to pass the tasklet pointer explicitly.
--- net/xfrm/xfrm_input.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/xfrm/xfrm_input.c +3 -4
@@ -760,9 +760,9 @@ int xfrm_input_resume(struct sk_buff *skb, int nexthdr) }EXPORT_SYMBOL (xfrm_input_resume); -static void xfrm_trans_reinject (unsigned long data) +static void xfrm_trans_reinject (struct tasklet_struct *t) { -struct xfrm_trans_tasklet *trans = (void *)data; +struct xfrm_trans_tasklet *trans =from_tasklet (trans, t, tasklet);struct sk_buff_head queue;struct sk_buff *skb;
@@ -818,7 +818,6 @@ void __init xfrm_input_init(void) trans = &per_cpu (xfrm_trans_tasklet, i);__skb_queue_head_init (&trans->queue); -tasklet_init (&trans->tasklet, xfrm_trans_reinject, - (unsigned long )trans); +tasklet_setup (&trans->tasklet, xfrm_trans_reinject); } }
Signature · 1 line
2.17.1