From: Jesper Dangaard Brouer <brouer@redhat.com>
To: Michal Hocko <mhocko@kernel.org>
Cc: Jason Wang <jasowang@redhat.com>,
ast@kernel.org, daniel@iogearbox.net, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, mst@redhat.com,
Matthew Wilcox <willy@infradead.org>,
akpm@linux-foundation.org, dhowells@redhat.com,
hannes@cmpxchg.org, brouer@redhat.com
Subject: Re: [PATCH net] bpf: cpumap: use GFP_KERNEL instead of GFP_ATOMIC in __cpu_map_entry_alloc()
Date: Wed, 14 Feb 2018 18:34:51 +0100 [thread overview]
Message-ID: <20180214183451.25252d72@redhat.com> (raw)
In-Reply-To: <20180214150640.GC3443@dhcp22.suse.cz>
On Wed, 14 Feb 2018 16:06:40 +0100
Michal Hocko <mhocko@kernel.org> wrote:
> On Wed 14-02-18 22:17:34, Jason Wang wrote:
> > There're several implications after commit 0bf7800f1799 ("ptr_ring:
> > try vmalloc() when kmalloc() fails") with the using of vmalloc() since
> > can't allow GFP_ATOMIC but mandate GFP_KERNEL. This will lead a WARN
> > since cpumap try to call with GFP_ATOMIC. Fortunately, entry
> > allocation of cpumap can only be done through syscall path which means
> > GFP_ATOMIC is not necessary, so fixing this by replacing GFP_ATOMIC
> > with GFP_KERNEL.
>
> map_update_elem does the following. Unless I am missing something and
> the callback doesn't call cpu_map_update_elem there then we are in a
> non-preemptible context there and GFP_WAIT would blow up.
> rcu_read_lock();
> err = map->ops->map_update_elem(map, key, value, attr->flags);
> rcu_read_unlock();
Nope - you did miss something ;-)
You are looking at the wrong place. Look at /kernel/bpf/syscall.c line 697.
vim +697 kernel/bpf/syscall.c
[...]
} else if (map->map_type == BPF_MAP_TYPE_CPUMAP) {
err = map->ops->map_update_elem(map, key, value, attr->flags);
goto out;
}
You missed that map type BPF_MAP_TYPE_CPUMAP is special cased, and
is moved outside rcu_read_{lock,unlock} (because it need to create some
kthreads).
Further more the BPF-verifier disallow BPF programs runtime changing
the BPF_MAP_TYPE_CPUMAP. Right now, we disallow almost everything from
the bpf-side (even reading the value):
vim +2057 kernel/bpf/verifier.c
> > Reported-by: syzbot+1a240cdb1f4cc88819df@syzkaller.appspotmail.com
> > Fixes: 0bf7800f1799 ("ptr_ring: try vmalloc() when kmalloc() fails")
> > Cc: Michal Hocko <mhocko@kernel.org>
> > Cc: Daniel Borkmann <daniel@iogearbox.net>
> > Cc: Matthew Wilcox <willy@infradead.org>
> > Cc: Jesper Dangaard Brouer <brouer@redhat.com>
> > Cc: akpm@linux-foundation.org
> > Cc: dhowells@redhat.com
> > Cc: hannes@cmpxchg.org
> > Signed-off-by: Jason Wang <jasowang@redhat.com>
> > ---
> > kernel/bpf/cpumap.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/kernel/bpf/cpumap.c b/kernel/bpf/cpumap.c
> > index fbfdada6..a4bb0b3 100644
> > --- a/kernel/bpf/cpumap.c
> > +++ b/kernel/bpf/cpumap.c
> > @@ -334,7 +334,7 @@ static int cpu_map_kthread_run(void *data)
> > static struct bpf_cpu_map_entry *__cpu_map_entry_alloc(u32 qsize, u32 cpu,
> > int map_id)
> > {
> > - gfp_t gfp = GFP_ATOMIC|__GFP_NOWARN;
> > + gfp_t gfp = GFP_KERNEL | __GFP_NOWARN;
> > struct bpf_cpu_map_entry *rcpu;
> > int numa, err;
> >
> > --
> > 2.7.4
>
--
Best regards,
Jesper Dangaard Brouer
MSc.CS, Principal Kernel Engineer at Red Hat
LinkedIn: http://www.linkedin.com/in/brouer
next prev parent reply other threads:[~2018-02-14 17:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-14 14:17 [PATCH net] bpf: cpumap: use GFP_KERNEL instead of GFP_ATOMIC in __cpu_map_entry_alloc() Jason Wang
2018-02-14 14:20 ` Jesper Dangaard Brouer
2018-02-14 14:37 ` Daniel Borkmann
2018-02-14 15:06 ` Michal Hocko
2018-02-14 17:34 ` Jesper Dangaard Brouer [this message]
2018-02-14 17:58 ` Michal Hocko
2018-02-14 17:04 ` Michael S. Tsirkin
2018-02-14 17:45 ` Daniel Borkmann
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=20180214183451.25252d72@redhat.com \
--to=brouer@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=dhowells@redhat.com \
--cc=hannes@cmpxchg.org \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhocko@kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=willy@infradead.org \
/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).