| Message ID | 20211103220845.2676888-8-andrii@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | BPF |
| Headers | show |
| Series | libbpf: add unified bpf_prog_load() low-level API | expand |
On 11/3/21 6:08 PM, Andrii Nakryiko wrote: > This deprecation annotation has no effect because for struct deprecation > attribute has to be declared after struct definition. But instead of > moving it to the end of struct definition, remove it. When deprecation > will go in effect at libbpf v0.7, this deprecation attribute will cause > libbpf's own source code compilation to trigger deprecation warnings, > which is unavoidable because libbpf still has to support that API. > > So keep deprecation of APIs, but don't mark structs used in API as > deprecated. > > Fixes: e21d585cb3db ("libbpf: Deprecate multi-instance bpf_program APIs") > Signed-off-by: Andrii Nakryiko <andrii@kernel.org> > --- Acked-by: Dave Marchevsky <davemarchevsky@fb.com> > tools/lib/bpf/libbpf.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h > index bbc828667b22..039058763173 100644 > --- a/tools/lib/bpf/libbpf.h > +++ b/tools/lib/bpf/libbpf.h > @@ -431,7 +431,6 @@ bpf_program__attach_iter(const struct bpf_program *prog, > * one instance. In this case bpf_program__fd(prog) is equal to > * bpf_program__nth_fd(prog, 0). > */ > -LIBBPF_DEPRECATED_SINCE(0, 7, "use bpf_program__insns() for getting bpf_program instructions") > struct bpf_prog_prep_result { > /* > * If not NULL, load new instruction array. >
diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index bbc828667b22..039058763173 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -431,7 +431,6 @@ bpf_program__attach_iter(const struct bpf_program *prog, * one instance. In this case bpf_program__fd(prog) is equal to * bpf_program__nth_fd(prog, 0). */ -LIBBPF_DEPRECATED_SINCE(0, 7, "use bpf_program__insns() for getting bpf_program instructions") struct bpf_prog_prep_result { /* * If not NULL, load new instruction array.
This deprecation annotation has no effect because for struct deprecation attribute has to be declared after struct definition. But instead of moving it to the end of struct definition, remove it. When deprecation will go in effect at libbpf v0.7, this deprecation attribute will cause libbpf's own source code compilation to trigger deprecation warnings, which is unavoidable because libbpf still has to support that API. So keep deprecation of APIs, but don't mark structs used in API as deprecated. Fixes: e21d585cb3db ("libbpf: Deprecate multi-instance bpf_program APIs") Signed-off-by: Andrii Nakryiko <andrii@kernel.org> --- tools/lib/bpf/libbpf.h | 1 - 1 file changed, 1 deletion(-)