Skip to main content

Browse the archive

https://github.com/torvalds/linux
17 May 2024, 11:00:25 UTC
Revision 60e5ca8a64bad8f3e2e20a1e57846e497361c700 authored by Andrey Ignatov on 12 June 2020, 00:08:57 UTC, committed by Alexei Starovoitov on 12 June 2020, 22:21:29 UTC 
bpf: Fix memlock accounting for sock_hash
 
Add missed bpf_map_charge_init() in sock_hash_alloc() and
correspondingly bpf_map_charge_finish() on ENOMEM.

It was found accidentally while working on unrelated selftest that
checks "map->memory.pages > 0" is true for all map types.

Before:
	# bpftool m l
	...
	3692: sockhash  name m_sockhash  flags 0x0
		key 4B  value 4B  max_entries 8  memlock 0B

After:
	# bpftool m l
	...
	84: sockmap  name m_sockmap  flags 0x0
		key 4B  value 4B  max_entries 8  memlock 4096B

Fixes: 604326b41a6f ("bpf, sockmap: convert to generic sk_msg interface")
Signed-off-by: Andrey Ignatov <rdna@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200612000857.2881453-1-rdna@fb.com
1 parent f6fede8
History
Tip revision: 60e5ca8a64bad8f3e2e20a1e57846e497361c700 authored by Andrey Ignatov on 12 June 2020, 00:08:57 UTC
bpf: Fix memlock accounting for sock_hash
Tip revision: 60e5ca8
File Mode Size
.gitignore -rw-r--r-- 62 bytes
Kconfig -rw-r--r-- 3.4 KB
Makefile -rw-r--r-- 4.1 KB
blacklist.c -rw-r--r-- 4.0 KB
blacklist.h -rw-r--r-- 84 bytes
blacklist_hashes.c -rw-r--r-- 166 bytes
blacklist_nohashes.c -rw-r--r-- 122 bytes
system_certificates.S -rw-r--r-- 828 bytes
system_keyring.c -rw-r--r-- 8.7 KB
back to top