From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-188.mta0.migadu.com (out-188.mta0.migadu.com [91.218.175.188]) (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 DB221134BD for ; Wed, 16 Jul 2025 05:28:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.188 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752643731; cv=none; b=XWNK045FtkvibcC/p/cEyHKv8VTwBHU2m9FbgEU67ty6mA90ZqZfZ2FWpyDFl2qQ/MVOEfHXpgHaMmAKxbLlYye7zRaakK5qELRKYwuEFXBQi2gjU2HzI/y7yFwfzc7FexMMQXdnlO9ETWzssadV1Q0yVSzxrgp03NtvDFGP78U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752643731; c=relaxed/simple; bh=VutHikv1pvEMGzxLE3PRw2qY+nMCiEHHyOZJtbI+ik4=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Je4icotczc/bg9y7ZelPHDurWCoEfS4mJRsR58dClV9rR3vzdPbBQbFCNubS85hGkSd1NVYfpgT228baNR1rmeU9zGh7LxPqqMl2gxAVKS9E30t3YtS4UQiIrxBhqBng0CGW3o1iwRhnuL4dK3tdgAAi9mrTtUPRr4fcIjePO4U= 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=nfy1ADgS; arc=none smtp.client-ip=91.218.175.188 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="nfy1ADgS" Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1752643726; 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=xyhZ/FnFe6rb1lJ+3cQ1tnL5rn/O/A2CII8bIqwgAEI=; b=nfy1ADgSrX3vI0IWtmxsIz3mEDMcMNgniXaLYdsFYXQZ+ZJSrsIwNcbcOhaUODUkhu92qC vdTp5gESXRpGAGbaPlaYpY/6ZQY9diwpP9gCYyOLzyNSuPlGEI6YXLppjUK33Ftzk8kVw/ u3PnOyZflaFAHZhiDDD5wi8XcNTj5qg= Date: Wed, 16 Jul 2025 13:28:32 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [PATCH bpf-next v2 2/2] bpf/selftests: Add selftests for token info To: Andrii Nakryiko Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, willemb@google.com, kerneljasonxing@gmail.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org References: <20250715035831.1094282-1-chen.dylane@linux.dev> <20250715035831.1094282-2-chen.dylane@linux.dev> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Tao Chen In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT 在 2025/7/16 05:51, Andrii Nakryiko 写道: > On Mon, Jul 14, 2025 at 8:59 PM Tao Chen wrote: >> >> A previous change added bpf_token_info to get token info with >> bpf_get_obj_info_by_fd, this patch adds a new test for token info. >> >> #461/12 token/bpf_token_info:OK >> >> Signed-off-by: Tao Chen >> --- >> .../testing/selftests/bpf/prog_tests/token.c | 39 +++++++++++++++++++ >> 1 file changed, 39 insertions(+) >> >> diff --git a/tools/testing/selftests/bpf/prog_tests/token.c b/tools/testing/selftests/bpf/prog_tests/token.c >> index cfc032b910c..a16f25bdd4c 100644 >> --- a/tools/testing/selftests/bpf/prog_tests/token.c >> +++ b/tools/testing/selftests/bpf/prog_tests/token.c >> @@ -1047,6 +1047,36 @@ static int userns_obj_priv_implicit_token_envvar(int mnt_fd, struct token_lsm *l >> >> #define bit(n) (1ULL << (n)) >> >> +static int userns_bpf_token_info(int mnt_fd, struct token_lsm *lsm_skel) >> +{ >> + int err, token_fd = -1; >> + struct bpf_token_info info; >> + u32 len = sizeof(struct bpf_token_info); >> + >> + /* create BPF token from BPF FS mount */ >> + token_fd = bpf_token_create(mnt_fd, NULL); >> + if (!ASSERT_GT(token_fd, 0, "token_create")) { >> + err = -EINVAL; >> + goto cleanup; >> + } >> + >> + memset(&info, 0, len); >> + err = bpf_obj_get_info_by_fd(token_fd, &info, &len); >> + if (!ASSERT_ERR(err, "bpf_obj_get_token_info")) >> + goto cleanup; >> + if (!ASSERT_EQ(info.allowed_cmds, bit(BPF_MAP_CREATE), "token_info_cmds_map_create")) >> + goto cleanup; >> + if (!ASSERT_EQ(info.allowed_progs, bit(BPF_PROG_TYPE_XDP), "token_info_progs_xdp")) >> + goto cleanup; > > nit: there is no harm in just doing a few ASSERT_EQ() checks > unconditionally, it's cleaner and more succinct (and either way you > return err == 0 in this case) > It seems necessary to assign the err when ASSERT_EQ fails, will fix it in v3, thanks. >> + >> + /* The BPF_PROG_TYPE_EXT is not set in token */ >> + ASSERT_EQ(info.allowed_progs, bit(BPF_PROG_TYPE_EXT), "token_info_progs_ext"); >> + >> +cleanup: >> + zclose(token_fd); >> + return err; >> +} >> + >> void test_token(void) >> { >> if (test__start_subtest("map_token")) { >> @@ -1150,4 +1180,13 @@ void test_token(void) >> >> subtest_userns(&opts, userns_obj_priv_implicit_token_envvar); >> } >> + if (test__start_subtest("bpf_token_info")) { >> + struct bpffs_opts opts = { >> + .cmds = bit(BPF_MAP_CREATE), >> + .progs = bit(BPF_PROG_TYPE_XDP), >> + .attachs = ~0ULL, >> + }; >> + >> + subtest_userns(&opts, userns_bpf_token_info); >> + } >> } >> -- >> 2.48.1 >> -- Best Regards Tao Chen