From: Peter Zijlstra <peterz@infradead.org>
To: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Alexei Starovoitov <ast@kernel.org>,
davem@davemloft.net, daniel@iogearbox.net,
jakub.kicinski@netronome.com, netdev@vger.kernel.org,
kernel-team@fb.com, mingo@redhat.com, will.deacon@arm.com,
Paul McKenney <paulmck@linux.vnet.ibm.com>,
jannh@google.com
Subject: Re: [PATCH v4 bpf-next 1/9] bpf: introduce bpf_spin_lock
Date: Fri, 25 Jan 2019 10:10:57 +0100 [thread overview]
Message-ID: <20190125091057.GK17749@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20190124235857.xyb5xx2ufr6x5mbt@ast-mbp.dhcp.thefacebook.com>
On Thu, Jan 24, 2019 at 03:58:59PM -0800, Alexei Starovoitov wrote:
> On Thu, Jan 24, 2019 at 07:01:09PM +0100, Peter Zijlstra wrote:
> >
> > Thanks for having kernel/locking people on Cc...
> >
> > On Wed, Jan 23, 2019 at 08:13:55PM -0800, Alexei Starovoitov wrote:
> >
> > > Implementation details:
> > > - on !SMP bpf_spin_lock() becomes nop
> >
> > Because no BPF program is preemptible? I don't see any assertions or
> > even a comment that says this code is non-preemptible.
> >
> > AFAICT some of the BPF_RUN_PROG things are under rcu_read_lock() only,
> > which is not sufficient.
>
> nope. all bpf prog types disable preemption. That is must have for all
> sorts of things to work properly.
> If there is a prog type that doing rcu_read_lock only it's a serious bug.
> About a year or so ago we audited everything specifically to make
> sure everything disables preemption before calling bpf progs.
> I'm pretty sure nothing crept in in the mean time.
Do we want something like (the completely untested) below to avoid
having to manually audit this over and over?
---
include/linux/filter.h | 2 +-
include/linux/kernel.h | 9 +++++++--
kernel/sched/core.c | 28 ++++++++++++++++++++++++++++
3 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/include/linux/filter.h b/include/linux/filter.h
index d531d4250bff..4ab51e78da36 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -513,7 +513,7 @@ struct sk_filter {
struct bpf_prog *prog;
};
-#define BPF_PROG_RUN(filter, ctx) (*(filter)->bpf_func)(ctx, (filter)->insnsi)
+#define BPF_PROG_RUN(filter, ctx) ({ cant_sleep(); (*(filter)->bpf_func)(ctx, (filter)->insnsi); })
#define BPF_SKB_CB_LEN QDISC_CB_PRIV_LEN
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 8f0e68e250a7..f4cea3260a28 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -245,8 +245,10 @@ extern int _cond_resched(void);
#endif
#ifdef CONFIG_DEBUG_ATOMIC_SLEEP
- void ___might_sleep(const char *file, int line, int preempt_offset);
- void __might_sleep(const char *file, int line, int preempt_offset);
+extern void ___might_sleep(const char *file, int line, int preempt_offset);
+extern void __might_sleep(const char *file, int line, int preempt_offset);
+extern void __cant_sleep(const char *file, int line, int preempt_offset);
+
/**
* might_sleep - annotation for functions that can sleep
*
@@ -259,6 +261,8 @@ extern int _cond_resched(void);
*/
# define might_sleep() \
do { __might_sleep(__FILE__, __LINE__, 0); might_resched(); } while (0)
+# define cant_sleep() \
+ do { __cant_sleep(__FILE__, __LINE__, 0); } while (0)
# define sched_annotate_sleep() (current->task_state_change = 0)
#else
static inline void ___might_sleep(const char *file, int line,
@@ -266,6 +270,7 @@ extern int _cond_resched(void);
static inline void __might_sleep(const char *file, int line,
int preempt_offset) { }
# define might_sleep() do { might_resched(); } while (0)
+# define cant_sleep() do { } while (0)
# define sched_annotate_sleep() do { } while (0)
#endif
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index ee7763641348..799c285f4e0f 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6162,6 +6162,34 @@ void ___might_sleep(const char *file, int line, int preempt_offset)
add_taint(TAINT_WARN, LOCKDEP_STILL_OK);
}
EXPORT_SYMBOL(___might_sleep);
+
+void __cant_sleep(const char *file, int line, int preempt_offset)
+{
+ static unsigned long prev_jiffy;
+
+ if (irqs_disabled())
+ return;
+
+ if (!IS_ENABLED(CONFIG_PREEMPT_COUNT))
+ return;
+
+ if (preempt_count() > preempt_offset)
+ return;
+
+ if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy)
+ return;
+ prev_jiffy = jiffies;
+
+ printk(KERN_ERR "BUG: assuming atomic context at %s:%d\n", file, line);
+ printk(KERN_ERR "in_atomic(): %d, irqs_disabled(): %d, pid: %d, name: %s\n",
+ in_atomic(), irqs_disabled(),
+ current->pid, current->comm);
+
+ debug_show_held_locks(current);
+ dump_stack();
+ add_taint(TAINT_WARN, LOCKDEP_STILL_OK);
+}
+EXPORT_SYMBOL_GPL(__cant_sleep);
#endif
#ifdef CONFIG_MAGIC_SYSRQ
next prev parent reply other threads:[~2019-01-25 9:11 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-24 4:13 [PATCH v4 bpf-next 0/9] introduce bpf_spin_lock Alexei Starovoitov
2019-01-24 4:13 ` [PATCH v4 bpf-next 1/9] bpf: " Alexei Starovoitov
2019-01-24 18:01 ` Peter Zijlstra
2019-01-24 18:56 ` Peter Zijlstra
2019-01-24 23:42 ` Paul E. McKenney
2019-01-25 0:05 ` Alexei Starovoitov
2019-01-25 1:22 ` Paul E. McKenney
2019-01-25 1:46 ` Jann Horn
2019-01-25 2:38 ` Alexei Starovoitov
2019-01-25 4:27 ` Alexei Starovoitov
2019-01-25 4:31 ` Paul E. McKenney
2019-01-25 4:47 ` Alexei Starovoitov
2019-01-25 16:02 ` Paul E. McKenney
2019-01-25 4:11 ` Paul E. McKenney
2019-01-25 16:18 ` Jann Horn
2019-01-25 22:51 ` Paul E. McKenney
2019-01-25 23:44 ` Alexei Starovoitov
2019-01-26 0:43 ` Jann Horn
2019-01-26 0:59 ` Jann Horn
2019-01-24 23:58 ` Alexei Starovoitov
2019-01-25 0:18 ` Jann Horn
2019-01-25 2:49 ` Alexei Starovoitov
2019-01-25 2:29 ` Eric Dumazet
2019-01-25 2:34 ` Alexei Starovoitov
2019-01-25 2:44 ` Eric Dumazet
2019-01-25 2:57 ` Alexei Starovoitov
2019-01-25 8:38 ` Peter Zijlstra
2019-01-25 9:10 ` Peter Zijlstra [this message]
2019-01-25 23:42 ` Alexei Starovoitov
2019-01-28 8:24 ` Peter Zijlstra
2019-01-28 8:31 ` Peter Zijlstra
2019-01-28 8:35 ` Peter Zijlstra
2019-01-28 20:49 ` Alexei Starovoitov
2019-01-28 8:43 ` Peter Zijlstra
2019-01-28 21:37 ` Alexei Starovoitov
2019-01-29 8:59 ` Peter Zijlstra
2019-01-30 2:20 ` Alexei Starovoitov
2019-01-25 9:59 ` Peter Zijlstra
2019-01-25 10:09 ` Peter Zijlstra
2019-01-25 10:23 ` Peter Zijlstra
2019-01-26 0:17 ` bpf memory model. Was: " Alexei Starovoitov
2019-01-28 9:24 ` Peter Zijlstra
2019-01-28 21:56 ` Alexei Starovoitov
2019-01-29 9:16 ` Peter Zijlstra
2019-01-30 2:32 ` Alexei Starovoitov
2019-01-30 8:58 ` Peter Zijlstra
2019-01-30 19:36 ` Alexei Starovoitov
2019-01-30 18:11 ` Will Deacon
2019-01-30 18:36 ` Paul E. McKenney
2019-01-30 19:51 ` Alexei Starovoitov
2019-01-30 21:05 ` Paul E. McKenney
2019-01-30 22:57 ` Alexei Starovoitov
2019-01-31 14:01 ` Paul E. McKenney
2019-01-31 18:47 ` Alexei Starovoitov
2019-02-01 14:05 ` Paul E. McKenney
2019-01-30 19:50 ` Alexei Starovoitov
2019-01-24 4:13 ` [PATCH v4 bpf-next 2/9] bpf: add support for bpf_spin_lock to cgroup local storage Alexei Starovoitov
2019-01-24 4:13 ` [PATCH v4 bpf-next 3/9] tools/bpf: sync include/uapi/linux/bpf.h Alexei Starovoitov
2019-01-24 4:13 ` [PATCH v4 bpf-next 4/9] selftests/bpf: add bpf_spin_lock tests Alexei Starovoitov
2019-01-24 4:13 ` [PATCH v4 bpf-next 5/9] selftests/bpf: add bpf_spin_lock C test Alexei Starovoitov
2019-01-24 4:14 ` [PATCH v4 bpf-next 6/9] bpf: introduce BPF_F_LOCK flag Alexei Starovoitov
2019-01-24 4:14 ` [PATCH v4 bpf-next 7/9] tools/bpf: sync uapi/bpf.h Alexei Starovoitov
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=20190125091057.GK17749@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=alexei.starovoitov@gmail.com \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=jakub.kicinski@netronome.com \
--cc=jannh@google.com \
--cc=kernel-team@fb.com \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=will.deacon@arm.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).