From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Eric Dumazet <edumazet@google.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Chris Mason <clm@fb.com>, Arjan van de Ven <arjan@infradead.org>,
rt@linutronix.de
Subject: [patch 08/20] net/ipv4/inet: Initialize timers as pinned
Date: Mon, 13 Jun 2016 08:40:56 -0000 [thread overview]
Message-ID: <20160613075928.856100460@linutronix.de> (raw)
In-Reply-To: 20160613070440.950649741@linutronix.de
[-- Attachment #1: net-ipv4-inet--Initialize-timers-as-pinned.patch --]
[-- Type: text/plain, Size: 2252 bytes --]
Pinned timers must carry that attribute in the timer itself. No functional
change.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
net/ipv4/inet_connection_sock.c | 7 ++++---
net/ipv4/inet_timewait_sock.c | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
Index: b/net/ipv4/inet_connection_sock.c
===================================================================
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -603,7 +603,7 @@ static void reqsk_timer_handler(unsigned
if (req->num_timeout++ == 0)
atomic_dec(&queue->young);
timeo = min(TCP_TIMEOUT_INIT << req->num_timeout, TCP_RTO_MAX);
- mod_timer_pinned(&req->rsk_timer, jiffies + timeo);
+ mod_timer(&req->rsk_timer, jiffies + timeo);
return;
}
drop:
@@ -617,8 +617,9 @@ static void reqsk_queue_hash_req(struct
req->num_timeout = 0;
req->sk = NULL;
- setup_timer(&req->rsk_timer, reqsk_timer_handler, (unsigned long)req);
- mod_timer_pinned(&req->rsk_timer, jiffies + timeout);
+ setup_pinned_timer(&req->rsk_timer, reqsk_timer_handler,
+ (unsigned long)req);
+ mod_timer(&req->rsk_timer, jiffies + timeout);
inet_ehash_insert(req_to_sk(req), NULL);
/* before letting lookups find us, make sure all req fields
Index: b/net/ipv4/inet_timewait_sock.c
===================================================================
--- a/net/ipv4/inet_timewait_sock.c
+++ b/net/ipv4/inet_timewait_sock.c
@@ -188,7 +188,8 @@ struct inet_timewait_sock *inet_twsk_all
tw->tw_prot = sk->sk_prot_creator;
atomic64_set(&tw->tw_cookie, atomic64_read(&sk->sk_cookie));
twsk_net_set(tw, sock_net(sk));
- setup_timer(&tw->tw_timer, tw_timer_handler, (unsigned long)tw);
+ setup_pinned_timer(&tw->tw_timer, tw_timer_handler,
+ (unsigned long)tw);
/*
* Because we use RCU lookups, we should not set tw_refcnt
* to a non null value before everything is setup for this
@@ -248,7 +249,7 @@ void __inet_twsk_schedule(struct inet_ti
tw->tw_kill = timeo <= 4*HZ;
if (!rearm) {
- BUG_ON(mod_timer_pinned(&tw->tw_timer, jiffies + timeo));
+ BUG_ON(mod_timer(&tw->tw_timer, jiffies + timeo));
atomic_inc(&tw->tw_dr->tw_count);
} else {
mod_timer_pending(&tw->tw_timer, jiffies + timeo);
next prev parent reply other threads:[~2016-06-13 8:50 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-13 8:40 [patch 00/20] timer: Refactor the timer wheel Thomas Gleixner
2016-06-13 8:40 ` [patch 01/20] timer: Make pinned a timer property Thomas Gleixner
2016-06-13 8:40 ` [patch 02/20] x86/apic/uv: Initialize timer as pinned Thomas Gleixner
2016-06-13 8:40 ` [patch 03/20] x86/mce: " Thomas Gleixner
2016-06-13 8:40 ` [patch 04/20] cpufreq/powernv: " Thomas Gleixner
2016-06-13 13:18 ` Arjan van de Ven
2016-06-13 8:40 ` [patch 05/20] driver/net/ethernet/tile: " Thomas Gleixner
2016-06-13 8:40 ` [patch 06/20] drivers/tty/metag_da: " Thomas Gleixner
2016-06-13 13:13 ` Arjan van de Ven
2016-06-13 8:40 ` [patch 07/20] drivers/tty/mips_ejtag: " Thomas Gleixner
2016-06-13 8:40 ` Thomas Gleixner [this message]
2016-06-13 8:40 ` [patch 09/20] timer: Remove mod_timer_pinned Thomas Gleixner
2016-06-13 8:40 ` [patch 10/20] timer: Add a cascading tracepoint Thomas Gleixner
2016-06-13 8:40 ` [patch 11/20] hlist: Add hlist_is_last_node() helper Thomas Gleixner
2016-06-13 10:27 ` Paolo Bonzini
2016-06-13 8:40 ` [patch 12/20] timer: Give a few structs and members proper names Thomas Gleixner
2016-06-13 8:41 ` [patch 13/20] timer: Switch to a non cascading wheel Thomas Gleixner
2016-06-13 11:40 ` Peter Zijlstra
2016-06-13 12:30 ` Thomas Gleixner
2016-06-13 12:46 ` Eric Dumazet
2016-06-13 14:30 ` Thomas Gleixner
2016-06-14 10:11 ` Ingo Molnar
2016-06-14 16:28 ` Thomas Gleixner
2016-06-14 17:14 ` Arjan van de Ven
2016-06-14 18:05 ` Thomas Gleixner
2016-06-14 20:34 ` Peter Zijlstra
2016-06-14 20:42 ` Peter Zijlstra
2016-06-14 21:17 ` Eric Dumazet
2016-06-15 14:53 ` Thomas Gleixner
2016-06-15 14:55 ` Arjan van de Ven
2016-06-15 16:43 ` Thomas Gleixner
2016-06-16 15:43 ` Thomas Gleixner
2016-06-16 16:02 ` Paul E. McKenney
2016-06-16 18:14 ` Peter Zijlstra
2016-06-17 0:40 ` Paul E. McKenney
2016-06-17 4:04 ` Paul E. McKenney
2016-06-16 16:04 ` Arjan van de Ven
2016-06-16 16:09 ` Thomas Gleixner
2016-06-15 15:05 ` Eric Dumazet
2016-06-13 14:36 ` Richard Cochran
2016-06-13 14:39 ` Thomas Gleixner
2016-06-13 8:41 ` [patch 15/20] timer: Move __run_timers() function Thomas Gleixner
2016-06-13 8:41 ` [patch 14/20] timer: Remove slack leftovers Thomas Gleixner
2016-06-13 8:41 ` [patch 16/20] timer: Optimize collect timers for NOHZ Thomas Gleixner
2016-06-13 8:41 ` [patch 17/20] tick/sched: Remove pointless empty function Thomas Gleixner
2016-06-13 8:41 ` [patch 18/20] timer: Forward wheel clock whenever possible Thomas Gleixner
2016-06-13 15:14 ` Richard Cochran
2016-06-13 15:18 ` Thomas Gleixner
2016-06-13 8:41 ` [patch 19/20] timer: Split out index calculation Thomas Gleixner
2016-06-13 8:41 ` [patch 20/20] timer: Optimization for same expiry time in mod_timer() Thomas Gleixner
2016-06-13 14:10 ` [patch 00/20] timer: Refactor the timer wheel Eric Dumazet
2016-06-13 16:15 ` Paul E. McKenney
2016-06-15 15:15 ` Paul E. McKenney
2016-06-15 17:02 ` Thomas Gleixner
2016-06-15 20:26 ` Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160613075928.856100460@linutronix.de \
--to=tglx@linutronix.de \
--cc=arjan@infradead.org \
--cc=clm@fb.com \
--cc=edumazet@google.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=rt@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).