]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
bpf: use __GFP_COMP while allocating page
authorTushar Dave <tushar.n.dave@oracle.com>
Wed, 12 Sep 2018 20:15:29 +0000 (22:15 +0200)
committerDaniel Borkmann <daniel@iogearbox.net>
Wed, 12 Sep 2018 21:47:28 +0000 (23:47 +0200)
Helper bpg_msg_pull_data() can allocate multiple pages while
linearizing multiple scatterlist elements into one shared page.
However, if the shared page has size > PAGE_SIZE, using
copy_page_to_iter() causes below warning.

e.g.
[ 6367.019832] WARNING: CPU: 2 PID: 7410 at lib/iov_iter.c:825
page_copy_sane.part.8+0x0/0x8

To avoid above warning, use __GFP_COMP while allocating multiple
contiguous pages.

Fixes: 015632bb30da ("bpf: sk_msg program helper bpf_sk_msg_pull_data")
Signed-off-by: Tushar Dave <tushar.n.dave@oracle.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
net/core/filter.c

index aecdeba052d3f0ff3d4f0a33ec36891f9738052c..5e00f2b85a5681a32cd905f0c02a303c5ef209af 100644 (file)
@@ -2344,7 +2344,8 @@ BPF_CALL_4(bpf_msg_pull_data,
        if (unlikely(bytes_sg_total > copy))
                return -EINVAL;
 
-       page = alloc_pages(__GFP_NOWARN | GFP_ATOMIC, get_order(copy));
+       page = alloc_pages(__GFP_NOWARN | GFP_ATOMIC | __GFP_COMP,
+                          get_order(copy));
        if (unlikely(!page))
                return -ENOMEM;
        p = page_address(page);