diff options
| author | Willem de Bruijn <willemb@google.com> | 2017-08-03 16:29:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-03 21:37:30 -0700 |
| commit | a91dbff551a6f1865b68fa82b654591490b59901 (patch) | |
| tree | 89d57387331da71c174bff7d3d840c7f39b30e83 /include/linux | |
| parent | 4ab6c99d99bb1bf0fbba8ff4e52114c66109992f (diff) | |
| download | lwn-a91dbff551a6f1865b68fa82b654591490b59901.tar.gz lwn-a91dbff551a6f1865b68fa82b654591490b59901.zip | |
sock: ulimit on MSG_ZEROCOPY pages
Bound the number of pages that a user may pin.
Follow the lead of perf tools to maintain a per-user bound on memory
locked pages commit 789f90fcf6b0 ("perf_counter: per user mlock gift")
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sched/user.h | 3 | ||||
| -rw-r--r-- | include/linux/skbuff.h | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/sched/user.h b/include/linux/sched/user.h index 5d5415e129d4..3c07e4135127 100644 --- a/include/linux/sched/user.h +++ b/include/linux/sched/user.h @@ -36,7 +36,8 @@ struct user_struct { struct hlist_node uidhash_node; kuid_t uid; -#if defined(CONFIG_PERF_EVENTS) || defined(CONFIG_BPF_SYSCALL) +#if defined(CONFIG_PERF_EVENTS) || defined(CONFIG_BPF_SYSCALL) || \ + defined(CONFIG_NET) atomic_long_t locked_vm; #endif }; diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index f5bdd93a87da..8c0708d2e5e6 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -457,6 +457,11 @@ struct ubuf_info { }; }; atomic_t refcnt; + + struct mmpin { + struct user_struct *user; + unsigned int num_pg; + } mmp; }; #define skb_uarg(SKB) ((struct ubuf_info *)(skb_shinfo(SKB)->destructor_arg)) |