From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org,
linux-rt-users <linux-rt-users@vger.kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Carsten Emde <C.Emde@osadl.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
John Kacur <jkacur@redhat.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Julia Cartwright <julia@ni.com>,
Daniel Wagner <daniel.wagner@siemens.com>,
tom.zanussi@linux.intel.com, Alex Shi <alex.shi@linaro.org>,
rt-stable@vger.kernel.org
Subject: [PATCH RT 14/15] net: use trylock in icmp_sk
Date: Fri, 01 Dec 2017 19:02:03 -0500 [thread overview]
Message-ID: <20171202000428.964845943@goodmis.org> (raw)
In-Reply-To: 20171202000149.842718953@goodmis.org
[-- Attachment #1: 0014-net-use-trylock-in-icmp_sk.patch --]
[-- Type: text/plain, Size: 967 bytes --]
4.9.65-rt57-rc2 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
The locking path can be recursive (same as for sk->sk_lock.slock) and
therefore we need a trylock version for the locallock, too.
Cc: rt-stable@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
net/ipv4/icmp.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index e6864ff11352..330224ef4174 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -219,7 +219,11 @@ static inline struct sock *icmp_xmit_lock(struct net *net)
local_bh_disable();
- local_lock(icmp_sk_lock);
+ if (!local_trylock(icmp_sk_lock)) {
+ local_bh_enable();
+ return NULL;
+ }
+
sk = icmp_sk(net);
if (unlikely(!spin_trylock(&sk->sk_lock.slock))) {
--
2.13.2
next prev parent reply other threads:[~2017-12-02 0:02 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-02 0:01 [PATCH RT 00/15] Linux 4.9.65-rt57-rc2 Steven Rostedt
2017-12-02 0:01 ` [PATCH RT 01/15] Revert "memcontrol: Prevent scheduling while atomic in cgroup code" Steven Rostedt
2017-12-02 0:01 ` [PATCH RT 02/15] Revert "fs: jbd2: pull your plug when waiting for space" Steven Rostedt
2017-12-04 8:37 ` Sebastian Andrzej Siewior
2017-12-08 18:13 ` Steven Rostedt
2017-12-02 0:01 ` [PATCH RT 03/15] rtmutex: Fix lock stealing logic Steven Rostedt
2017-12-02 0:01 ` [PATCH RT 04/15] cpu_pm: replace raw_notifier to atomic_notifier Steven Rostedt
2017-12-02 0:01 ` [PATCH RT 05/15] PM / CPU: replace raw_notifier with atomic_notifier (fixup) Steven Rostedt
2017-12-02 0:01 ` [PATCH RT 06/15] kernel/hrtimer: migrate deferred timer on CPU down Steven Rostedt
2017-12-02 0:01 ` [PATCH RT 07/15] net: take the tcp_sk_lock lock with BH disabled Steven Rostedt
2017-12-02 0:01 ` [PATCH RT 08/15] kernel/hrtimer: dont wakeup a process while holding the hrtimer base lock Steven Rostedt
2017-12-02 0:01 ` [PATCH RT 09/15] kernel/hrtimer/hotplug: dont wake ktimersoftd " Steven Rostedt
2017-12-02 0:01 ` [PATCH RT 10/15] Bluetooth: avoid recursive locking in hci_send_to_channel() Steven Rostedt
2017-12-02 0:02 ` [PATCH RT 11/15] iommu/amd: Use raw_cpu_ptr() instead of get_cpu_ptr() for ->flush_queue Steven Rostedt
2017-12-02 0:02 ` [PATCH RT 12/15] rt/locking: allow recursive local_trylock() Steven Rostedt
2017-12-02 0:02 ` [PATCH RT 13/15] locking/rtmutex: dont drop the wait_lock twice Steven Rostedt
2017-12-02 0:02 ` Steven Rostedt [this message]
2017-12-02 0:02 ` [PATCH RT 15/15] Linux 4.9.65-rt57-rc2 Steven Rostedt
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=20171202000428.964845943@goodmis.org \
--to=rostedt@goodmis.org \
--cc=C.Emde@osadl.org \
--cc=alex.shi@linaro.org \
--cc=bigeasy@linutronix.de \
--cc=daniel.wagner@siemens.com \
--cc=jkacur@redhat.com \
--cc=julia@ni.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=rt-stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tom.zanussi@linux.intel.com \
/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).