shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

bpf: Merge printk and seq_printf VARARG max macros

Browse Source 
commit 335ff4990c upstream.

MAX_SNPRINTF_VARARGS and MAX_SEQ_PRINTF_VARARGS are used by bpf helpers
bpf_snprintf and bpf_seq_printf to limit their varargs. Both call into
bpf_bprintf_prepare for print formatting logic and have convenience
macros in libbpf (BPF_SNPRINTF, BPF_SEQ_PRINTF) which use the same
helper macros to convert varargs to a byte array.

Changing shared functionality to support more varargs for either bpf
helper would affect the other as well, so let's combine the _VARARGS
macros to make this more obvious.

Signed-off-by: Dave Marchevsky <davemarchevsky@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20210917182911.2426606-2-davemarchevsky@fb.com
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dave Marchevsky
2024-02-17 09:13:18 -03:00
committed by Greg Kroah-Hartman
parent ab2e127896
commit 8495c34dff
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/bpf.h
View File

@@ -2290,6 +2290,8 @@ void bpf_arch_poke_desc_update(struct bpf_jit_poke_descriptor *poke,
struct btf_id_set; struct btf_id_set;
bool btf_id_set_contains(const struct btf_id_set *set, u32 id); bool btf_id_set_contains(const struct btf_id_set *set, u32 id);
#define MAX_BPRINTF_VARARGS 12
int bpf_bprintf_prepare(char *fmt, u32 fmt_size, const u64 *raw_args, int bpf_bprintf_prepare(char *fmt, u32 fmt_size, const u64 *raw_args,
u32 **bin_buf, u32 num_args); u32 **bin_buf, u32 num_args);
void bpf_bprintf_cleanup(void); void bpf_bprintf_cleanup(void);

4
kernel/bpf/helpers.c
View File

@@ -979,15 +979,13 @@ out:
return err; return err;
} }
#define MAX_SNPRINTF_VARARGS 12
BPF_CALL_5(bpf_snprintf, char *, str, u32, str_size, char *, fmt, BPF_CALL_5(bpf_snprintf, char *, str, u32, str_size, char *, fmt,
const void *, data, u32, data_len) const void *, data, u32, data_len)
{ {
int err, num_args; int err, num_args;
u32 *bin_args; u32 *bin_args;
if (data_len % 8 || data_len > MAX_SNPRINTF_VARARGS * 8 || if (data_len % 8 || data_len > MAX_BPRINTF_VARARGS * 8 ||
(data_len && !data)) (data_len && !data))
return -EINVAL; return -EINVAL;
num_args = data_len / 8; num_args = data_len / 8;

4
kernel/trace/bpf_trace.c
View File

@@ -414,15 +414,13 @@ const struct bpf_func_proto *bpf_get_trace_printk_proto(void)
return &bpf_trace_printk_proto; return &bpf_trace_printk_proto;
} }
#define MAX_SEQ_PRINTF_VARARGS 12
BPF_CALL_5(bpf_seq_printf, struct seq_file *, m, char *, fmt, u32, fmt_size, BPF_CALL_5(bpf_seq_printf, struct seq_file *, m, char *, fmt, u32, fmt_size,
const void *, data, u32, data_len) const void *, data, u32, data_len)
{ {
int err, num_args; int err, num_args;
u32 *bin_args; u32 *bin_args;
if (data_len & 7 || data_len > MAX_SEQ_PRINTF_VARARGS * 8 || if (data_len & 7 || data_len > MAX_BPRINTF_VARARGS * 8 ||
(data_len && !data)) (data_len && !data))
return -EINVAL; return -EINVAL;
num_args = data_len / 8; num_args = data_len / 8;