Commit 9e838b02 authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by Alexei Starovoitov
Browse files

bpf: Folding omem_charge() into sk_storage_charge() 



sk_storage_charge() is the only user of omem_charge().
This patch simplifies it by folding omem_charge() into
sk_storage_charge().

Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Acked-by: default avatarKP Singh <kpsingh@google.com>
Link: https://lore.kernel.org/bpf/20201112211301.2586255-1-kafai@fb.com
parent 0a58a65c

net/core/bpf_sk_storage.c

+10 −13
Original line number Diff line number Diff line
@@ -15,18 +15,6 @@ 


DEFINE_BPF_STORAGE_CACHE(sk_cache);



static int omem_charge(struct sock *sk, unsigned int size)

{

	/* same check as in sock_kmalloc() */

	if (size <= sysctl_optmem_max &&

	    atomic_read(&sk->sk_omem_alloc) + size < sysctl_optmem_max) {

		atomic_add(size, &sk->sk_omem_alloc);

		return 0;

	}



	return -ENOMEM;

}



static struct bpf_local_storage_data *

sk_storage_lookup(struct sock *sk, struct bpf_map *map, bool cacheit_lockit)

{
@@ -316,7 +304,16 @@ BPF_CALL_2(bpf_sk_storage_delete, struct bpf_map *, map, struct sock *, sk) 
static int sk_storage_charge(struct bpf_local_storage_map *smap,

			     void *owner, u32 size)

{

	return omem_charge(owner, size);

	struct sock *sk = (struct sock *)owner;



	/* same check as in sock_kmalloc() */

	if (size <= sysctl_optmem_max &&

	    atomic_read(&sk->sk_omem_alloc) + size < sysctl_optmem_max) {

		atomic_add(size, &sk->sk_omem_alloc);

		return 0;

	}



	return -ENOMEM;

}



static void sk_storage_uncharge(struct bpf_local_storage_map *smap,

CRA Git | Maintained and supported by SUSTech CRA and CCSE