[bpf-next,v3,03/11] btf: Add BTF_ID_LIST_SINGLE macro

Message ID	20200910125631.225188-4-lmb@cloudflare.com
State	Changes Requested
Delegated to:	BPF Maintainers
Headers	show Return-Path: <bpf-owner@vger.kernel.org> From: Lorenz Bauer <lmb@cloudflare.com> To: ast@kernel.org, yhs@fb.com, daniel@iogearbox.net, kafai@fb.com, andriin@fb.com Cc: bpf@vger.kernel.org, kernel-team@cloudflare.com, Lorenz Bauer <lmb@cloudflare.com> Subject: [PATCH bpf-next v3 03/11] btf: Add BTF_ID_LIST_SINGLE macro Date: Thu, 10 Sep 2020 13:56:23 +0100 Message-Id: <20200910125631.225188-4-lmb@cloudflare.com> In-Reply-To: <20200910125631.225188-1-lmb@cloudflare.com> References: <20200910125631.225188-1-lmb@cloudflare.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk
Series	Make check_func_arg type checks table driven \| expand [bpf-next,v3,00/11] Make check_func_arg type checks table driven [bpf-next,v3,01/11] btf: make btf_set_contains take a const pointer [bpf-next,v3,02/11] bpf: check scalar or invalid register in check_helper_mem_access [bpf-next,v3,03/11] btf: Add BTF_ID_LIST_SINGLE macro [bpf-next,v3,04/11] bpf: allow specifying a BTF ID per argument in function protos [bpf-next,v3,05/11] bpf: make BTF pointer type checking generic [bpf-next,v3,06/11] bpf: make reference tracking generic [bpf-next,v3,07/11] bpf: make context access check generic [bpf-next,v3,08/11] bpf: set meta->raw_mode for pointers close to use [bpf-next,v3,09/11] bpf: check ARG_PTR_TO_SPINLOCK register type in check_func_arg [bpf-next,v3,10/11] bpf: hoist type checking for nullable arg types [bpf-next,v3,11/11] bpf: use a table to drive helper arg type checks

Message ID

20200910125631.225188-4-lmb@cloudflare.com

State

Changes Requested

Delegated to:

BPF Maintainers

Headers

From: Lorenz Bauer <lmb@cloudflare.com>
To: ast@kernel.org, yhs@fb.com, daniel@iogearbox.net, kafai@fb.com,
	andriin@fb.com
Cc: bpf@vger.kernel.org, kernel-team@cloudflare.com,
	Lorenz Bauer <lmb@cloudflare.com>
Subject: [PATCH bpf-next v3 03/11] btf: Add BTF_ID_LIST_SINGLE macro
Date: Thu, 10 Sep 2020 13:56:23 +0100
Message-Id: <20200910125631.225188-4-lmb@cloudflare.com>
In-Reply-To: <20200910125631.225188-1-lmb@cloudflare.com>
References: <20200910125631.225188-1-lmb@cloudflare.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: bpf-owner@vger.kernel.org
Precedence: bulk

Series

Make check_func_arg type checks table driven | expand

Commit Message

Lorenz Bauer Sept. 10, 2020, 12:56 p.m. UTC

Add a convenience macro that allows defining a BTF ID list with
a single item. This lets us cut down on repetitive macros.

Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
Suggested-by: Andrii Nakryiko <andriin@fb.com>
---
 include/linux/btf_ids.h       | 8 ++++++++
 tools/include/linux/btf_ids.h | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/include/linux/btf_ids.h b/include/linux/btf_ids.h
index 210b086188a3..57890b357f85 100644
--- a/include/linux/btf_ids.h
+++ b/include/linux/btf_ids.h
@@ -76,6 +76,13 @@  extern u32 name[];
 #define BTF_ID_LIST_GLOBAL(name)			\
 __BTF_ID_LIST(name, globl)
 
+/* The BTF_ID_LIST_SINGLE macro defines a BTF_ID_LIST with
+ * a single entry.
+ */
+#define BTF_ID_LIST_SINGLE(name, prefix, typename)	\
+	BTF_ID_LIST(name) \
+	BTF_ID(prefix, typename)
+
 /*
  * The BTF_ID_UNUSED macro defines 4 zero bytes.
  * It's used when we want to define 'unused' entry
@@ -140,6 +147,7 @@  extern struct btf_id_set name;
 #define BTF_ID(prefix, name)
 #define BTF_ID_UNUSED
 #define BTF_ID_LIST_GLOBAL(name) u32 name[1];
+#define BTF_ID_LIST_SINGLE(name, prefix, typename) static u32 name[1];
 #define BTF_SET_START(name) static struct btf_id_set name = { 0 };
 #define BTF_SET_START_GLOBAL(name) static struct btf_id_set name = { 0 };
 #define BTF_SET_END(name)
diff --git a/tools/include/linux/btf_ids.h b/tools/include/linux/btf_ids.h
index 210b086188a3..57890b357f85 100644
--- a/tools/include/linux/btf_ids.h
+++ b/tools/include/linux/btf_ids.h
@@ -76,6 +76,13 @@  extern u32 name[];
 #define BTF_ID_LIST_GLOBAL(name)			\
 __BTF_ID_LIST(name, globl)
 
+/* The BTF_ID_LIST_SINGLE macro defines a BTF_ID_LIST with
+ * a single entry.
+ */
+#define BTF_ID_LIST_SINGLE(name, prefix, typename)	\
+	BTF_ID_LIST(name) \
+	BTF_ID(prefix, typename)
+
 /*
  * The BTF_ID_UNUSED macro defines 4 zero bytes.
  * It's used when we want to define 'unused' entry
@@ -140,6 +147,7 @@  extern struct btf_id_set name;
 #define BTF_ID(prefix, name)
 #define BTF_ID_UNUSED
 #define BTF_ID_LIST_GLOBAL(name) u32 name[1];
+#define BTF_ID_LIST_SINGLE(name, prefix, typename) static u32 name[1];
 #define BTF_SET_START(name) static struct btf_id_set name = { 0 };
 #define BTF_SET_START_GLOBAL(name) static struct btf_id_set name = { 0 };
 #define BTF_SET_END(name)

[bpf-next,v3,03/11] btf: Add BTF_ID_LIST_SINGLE macro

Commit Message

Patch