[bpf-next,v3,1/7] bpf: rename stack trace map operations

Message ID	153986856962.9127.16599603891100844690.stgit@kernel
State	Accepted, archived
Delegated to:	BPF Maintainers
Headers	show Return-Path: <netdev-owner@vger.kernel.org> Subject: [PATCH bpf-next v3 1/7] bpf: rename stack trace map operations From: Mauricio Vasquez B <mauricio.vasquez@polito.it> To: Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, netdev@vger.kernel.org Cc: Song Liu <liu.song.a23@gmail.com> Date: Thu, 18 Oct 2018 15:16:09 +0200 Message-ID: <153986856962.9127.16599603891100844690.stgit@kernel> In-Reply-To: <153986856416.9127.9618539079636149043.stgit@kernel> References: <153986856416.9127.9618539079636149043.stgit@kernel> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	Implement queue/stack maps \| expand [bpf-next,v3,0/7] Implement queue/stack maps [bpf-next,v3,1/7] bpf: rename stack trace map operations [bpf-next,v3,2/7] bpf/syscall: allow key to be null in map functions [bpf-next,v3,3/7] bpf/verifier: add ARG_PTR_TO_UNINIT_MAP_VALUE [bpf-next,v3,4/7] bpf: add queue and stack maps [bpf-next,v3,5/7] bpf: add MAP_LOOKUP_AND_DELETE_ELEM syscall [bpf-next,v3,6/7] Sync uapi/bpf.h to tools/include [bpf-next,v3,7/7] selftests/bpf: add test cases for queue and stack maps

Message ID

153986856962.9127.16599603891100844690.stgit@kernel

State

Accepted, archived

Delegated to:

BPF Maintainers

Headers

Subject: [PATCH bpf-next v3 1/7] bpf: rename stack trace map operations
From: Mauricio Vasquez B <mauricio.vasquez@polito.it>
To: Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>, netdev@vger.kernel.org
Cc: Song Liu <liu.song.a23@gmail.com>
Date: Thu, 18 Oct 2018 15:16:09 +0200
Message-ID: <153986856962.9127.16599603891100844690.stgit@kernel>
In-Reply-To: <153986856416.9127.9618539079636149043.stgit@kernel>
References: <153986856416.9127.9618539079636149043.stgit@kernel>
User-Agent: StGit/unknown-version
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

Implement queue/stack maps | expand

Commit Message

Mauricio Vasquez Oct. 18, 2018, 1:16 p.m. UTC

In the following patches queue and stack maps (FIFO and LIFO
datastructures) will be implemented.  In order to avoid confusion and
a possible name clash rename stack_map_ops to stack_trace_map_ops

Signed-off-by: Mauricio Vasquez B <mauricio.vasquez@polito.it>
Acked-by: Song Liu <songliubraving@fb.com>
---
 include/linux/bpf_types.h |    2 +-
 kernel/bpf/stackmap.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/bpf_types.h b/include/linux/bpf_types.h
index fa48343a5ea1..7bad4e1947ed 100644
--- a/include/linux/bpf_types.h
+++ b/include/linux/bpf_types.h
@@ -51,7 +51,7 @@  BPF_MAP_TYPE(BPF_MAP_TYPE_LRU_HASH, htab_lru_map_ops)
 BPF_MAP_TYPE(BPF_MAP_TYPE_LRU_PERCPU_HASH, htab_lru_percpu_map_ops)
 BPF_MAP_TYPE(BPF_MAP_TYPE_LPM_TRIE, trie_map_ops)
 #ifdef CONFIG_PERF_EVENTS
-BPF_MAP_TYPE(BPF_MAP_TYPE_STACK_TRACE, stack_map_ops)
+BPF_MAP_TYPE(BPF_MAP_TYPE_STACK_TRACE, stack_trace_map_ops)
 #endif
 BPF_MAP_TYPE(BPF_MAP_TYPE_ARRAY_OF_MAPS, array_of_maps_map_ops)
 BPF_MAP_TYPE(BPF_MAP_TYPE_HASH_OF_MAPS, htab_of_maps_map_ops)
diff --git a/kernel/bpf/stackmap.c b/kernel/bpf/stackmap.c
index b2ade10f7ec3..90daf285de03 100644
--- a/kernel/bpf/stackmap.c
+++ b/kernel/bpf/stackmap.c
@@ -600,7 +600,7 @@  static void stack_map_free(struct bpf_map *map)
 	put_callchain_buffers();
 }
 
-const struct bpf_map_ops stack_map_ops = {
+const struct bpf_map_ops stack_trace_map_ops = {
 	.map_alloc = stack_map_alloc,
 	.map_free = stack_map_free,
 	.map_get_next_key = stack_map_get_next_key,

[bpf-next,v3,1/7] bpf: rename stack trace map operations

Commit Message

Patch