diff options
| author | David S. Miller <davem@davemloft.net> | 2018-06-12 03:37:03 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-12 03:37:03 +0300 |
| commit | 0ca69d1399eefd481f926bb5f271ddc2da38d4f4 (patch) | |
| tree | 0f6368a1fe6be42b2bfeeba294f655f721e5e49a /net | |
| parent | 93ba168ad4c771b9b37bd28230fc5e7f285ccff9 (diff) | |
| parent | a343993c518ce252b62ec00ac06bccfb1d17129d (diff) | |
| download | linux-0ca69d1399eefd481f926bb5f271ddc2da38d4f4.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2018-06-12
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) Avoid an allocation warning in AF_XDP by adding __GFP_NOWARN for the
umem setup, from Björn.
2) Silence a warning in bpf fs when an application tries to open(2) a
pinned bpf obj due to missing fops. Add a dummy open fop that continues
to just bail out in such case, from Daniel.
3) Fix a BPF selftest urandom_read build issue where gcc complains that
it gets built twice, from Anders.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/xdp/xdp_umem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c index b9ef487c4618..f47abb46c587 100644 --- a/net/xdp/xdp_umem.c +++ b/net/xdp/xdp_umem.c @@ -204,7 +204,8 @@ static int xdp_umem_pin_pages(struct xdp_umem *umem) long npgs; int err; - umem->pgs = kcalloc(umem->npgs, sizeof(*umem->pgs), GFP_KERNEL); + umem->pgs = kcalloc(umem->npgs, sizeof(*umem->pgs), + GFP_KERNEL | __GFP_NOWARN); if (!umem->pgs) return -ENOMEM; |