diff options
| author |   Eric Dumazet <edumazet@google.com> | 2018-08-29 11:50:12 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-08-31 23:00:28 -0700 |
| commit | 3a7ad0634f0986d807772ba74f66f7c3a73612e5 (patch) | |
| tree | f64aca1c92187b15255c3da45bf0e6df95193c2c /net/packet/internal.h | |
| parent | Merge branch 'net_sched-reject-unknown-tcfa_action-values' (diff) | |
| download | linux-dev-3a7ad0634f0986d807772ba74f66f7c3a73612e5.tar.xz linux-dev-3a7ad0634f0986d807772ba74f66f7c3a73612e5.zip | |
Revert "packet: switch kvzalloc to allocate memory"
This reverts commit 71e41286203c017d24f041a7cd71abea7ca7b1e0.
mmap()/munmap() can not be backed by kmalloced pages :
We fault in :
VM_BUG_ON_PAGE(PageSlab(page), page);
unmap_single_vma+0x8a/0x110
unmap_vmas+0x4b/0x90
unmap_region+0xc9/0x140
do_munmap+0x274/0x360
vm_munmap+0x81/0xc0
SyS_munmap+0x2b/0x40
do_syscall_64+0x13e/0x1c0
entry_SYSCALL_64_after_hwframe+0x42/0xb7
Fixes: 71e41286203c ("packet: switch kvzalloc to allocate memory")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: John Sperbeck <jsperbeck@google.com>
Bisected-by: John Sperbeck <jsperbeck@google.com>
Cc: Zhang Yu <zhangyu31@baidu.com>
Cc: Li RongQing <lirongqing@baidu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/packet/internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/packet/internal.h b/net/packet/internal.h index 8f50036f62f0..3bb7c5fb3bff 100644 --- a/net/packet/internal.h +++ b/net/packet/internal.h @@ -64,6 +64,7 @@ struct packet_ring_buffer { unsigned int frame_size; unsigned int frame_max; + unsigned int pg_vec_order; unsigned int pg_vec_pages; unsigned int pg_vec_len; |