Attach_type will be set when link created from user, it is better
to record attach_type in bpf_link directly suggested by Andrii.
Signed-off-by: Tao Chen <chen.dylane@linux.dev>
---
include/linux/bpf.h | 17 +++++++++++------
kernel/bpf/bpf_iter.c | 3 ++-
kernel/bpf/bpf_struct_ops.c | 5 +++--
kernel/bpf/cgroup.c | 4 ++--
kernel/bpf/net_namespace.c | 2 +-
kernel/bpf/syscall.c | 35 +++++++++++++++++++++-------------
kernel/bpf/tcx.c | 3 ++-
kernel/bpf/trampoline.c | 10 ++++++----
kernel/trace/bpf_trace.c | 4 ++--
net/bpf/bpf_dummy_struct_ops.c | 3 ++-
net/core/dev.c | 3 ++-
net/core/sock_map.c | 3 ++-
net/netfilter/nf_bpf_link.c | 3 ++-
13 files changed, 59 insertions(+), 36 deletions(-)
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 34dd90ec7fa..12a965362de 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -1735,6 +1735,8 @@ struct bpf_link {
*/
bool sleepable;
u32 flags;
+ enum bpf_attach_type attach_type;
+
/* rcu is used before freeing, work can be used to schedule that
* RCU-based freeing before that, so they never overlap
*/
@@ -2034,11 +2036,13 @@ int bpf_prog_ctx_arg_info_init(struct bpf_prog *prog,
#if defined(CONFIG_CGROUP_BPF) && defined(CONFIG_BPF_LSM)
int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,
- int cgroup_atype);
+ int cgroup_atype,
+ enum bpf_attach_type attach_type);
void bpf_trampoline_unlink_cgroup_shim(struct bpf_prog *prog);
#else
static inline int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,
- int cgroup_atype)
+ int cgroup_atype,
+ enum bpf_attach_type attach_type)
{
return -EOPNOTSUPP;
}
@@ -2528,10 +2532,11 @@ int bpf_map_new_fd(struct bpf_map *map, int flags);
int bpf_prog_new_fd(struct bpf_prog *prog);
void bpf_link_init(struct bpf_link *link, enum bpf_link_type type,
- const struct bpf_link_ops *ops, struct bpf_prog *prog);
+ const struct bpf_link_ops *ops, struct bpf_prog *prog,
+ enum bpf_attach_type attach_type);
void bpf_link_init_sleepable(struct bpf_link *link, enum bpf_link_type type,
const struct bpf_link_ops *ops, struct bpf_prog *prog,
- bool sleepable);
+ bool sleepable, enum bpf_attach_type attach_type);
int bpf_link_prime(struct bpf_link *link, struct bpf_link_primer *primer);
int bpf_link_settle(struct bpf_link_primer *primer);
void bpf_link_cleanup(struct bpf_link_primer *primer);
@@ -2883,13 +2888,13 @@ bpf_prog_inc_not_zero(struct bpf_prog *prog)
static inline void bpf_link_init(struct bpf_link *link, enum bpf_link_type type,
const struct bpf_link_ops *ops,
- struct bpf_prog *prog)
+ struct bpf_prog *prog, enum bpf_attach_type attach_type)
{
}
static inline void bpf_link_init_sleepable(struct bpf_link *link, enum bpf_link_type type,
const struct bpf_link_ops *ops, struct bpf_prog *prog,
- bool sleepable)
+ bool sleepable, enum bpf_attach_type attach_type)
{
}
diff --git a/kernel/bpf/bpf_iter.c b/kernel/bpf/bpf_iter.c
index 303ab1f42d3..0cbcae72707 100644
--- a/kernel/bpf/bpf_iter.c
+++ b/kernel/bpf/bpf_iter.c
@@ -552,7 +552,8 @@ int bpf_iter_link_attach(const union bpf_attr *attr, bpfptr_t uattr,
if (!link)
return -ENOMEM;
- bpf_link_init(&link->link, BPF_LINK_TYPE_ITER, &bpf_iter_link_lops, prog);
+ bpf_link_init(&link->link, BPF_LINK_TYPE_ITER, &bpf_iter_link_lops, prog,
+ attr->link_create.attach_type);
link->tinfo = tinfo;
err = bpf_link_prime(&link->link, &link_primer);
diff --git a/kernel/bpf/bpf_struct_ops.c b/kernel/bpf/bpf_struct_ops.c
index 96113633e39..687a3e9c76f 100644
--- a/kernel/bpf/bpf_struct_ops.c
+++ b/kernel/bpf/bpf_struct_ops.c
@@ -808,7 +808,7 @@ static long bpf_struct_ops_map_update_elem(struct bpf_map *map, void *key,
goto reset_unlock;
}
bpf_link_init(&link->link, BPF_LINK_TYPE_STRUCT_OPS,
- &bpf_struct_ops_link_lops, prog);
+ &bpf_struct_ops_link_lops, prog, prog->expected_attach_type);
*plink++ = &link->link;
ksym = kzalloc(sizeof(*ksym), GFP_USER);
@@ -1351,7 +1351,8 @@ int bpf_struct_ops_link_create(union bpf_attr *attr)
err = -ENOMEM;
goto err_out;
}
- bpf_link_init(&link->link, BPF_LINK_TYPE_STRUCT_OPS, &bpf_struct_ops_map_lops, NULL);
+ bpf_link_init(&link->link, BPF_LINK_TYPE_STRUCT_OPS, &bpf_struct_ops_map_lops, NULL,
+ attr->link_create.attach_type);
err = bpf_link_prime(&link->link, &link_primer);
if (err)
diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c
index cd220e861d6..bacdd0ca741 100644
--- a/kernel/bpf/cgroup.c
+++ b/kernel/bpf/cgroup.c
@@ -867,7 +867,7 @@ static int __cgroup_bpf_attach(struct cgroup *cgrp,
cgrp->bpf.flags[atype] = saved_flags;
if (type == BPF_LSM_CGROUP) {
- err = bpf_trampoline_link_cgroup_shim(new_prog, atype);
+ err = bpf_trampoline_link_cgroup_shim(new_prog, atype, type);
if (err)
goto cleanup;
}
@@ -1495,7 +1495,7 @@ int cgroup_bpf_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)
goto out_put_cgroup;
}
bpf_link_init(&link->link, BPF_LINK_TYPE_CGROUP, &bpf_cgroup_link_lops,
- prog);
+ prog, attr->link_create.attach_type);
link->cgroup = cgrp;
link->type = attr->link_create.attach_type;
diff --git a/kernel/bpf/net_namespace.c b/kernel/bpf/net_namespace.c
index 868cc2c4389..63702c86275 100644
--- a/kernel/bpf/net_namespace.c
+++ b/kernel/bpf/net_namespace.c
@@ -501,7 +501,7 @@ int netns_bpf_link_create(const union bpf_attr *attr, struct bpf_prog *prog)
goto out_put_net;
}
bpf_link_init(&net_link->link, BPF_LINK_TYPE_NETNS,
- &bpf_netns_link_ops, prog);
+ &bpf_netns_link_ops, prog, type);
net_link->net = net;
net_link->type = type;
net_link->netns_type = netns_type;
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 7db7182a305..14883b3040a 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -3069,7 +3069,7 @@ static int bpf_obj_get(const union bpf_attr *attr)
*/
void bpf_link_init_sleepable(struct bpf_link *link, enum bpf_link_type type,
const struct bpf_link_ops *ops, struct bpf_prog *prog,
- bool sleepable)
+ bool sleepable, enum bpf_attach_type attach_type)
{
WARN_ON(ops->dealloc && ops->dealloc_deferred);
atomic64_set(&link->refcnt, 1);
@@ -3078,12 +3078,14 @@ void bpf_link_init_sleepable(struct bpf_link *link, enum bpf_link_type type,
link->id = 0;
link->ops = ops;
link->prog = prog;
+ link->attach_type = attach_type;
}
void bpf_link_init(struct bpf_link *link, enum bpf_link_type type,
- const struct bpf_link_ops *ops, struct bpf_prog *prog)
+ const struct bpf_link_ops *ops, struct bpf_prog *prog,
+ enum bpf_attach_type attach_type)
{
- bpf_link_init_sleepable(link, type, ops, prog, false);
+ bpf_link_init_sleepable(link, type, ops, prog, false, attach_type);
}
static void bpf_link_free_id(int id)
@@ -3443,7 +3445,8 @@ static const struct bpf_link_ops bpf_tracing_link_lops = {
static int bpf_tracing_prog_attach(struct bpf_prog *prog,
int tgt_prog_fd,
u32 btf_id,
- u64 bpf_cookie)
+ u64 bpf_cookie,
+ enum bpf_attach_type attach_type)
{
struct bpf_link_primer link_primer;
struct bpf_prog *tgt_prog = NULL;
@@ -3511,7 +3514,8 @@ static int bpf_tracing_prog_attach(struct bpf_prog *prog,
goto out_put_prog;
}
bpf_link_init(&link->link.link, BPF_LINK_TYPE_TRACING,
- &bpf_tracing_link_lops, prog);
+ &bpf_tracing_link_lops, prog, attach_type);
+
link->attach_type = prog->expected_attach_type;
link->link.cookie = bpf_cookie;
@@ -4049,7 +4053,8 @@ static int bpf_perf_link_attach(const union bpf_attr *attr, struct bpf_prog *pro
err = -ENOMEM;
goto out_put_file;
}
- bpf_link_init(&link->link, BPF_LINK_TYPE_PERF_EVENT, &bpf_perf_link_lops, prog);
+ bpf_link_init(&link->link, BPF_LINK_TYPE_PERF_EVENT, &bpf_perf_link_lops, prog,
+ attr->link_create.attach_type);
link->perf_file = perf_file;
err = bpf_link_prime(&link->link, &link_primer);
@@ -4081,7 +4086,8 @@ static int bpf_perf_link_attach(const union bpf_attr *attr, struct bpf_prog *pro
#endif /* CONFIG_PERF_EVENTS */
static int bpf_raw_tp_link_attach(struct bpf_prog *prog,
- const char __user *user_tp_name, u64 cookie)
+ const char __user *user_tp_name, u64 cookie,
+ enum bpf_attach_type attach_type)
{
struct bpf_link_primer link_primer;
struct bpf_raw_tp_link *link;
@@ -4104,7 +4110,7 @@ static int bpf_raw_tp_link_attach(struct bpf_prog *prog,
tp_name = prog->aux->attach_func_name;
break;
}
- return bpf_tracing_prog_attach(prog, 0, 0, 0);
+ return bpf_tracing_prog_attach(prog, 0, 0, 0, attach_type);
case BPF_PROG_TYPE_RAW_TRACEPOINT:
case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE:
if (strncpy_from_user(buf, user_tp_name, sizeof(buf) - 1) < 0)
@@ -4127,7 +4133,7 @@ static int bpf_raw_tp_link_attach(struct bpf_prog *prog,
}
bpf_link_init_sleepable(&link->link, BPF_LINK_TYPE_RAW_TRACEPOINT,
&bpf_raw_tp_link_lops, prog,
- tracepoint_is_faultable(btp->tp));
+ tracepoint_is_faultable(btp->tp), attach_type);
link->btp = btp;
link->cookie = cookie;
@@ -4168,7 +4174,7 @@ static int bpf_raw_tracepoint_open(const union bpf_attr *attr)
tp_name = u64_to_user_ptr(attr->raw_tracepoint.name);
cookie = attr->raw_tracepoint.cookie;
- fd = bpf_raw_tp_link_attach(prog, tp_name, cookie);
+ fd = bpf_raw_tp_link_attach(prog, tp_name, cookie, prog->expected_attach_type);
if (fd < 0)
bpf_prog_put(prog);
return fd;
@@ -5536,7 +5542,8 @@ static int link_create(union bpf_attr *attr, bpfptr_t uattr)
ret = bpf_tracing_prog_attach(prog,
attr->link_create.target_fd,
attr->link_create.target_btf_id,
- attr->link_create.tracing.cookie);
+ attr->link_create.tracing.cookie,
+ attr->link_create.attach_type);
break;
case BPF_PROG_TYPE_LSM:
case BPF_PROG_TYPE_TRACING:
@@ -5545,7 +5552,8 @@ static int link_create(union bpf_attr *attr, bpfptr_t uattr)
goto out;
}
if (prog->expected_attach_type == BPF_TRACE_RAW_TP)
- ret = bpf_raw_tp_link_attach(prog, NULL, attr->link_create.tracing.cookie);
+ ret = bpf_raw_tp_link_attach(prog, NULL, attr->link_create.tracing.cookie,
+ attr->link_create.attach_type);
else if (prog->expected_attach_type == BPF_TRACE_ITER)
ret = bpf_iter_link_attach(attr, uattr, prog);
else if (prog->expected_attach_type == BPF_LSM_CGROUP)
@@ -5554,7 +5562,8 @@ static int link_create(union bpf_attr *attr, bpfptr_t uattr)
ret = bpf_tracing_prog_attach(prog,
attr->link_create.target_fd,
attr->link_create.target_btf_id,
- attr->link_create.tracing.cookie);
+ attr->link_create.tracing.cookie,
+ attr->link_create.attach_type);
break;
case BPF_PROG_TYPE_FLOW_DISSECTOR:
case BPF_PROG_TYPE_SK_LOOKUP:
diff --git a/kernel/bpf/tcx.c b/kernel/bpf/tcx.c
index 2e4885e7781..e6a14f408d9 100644
--- a/kernel/bpf/tcx.c
+++ b/kernel/bpf/tcx.c
@@ -301,7 +301,8 @@ static int tcx_link_init(struct tcx_link *tcx,
struct net_device *dev,
struct bpf_prog *prog)
{
- bpf_link_init(&tcx->link, BPF_LINK_TYPE_TCX, &tcx_link_lops, prog);
+ bpf_link_init(&tcx->link, BPF_LINK_TYPE_TCX, &tcx_link_lops, prog,
+ attr->link_create.attach_type);
tcx->location = attr->link_create.attach_type;
tcx->dev = dev;
return bpf_link_prime(&tcx->link, link_primer);
diff --git a/kernel/bpf/trampoline.c b/kernel/bpf/trampoline.c
index b1e358c16ee..0e364614c3a 100644
--- a/kernel/bpf/trampoline.c
+++ b/kernel/bpf/trampoline.c
@@ -674,7 +674,8 @@ static const struct bpf_link_ops bpf_shim_tramp_link_lops = {
static struct bpf_shim_tramp_link *cgroup_shim_alloc(const struct bpf_prog *prog,
bpf_func_t bpf_func,
- int cgroup_atype)
+ int cgroup_atype,
+ enum bpf_attach_type attach_type)
{
struct bpf_shim_tramp_link *shim_link = NULL;
struct bpf_prog *p;
@@ -701,7 +702,7 @@ static struct bpf_shim_tramp_link *cgroup_shim_alloc(const struct bpf_prog *prog
p->expected_attach_type = BPF_LSM_MAC;
bpf_prog_inc(p);
bpf_link_init(&shim_link->link.link, BPF_LINK_TYPE_UNSPEC,
- &bpf_shim_tramp_link_lops, p);
+ &bpf_shim_tramp_link_lops, p, attach_type);
bpf_cgroup_atype_get(p->aux->attach_btf_id, cgroup_atype);
return shim_link;
@@ -726,7 +727,8 @@ static struct bpf_shim_tramp_link *cgroup_shim_find(struct bpf_trampoline *tr,
}
int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,
- int cgroup_atype)
+ int cgroup_atype,
+ enum bpf_attach_type attach_type)
{
struct bpf_shim_tramp_link *shim_link = NULL;
struct bpf_attach_target_info tgt_info = {};
@@ -763,7 +765,7 @@ int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,
/* Allocate and install new shim. */
- shim_link = cgroup_shim_alloc(prog, bpf_func, cgroup_atype);
+ shim_link = cgroup_shim_alloc(prog, bpf_func, cgroup_atype, attach_type);
if (!shim_link) {
err = -ENOMEM;
goto err;
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index e7f97a9a8bb..ffdde840abb 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -2986,7 +2986,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr
}
bpf_link_init(&link->link, BPF_LINK_TYPE_KPROBE_MULTI,
- &bpf_kprobe_multi_link_lops, prog);
+ &bpf_kprobe_multi_link_lops, prog, attr->link_create.attach_type);
err = bpf_link_prime(&link->link, &link_primer);
if (err)
@@ -3441,7 +3441,7 @@ int bpf_uprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr
link->link.flags = flags;
bpf_link_init(&link->link, BPF_LINK_TYPE_UPROBE_MULTI,
- &bpf_uprobe_multi_link_lops, prog);
+ &bpf_uprobe_multi_link_lops, prog, attr->link_create.attach_type);
for (i = 0; i < cnt; i++) {
uprobes[i].uprobe = uprobe_register(d_real_inode(link->path.dentry),
diff --git a/net/bpf/bpf_dummy_struct_ops.c b/net/bpf/bpf_dummy_struct_ops.c
index f71f67c6896..812457819b5 100644
--- a/net/bpf/bpf_dummy_struct_ops.c
+++ b/net/bpf/bpf_dummy_struct_ops.c
@@ -171,7 +171,8 @@ int bpf_struct_ops_test_run(struct bpf_prog *prog, const union bpf_attr *kattr,
}
/* prog doesn't take the ownership of the reference from caller */
bpf_prog_inc(prog);
- bpf_link_init(&link->link, BPF_LINK_TYPE_STRUCT_OPS, &bpf_struct_ops_link_lops, prog);
+ bpf_link_init(&link->link, BPF_LINK_TYPE_STRUCT_OPS, &bpf_struct_ops_link_lops, prog,
+ prog->expected_attach_type);
op_idx = prog->expected_attach_type;
err = bpf_struct_ops_prepare_trampoline(tlinks, link,
diff --git a/net/core/dev.c b/net/core/dev.c
index be97c440ecd..7969fddc94e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -10364,7 +10364,8 @@ int bpf_xdp_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)
goto unlock;
}
- bpf_link_init(&link->link, BPF_LINK_TYPE_XDP, &bpf_xdp_link_lops, prog);
+ bpf_link_init(&link->link, BPF_LINK_TYPE_XDP, &bpf_xdp_link_lops, prog,
+ attr->link_create.attach_type);
link->dev = dev;
link->flags = attr->link_create.flags;
diff --git a/net/core/sock_map.c b/net/core/sock_map.c
index 82a14f131d0..fbe9a33ddf1 100644
--- a/net/core/sock_map.c
+++ b/net/core/sock_map.c
@@ -1866,7 +1866,8 @@ int sock_map_link_create(const union bpf_attr *attr, struct bpf_prog *prog)
}
attach_type = attr->link_create.attach_type;
- bpf_link_init(&sockmap_link->link, BPF_LINK_TYPE_SOCKMAP, &sock_map_link_ops, prog);
+ bpf_link_init(&sockmap_link->link, BPF_LINK_TYPE_SOCKMAP, &sock_map_link_ops, prog,
+ attach_type);
sockmap_link->map = map;
sockmap_link->attach_type = attach_type;
diff --git a/net/netfilter/nf_bpf_link.c b/net/netfilter/nf_bpf_link.c
index 06b08484470..a054d3b216d 100644
--- a/net/netfilter/nf_bpf_link.c
+++ b/net/netfilter/nf_bpf_link.c
@@ -225,7 +225,8 @@ int bpf_nf_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)
if (!link)
return -ENOMEM;
- bpf_link_init(&link->link, BPF_LINK_TYPE_NETFILTER, &bpf_nf_link_lops, prog);
+ bpf_link_init(&link->link, BPF_LINK_TYPE_NETFILTER, &bpf_nf_link_lops, prog,
+ attr->link_create.attach_type);
link->hook_ops.hook = nf_hook_run_bpf;
link->hook_ops.hook_ops_type = NF_HOOK_OP_BPF;
--
2.48.1Hi Tao,
kernel test robot noticed the following build errors:
[auto build test ERROR on bpf-next/master]
url: https://github.com/intel-lab-lkp/linux/commits/Tao-Chen/bpf-Add-attach_type-in-bpf_link/20250707-234517
base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master
patch link: https://lore.kernel.org/r/20250707153916.802802-2-chen.dylane%40linux.dev
patch subject: [PATCH bpf-next 1/6] bpf: Add attach_type in bpf_link
config: i386-randconfig-015-20250708 (https://download.01.org/0day-ci/archive/20250708/202507081130.devFCURB-lkp@intel.com/config)
compiler: clang version 20.1.7 (https://github.com/llvm/llvm-project 6146a88f60492b520a36f8f8f3231e15f3cc6082)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250708/202507081130.devFCURB-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202507081130.devFCURB-lkp@intel.com/
All errors (new ones prefixed by >>):
>> drivers/net/netkit.c:778:32: error: too few arguments to function call, expected 5, have 4
777 | bpf_link_init(&nkl->link, BPF_LINK_TYPE_NETKIT,
| ~~~~~~~~~~~~~
778 | &netkit_link_lops, prog);
| ^
include/linux/bpf.h:2534:6: note: 'bpf_link_init' declared here
2534 | void bpf_link_init(struct bpf_link *link, enum bpf_link_type type,
| ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2535 | const struct bpf_link_ops *ops, struct bpf_prog *prog,
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2536 | enum bpf_attach_type attach_type);
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
vim +778 drivers/net/netkit.c
35dfaad7188cdc Daniel Borkmann 2023-10-24 770
35dfaad7188cdc Daniel Borkmann 2023-10-24 771 static int netkit_link_init(struct netkit_link *nkl,
35dfaad7188cdc Daniel Borkmann 2023-10-24 772 struct bpf_link_primer *link_primer,
35dfaad7188cdc Daniel Borkmann 2023-10-24 773 const union bpf_attr *attr,
35dfaad7188cdc Daniel Borkmann 2023-10-24 774 struct net_device *dev,
35dfaad7188cdc Daniel Borkmann 2023-10-24 775 struct bpf_prog *prog)
35dfaad7188cdc Daniel Borkmann 2023-10-24 776 {
35dfaad7188cdc Daniel Borkmann 2023-10-24 777 bpf_link_init(&nkl->link, BPF_LINK_TYPE_NETKIT,
35dfaad7188cdc Daniel Borkmann 2023-10-24 @778 &netkit_link_lops, prog);
35dfaad7188cdc Daniel Borkmann 2023-10-24 779 nkl->location = attr->link_create.attach_type;
35dfaad7188cdc Daniel Borkmann 2023-10-24 780 nkl->dev = dev;
35dfaad7188cdc Daniel Borkmann 2023-10-24 781 return bpf_link_prime(&nkl->link, link_primer);
35dfaad7188cdc Daniel Borkmann 2023-10-24 782 }
35dfaad7188cdc Daniel Borkmann 2023-10-24 783
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
On Mon, Jul 07, 2025 at 11:39:11PM +0800, Tao Chen wrote:
> Attach_type will be set when link created from user, it is better
> to record attach_type in bpf_link directly suggested by Andrii.
>
> Signed-off-by: Tao Chen <chen.dylane@linux.dev>
> ---
> include/linux/bpf.h | 17 +++++++++++------
> kernel/bpf/bpf_iter.c | 3 ++-
> kernel/bpf/bpf_struct_ops.c | 5 +++--
> kernel/bpf/cgroup.c | 4 ++--
> kernel/bpf/net_namespace.c | 2 +-
> kernel/bpf/syscall.c | 35 +++++++++++++++++++++-------------
> kernel/bpf/tcx.c | 3 ++-
> kernel/bpf/trampoline.c | 10 ++++++----
> kernel/trace/bpf_trace.c | 4 ++--
> net/bpf/bpf_dummy_struct_ops.c | 3 ++-
> net/core/dev.c | 3 ++-
> net/core/sock_map.c | 3 ++-
> net/netfilter/nf_bpf_link.c | 3 ++-
there's one more caller from drivers/net/netkit.c, check CI
https://github.com/kernel-patches/bpf/actions/runs/16121901562/job/45489558386#annotation:11:4597
jirka
> 13 files changed, 59 insertions(+), 36 deletions(-)
>
> diff --git a/include/linux/bpf.h b/include/linux/bpf.h
> index 34dd90ec7fa..12a965362de 100644
> --- a/include/linux/bpf.h
> +++ b/include/linux/bpf.h
> @@ -1735,6 +1735,8 @@ struct bpf_link {
> */
> bool sleepable;
> u32 flags;
> + enum bpf_attach_type attach_type;
> +
> /* rcu is used before freeing, work can be used to schedule that
> * RCU-based freeing before that, so they never overlap
> */
> @@ -2034,11 +2036,13 @@ int bpf_prog_ctx_arg_info_init(struct bpf_prog *prog,
>
> #if defined(CONFIG_CGROUP_BPF) && defined(CONFIG_BPF_LSM)
> int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,
> - int cgroup_atype);
> + int cgroup_atype,
> + enum bpf_attach_type attach_type);
> void bpf_trampoline_unlink_cgroup_shim(struct bpf_prog *prog);
> #else
> static inline int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,
> - int cgroup_atype)
> + int cgroup_atype,
> + enum bpf_attach_type attach_type)
> {
> return -EOPNOTSUPP;
> }
> @@ -2528,10 +2532,11 @@ int bpf_map_new_fd(struct bpf_map *map, int flags);
> int bpf_prog_new_fd(struct bpf_prog *prog);
>
> void bpf_link_init(struct bpf_link *link, enum bpf_link_type type,
> - const struct bpf_link_ops *ops, struct bpf_prog *prog);
> + const struct bpf_link_ops *ops, struct bpf_prog *prog,
> + enum bpf_attach_type attach_type);
> void bpf_link_init_sleepable(struct bpf_link *link, enum bpf_link_type type,
> const struct bpf_link_ops *ops, struct bpf_prog *prog,
> - bool sleepable);
> + bool sleepable, enum bpf_attach_type attach_type);
> int bpf_link_prime(struct bpf_link *link, struct bpf_link_primer *primer);
> int bpf_link_settle(struct bpf_link_primer *primer);
> void bpf_link_cleanup(struct bpf_link_primer *primer);
> @@ -2883,13 +2888,13 @@ bpf_prog_inc_not_zero(struct bpf_prog *prog)
>
> static inline void bpf_link_init(struct bpf_link *link, enum bpf_link_type type,
> const struct bpf_link_ops *ops,
> - struct bpf_prog *prog)
> + struct bpf_prog *prog, enum bpf_attach_type attach_type)
> {
> }
>
> static inline void bpf_link_init_sleepable(struct bpf_link *link, enum bpf_link_type type,
> const struct bpf_link_ops *ops, struct bpf_prog *prog,
> - bool sleepable)
> + bool sleepable, enum bpf_attach_type attach_type)
> {
> }
>
> diff --git a/kernel/bpf/bpf_iter.c b/kernel/bpf/bpf_iter.c
> index 303ab1f42d3..0cbcae72707 100644
> --- a/kernel/bpf/bpf_iter.c
> +++ b/kernel/bpf/bpf_iter.c
> @@ -552,7 +552,8 @@ int bpf_iter_link_attach(const union bpf_attr *attr, bpfptr_t uattr,
> if (!link)
> return -ENOMEM;
>
> - bpf_link_init(&link->link, BPF_LINK_TYPE_ITER, &bpf_iter_link_lops, prog);
> + bpf_link_init(&link->link, BPF_LINK_TYPE_ITER, &bpf_iter_link_lops, prog,
> + attr->link_create.attach_type);
> link->tinfo = tinfo;
>
> err = bpf_link_prime(&link->link, &link_primer);
> diff --git a/kernel/bpf/bpf_struct_ops.c b/kernel/bpf/bpf_struct_ops.c
> index 96113633e39..687a3e9c76f 100644
> --- a/kernel/bpf/bpf_struct_ops.c
> +++ b/kernel/bpf/bpf_struct_ops.c
> @@ -808,7 +808,7 @@ static long bpf_struct_ops_map_update_elem(struct bpf_map *map, void *key,
> goto reset_unlock;
> }
> bpf_link_init(&link->link, BPF_LINK_TYPE_STRUCT_OPS,
> - &bpf_struct_ops_link_lops, prog);
> + &bpf_struct_ops_link_lops, prog, prog->expected_attach_type);
> *plink++ = &link->link;
>
> ksym = kzalloc(sizeof(*ksym), GFP_USER);
> @@ -1351,7 +1351,8 @@ int bpf_struct_ops_link_create(union bpf_attr *attr)
> err = -ENOMEM;
> goto err_out;
> }
> - bpf_link_init(&link->link, BPF_LINK_TYPE_STRUCT_OPS, &bpf_struct_ops_map_lops, NULL);
> + bpf_link_init(&link->link, BPF_LINK_TYPE_STRUCT_OPS, &bpf_struct_ops_map_lops, NULL,
> + attr->link_create.attach_type);
>
> err = bpf_link_prime(&link->link, &link_primer);
> if (err)
> diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c
> index cd220e861d6..bacdd0ca741 100644
> --- a/kernel/bpf/cgroup.c
> +++ b/kernel/bpf/cgroup.c
> @@ -867,7 +867,7 @@ static int __cgroup_bpf_attach(struct cgroup *cgrp,
> cgrp->bpf.flags[atype] = saved_flags;
>
> if (type == BPF_LSM_CGROUP) {
> - err = bpf_trampoline_link_cgroup_shim(new_prog, atype);
> + err = bpf_trampoline_link_cgroup_shim(new_prog, atype, type);
> if (err)
> goto cleanup;
> }
> @@ -1495,7 +1495,7 @@ int cgroup_bpf_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)
> goto out_put_cgroup;
> }
> bpf_link_init(&link->link, BPF_LINK_TYPE_CGROUP, &bpf_cgroup_link_lops,
> - prog);
> + prog, attr->link_create.attach_type);
> link->cgroup = cgrp;
> link->type = attr->link_create.attach_type;
>
> diff --git a/kernel/bpf/net_namespace.c b/kernel/bpf/net_namespace.c
> index 868cc2c4389..63702c86275 100644
> --- a/kernel/bpf/net_namespace.c
> +++ b/kernel/bpf/net_namespace.c
> @@ -501,7 +501,7 @@ int netns_bpf_link_create(const union bpf_attr *attr, struct bpf_prog *prog)
> goto out_put_net;
> }
> bpf_link_init(&net_link->link, BPF_LINK_TYPE_NETNS,
> - &bpf_netns_link_ops, prog);
> + &bpf_netns_link_ops, prog, type);
> net_link->net = net;
> net_link->type = type;
> net_link->netns_type = netns_type;
> diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
> index 7db7182a305..14883b3040a 100644
> --- a/kernel/bpf/syscall.c
> +++ b/kernel/bpf/syscall.c
> @@ -3069,7 +3069,7 @@ static int bpf_obj_get(const union bpf_attr *attr)
> */
> void bpf_link_init_sleepable(struct bpf_link *link, enum bpf_link_type type,
> const struct bpf_link_ops *ops, struct bpf_prog *prog,
> - bool sleepable)
> + bool sleepable, enum bpf_attach_type attach_type)
> {
> WARN_ON(ops->dealloc && ops->dealloc_deferred);
> atomic64_set(&link->refcnt, 1);
> @@ -3078,12 +3078,14 @@ void bpf_link_init_sleepable(struct bpf_link *link, enum bpf_link_type type,
> link->id = 0;
> link->ops = ops;
> link->prog = prog;
> + link->attach_type = attach_type;
> }
>
> void bpf_link_init(struct bpf_link *link, enum bpf_link_type type,
> - const struct bpf_link_ops *ops, struct bpf_prog *prog)
> + const struct bpf_link_ops *ops, struct bpf_prog *prog,
> + enum bpf_attach_type attach_type)
> {
> - bpf_link_init_sleepable(link, type, ops, prog, false);
> + bpf_link_init_sleepable(link, type, ops, prog, false, attach_type);
> }
>
> static void bpf_link_free_id(int id)
> @@ -3443,7 +3445,8 @@ static const struct bpf_link_ops bpf_tracing_link_lops = {
> static int bpf_tracing_prog_attach(struct bpf_prog *prog,
> int tgt_prog_fd,
> u32 btf_id,
> - u64 bpf_cookie)
> + u64 bpf_cookie,
> + enum bpf_attach_type attach_type)
> {
> struct bpf_link_primer link_primer;
> struct bpf_prog *tgt_prog = NULL;
> @@ -3511,7 +3514,8 @@ static int bpf_tracing_prog_attach(struct bpf_prog *prog,
> goto out_put_prog;
> }
> bpf_link_init(&link->link.link, BPF_LINK_TYPE_TRACING,
> - &bpf_tracing_link_lops, prog);
> + &bpf_tracing_link_lops, prog, attach_type);
> +
> link->attach_type = prog->expected_attach_type;
> link->link.cookie = bpf_cookie;
>
> @@ -4049,7 +4053,8 @@ static int bpf_perf_link_attach(const union bpf_attr *attr, struct bpf_prog *pro
> err = -ENOMEM;
> goto out_put_file;
> }
> - bpf_link_init(&link->link, BPF_LINK_TYPE_PERF_EVENT, &bpf_perf_link_lops, prog);
> + bpf_link_init(&link->link, BPF_LINK_TYPE_PERF_EVENT, &bpf_perf_link_lops, prog,
> + attr->link_create.attach_type);
> link->perf_file = perf_file;
>
> err = bpf_link_prime(&link->link, &link_primer);
> @@ -4081,7 +4086,8 @@ static int bpf_perf_link_attach(const union bpf_attr *attr, struct bpf_prog *pro
> #endif /* CONFIG_PERF_EVENTS */
>
> static int bpf_raw_tp_link_attach(struct bpf_prog *prog,
> - const char __user *user_tp_name, u64 cookie)
> + const char __user *user_tp_name, u64 cookie,
> + enum bpf_attach_type attach_type)
> {
> struct bpf_link_primer link_primer;
> struct bpf_raw_tp_link *link;
> @@ -4104,7 +4110,7 @@ static int bpf_raw_tp_link_attach(struct bpf_prog *prog,
> tp_name = prog->aux->attach_func_name;
> break;
> }
> - return bpf_tracing_prog_attach(prog, 0, 0, 0);
> + return bpf_tracing_prog_attach(prog, 0, 0, 0, attach_type);
> case BPF_PROG_TYPE_RAW_TRACEPOINT:
> case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE:
> if (strncpy_from_user(buf, user_tp_name, sizeof(buf) - 1) < 0)
> @@ -4127,7 +4133,7 @@ static int bpf_raw_tp_link_attach(struct bpf_prog *prog,
> }
> bpf_link_init_sleepable(&link->link, BPF_LINK_TYPE_RAW_TRACEPOINT,
> &bpf_raw_tp_link_lops, prog,
> - tracepoint_is_faultable(btp->tp));
> + tracepoint_is_faultable(btp->tp), attach_type);
> link->btp = btp;
> link->cookie = cookie;
>
> @@ -4168,7 +4174,7 @@ static int bpf_raw_tracepoint_open(const union bpf_attr *attr)
>
> tp_name = u64_to_user_ptr(attr->raw_tracepoint.name);
> cookie = attr->raw_tracepoint.cookie;
> - fd = bpf_raw_tp_link_attach(prog, tp_name, cookie);
> + fd = bpf_raw_tp_link_attach(prog, tp_name, cookie, prog->expected_attach_type);
> if (fd < 0)
> bpf_prog_put(prog);
> return fd;
> @@ -5536,7 +5542,8 @@ static int link_create(union bpf_attr *attr, bpfptr_t uattr)
> ret = bpf_tracing_prog_attach(prog,
> attr->link_create.target_fd,
> attr->link_create.target_btf_id,
> - attr->link_create.tracing.cookie);
> + attr->link_create.tracing.cookie,
> + attr->link_create.attach_type);
> break;
> case BPF_PROG_TYPE_LSM:
> case BPF_PROG_TYPE_TRACING:
> @@ -5545,7 +5552,8 @@ static int link_create(union bpf_attr *attr, bpfptr_t uattr)
> goto out;
> }
> if (prog->expected_attach_type == BPF_TRACE_RAW_TP)
> - ret = bpf_raw_tp_link_attach(prog, NULL, attr->link_create.tracing.cookie);
> + ret = bpf_raw_tp_link_attach(prog, NULL, attr->link_create.tracing.cookie,
> + attr->link_create.attach_type);
> else if (prog->expected_attach_type == BPF_TRACE_ITER)
> ret = bpf_iter_link_attach(attr, uattr, prog);
> else if (prog->expected_attach_type == BPF_LSM_CGROUP)
> @@ -5554,7 +5562,8 @@ static int link_create(union bpf_attr *attr, bpfptr_t uattr)
> ret = bpf_tracing_prog_attach(prog,
> attr->link_create.target_fd,
> attr->link_create.target_btf_id,
> - attr->link_create.tracing.cookie);
> + attr->link_create.tracing.cookie,
> + attr->link_create.attach_type);
> break;
> case BPF_PROG_TYPE_FLOW_DISSECTOR:
> case BPF_PROG_TYPE_SK_LOOKUP:
> diff --git a/kernel/bpf/tcx.c b/kernel/bpf/tcx.c
> index 2e4885e7781..e6a14f408d9 100644
> --- a/kernel/bpf/tcx.c
> +++ b/kernel/bpf/tcx.c
> @@ -301,7 +301,8 @@ static int tcx_link_init(struct tcx_link *tcx,
> struct net_device *dev,
> struct bpf_prog *prog)
> {
> - bpf_link_init(&tcx->link, BPF_LINK_TYPE_TCX, &tcx_link_lops, prog);
> + bpf_link_init(&tcx->link, BPF_LINK_TYPE_TCX, &tcx_link_lops, prog,
> + attr->link_create.attach_type);
> tcx->location = attr->link_create.attach_type;
> tcx->dev = dev;
> return bpf_link_prime(&tcx->link, link_primer);
> diff --git a/kernel/bpf/trampoline.c b/kernel/bpf/trampoline.c
> index b1e358c16ee..0e364614c3a 100644
> --- a/kernel/bpf/trampoline.c
> +++ b/kernel/bpf/trampoline.c
> @@ -674,7 +674,8 @@ static const struct bpf_link_ops bpf_shim_tramp_link_lops = {
>
> static struct bpf_shim_tramp_link *cgroup_shim_alloc(const struct bpf_prog *prog,
> bpf_func_t bpf_func,
> - int cgroup_atype)
> + int cgroup_atype,
> + enum bpf_attach_type attach_type)
> {
> struct bpf_shim_tramp_link *shim_link = NULL;
> struct bpf_prog *p;
> @@ -701,7 +702,7 @@ static struct bpf_shim_tramp_link *cgroup_shim_alloc(const struct bpf_prog *prog
> p->expected_attach_type = BPF_LSM_MAC;
> bpf_prog_inc(p);
> bpf_link_init(&shim_link->link.link, BPF_LINK_TYPE_UNSPEC,
> - &bpf_shim_tramp_link_lops, p);
> + &bpf_shim_tramp_link_lops, p, attach_type);
> bpf_cgroup_atype_get(p->aux->attach_btf_id, cgroup_atype);
>
> return shim_link;
> @@ -726,7 +727,8 @@ static struct bpf_shim_tramp_link *cgroup_shim_find(struct bpf_trampoline *tr,
> }
>
> int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,
> - int cgroup_atype)
> + int cgroup_atype,
> + enum bpf_attach_type attach_type)
> {
> struct bpf_shim_tramp_link *shim_link = NULL;
> struct bpf_attach_target_info tgt_info = {};
> @@ -763,7 +765,7 @@ int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,
>
> /* Allocate and install new shim. */
>
> - shim_link = cgroup_shim_alloc(prog, bpf_func, cgroup_atype);
> + shim_link = cgroup_shim_alloc(prog, bpf_func, cgroup_atype, attach_type);
> if (!shim_link) {
> err = -ENOMEM;
> goto err;
> diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
> index e7f97a9a8bb..ffdde840abb 100644
> --- a/kernel/trace/bpf_trace.c
> +++ b/kernel/trace/bpf_trace.c
> @@ -2986,7 +2986,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr
> }
>
> bpf_link_init(&link->link, BPF_LINK_TYPE_KPROBE_MULTI,
> - &bpf_kprobe_multi_link_lops, prog);
> + &bpf_kprobe_multi_link_lops, prog, attr->link_create.attach_type);
>
> err = bpf_link_prime(&link->link, &link_primer);
> if (err)
> @@ -3441,7 +3441,7 @@ int bpf_uprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr
> link->link.flags = flags;
>
> bpf_link_init(&link->link, BPF_LINK_TYPE_UPROBE_MULTI,
> - &bpf_uprobe_multi_link_lops, prog);
> + &bpf_uprobe_multi_link_lops, prog, attr->link_create.attach_type);
>
> for (i = 0; i < cnt; i++) {
> uprobes[i].uprobe = uprobe_register(d_real_inode(link->path.dentry),
> diff --git a/net/bpf/bpf_dummy_struct_ops.c b/net/bpf/bpf_dummy_struct_ops.c
> index f71f67c6896..812457819b5 100644
> --- a/net/bpf/bpf_dummy_struct_ops.c
> +++ b/net/bpf/bpf_dummy_struct_ops.c
> @@ -171,7 +171,8 @@ int bpf_struct_ops_test_run(struct bpf_prog *prog, const union bpf_attr *kattr,
> }
> /* prog doesn't take the ownership of the reference from caller */
> bpf_prog_inc(prog);
> - bpf_link_init(&link->link, BPF_LINK_TYPE_STRUCT_OPS, &bpf_struct_ops_link_lops, prog);
> + bpf_link_init(&link->link, BPF_LINK_TYPE_STRUCT_OPS, &bpf_struct_ops_link_lops, prog,
> + prog->expected_attach_type);
>
> op_idx = prog->expected_attach_type;
> err = bpf_struct_ops_prepare_trampoline(tlinks, link,
> diff --git a/net/core/dev.c b/net/core/dev.c
> index be97c440ecd..7969fddc94e 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -10364,7 +10364,8 @@ int bpf_xdp_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)
> goto unlock;
> }
>
> - bpf_link_init(&link->link, BPF_LINK_TYPE_XDP, &bpf_xdp_link_lops, prog);
> + bpf_link_init(&link->link, BPF_LINK_TYPE_XDP, &bpf_xdp_link_lops, prog,
> + attr->link_create.attach_type);
> link->dev = dev;
> link->flags = attr->link_create.flags;
>
> diff --git a/net/core/sock_map.c b/net/core/sock_map.c
> index 82a14f131d0..fbe9a33ddf1 100644
> --- a/net/core/sock_map.c
> +++ b/net/core/sock_map.c
> @@ -1866,7 +1866,8 @@ int sock_map_link_create(const union bpf_attr *attr, struct bpf_prog *prog)
> }
>
> attach_type = attr->link_create.attach_type;
> - bpf_link_init(&sockmap_link->link, BPF_LINK_TYPE_SOCKMAP, &sock_map_link_ops, prog);
> + bpf_link_init(&sockmap_link->link, BPF_LINK_TYPE_SOCKMAP, &sock_map_link_ops, prog,
> + attach_type);
> sockmap_link->map = map;
> sockmap_link->attach_type = attach_type;
>
> diff --git a/net/netfilter/nf_bpf_link.c b/net/netfilter/nf_bpf_link.c
> index 06b08484470..a054d3b216d 100644
> --- a/net/netfilter/nf_bpf_link.c
> +++ b/net/netfilter/nf_bpf_link.c
> @@ -225,7 +225,8 @@ int bpf_nf_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)
> if (!link)
> return -ENOMEM;
>
> - bpf_link_init(&link->link, BPF_LINK_TYPE_NETFILTER, &bpf_nf_link_lops, prog);
> + bpf_link_init(&link->link, BPF_LINK_TYPE_NETFILTER, &bpf_nf_link_lops, prog,
> + attr->link_create.attach_type);
>
> link->hook_ops.hook = nf_hook_run_bpf;
> link->hook_ops.hook_ops_type = NF_HOOK_OP_BPF;
> --
> 2.48.1
>
在 2025/7/8 05:13, Jiri Olsa 写道:
> On Mon, Jul 07, 2025 at 11:39:11PM +0800, Tao Chen wrote:
>> Attach_type will be set when link created from user, it is better
>> to record attach_type in bpf_link directly suggested by Andrii.
>>
>> Signed-off-by: Tao Chen <chen.dylane@linux.dev>
>> ---
>> include/linux/bpf.h | 17 +++++++++++------
>> kernel/bpf/bpf_iter.c | 3 ++-
>> kernel/bpf/bpf_struct_ops.c | 5 +++--
>> kernel/bpf/cgroup.c | 4 ++--
>> kernel/bpf/net_namespace.c | 2 +-
>> kernel/bpf/syscall.c | 35 +++++++++++++++++++++-------------
>> kernel/bpf/tcx.c | 3 ++-
>> kernel/bpf/trampoline.c | 10 ++++++----
>> kernel/trace/bpf_trace.c | 4 ++--
>> net/bpf/bpf_dummy_struct_ops.c | 3 ++-
>> net/core/dev.c | 3 ++-
>> net/core/sock_map.c | 3 ++-
>> net/netfilter/nf_bpf_link.c | 3 ++-
>
> there's one more caller from drivers/net/netkit.c, check CI
> https://github.com/kernel-patches/bpf/actions/runs/16121901562/job/45489558386#annotation:11:4597
>
my fault, there are some configs not opened in my develop enviroment, i
will fix it, thanks.
> jirka
>
>
>> 13 files changed, 59 insertions(+), 36 deletions(-)
>>
>> diff --git a/include/linux/bpf.h b/include/linux/bpf.h
>> index 34dd90ec7fa..12a965362de 100644
>> --- a/include/linux/bpf.h
>> +++ b/include/linux/bpf.h
>> @@ -1735,6 +1735,8 @@ struct bpf_link {
>> */
>> bool sleepable;
>> u32 flags;
>> + enum bpf_attach_type attach_type;
>> +
>> /* rcu is used before freeing, work can be used to schedule that
>> * RCU-based freeing before that, so they never overlap
>> */
>> @@ -2034,11 +2036,13 @@ int bpf_prog_ctx_arg_info_init(struct bpf_prog *prog,
>>
>> #if defined(CONFIG_CGROUP_BPF) && defined(CONFIG_BPF_LSM)
>> int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,
>> - int cgroup_atype);
>> + int cgroup_atype,
>> + enum bpf_attach_type attach_type);
>> void bpf_trampoline_unlink_cgroup_shim(struct bpf_prog *prog);
>> #else
>> static inline int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,
>> - int cgroup_atype)
>> + int cgroup_atype,
>> + enum bpf_attach_type attach_type)
>> {
>> return -EOPNOTSUPP;
>> }
>> @@ -2528,10 +2532,11 @@ int bpf_map_new_fd(struct bpf_map *map, int flags);
>> int bpf_prog_new_fd(struct bpf_prog *prog);
>>
>> void bpf_link_init(struct bpf_link *link, enum bpf_link_type type,
>> - const struct bpf_link_ops *ops, struct bpf_prog *prog);
>> + const struct bpf_link_ops *ops, struct bpf_prog *prog,
>> + enum bpf_attach_type attach_type);
>> void bpf_link_init_sleepable(struct bpf_link *link, enum bpf_link_type type,
>> const struct bpf_link_ops *ops, struct bpf_prog *prog,
>> - bool sleepable);
>> + bool sleepable, enum bpf_attach_type attach_type);
>> int bpf_link_prime(struct bpf_link *link, struct bpf_link_primer *primer);
>> int bpf_link_settle(struct bpf_link_primer *primer);
>> void bpf_link_cleanup(struct bpf_link_primer *primer);
>> @@ -2883,13 +2888,13 @@ bpf_prog_inc_not_zero(struct bpf_prog *prog)
>>
>> static inline void bpf_link_init(struct bpf_link *link, enum bpf_link_type type,
>> const struct bpf_link_ops *ops,
>> - struct bpf_prog *prog)
>> + struct bpf_prog *prog, enum bpf_attach_type attach_type)
>> {
>> }
>>
>> static inline void bpf_link_init_sleepable(struct bpf_link *link, enum bpf_link_type type,
>> const struct bpf_link_ops *ops, struct bpf_prog *prog,
>> - bool sleepable)
>> + bool sleepable, enum bpf_attach_type attach_type)
>> {
>> }
>>
>> diff --git a/kernel/bpf/bpf_iter.c b/kernel/bpf/bpf_iter.c
>> index 303ab1f42d3..0cbcae72707 100644
>> --- a/kernel/bpf/bpf_iter.c
>> +++ b/kernel/bpf/bpf_iter.c
>> @@ -552,7 +552,8 @@ int bpf_iter_link_attach(const union bpf_attr *attr, bpfptr_t uattr,
>> if (!link)
>> return -ENOMEM;
>>
>> - bpf_link_init(&link->link, BPF_LINK_TYPE_ITER, &bpf_iter_link_lops, prog);
>> + bpf_link_init(&link->link, BPF_LINK_TYPE_ITER, &bpf_iter_link_lops, prog,
>> + attr->link_create.attach_type);
>> link->tinfo = tinfo;
>>
>> err = bpf_link_prime(&link->link, &link_primer);
>> diff --git a/kernel/bpf/bpf_struct_ops.c b/kernel/bpf/bpf_struct_ops.c
>> index 96113633e39..687a3e9c76f 100644
>> --- a/kernel/bpf/bpf_struct_ops.c
>> +++ b/kernel/bpf/bpf_struct_ops.c
>> @@ -808,7 +808,7 @@ static long bpf_struct_ops_map_update_elem(struct bpf_map *map, void *key,
>> goto reset_unlock;
>> }
>> bpf_link_init(&link->link, BPF_LINK_TYPE_STRUCT_OPS,
>> - &bpf_struct_ops_link_lops, prog);
>> + &bpf_struct_ops_link_lops, prog, prog->expected_attach_type);
>> *plink++ = &link->link;
>>
>> ksym = kzalloc(sizeof(*ksym), GFP_USER);
>> @@ -1351,7 +1351,8 @@ int bpf_struct_ops_link_create(union bpf_attr *attr)
>> err = -ENOMEM;
>> goto err_out;
>> }
>> - bpf_link_init(&link->link, BPF_LINK_TYPE_STRUCT_OPS, &bpf_struct_ops_map_lops, NULL);
>> + bpf_link_init(&link->link, BPF_LINK_TYPE_STRUCT_OPS, &bpf_struct_ops_map_lops, NULL,
>> + attr->link_create.attach_type);
>>
>> err = bpf_link_prime(&link->link, &link_primer);
>> if (err)
>> diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c
>> index cd220e861d6..bacdd0ca741 100644
>> --- a/kernel/bpf/cgroup.c
>> +++ b/kernel/bpf/cgroup.c
>> @@ -867,7 +867,7 @@ static int __cgroup_bpf_attach(struct cgroup *cgrp,
>> cgrp->bpf.flags[atype] = saved_flags;
>>
>> if (type == BPF_LSM_CGROUP) {
>> - err = bpf_trampoline_link_cgroup_shim(new_prog, atype);
>> + err = bpf_trampoline_link_cgroup_shim(new_prog, atype, type);
>> if (err)
>> goto cleanup;
>> }
>> @@ -1495,7 +1495,7 @@ int cgroup_bpf_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)
>> goto out_put_cgroup;
>> }
>> bpf_link_init(&link->link, BPF_LINK_TYPE_CGROUP, &bpf_cgroup_link_lops,
>> - prog);
>> + prog, attr->link_create.attach_type);
>> link->cgroup = cgrp;
>> link->type = attr->link_create.attach_type;
>>
>> diff --git a/kernel/bpf/net_namespace.c b/kernel/bpf/net_namespace.c
>> index 868cc2c4389..63702c86275 100644
>> --- a/kernel/bpf/net_namespace.c
>> +++ b/kernel/bpf/net_namespace.c
>> @@ -501,7 +501,7 @@ int netns_bpf_link_create(const union bpf_attr *attr, struct bpf_prog *prog)
>> goto out_put_net;
>> }
>> bpf_link_init(&net_link->link, BPF_LINK_TYPE_NETNS,
>> - &bpf_netns_link_ops, prog);
>> + &bpf_netns_link_ops, prog, type);
>> net_link->net = net;
>> net_link->type = type;
>> net_link->netns_type = netns_type;
>> diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
>> index 7db7182a305..14883b3040a 100644
>> --- a/kernel/bpf/syscall.c
>> +++ b/kernel/bpf/syscall.c
>> @@ -3069,7 +3069,7 @@ static int bpf_obj_get(const union bpf_attr *attr)
>> */
>> void bpf_link_init_sleepable(struct bpf_link *link, enum bpf_link_type type,
>> const struct bpf_link_ops *ops, struct bpf_prog *prog,
>> - bool sleepable)
>> + bool sleepable, enum bpf_attach_type attach_type)
>> {
>> WARN_ON(ops->dealloc && ops->dealloc_deferred);
>> atomic64_set(&link->refcnt, 1);
>> @@ -3078,12 +3078,14 @@ void bpf_link_init_sleepable(struct bpf_link *link, enum bpf_link_type type,
>> link->id = 0;
>> link->ops = ops;
>> link->prog = prog;
>> + link->attach_type = attach_type;
>> }
>>
>> void bpf_link_init(struct bpf_link *link, enum bpf_link_type type,
>> - const struct bpf_link_ops *ops, struct bpf_prog *prog)
>> + const struct bpf_link_ops *ops, struct bpf_prog *prog,
>> + enum bpf_attach_type attach_type)
>> {
>> - bpf_link_init_sleepable(link, type, ops, prog, false);
>> + bpf_link_init_sleepable(link, type, ops, prog, false, attach_type);
>> }
>>
>> static void bpf_link_free_id(int id)
>> @@ -3443,7 +3445,8 @@ static const struct bpf_link_ops bpf_tracing_link_lops = {
>> static int bpf_tracing_prog_attach(struct bpf_prog *prog,
>> int tgt_prog_fd,
>> u32 btf_id,
>> - u64 bpf_cookie)
>> + u64 bpf_cookie,
>> + enum bpf_attach_type attach_type)
>> {
>> struct bpf_link_primer link_primer;
>> struct bpf_prog *tgt_prog = NULL;
>> @@ -3511,7 +3514,8 @@ static int bpf_tracing_prog_attach(struct bpf_prog *prog,
>> goto out_put_prog;
>> }
>> bpf_link_init(&link->link.link, BPF_LINK_TYPE_TRACING,
>> - &bpf_tracing_link_lops, prog);
>> + &bpf_tracing_link_lops, prog, attach_type);
>> +
>> link->attach_type = prog->expected_attach_type;
>> link->link.cookie = bpf_cookie;
>>
>> @@ -4049,7 +4053,8 @@ static int bpf_perf_link_attach(const union bpf_attr *attr, struct bpf_prog *pro
>> err = -ENOMEM;
>> goto out_put_file;
>> }
>> - bpf_link_init(&link->link, BPF_LINK_TYPE_PERF_EVENT, &bpf_perf_link_lops, prog);
>> + bpf_link_init(&link->link, BPF_LINK_TYPE_PERF_EVENT, &bpf_perf_link_lops, prog,
>> + attr->link_create.attach_type);
>> link->perf_file = perf_file;
>>
>> err = bpf_link_prime(&link->link, &link_primer);
>> @@ -4081,7 +4086,8 @@ static int bpf_perf_link_attach(const union bpf_attr *attr, struct bpf_prog *pro
>> #endif /* CONFIG_PERF_EVENTS */
>>
>> static int bpf_raw_tp_link_attach(struct bpf_prog *prog,
>> - const char __user *user_tp_name, u64 cookie)
>> + const char __user *user_tp_name, u64 cookie,
>> + enum bpf_attach_type attach_type)
>> {
>> struct bpf_link_primer link_primer;
>> struct bpf_raw_tp_link *link;
>> @@ -4104,7 +4110,7 @@ static int bpf_raw_tp_link_attach(struct bpf_prog *prog,
>> tp_name = prog->aux->attach_func_name;
>> break;
>> }
>> - return bpf_tracing_prog_attach(prog, 0, 0, 0);
>> + return bpf_tracing_prog_attach(prog, 0, 0, 0, attach_type);
>> case BPF_PROG_TYPE_RAW_TRACEPOINT:
>> case BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE:
>> if (strncpy_from_user(buf, user_tp_name, sizeof(buf) - 1) < 0)
>> @@ -4127,7 +4133,7 @@ static int bpf_raw_tp_link_attach(struct bpf_prog *prog,
>> }
>> bpf_link_init_sleepable(&link->link, BPF_LINK_TYPE_RAW_TRACEPOINT,
>> &bpf_raw_tp_link_lops, prog,
>> - tracepoint_is_faultable(btp->tp));
>> + tracepoint_is_faultable(btp->tp), attach_type);
>> link->btp = btp;
>> link->cookie = cookie;
>>
>> @@ -4168,7 +4174,7 @@ static int bpf_raw_tracepoint_open(const union bpf_attr *attr)
>>
>> tp_name = u64_to_user_ptr(attr->raw_tracepoint.name);
>> cookie = attr->raw_tracepoint.cookie;
>> - fd = bpf_raw_tp_link_attach(prog, tp_name, cookie);
>> + fd = bpf_raw_tp_link_attach(prog, tp_name, cookie, prog->expected_attach_type);
>> if (fd < 0)
>> bpf_prog_put(prog);
>> return fd;
>> @@ -5536,7 +5542,8 @@ static int link_create(union bpf_attr *attr, bpfptr_t uattr)
>> ret = bpf_tracing_prog_attach(prog,
>> attr->link_create.target_fd,
>> attr->link_create.target_btf_id,
>> - attr->link_create.tracing.cookie);
>> + attr->link_create.tracing.cookie,
>> + attr->link_create.attach_type);
>> break;
>> case BPF_PROG_TYPE_LSM:
>> case BPF_PROG_TYPE_TRACING:
>> @@ -5545,7 +5552,8 @@ static int link_create(union bpf_attr *attr, bpfptr_t uattr)
>> goto out;
>> }
>> if (prog->expected_attach_type == BPF_TRACE_RAW_TP)
>> - ret = bpf_raw_tp_link_attach(prog, NULL, attr->link_create.tracing.cookie);
>> + ret = bpf_raw_tp_link_attach(prog, NULL, attr->link_create.tracing.cookie,
>> + attr->link_create.attach_type);
>> else if (prog->expected_attach_type == BPF_TRACE_ITER)
>> ret = bpf_iter_link_attach(attr, uattr, prog);
>> else if (prog->expected_attach_type == BPF_LSM_CGROUP)
>> @@ -5554,7 +5562,8 @@ static int link_create(union bpf_attr *attr, bpfptr_t uattr)
>> ret = bpf_tracing_prog_attach(prog,
>> attr->link_create.target_fd,
>> attr->link_create.target_btf_id,
>> - attr->link_create.tracing.cookie);
>> + attr->link_create.tracing.cookie,
>> + attr->link_create.attach_type);
>> break;
>> case BPF_PROG_TYPE_FLOW_DISSECTOR:
>> case BPF_PROG_TYPE_SK_LOOKUP:
>> diff --git a/kernel/bpf/tcx.c b/kernel/bpf/tcx.c
>> index 2e4885e7781..e6a14f408d9 100644
>> --- a/kernel/bpf/tcx.c
>> +++ b/kernel/bpf/tcx.c
>> @@ -301,7 +301,8 @@ static int tcx_link_init(struct tcx_link *tcx,
>> struct net_device *dev,
>> struct bpf_prog *prog)
>> {
>> - bpf_link_init(&tcx->link, BPF_LINK_TYPE_TCX, &tcx_link_lops, prog);
>> + bpf_link_init(&tcx->link, BPF_LINK_TYPE_TCX, &tcx_link_lops, prog,
>> + attr->link_create.attach_type);
>> tcx->location = attr->link_create.attach_type;
>> tcx->dev = dev;
>> return bpf_link_prime(&tcx->link, link_primer);
>> diff --git a/kernel/bpf/trampoline.c b/kernel/bpf/trampoline.c
>> index b1e358c16ee..0e364614c3a 100644
>> --- a/kernel/bpf/trampoline.c
>> +++ b/kernel/bpf/trampoline.c
>> @@ -674,7 +674,8 @@ static const struct bpf_link_ops bpf_shim_tramp_link_lops = {
>>
>> static struct bpf_shim_tramp_link *cgroup_shim_alloc(const struct bpf_prog *prog,
>> bpf_func_t bpf_func,
>> - int cgroup_atype)
>> + int cgroup_atype,
>> + enum bpf_attach_type attach_type)
>> {
>> struct bpf_shim_tramp_link *shim_link = NULL;
>> struct bpf_prog *p;
>> @@ -701,7 +702,7 @@ static struct bpf_shim_tramp_link *cgroup_shim_alloc(const struct bpf_prog *prog
>> p->expected_attach_type = BPF_LSM_MAC;
>> bpf_prog_inc(p);
>> bpf_link_init(&shim_link->link.link, BPF_LINK_TYPE_UNSPEC,
>> - &bpf_shim_tramp_link_lops, p);
>> + &bpf_shim_tramp_link_lops, p, attach_type);
>> bpf_cgroup_atype_get(p->aux->attach_btf_id, cgroup_atype);
>>
>> return shim_link;
>> @@ -726,7 +727,8 @@ static struct bpf_shim_tramp_link *cgroup_shim_find(struct bpf_trampoline *tr,
>> }
>>
>> int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,
>> - int cgroup_atype)
>> + int cgroup_atype,
>> + enum bpf_attach_type attach_type)
>> {
>> struct bpf_shim_tramp_link *shim_link = NULL;
>> struct bpf_attach_target_info tgt_info = {};
>> @@ -763,7 +765,7 @@ int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog,
>>
>> /* Allocate and install new shim. */
>>
>> - shim_link = cgroup_shim_alloc(prog, bpf_func, cgroup_atype);
>> + shim_link = cgroup_shim_alloc(prog, bpf_func, cgroup_atype, attach_type);
>> if (!shim_link) {
>> err = -ENOMEM;
>> goto err;
>> diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
>> index e7f97a9a8bb..ffdde840abb 100644
>> --- a/kernel/trace/bpf_trace.c
>> +++ b/kernel/trace/bpf_trace.c
>> @@ -2986,7 +2986,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr
>> }
>>
>> bpf_link_init(&link->link, BPF_LINK_TYPE_KPROBE_MULTI,
>> - &bpf_kprobe_multi_link_lops, prog);
>> + &bpf_kprobe_multi_link_lops, prog, attr->link_create.attach_type);
>>
>> err = bpf_link_prime(&link->link, &link_primer);
>> if (err)
>> @@ -3441,7 +3441,7 @@ int bpf_uprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr
>> link->link.flags = flags;
>>
>> bpf_link_init(&link->link, BPF_LINK_TYPE_UPROBE_MULTI,
>> - &bpf_uprobe_multi_link_lops, prog);
>> + &bpf_uprobe_multi_link_lops, prog, attr->link_create.attach_type);
>>
>> for (i = 0; i < cnt; i++) {
>> uprobes[i].uprobe = uprobe_register(d_real_inode(link->path.dentry),
>> diff --git a/net/bpf/bpf_dummy_struct_ops.c b/net/bpf/bpf_dummy_struct_ops.c
>> index f71f67c6896..812457819b5 100644
>> --- a/net/bpf/bpf_dummy_struct_ops.c
>> +++ b/net/bpf/bpf_dummy_struct_ops.c
>> @@ -171,7 +171,8 @@ int bpf_struct_ops_test_run(struct bpf_prog *prog, const union bpf_attr *kattr,
>> }
>> /* prog doesn't take the ownership of the reference from caller */
>> bpf_prog_inc(prog);
>> - bpf_link_init(&link->link, BPF_LINK_TYPE_STRUCT_OPS, &bpf_struct_ops_link_lops, prog);
>> + bpf_link_init(&link->link, BPF_LINK_TYPE_STRUCT_OPS, &bpf_struct_ops_link_lops, prog,
>> + prog->expected_attach_type);
>>
>> op_idx = prog->expected_attach_type;
>> err = bpf_struct_ops_prepare_trampoline(tlinks, link,
>> diff --git a/net/core/dev.c b/net/core/dev.c
>> index be97c440ecd..7969fddc94e 100644
>> --- a/net/core/dev.c
>> +++ b/net/core/dev.c
>> @@ -10364,7 +10364,8 @@ int bpf_xdp_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)
>> goto unlock;
>> }
>>
>> - bpf_link_init(&link->link, BPF_LINK_TYPE_XDP, &bpf_xdp_link_lops, prog);
>> + bpf_link_init(&link->link, BPF_LINK_TYPE_XDP, &bpf_xdp_link_lops, prog,
>> + attr->link_create.attach_type);
>> link->dev = dev;
>> link->flags = attr->link_create.flags;
>>
>> diff --git a/net/core/sock_map.c b/net/core/sock_map.c
>> index 82a14f131d0..fbe9a33ddf1 100644
>> --- a/net/core/sock_map.c
>> +++ b/net/core/sock_map.c
>> @@ -1866,7 +1866,8 @@ int sock_map_link_create(const union bpf_attr *attr, struct bpf_prog *prog)
>> }
>>
>> attach_type = attr->link_create.attach_type;
>> - bpf_link_init(&sockmap_link->link, BPF_LINK_TYPE_SOCKMAP, &sock_map_link_ops, prog);
>> + bpf_link_init(&sockmap_link->link, BPF_LINK_TYPE_SOCKMAP, &sock_map_link_ops, prog,
>> + attach_type);
>> sockmap_link->map = map;
>> sockmap_link->attach_type = attach_type;
>>
>> diff --git a/net/netfilter/nf_bpf_link.c b/net/netfilter/nf_bpf_link.c
>> index 06b08484470..a054d3b216d 100644
>> --- a/net/netfilter/nf_bpf_link.c
>> +++ b/net/netfilter/nf_bpf_link.c
>> @@ -225,7 +225,8 @@ int bpf_nf_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)
>> if (!link)
>> return -ENOMEM;
>>
>> - bpf_link_init(&link->link, BPF_LINK_TYPE_NETFILTER, &bpf_nf_link_lops, prog);
>> + bpf_link_init(&link->link, BPF_LINK_TYPE_NETFILTER, &bpf_nf_link_lops, prog,
>> + attr->link_create.attach_type);
>>
>> link->hook_ops.hook = nf_hook_run_bpf;
>> link->hook_ops.hook_ops_type = NF_HOOK_OP_BPF;
>> --
>> 2.48.1
>>
--
Best Regards
Tao Chen
© 2016 - 2025 Red Hat, Inc.