Commit 1f00d375 authored Aug 25, 2020 by KP Singh Committed by Alexei Starovoitov Aug 25, 2020

bpf: Renames in preparation for bpf_local_storage



A purely mechanical change to split the renaming from the actual
generalization.

Flags/consts:

  SK_STORAGE_CREATE_FLAG_MASK	BPF_LOCAL_STORAGE_CREATE_FLAG_MASK
  BPF_SK_STORAGE_CACHE_SIZE	BPF_LOCAL_STORAGE_CACHE_SIZE
  MAX_VALUE_SIZE		BPF_LOCAL_STORAGE_MAX_VALUE_SIZE

Structs:

  bucket			bpf_local_storage_map_bucket
  bpf_sk_storage_map		bpf_local_storage_map
  bpf_sk_storage_data		bpf_local_storage_data
  bpf_sk_storage_elem		bpf_local_storage_elem
  bpf_sk_storage		bpf_local_storage

The "sk" member in bpf_local_storage is also updated to "owner"
in preparation for changing the type to void * in a subsequent patch.

Functions:

  selem_linked_to_sk			selem_linked_to_storage
  selem_alloc				bpf_selem_alloc
  __selem_unlink_sk			bpf_selem_unlink_storage_nolock
  __selem_link_sk			bpf_selem_link_storage_nolock
  selem_unlink_sk			__bpf_selem_unlink_storage
  sk_storage_update			bpf_local_storage_update
  __sk_storage_lookup			bpf_local_storage_lookup
  bpf_sk_storage_map_free		bpf_local_storage_map_free
  bpf_sk_storage_map_alloc		bpf_local_storage_map_alloc
  bpf_sk_storage_map_alloc_check	bpf_local_storage_map_alloc_check
  bpf_sk_storage_map_check_btf		bpf_local_storage_map_check_btf

Signed-off-by: KP Singh <kpsingh@google.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20200825182919.1118197-2-kpsingh@chromium.org

parent 0fcdfffe

include/net/sock.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -246,7 +246,7 @@ struct sock_common {
		/* public: */
		};

		struct bpf_sk_storage;
		struct bpf_local_storage;

		/**
		* struct sock - network layer representation of sockets
		@@ -517,7 +517,7 @@ struct sock {
		void (sk_destruct)(struct sock sk);
		struct sock_reuseport __rcu *sk_reuseport_cb;
		#ifdef CONFIG_BPF_SYSCALL
		struct bpf_sk_storage __rcu *sk_bpf_storage;
		struct bpf_local_storage __rcu *sk_bpf_storage;
		#endif
		struct rcu_head sk_rcu;
		};

net/core/bpf_sk_storage.c

+250 −238

File changed.

Preview size limit exceeded, changes collapsed.

tools/testing/selftests/bpf/progs/map_ptr_kern.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -589,7 +589,7 @@ static inline int check_stack(void)
		return 1;
		}

		struct bpf_sk_storage_map {
		struct bpf_local_storage_map {
		struct bpf_map map;
		} __attribute__((preserve_access_index));

		@@ -602,8 +602,8 @@ struct {

		static inline int check_sk_storage(void)
		{
		struct bpf_sk_storage_map *sk_storage =
		(struct bpf_sk_storage_map *)&m_sk_storage;
		struct bpf_local_storage_map *sk_storage =
		(struct bpf_local_storage_map *)&m_sk_storage;
		struct bpf_map map = (struct bpf_map )&m_sk_storage;

		VERIFY(check(&sk_storage->map, map, sizeof(__u32), sizeof(__u32), 0));

Admin message