From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 3844647A0D7; Tue, 16 Jun 2026 17:23:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781630592; cv=none; b=W1kgGu7nZTplqylanotpAKsKVoz/PBTlbl/k7Y8CPezAiqAYA5QU2FgFWswKUe1VC3+wmJCHRlKCIg9YSI8dIEQLGfk2y8sUepOpRVss/YJc1xCP+sIzxQknOv0tutm5FKRjN+0SjqyB98po5EkmVi1ws5YuKmw6pkoc8G69NFg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781630592; c=relaxed/simple; bh=dz4W9qfm9Rxt2VYTzlTwaUJ/deEfk1Yc/w0tiHBIgCU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qo9k7Z6JUxItD4ks6aLPlNNiO91bY4wdkdGxK+P5DBhNaND7p6EUTNwPlXnHE6Ey3AUOaw83fCmduRYGqLsDtfWFJ5bIqnQtY/GIcW6Z18JlUPJfDLci7u7jzcFygVv3AuZKRgerpX75CHi3jtqopylPgPiVsCk0HCXb2f58Sw0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TA8/VGB9; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TA8/VGB9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3342A1F000E9; Tue, 16 Jun 2026 17:23:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781630590; bh=ZmZ2aUJSuJeUBfAhSpPSHAbmcutHrNmJiFzu2tmMgQs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TA8/VGB9d6dnm62jT1zYiAaZ2+UfXeZQhxIuGRIHO5TswEnXse6A5rE7+L8K5v6/C X/xSCTtkpXHPlNQG25w6nLtNVZCCITqs0vI0X18Q0znLvKaSfwwRErFF5151YlBt71 tLLr2NOG8aOimWxUDv4KTKxPd83jhI39lg00vLTg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Paul Chaignon , Shung-Hsi Yu , Sasha Levin Subject: [PATCH 6.1 057/522] Revert "selftests/bpf: Add tests for _opts variants of bpf_*_get_fd_by_id()" Date: Tue, 16 Jun 2026 20:23:24 +0530 Message-ID: <20260616145128.451168149@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Paul Chaignon This reverts commit 45108a7b4866 ("selftests/bpf: Add tests for _opts variants of bpf_*_get_fd_by_id()"). As explained in the previous patch, it introduces a new selftest for a feature that doesn't exist in 6.1. It was backported as a stable-dep of a1914d146622 ("selftests/bpf: Workaround strict bpf_lsm return value check"), also reverted in the previous patch. Signed-off-by: Paul Chaignon Acked-by: Shung-Hsi Yu Signed-off-by: Sasha Levin --- tools/testing/selftests/bpf/DENYLIST.s390x | 1 - .../bpf/prog_tests/libbpf_get_fd_by_id_opts.c | 87 ------------------- .../bpf/progs/test_libbpf_get_fd_by_id_opts.c | 36 -------- 3 files changed, 124 deletions(-) delete mode 100644 tools/testing/selftests/bpf/prog_tests/libbpf_get_fd_by_id_opts.c delete mode 100644 tools/testing/selftests/bpf/progs/test_libbpf_get_fd_by_id_opts.c diff --git a/tools/testing/selftests/bpf/DENYLIST.s390x b/tools/testing/selftests/bpf/DENYLIST.s390x index beef1232a47aeb..0fb03b8047d535 100644 --- a/tools/testing/selftests/bpf/DENYLIST.s390x +++ b/tools/testing/selftests/bpf/DENYLIST.s390x @@ -76,4 +76,3 @@ lookup_key # JIT does not support calling kernel f verify_pkcs7_sig # JIT does not support calling kernel function (kfunc) kfunc_dynptr_param # JIT does not support calling kernel function (kfunc) deny_namespace # failed to attach: ERROR: strerror_r(-524)=22 (trampoline) -libbpf_get_fd_by_id_opts # failed to attach: ERROR: strerror_r(-524)=22 (trampoline) diff --git a/tools/testing/selftests/bpf/prog_tests/libbpf_get_fd_by_id_opts.c b/tools/testing/selftests/bpf/prog_tests/libbpf_get_fd_by_id_opts.c deleted file mode 100644 index 25e5dfa9c315ce..00000000000000 --- a/tools/testing/selftests/bpf/prog_tests/libbpf_get_fd_by_id_opts.c +++ /dev/null @@ -1,87 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - -/* - * Copyright (C) 2022 Huawei Technologies Duesseldorf GmbH - * - * Author: Roberto Sassu - */ - -#include - -#include "test_libbpf_get_fd_by_id_opts.skel.h" - -void test_libbpf_get_fd_by_id_opts(void) -{ - struct test_libbpf_get_fd_by_id_opts *skel; - struct bpf_map_info info_m = {}; - __u32 len = sizeof(info_m), value; - int ret, zero = 0, fd = -1; - LIBBPF_OPTS(bpf_get_fd_by_id_opts, fd_opts_rdonly, - .open_flags = BPF_F_RDONLY, - ); - - skel = test_libbpf_get_fd_by_id_opts__open_and_load(); - if (!ASSERT_OK_PTR(skel, - "test_libbpf_get_fd_by_id_opts__open_and_load")) - return; - - ret = test_libbpf_get_fd_by_id_opts__attach(skel); - if (!ASSERT_OK(ret, "test_libbpf_get_fd_by_id_opts__attach")) - goto close_prog; - - ret = bpf_obj_get_info_by_fd(bpf_map__fd(skel->maps.data_input), - &info_m, &len); - if (!ASSERT_OK(ret, "bpf_obj_get_info_by_fd")) - goto close_prog; - - fd = bpf_map_get_fd_by_id(info_m.id); - if (!ASSERT_LT(fd, 0, "bpf_map_get_fd_by_id")) - goto close_prog; - - fd = bpf_map_get_fd_by_id_opts(info_m.id, NULL); - if (!ASSERT_LT(fd, 0, "bpf_map_get_fd_by_id_opts")) - goto close_prog; - - fd = bpf_map_get_fd_by_id_opts(info_m.id, &fd_opts_rdonly); - if (!ASSERT_GE(fd, 0, "bpf_map_get_fd_by_id_opts")) - goto close_prog; - - /* Map lookup should work with read-only fd. */ - ret = bpf_map_lookup_elem(fd, &zero, &value); - if (!ASSERT_OK(ret, "bpf_map_lookup_elem")) - goto close_prog; - - if (!ASSERT_EQ(value, 0, "map value mismatch")) - goto close_prog; - - /* Map update should not work with read-only fd. */ - ret = bpf_map_update_elem(fd, &zero, &len, BPF_ANY); - if (!ASSERT_LT(ret, 0, "bpf_map_update_elem")) - goto close_prog; - - /* Map update should work with read-write fd. */ - ret = bpf_map_update_elem(bpf_map__fd(skel->maps.data_input), &zero, - &len, BPF_ANY); - if (!ASSERT_OK(ret, "bpf_map_update_elem")) - goto close_prog; - - /* Prog get fd with opts set should not work (no kernel support). */ - ret = bpf_prog_get_fd_by_id_opts(0, &fd_opts_rdonly); - if (!ASSERT_EQ(ret, -EINVAL, "bpf_prog_get_fd_by_id_opts")) - goto close_prog; - - /* Link get fd with opts set should not work (no kernel support). */ - ret = bpf_link_get_fd_by_id_opts(0, &fd_opts_rdonly); - if (!ASSERT_EQ(ret, -EINVAL, "bpf_link_get_fd_by_id_opts")) - goto close_prog; - - /* BTF get fd with opts set should not work (no kernel support). */ - ret = bpf_btf_get_fd_by_id_opts(0, &fd_opts_rdonly); - ASSERT_EQ(ret, -EINVAL, "bpf_btf_get_fd_by_id_opts"); - -close_prog: - if (fd >= 0) - close(fd); - - test_libbpf_get_fd_by_id_opts__destroy(skel); -} diff --git a/tools/testing/selftests/bpf/progs/test_libbpf_get_fd_by_id_opts.c b/tools/testing/selftests/bpf/progs/test_libbpf_get_fd_by_id_opts.c deleted file mode 100644 index f5ac5f3e89196f..00000000000000 --- a/tools/testing/selftests/bpf/progs/test_libbpf_get_fd_by_id_opts.c +++ /dev/null @@ -1,36 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - -/* - * Copyright (C) 2022 Huawei Technologies Duesseldorf GmbH - * - * Author: Roberto Sassu - */ - -#include "vmlinux.h" -#include -#include -#include - -/* From include/linux/mm.h. */ -#define FMODE_WRITE 0x2 - -struct { - __uint(type, BPF_MAP_TYPE_ARRAY); - __uint(max_entries, 1); - __type(key, __u32); - __type(value, __u32); -} data_input SEC(".maps"); - -char _license[] SEC("license") = "GPL"; - -SEC("lsm/bpf_map") -int BPF_PROG(check_access, struct bpf_map *map, fmode_t fmode) -{ - if (map != (struct bpf_map *)&data_input) - return 0; - - if (fmode & FMODE_WRITE) - return -EACCES; - - return 0; -} -- 2.53.0