From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-189.mta0.migadu.com (out-189.mta0.migadu.com [91.218.175.189]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C906B5D72B for ; Fri, 22 Mar 2024 17:28:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.189 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711128533; cv=none; b=I7YNjnDah3anW0N6ZSpogsZ7baSklPhMq0wDJqmhBOkYL7I/i4FIe6dUOE//3Q7gbyRpsr3yrTHIXhvTGetfWPaIursZ+YQS9Tkbnx93MCZSQwHOKFYsrDz0pIxrF0GodamHZtrdTt+c9xWPGQkEGPsATW+rsF6omIuj567UoTM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711128533; c=relaxed/simple; bh=QTkQ4bsy7anIbXZJ1Z5d7KY0LyMntDMKWojB1gK4gDw=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=R1QB2XS7FP+/BT20bj4H3fVH+rLRSHS5OW9F7WSY4MGT1/Aey2MUFX3g8iyJu0raMIcWdxYbfNHPXYJ2cY0MsAaYEFpw20/5H+IORcby/XrvAiF4oJo0F6bvOjq2gs8dtXPKNdd3cjpbU+h+vw0jhsnn5R8x2JlT7pgbZ3cOep0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=UZDjBWnS; arc=none smtp.client-ip=91.218.175.189 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="UZDjBWnS" Message-ID: <101611b6-2c7a-47c0-85dd-9cfe17c4a7e8@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1711128528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sk9OIb1i3KDEX24h/lyJXCAdyC4mzU7yfYowli/Xb90=; b=UZDjBWnSMLukYrNIrcfY0viimCnakCBsJqou0qfdelPjBmsOjMolMg0Iz6we8zvWt9qiLT XdT+5x0xI+nalAV6sPsGQW8Lr1fMFI7MSk9BIOBkJ5/LbShM7BIWHa9U471Lxr1OKvz4wb vvopKrpkNq/OTew9Sno+qPigtjlZPjU= Date: Fri, 22 Mar 2024 10:28:40 -0700 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [PATCH bpf-next v2 1/5] selftests/bpf: Replace CHECK with ASSERT macros for ksyms test Content-Language: en-GB To: Andrii Nakryiko Cc: bpf@vger.kernel.org, Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , kernel-team@fb.com, Martin KaFai Lau References: <20240321200058.2218328-1-yonghong.song@linux.dev> <20240321200103.2218888-1-yonghong.song@linux.dev> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Yonghong Song In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT On 3/22/24 9:48 AM, Andrii Nakryiko wrote: > On Fri, Mar 22, 2024 at 9:41 AM Yonghong Song wrote: >> >> On 3/22/24 9:13 AM, Andrii Nakryiko wrote: >>> On Thu, Mar 21, 2024 at 1:01 PM Yonghong Song wrote: >>>> I am going to modify ksyms test later so take this opportunity >>>> to replace old CHECK macros with new ASSERT macros. >>>> No functionality change. >>>> >>>> Signed-off-by: Yonghong Song >>>> --- >>>> .../testing/selftests/bpf/prog_tests/ksyms.c | 30 ++++++------------- >>>> 1 file changed, 9 insertions(+), 21 deletions(-) >>>> >>>> diff --git a/tools/testing/selftests/bpf/prog_tests/ksyms.c b/tools/testing/selftests/bpf/prog_tests/ksyms.c >>>> index b295969b263b..6a86d1f07800 100644 >>>> --- a/tools/testing/selftests/bpf/prog_tests/ksyms.c >>>> +++ b/tools/testing/selftests/bpf/prog_tests/ksyms.c >>>> @@ -5,8 +5,6 @@ >>>> #include "test_ksyms.skel.h" >>>> #include >>>> >>>> -static int duration; >>>> - >>>> void test_ksyms(void) >>>> { >>>> const char *btf_path = "/sys/kernel/btf/vmlinux"; >>>> @@ -18,43 +16,33 @@ void test_ksyms(void) >>>> int err; >>>> >>>> err = kallsyms_find("bpf_link_fops", &link_fops_addr); >>>> - if (CHECK(err == -EINVAL, "kallsyms_fopen", "failed to open: %d\n", errno)) >>>> - return; >>>> - if (CHECK(err == -ENOENT, "ksym_find", "symbol 'bpf_link_fops' not found\n")) >>>> + if (!ASSERT_TRUE(err != -EINVAL && err != -ENOENT, "bpf_link_fops")) >>>> return; >>> it's best to keep each individual equality test as ASSERT_EQ(), that >>> way we get more specific and detailed error (with expected vs actual >>> value), which here we'll just get "wanted true but got false", and >>> then we'd have to debug some more which of the conditions it is. So >>> please keep the original granularity of checks everywhere. >> Do you mean >> >> if (ASSERT_EQ(err, -EINVAL, "...")) >> return; >> if (ASSERT_EQ(err, -ENOENT, "...")) >> return; >> >> This does not really work, for example if err = 0, it will declare test >> failure. > > if (!ASSERT_NEQ(err, -EINVAL, "...")) > return; > if (!ASSERT_NEQ(err, -NOENT, "...")) > return; > > It's mirroring original logic. We had two independent checks there? In > this case the condition is "not equal" (ASSERT_NEQ). I actually tried this as well when I am experimenting ASSERT_EQ and somehow I concluded that !ASSERT_NEQ not working either. Now, I actully tried with adding err = 0, -EINVAL and -ENOENT and verified it indeed works. I don't know how I concluded it was not working before... Sad. > >> >>>> err = kallsyms_find("__per_cpu_start", &per_cpu_start_addr); >>>> - if (CHECK(err == -EINVAL, "kallsyms_fopen", "failed to open: %d\n", errno)) >>>> - return; >>>> - if (CHECK(err == -ENOENT, "ksym_find", "symbol 'per_cpu_start' not found\n")) >>>> + if (!ASSERT_TRUE(err != -EINVAL && err != -ENOENT, "__per_cpu_start")) >>>> return; >>>> >>>> - if (CHECK(stat(btf_path, &st), "stat_btf", "err %d\n", errno)) >>>> + if (!ASSERT_OK(stat(btf_path, &st), "stat_btf")) >>>> return; >>>> btf_size = st.st_size; >>>> >>>> skel = test_ksyms__open_and_load(); >>>> - if (CHECK(!skel, "skel_open", "failed to open and load skeleton\n")) >>>> + if (!ASSERT_OK_PTR(skel, "test_ksyms__open_and_load")) >>>> return; >>>> >>>> err = test_ksyms__attach(skel); >>>> - if (CHECK(err, "skel_attach", "skeleton attach failed: %d\n", err)) >>>> + if (!ASSERT_OK(err, "test_ksyms__attach")) >>>> goto cleanup; >>>> >>>> /* trigger tracepoint */ >>>> usleep(1); >>>> >>>> data = skel->data; >>>> - CHECK(data->out__bpf_link_fops != link_fops_addr, "bpf_link_fops", >>>> - "got 0x%llx, exp 0x%llx\n", >>>> - data->out__bpf_link_fops, link_fops_addr); >>>> - CHECK(data->out__bpf_link_fops1 != 0, "bpf_link_fops1", >>>> - "got %llu, exp %llu\n", data->out__bpf_link_fops1, (__u64)0); >>>> - CHECK(data->out__btf_size != btf_size, "btf_size", >>>> - "got %llu, exp %llu\n", data->out__btf_size, btf_size); >>>> - CHECK(data->out__per_cpu_start != per_cpu_start_addr, "__per_cpu_start", >>>> - "got %llu, exp %llu\n", data->out__per_cpu_start, >>>> - per_cpu_start_addr); >>>> + ASSERT_EQ(data->out__bpf_link_fops, link_fops_addr, "bpf_link_fops"); >>>> + ASSERT_EQ(data->out__bpf_link_fops1, 0, "bpf_link_fops1"); >>>> + ASSERT_EQ(data->out__btf_size, btf_size, "btf_size"); >>>> + ASSERT_EQ(data->out__per_cpu_start, per_cpu_start_addr, "__per_cpu_start"); >>>> >>>> cleanup: >>>> test_ksyms__destroy(skel); >>>> -- >>>> 2.43.0 >>>>