lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Wed, 22 May 2019 19:44:31 +0000
From:   Yonghong Song <yhs@...com>
To:     Stanislav Fomichev <sdf@...ichev.me>
CC:     "bpf@...r.kernel.org" <bpf@...r.kernel.org>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
        Alexei Starovoitov <ast@...com>,
        Daniel Borkmann <daniel@...earbox.net>,
        Kernel Team <Kernel-team@...com>,
        Peter Zijlstra <peterz@...radead.org>
Subject: Re: [PATCH bpf-next v2 3/3] tools/bpf: add a selftest for
 bpf_send_signal() helper



On 5/22/19 12:10 PM, Stanislav Fomichev wrote:
> On 05/21, Yonghong Song wrote:
>> The test covered both nmi and tracepoint perf events.
>>    $ ./test_send_signal_user
>>    test_send_signal (tracepoint): OK
>>    test_send_signal (perf_event): OK
>>
>> Signed-off-by: Yonghong Song <yhs@...com>
>> ---
>>   tools/testing/selftests/bpf/Makefile          |   3 +-
>>   tools/testing/selftests/bpf/bpf_helpers.h     |   1 +
>>   .../bpf/progs/test_send_signal_kern.c         |  51 +++++
>>   .../selftests/bpf/test_send_signal_user.c     | 212 ++++++++++++++++++
>>   4 files changed, 266 insertions(+), 1 deletion(-)
>>   create mode 100644 tools/testing/selftests/bpf/progs/test_send_signal_kern.c
>>   create mode 100644 tools/testing/selftests/bpf/test_send_signal_user.c
>>
>> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
>> index 66f2dca1dee1..5eb6368a96a2 100644
>> --- a/tools/testing/selftests/bpf/Makefile
>> +++ b/tools/testing/selftests/bpf/Makefile
>> @@ -23,7 +23,8 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test
>>   	test_align test_verifier_log test_dev_cgroup test_tcpbpf_user \
>>   	test_sock test_btf test_sockmap test_lirc_mode2_user get_cgroup_id_user \
>>   	test_socket_cookie test_cgroup_storage test_select_reuseport test_section_names \
>> -	test_netcnt test_tcpnotify_user test_sock_fields test_sysctl
>> +	test_netcnt test_tcpnotify_user test_sock_fields test_sysctl \
>> +	test_send_signal_user
>>   
>>   BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c)))
>>   TEST_GEN_FILES = $(BPF_OBJ_FILES)
>> diff --git a/tools/testing/selftests/bpf/bpf_helpers.h b/tools/testing/selftests/bpf/bpf_helpers.h
>> index 5f6f9e7aba2a..cb02521b8e58 100644
>> --- a/tools/testing/selftests/bpf/bpf_helpers.h
>> +++ b/tools/testing/selftests/bpf/bpf_helpers.h
>> @@ -216,6 +216,7 @@ static void *(*bpf_sk_storage_get)(void *map, struct bpf_sock *sk,
>>   	(void *) BPF_FUNC_sk_storage_get;
>>   static int (*bpf_sk_storage_delete)(void *map, struct bpf_sock *sk) =
>>   	(void *)BPF_FUNC_sk_storage_delete;
>> +static int (*bpf_send_signal)(unsigned sig) = (void *)BPF_FUNC_send_signal;
>>   
>>   /* llvm builtin functions that eBPF C program may use to
>>    * emit BPF_LD_ABS and BPF_LD_IND instructions
>> diff --git a/tools/testing/selftests/bpf/progs/test_send_signal_kern.c b/tools/testing/selftests/bpf/progs/test_send_signal_kern.c
>> new file mode 100644
>> index 000000000000..45a1a1a2c345
>> --- /dev/null
>> +++ b/tools/testing/selftests/bpf/progs/test_send_signal_kern.c
>> @@ -0,0 +1,51 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +// Copyright (c) 2019 Facebook
>> +#include <linux/bpf.h>
>> +#include <linux/version.h>
>> +#include "bpf_helpers.h"
>> +
>> +struct bpf_map_def SEC("maps") info_map = {
>> +	.type = BPF_MAP_TYPE_ARRAY,
>> +	.key_size = sizeof(__u32),
>> +	.value_size = sizeof(__u64),
>> +	.max_entries = 1,
>> +};
>> +
>> +BPF_ANNOTATE_KV_PAIR(info_map, __u32, __u64);
>> +
>> +struct bpf_map_def SEC("maps") status_map = {
>> +	.type = BPF_MAP_TYPE_ARRAY,
>> +	.key_size = sizeof(__u32),
>> +	.value_size = sizeof(__u64),
>> +	.max_entries = 1,
>> +};
>> +
>> +BPF_ANNOTATE_KV_PAIR(status_map, __u32, __u64);
>> +
>> +SEC("send_signal_demo")
>> +int bpf_send_signal_test(void *ctx)
>> +{
>> +	__u64 *info_val, *status_val;
>> +	__u32 key = 0, pid, sig;
>> +	int ret;
>> +
>> +	status_val = bpf_map_lookup_elem(&status_map, &key);
>> +	if (!status_val || *status_val != 0)
>> +		return 0;
>> +
>> +	info_val = bpf_map_lookup_elem(&info_map, &key);
>> +	if (!info_val || *info_val == 0)
>> +		return 0;
>> +
>> +	sig = *info_val >> 32;
>> +	pid = *info_val & 0xffffFFFF;
>> +
>> +	if ((bpf_get_current_pid_tgid() >> 32) == pid) {
>> +		ret = bpf_send_signal(sig);
>> +		if (ret == 0)
>> +			*status_val = 1;
>> +	}
>> +
>> +	return 0;
>> +}
>> +char __license[] SEC("license") = "GPL";
>> diff --git a/tools/testing/selftests/bpf/test_send_signal_user.c b/tools/testing/selftests/bpf/test_send_signal_user.c
>> new file mode 100644
>> index 000000000000..0bd0f7674860
>> --- /dev/null
> [..]
>> +++ b/tools/testing/selftests/bpf/test_send_signal_user.c
> Any reason you didn't put it under bpf/prog_tests?

The only reason I put it as a standalone test is
that the program receives signals and tries to
minimize potential impact on other tests.

But it might be okay as the signal is sent to
child process.

> That way you don't need to define your own CHECK macro and
> care about the includes.

Right. I will try to use bpf/prog_tests infrastructure
in the next revision.

Powered by blists - more mailing lists