From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: linux-kernel@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Will Deacon <will@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
"Paul E . McKenney" <paulmck@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Mike Galbraith <umgwanakikbuti@gmail.com>,
Evgeniy Polyakov <zbr@ioremap.net>,
netdev@vger.kernel.org,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Subject: [PATCH 6/8] connector/cn_proc: Protect send_msg() with a local lock
Date: Tue, 19 May 2020 22:19:10 +0200 [thread overview]
Message-ID: <20200519201912.1564477-7-bigeasy@linutronix.de> (raw)
In-Reply-To: <20200519201912.1564477-1-bigeasy@linutronix.de>
From: Mike Galbraith <umgwanakikbuti@gmail.com>
send_msg() disables preemption to avoid out-of-order messages. As the
code inside the preempt disabled section acquires regular spinlocks,
which are converted to 'sleeping' spinlocks on a PREEMPT_RT kernel and
eventually calls into a memory allocator, this conflicts with the RT
semantics.
Convert it to a local_lock which allows RT kernels to substitute them with
a real per CPU lock. On non RT kernels this maps to preempt_disable() as
before. No functional change.
[bigeasy: Patch description]
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Cc: netdev@vger.kernel.org
Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
drivers/connector/cn_proc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
index d58ce664da843..055b0c86a0693 100644
--- a/drivers/connector/cn_proc.c
+++ b/drivers/connector/cn_proc.c
@@ -18,6 +18,7 @@
#include <linux/pid_namespace.h>
#include <linux/cn_proc.h>
+#include <linux/locallock.h>
/*
* Size of a cn_msg followed by a proc_event structure. Since the
@@ -40,10 +41,11 @@ static struct cb_id cn_proc_event_id = { CN_IDX_PROC, CN_VAL_PROC };
/* proc_event_counts is used as the sequence number of the netlink message */
static DEFINE_PER_CPU(__u32, proc_event_counts) = { 0 };
+static DEFINE_LOCAL_LOCK(send_msg_lock);
static inline void send_msg(struct cn_msg *msg)
{
- preempt_disable();
+ local_lock(send_msg_lock);
msg->seq = __this_cpu_inc_return(proc_event_counts) - 1;
((struct proc_event *)msg->data)->cpu = smp_processor_id();
@@ -56,7 +58,7 @@ static inline void send_msg(struct cn_msg *msg)
*/
cn_netlink_send(msg, 0, CN_IDX_PROC, GFP_NOWAIT);
- preempt_enable();
+ local_unlock(send_msg_lock);
}
void proc_fork_connector(struct task_struct *task)
--
2.26.2
next prev parent reply other threads:[~2020-05-19 20:20 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 20:19 [PATCH 0/8] Introduce local_lock() Sebastian Andrzej Siewior
2020-05-19 20:19 ` [PATCH 1/8] locking: " Sebastian Andrzej Siewior
2020-05-20 12:04 ` Peter Zijlstra
2020-05-22 11:05 ` Sebastian Andrzej Siewior
2020-05-22 13:01 ` Peter Zijlstra
2020-05-19 20:19 ` [PATCH 2/8] radix-tree: Use local_lock for protection Sebastian Andrzej Siewior
2020-05-19 20:45 ` Matthew Wilcox
2020-05-19 20:54 ` Steven Rostedt
2020-05-20 2:05 ` Matthew Wilcox
2020-05-20 10:13 ` Sebastian Andrzej Siewior
2020-05-20 10:21 ` Peter Zijlstra
2020-05-20 12:28 ` Thomas Gleixner
2020-05-19 20:19 ` [PATCH 3/8] srcu: Use local_lock() for per-CPU struct srcu_data access Sebastian Andrzej Siewior
2020-05-20 10:24 ` Peter Zijlstra
2020-05-20 12:06 ` Sebastian Andrzej Siewior
2020-05-20 13:27 ` Peter Zijlstra
2020-05-20 17:42 ` Joel Fernandes
2020-05-20 18:28 ` Sebastian Andrzej Siewior
2020-05-20 18:35 ` Peter Zijlstra
2020-05-20 18:44 ` Joel Fernandes
2020-05-20 18:50 ` Uladzislau Rezki
2020-05-20 18:59 ` Joel Fernandes
2020-05-20 18:43 ` Paul E. McKenney
2020-05-22 15:12 ` Sebastian Andrzej Siewior
2020-05-22 17:39 ` Paul E. McKenney
2020-05-23 15:08 ` Sebastian Andrzej Siewior
2020-05-23 16:59 ` Paul E. McKenney
2020-05-24 19:03 ` Sebastian Andrzej Siewior
2020-05-25 3:27 ` Paul E. McKenney
2020-05-26 13:41 ` [PATCH] srcu: Avoid local_irq_save() before acquiring spinlock_t Sebastian Andrzej Siewior
2020-05-26 16:16 ` Paul E. McKenney
2020-05-26 16:31 ` Sebastian Andrzej Siewior
2020-05-19 20:19 ` [PATCH 4/8] mm/swap: Use local_lock for protection Sebastian Andrzej Siewior
2020-05-19 23:58 ` Andrew Morton
2020-05-20 2:17 ` Matthew Wilcox
2020-05-20 10:53 ` Peter Zijlstra
2020-05-19 20:19 ` [PATCH 5/8] squashfs: make use of local lock in multi_cpu decompressor Sebastian Andrzej Siewior
2020-05-20 10:56 ` Peter Zijlstra
2020-05-19 20:19 ` Sebastian Andrzej Siewior [this message]
2020-05-20 11:03 ` [PATCH 6/8] connector/cn_proc: Protect send_msg() with a local lock Peter Zijlstra
2020-05-19 20:19 ` [PATCH 7/8] zram: Use local lock to protect per-CPU data Sebastian Andrzej Siewior
2020-05-20 11:07 ` Peter Zijlstra
2020-05-19 20:19 ` [PATCH 8/8] mm/zswap: " Sebastian Andrzej Siewior
2020-05-19 21:46 ` Song Bao Hua
2020-05-20 10:26 ` Sebastian Andrzej Siewior
2020-05-20 11:13 ` Song Bao Hua
2020-05-20 11:57 ` Sebastian Andrzej Siewior
2020-05-20 12:01 ` Song Bao Hua
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=20200519201912.1564477-7-bigeasy@linutronix.de \
--to=bigeasy@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=umgwanakikbuti@gmail.com \
--cc=will@kernel.org \
--cc=zbr@ioremap.net \
/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).