* [PATCH bpf-next] libbpf: deprecate xdp_cpumap and xdp_devmap sec definitions
@ 2022-01-27 12:12 Lorenzo Bianconi
2022-01-27 15:37 ` Toke Høiland-Jørgensen
0 siblings, 1 reply; 5+ messages in thread
From: Lorenzo Bianconi @ 2022-01-27 12:12 UTC (permalink / raw)
To: bpf
Cc: ast, daniel, dsahern, brouer, toke, lorenzo.bianconi, andrii,
john.fastabend
Deprecate xdp_cpumap xdp_devmap sec definitions.
Introduce xdp/devmap and xdp/cpumap definitions according to the standard
for SEC("") in libbpf:
- prog_type.prog_flags/attach_place
Update cpumap/devmap samples and kselftests
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
samples/bpf/xdp_redirect_cpu.bpf.c | 8 ++++----
samples/bpf/xdp_redirect_map.bpf.c | 2 +-
samples/bpf/xdp_redirect_map_multi.bpf.c | 2 +-
tools/lib/bpf/libbpf.c | 12 ++++++++++--
.../bpf/progs/test_xdp_with_cpumap_frags_helpers.c | 2 +-
.../bpf/progs/test_xdp_with_cpumap_helpers.c | 2 +-
.../bpf/progs/test_xdp_with_devmap_frags_helpers.c | 2 +-
.../bpf/progs/test_xdp_with_devmap_helpers.c | 2 +-
.../selftests/bpf/progs/xdp_redirect_multi_kern.c | 2 +-
9 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/samples/bpf/xdp_redirect_cpu.bpf.c b/samples/bpf/xdp_redirect_cpu.bpf.c
index 25e3a405375f..87c54bfdbb70 100644
--- a/samples/bpf/xdp_redirect_cpu.bpf.c
+++ b/samples/bpf/xdp_redirect_cpu.bpf.c
@@ -491,7 +491,7 @@ int xdp_prognum5_lb_hash_ip_pairs(struct xdp_md *ctx)
return bpf_redirect_map(&cpu_map, cpu_dest, 0);
}
-SEC("xdp_cpumap/redirect")
+SEC("xdp/cpumap")
int xdp_redirect_cpu_devmap(struct xdp_md *ctx)
{
void *data_end = (void *)(long)ctx->data_end;
@@ -507,19 +507,19 @@ int xdp_redirect_cpu_devmap(struct xdp_md *ctx)
return bpf_redirect_map(&tx_port, 0, 0);
}
-SEC("xdp_cpumap/pass")
+SEC("xdp/cpumap")
int xdp_redirect_cpu_pass(struct xdp_md *ctx)
{
return XDP_PASS;
}
-SEC("xdp_cpumap/drop")
+SEC("xdp/cpumap")
int xdp_redirect_cpu_drop(struct xdp_md *ctx)
{
return XDP_DROP;
}
-SEC("xdp_devmap/egress")
+SEC("xdp/devmap")
int xdp_redirect_egress_prog(struct xdp_md *ctx)
{
void *data_end = (void *)(long)ctx->data_end;
diff --git a/samples/bpf/xdp_redirect_map.bpf.c b/samples/bpf/xdp_redirect_map.bpf.c
index 59efd656e1b2..415bac1758e3 100644
--- a/samples/bpf/xdp_redirect_map.bpf.c
+++ b/samples/bpf/xdp_redirect_map.bpf.c
@@ -68,7 +68,7 @@ int xdp_redirect_map_native(struct xdp_md *ctx)
return xdp_redirect_map(ctx, &tx_port_native);
}
-SEC("xdp_devmap/egress")
+SEC("xdp/devmap")
int xdp_redirect_map_egress(struct xdp_md *ctx)
{
void *data_end = (void *)(long)ctx->data_end;
diff --git a/samples/bpf/xdp_redirect_map_multi.bpf.c b/samples/bpf/xdp_redirect_map_multi.bpf.c
index bb0a5a3bfcf0..8b2fd4ec2c76 100644
--- a/samples/bpf/xdp_redirect_map_multi.bpf.c
+++ b/samples/bpf/xdp_redirect_map_multi.bpf.c
@@ -53,7 +53,7 @@ int xdp_redirect_map_native(struct xdp_md *ctx)
return xdp_redirect_map(ctx, &forward_map_native);
}
-SEC("xdp_devmap/egress")
+SEC("xdp/devmap")
int xdp_devmap_prog(struct xdp_md *ctx)
{
void *data_end = (void *)(long)ctx->data_end;
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 4ce94f4ed34a..1d97bc346be6 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -237,6 +237,8 @@ enum sec_def_flags {
SEC_SLOPPY_PFX = 16,
/* BPF program support non-linear XDP buffer */
SEC_XDP_FRAGS = 32,
+ /* deprecated sec definitions not supposed to be used */
+ SEC_DEPRECATED = 64,
};
struct bpf_sec_def {
@@ -6575,6 +6577,10 @@ static int libbpf_preload_prog(struct bpf_program *prog,
if (prog->type == BPF_PROG_TYPE_XDP && (def & SEC_XDP_FRAGS))
opts->prog_flags |= BPF_F_XDP_HAS_FRAGS;
+ if (def & SEC_DEPRECATED)
+ pr_warn("sec '%s' is deprecated, please use new version instead\n",
+ prog->sec_name);
+
if ((prog->type == BPF_PROG_TYPE_TRACING ||
prog->type == BPF_PROG_TYPE_LSM ||
prog->type == BPF_PROG_TYPE_EXT) && !prog->attach_btf_id) {
@@ -8618,9 +8624,11 @@ static const struct bpf_sec_def section_defs[] = {
SEC_DEF("iter.s/", TRACING, BPF_TRACE_ITER, SEC_ATTACH_BTF | SEC_SLEEPABLE, attach_iter),
SEC_DEF("syscall", SYSCALL, 0, SEC_SLEEPABLE),
SEC_DEF("xdp.frags/devmap", XDP, BPF_XDP_DEVMAP, SEC_XDP_FRAGS),
- SEC_DEF("xdp_devmap/", XDP, BPF_XDP_DEVMAP, SEC_ATTACHABLE),
+ SEC_DEF("xdp/devmap", XDP, BPF_XDP_DEVMAP, SEC_ATTACHABLE),
+ SEC_DEF("xdp_devmap/", XDP, BPF_XDP_DEVMAP, SEC_ATTACHABLE | SEC_DEPRECATED),
SEC_DEF("xdp.frags/cpumap", XDP, BPF_XDP_CPUMAP, SEC_XDP_FRAGS),
- SEC_DEF("xdp_cpumap/", XDP, BPF_XDP_CPUMAP, SEC_ATTACHABLE),
+ SEC_DEF("xdp/cpumap", XDP, BPF_XDP_CPUMAP, SEC_ATTACHABLE),
+ SEC_DEF("xdp_cpumap/", XDP, BPF_XDP_CPUMAP, SEC_ATTACHABLE | SEC_DEPRECATED),
SEC_DEF("xdp.frags", XDP, BPF_XDP, SEC_XDP_FRAGS),
SEC_DEF("xdp", XDP, BPF_XDP, SEC_ATTACHABLE_OPT | SEC_SLOPPY_PFX),
SEC_DEF("perf_event", PERF_EVENT, 0, SEC_NONE | SEC_SLOPPY_PFX),
diff --git a/tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_frags_helpers.c b/tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_frags_helpers.c
index 62fb7cd4d87a..97ed625bb70a 100644
--- a/tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_frags_helpers.c
+++ b/tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_frags_helpers.c
@@ -12,7 +12,7 @@ struct {
__uint(max_entries, 4);
} cpu_map SEC(".maps");
-SEC("xdp_cpumap/dummy_cm")
+SEC("xdp/cpumap")
int xdp_dummy_cm(struct xdp_md *ctx)
{
return XDP_PASS;
diff --git a/tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_helpers.c b/tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_helpers.c
index 48007f17dfa8..20ec6723df18 100644
--- a/tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_helpers.c
+++ b/tools/testing/selftests/bpf/progs/test_xdp_with_cpumap_helpers.c
@@ -24,7 +24,7 @@ int xdp_dummy_prog(struct xdp_md *ctx)
return XDP_PASS;
}
-SEC("xdp_cpumap/dummy_cm")
+SEC("xdp/cpumap")
int xdp_dummy_cm(struct xdp_md *ctx)
{
if (ctx->ingress_ifindex == IFINDEX_LO)
diff --git a/tools/testing/selftests/bpf/progs/test_xdp_with_devmap_frags_helpers.c b/tools/testing/selftests/bpf/progs/test_xdp_with_devmap_frags_helpers.c
index e1caf510b7d2..cdcf7de7ec8c 100644
--- a/tools/testing/selftests/bpf/progs/test_xdp_with_devmap_frags_helpers.c
+++ b/tools/testing/selftests/bpf/progs/test_xdp_with_devmap_frags_helpers.c
@@ -12,7 +12,7 @@ struct {
/* valid program on DEVMAP entry via SEC name;
* has access to egress and ingress ifindex
*/
-SEC("xdp_devmap/map_prog")
+SEC("xdp/devmap")
int xdp_dummy_dm(struct xdp_md *ctx)
{
return XDP_PASS;
diff --git a/tools/testing/selftests/bpf/progs/test_xdp_with_devmap_helpers.c b/tools/testing/selftests/bpf/progs/test_xdp_with_devmap_helpers.c
index 8ae11fab8316..4139a14f9996 100644
--- a/tools/testing/selftests/bpf/progs/test_xdp_with_devmap_helpers.c
+++ b/tools/testing/selftests/bpf/progs/test_xdp_with_devmap_helpers.c
@@ -27,7 +27,7 @@ int xdp_dummy_prog(struct xdp_md *ctx)
/* valid program on DEVMAP entry via SEC name;
* has access to egress and ingress ifindex
*/
-SEC("xdp_devmap/map_prog")
+SEC("xdp/devmap")
int xdp_dummy_dm(struct xdp_md *ctx)
{
char fmt[] = "devmap redirect: dev %u -> dev %u len %u\n";
diff --git a/tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c b/tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c
index 8395782b6e0a..97b26a30b59a 100644
--- a/tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c
+++ b/tools/testing/selftests/bpf/progs/xdp_redirect_multi_kern.c
@@ -70,7 +70,7 @@ int xdp_redirect_map_all_prog(struct xdp_md *ctx)
BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS);
}
-SEC("xdp_devmap/map_prog")
+SEC("xdp/devmap")
int xdp_devmap_prog(struct xdp_md *ctx)
{
void *data_end = (void *)(long)ctx->data_end;
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH bpf-next] libbpf: deprecate xdp_cpumap and xdp_devmap sec definitions
2022-01-27 12:12 [PATCH bpf-next] libbpf: deprecate xdp_cpumap and xdp_devmap sec definitions Lorenzo Bianconi
@ 2022-01-27 15:37 ` Toke Høiland-Jørgensen
2022-01-27 17:08 ` Andrii Nakryiko
0 siblings, 1 reply; 5+ messages in thread
From: Toke Høiland-Jørgensen @ 2022-01-27 15:37 UTC (permalink / raw)
To: Lorenzo Bianconi, bpf
Cc: ast, daniel, dsahern, brouer, lorenzo.bianconi, andrii, john.fastabend
Lorenzo Bianconi <lorenzo@kernel.org> writes:
> Deprecate xdp_cpumap xdp_devmap sec definitions.
> Introduce xdp/devmap and xdp/cpumap definitions according to the standard
> for SEC("") in libbpf:
> - prog_type.prog_flags/attach_place
> Update cpumap/devmap samples and kselftests
>
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> ---
> samples/bpf/xdp_redirect_cpu.bpf.c | 8 ++++----
> samples/bpf/xdp_redirect_map.bpf.c | 2 +-
> samples/bpf/xdp_redirect_map_multi.bpf.c | 2 +-
> tools/lib/bpf/libbpf.c | 12 ++++++++++--
> .../bpf/progs/test_xdp_with_cpumap_frags_helpers.c | 2 +-
> .../bpf/progs/test_xdp_with_cpumap_helpers.c | 2 +-
> .../bpf/progs/test_xdp_with_devmap_frags_helpers.c | 2 +-
> .../bpf/progs/test_xdp_with_devmap_helpers.c | 2 +-
> .../selftests/bpf/progs/xdp_redirect_multi_kern.c | 2 +-
> 9 files changed, 21 insertions(+), 13 deletions(-)
>
> diff --git a/samples/bpf/xdp_redirect_cpu.bpf.c b/samples/bpf/xdp_redirect_cpu.bpf.c
> index 25e3a405375f..87c54bfdbb70 100644
> --- a/samples/bpf/xdp_redirect_cpu.bpf.c
> +++ b/samples/bpf/xdp_redirect_cpu.bpf.c
> @@ -491,7 +491,7 @@ int xdp_prognum5_lb_hash_ip_pairs(struct xdp_md *ctx)
> return bpf_redirect_map(&cpu_map, cpu_dest, 0);
> }
>
> -SEC("xdp_cpumap/redirect")
> +SEC("xdp/cpumap")
> int xdp_redirect_cpu_devmap(struct xdp_md *ctx)
> {
> void *data_end = (void *)(long)ctx->data_end;
> @@ -507,19 +507,19 @@ int xdp_redirect_cpu_devmap(struct xdp_md *ctx)
> return bpf_redirect_map(&tx_port, 0, 0);
> }
>
> -SEC("xdp_cpumap/pass")
> +SEC("xdp/cpumap")
> int xdp_redirect_cpu_pass(struct xdp_md *ctx)
> {
> return XDP_PASS;
> }
>
> -SEC("xdp_cpumap/drop")
> +SEC("xdp/cpumap")
> int xdp_redirect_cpu_drop(struct xdp_md *ctx)
> {
> return XDP_DROP;
> }
>
> -SEC("xdp_devmap/egress")
> +SEC("xdp/devmap")
> int xdp_redirect_egress_prog(struct xdp_md *ctx)
> {
> void *data_end = (void *)(long)ctx->data_end;
> diff --git a/samples/bpf/xdp_redirect_map.bpf.c b/samples/bpf/xdp_redirect_map.bpf.c
> index 59efd656e1b2..415bac1758e3 100644
> --- a/samples/bpf/xdp_redirect_map.bpf.c
> +++ b/samples/bpf/xdp_redirect_map.bpf.c
> @@ -68,7 +68,7 @@ int xdp_redirect_map_native(struct xdp_md *ctx)
> return xdp_redirect_map(ctx, &tx_port_native);
> }
>
> -SEC("xdp_devmap/egress")
> +SEC("xdp/devmap")
> int xdp_redirect_map_egress(struct xdp_md *ctx)
> {
> void *data_end = (void *)(long)ctx->data_end;
> diff --git a/samples/bpf/xdp_redirect_map_multi.bpf.c b/samples/bpf/xdp_redirect_map_multi.bpf.c
> index bb0a5a3bfcf0..8b2fd4ec2c76 100644
> --- a/samples/bpf/xdp_redirect_map_multi.bpf.c
> +++ b/samples/bpf/xdp_redirect_map_multi.bpf.c
> @@ -53,7 +53,7 @@ int xdp_redirect_map_native(struct xdp_md *ctx)
> return xdp_redirect_map(ctx, &forward_map_native);
> }
>
> -SEC("xdp_devmap/egress")
> +SEC("xdp/devmap")
> int xdp_devmap_prog(struct xdp_md *ctx)
> {
> void *data_end = (void *)(long)ctx->data_end;
> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> index 4ce94f4ed34a..1d97bc346be6 100644
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@ -237,6 +237,8 @@ enum sec_def_flags {
> SEC_SLOPPY_PFX = 16,
> /* BPF program support non-linear XDP buffer */
> SEC_XDP_FRAGS = 32,
> + /* deprecated sec definitions not supposed to be used */
> + SEC_DEPRECATED = 64,
> };
>
> struct bpf_sec_def {
> @@ -6575,6 +6577,10 @@ static int libbpf_preload_prog(struct bpf_program *prog,
> if (prog->type == BPF_PROG_TYPE_XDP && (def & SEC_XDP_FRAGS))
> opts->prog_flags |= BPF_F_XDP_HAS_FRAGS;
>
> + if (def & SEC_DEPRECATED)
> + pr_warn("sec '%s' is deprecated, please use new version instead\n",
> + prog->sec_name);
> +
How is the user supposed to figure out what "the new version" is?
-Toke
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH bpf-next] libbpf: deprecate xdp_cpumap and xdp_devmap sec definitions
2022-01-27 15:37 ` Toke Høiland-Jørgensen
@ 2022-01-27 17:08 ` Andrii Nakryiko
2022-01-27 17:24 ` Lorenzo Bianconi
0 siblings, 1 reply; 5+ messages in thread
From: Andrii Nakryiko @ 2022-01-27 17:08 UTC (permalink / raw)
To: Toke Høiland-Jørgensen
Cc: Lorenzo Bianconi, bpf, Alexei Starovoitov, Daniel Borkmann,
David Ahern, Jesper Dangaard Brouer, Lorenzo Bianconi,
Andrii Nakryiko, john fastabend
On Thu, Jan 27, 2022 at 7:37 AM Toke Høiland-Jørgensen <toke@redhat.com> wrote:
>
> Lorenzo Bianconi <lorenzo@kernel.org> writes:
>
> > Deprecate xdp_cpumap xdp_devmap sec definitions.
> > Introduce xdp/devmap and xdp/cpumap definitions according to the standard
> > for SEC("") in libbpf:
> > - prog_type.prog_flags/attach_place
> > Update cpumap/devmap samples and kselftests
> >
> > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> > ---
> > samples/bpf/xdp_redirect_cpu.bpf.c | 8 ++++----
> > samples/bpf/xdp_redirect_map.bpf.c | 2 +-
> > samples/bpf/xdp_redirect_map_multi.bpf.c | 2 +-
> > tools/lib/bpf/libbpf.c | 12 ++++++++++--
> > .../bpf/progs/test_xdp_with_cpumap_frags_helpers.c | 2 +-
> > .../bpf/progs/test_xdp_with_cpumap_helpers.c | 2 +-
> > .../bpf/progs/test_xdp_with_devmap_frags_helpers.c | 2 +-
> > .../bpf/progs/test_xdp_with_devmap_helpers.c | 2 +-
> > .../selftests/bpf/progs/xdp_redirect_multi_kern.c | 2 +-
> > 9 files changed, 21 insertions(+), 13 deletions(-)
> >
> > diff --git a/samples/bpf/xdp_redirect_cpu.bpf.c b/samples/bpf/xdp_redirect_cpu.bpf.c
> > index 25e3a405375f..87c54bfdbb70 100644
> > --- a/samples/bpf/xdp_redirect_cpu.bpf.c
> > +++ b/samples/bpf/xdp_redirect_cpu.bpf.c
> > @@ -491,7 +491,7 @@ int xdp_prognum5_lb_hash_ip_pairs(struct xdp_md *ctx)
> > return bpf_redirect_map(&cpu_map, cpu_dest, 0);
> > }
> >
> > -SEC("xdp_cpumap/redirect")
> > +SEC("xdp/cpumap")
> > int xdp_redirect_cpu_devmap(struct xdp_md *ctx)
> > {
> > void *data_end = (void *)(long)ctx->data_end;
> > @@ -507,19 +507,19 @@ int xdp_redirect_cpu_devmap(struct xdp_md *ctx)
> > return bpf_redirect_map(&tx_port, 0, 0);
> > }
> >
> > -SEC("xdp_cpumap/pass")
> > +SEC("xdp/cpumap")
> > int xdp_redirect_cpu_pass(struct xdp_md *ctx)
> > {
> > return XDP_PASS;
> > }
> >
> > -SEC("xdp_cpumap/drop")
> > +SEC("xdp/cpumap")
> > int xdp_redirect_cpu_drop(struct xdp_md *ctx)
> > {
> > return XDP_DROP;
> > }
> >
> > -SEC("xdp_devmap/egress")
> > +SEC("xdp/devmap")
> > int xdp_redirect_egress_prog(struct xdp_md *ctx)
> > {
> > void *data_end = (void *)(long)ctx->data_end;
> > diff --git a/samples/bpf/xdp_redirect_map.bpf.c b/samples/bpf/xdp_redirect_map.bpf.c
> > index 59efd656e1b2..415bac1758e3 100644
> > --- a/samples/bpf/xdp_redirect_map.bpf.c
> > +++ b/samples/bpf/xdp_redirect_map.bpf.c
> > @@ -68,7 +68,7 @@ int xdp_redirect_map_native(struct xdp_md *ctx)
> > return xdp_redirect_map(ctx, &tx_port_native);
> > }
> >
> > -SEC("xdp_devmap/egress")
> > +SEC("xdp/devmap")
> > int xdp_redirect_map_egress(struct xdp_md *ctx)
> > {
> > void *data_end = (void *)(long)ctx->data_end;
> > diff --git a/samples/bpf/xdp_redirect_map_multi.bpf.c b/samples/bpf/xdp_redirect_map_multi.bpf.c
> > index bb0a5a3bfcf0..8b2fd4ec2c76 100644
> > --- a/samples/bpf/xdp_redirect_map_multi.bpf.c
> > +++ b/samples/bpf/xdp_redirect_map_multi.bpf.c
> > @@ -53,7 +53,7 @@ int xdp_redirect_map_native(struct xdp_md *ctx)
> > return xdp_redirect_map(ctx, &forward_map_native);
> > }
> >
> > -SEC("xdp_devmap/egress")
> > +SEC("xdp/devmap")
> > int xdp_devmap_prog(struct xdp_md *ctx)
> > {
> > void *data_end = (void *)(long)ctx->data_end;
> > diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> > index 4ce94f4ed34a..1d97bc346be6 100644
> > --- a/tools/lib/bpf/libbpf.c
> > +++ b/tools/lib/bpf/libbpf.c
> > @@ -237,6 +237,8 @@ enum sec_def_flags {
> > SEC_SLOPPY_PFX = 16,
> > /* BPF program support non-linear XDP buffer */
> > SEC_XDP_FRAGS = 32,
> > + /* deprecated sec definitions not supposed to be used */
> > + SEC_DEPRECATED = 64,
> > };
> >
> > struct bpf_sec_def {
> > @@ -6575,6 +6577,10 @@ static int libbpf_preload_prog(struct bpf_program *prog,
> > if (prog->type == BPF_PROG_TYPE_XDP && (def & SEC_XDP_FRAGS))
> > opts->prog_flags |= BPF_F_XDP_HAS_FRAGS;
> >
> > + if (def & SEC_DEPRECATED)
> > + pr_warn("sec '%s' is deprecated, please use new version instead\n",
> > + prog->sec_name);
> > +
>
> How is the user supposed to figure out what "the new version" is?
Let's add the section to
https://github.com/libbpf/libbpf/wiki/Libbpf-1.0-migration-guide and
link to it from the deprecation warning.
>
> -Toke
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH bpf-next] libbpf: deprecate xdp_cpumap and xdp_devmap sec definitions
2022-01-27 17:08 ` Andrii Nakryiko
@ 2022-01-27 17:24 ` Lorenzo Bianconi
2022-02-01 0:53 ` Andrii Nakryiko
0 siblings, 1 reply; 5+ messages in thread
From: Lorenzo Bianconi @ 2022-01-27 17:24 UTC (permalink / raw)
To: Andrii Nakryiko
Cc: Toke Høiland-Jørgensen, bpf, Alexei Starovoitov,
Daniel Borkmann, David Ahern, Jesper Dangaard Brouer,
Lorenzo Bianconi, Andrii Nakryiko, john fastabend
[-- Attachment #1: Type: text/plain, Size: 4978 bytes --]
> On Thu, Jan 27, 2022 at 7:37 AM Toke Høiland-Jørgensen <toke@redhat.com> wrote:
> >
> > Lorenzo Bianconi <lorenzo@kernel.org> writes:
> >
> > > Deprecate xdp_cpumap xdp_devmap sec definitions.
> > > Introduce xdp/devmap and xdp/cpumap definitions according to the standard
> > > for SEC("") in libbpf:
> > > - prog_type.prog_flags/attach_place
> > > Update cpumap/devmap samples and kselftests
> > >
> > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> > > ---
> > > samples/bpf/xdp_redirect_cpu.bpf.c | 8 ++++----
> > > samples/bpf/xdp_redirect_map.bpf.c | 2 +-
> > > samples/bpf/xdp_redirect_map_multi.bpf.c | 2 +-
> > > tools/lib/bpf/libbpf.c | 12 ++++++++++--
> > > .../bpf/progs/test_xdp_with_cpumap_frags_helpers.c | 2 +-
> > > .../bpf/progs/test_xdp_with_cpumap_helpers.c | 2 +-
> > > .../bpf/progs/test_xdp_with_devmap_frags_helpers.c | 2 +-
> > > .../bpf/progs/test_xdp_with_devmap_helpers.c | 2 +-
> > > .../selftests/bpf/progs/xdp_redirect_multi_kern.c | 2 +-
> > > 9 files changed, 21 insertions(+), 13 deletions(-)
> > >
> > > diff --git a/samples/bpf/xdp_redirect_cpu.bpf.c b/samples/bpf/xdp_redirect_cpu.bpf.c
> > > index 25e3a405375f..87c54bfdbb70 100644
> > > --- a/samples/bpf/xdp_redirect_cpu.bpf.c
> > > +++ b/samples/bpf/xdp_redirect_cpu.bpf.c
> > > @@ -491,7 +491,7 @@ int xdp_prognum5_lb_hash_ip_pairs(struct xdp_md *ctx)
> > > return bpf_redirect_map(&cpu_map, cpu_dest, 0);
> > > }
> > >
> > > -SEC("xdp_cpumap/redirect")
> > > +SEC("xdp/cpumap")
> > > int xdp_redirect_cpu_devmap(struct xdp_md *ctx)
> > > {
> > > void *data_end = (void *)(long)ctx->data_end;
> > > @@ -507,19 +507,19 @@ int xdp_redirect_cpu_devmap(struct xdp_md *ctx)
> > > return bpf_redirect_map(&tx_port, 0, 0);
> > > }
> > >
> > > -SEC("xdp_cpumap/pass")
> > > +SEC("xdp/cpumap")
> > > int xdp_redirect_cpu_pass(struct xdp_md *ctx)
> > > {
> > > return XDP_PASS;
> > > }
> > >
> > > -SEC("xdp_cpumap/drop")
> > > +SEC("xdp/cpumap")
> > > int xdp_redirect_cpu_drop(struct xdp_md *ctx)
> > > {
> > > return XDP_DROP;
> > > }
> > >
> > > -SEC("xdp_devmap/egress")
> > > +SEC("xdp/devmap")
> > > int xdp_redirect_egress_prog(struct xdp_md *ctx)
> > > {
> > > void *data_end = (void *)(long)ctx->data_end;
> > > diff --git a/samples/bpf/xdp_redirect_map.bpf.c b/samples/bpf/xdp_redirect_map.bpf.c
> > > index 59efd656e1b2..415bac1758e3 100644
> > > --- a/samples/bpf/xdp_redirect_map.bpf.c
> > > +++ b/samples/bpf/xdp_redirect_map.bpf.c
> > > @@ -68,7 +68,7 @@ int xdp_redirect_map_native(struct xdp_md *ctx)
> > > return xdp_redirect_map(ctx, &tx_port_native);
> > > }
> > >
> > > -SEC("xdp_devmap/egress")
> > > +SEC("xdp/devmap")
> > > int xdp_redirect_map_egress(struct xdp_md *ctx)
> > > {
> > > void *data_end = (void *)(long)ctx->data_end;
> > > diff --git a/samples/bpf/xdp_redirect_map_multi.bpf.c b/samples/bpf/xdp_redirect_map_multi.bpf.c
> > > index bb0a5a3bfcf0..8b2fd4ec2c76 100644
> > > --- a/samples/bpf/xdp_redirect_map_multi.bpf.c
> > > +++ b/samples/bpf/xdp_redirect_map_multi.bpf.c
> > > @@ -53,7 +53,7 @@ int xdp_redirect_map_native(struct xdp_md *ctx)
> > > return xdp_redirect_map(ctx, &forward_map_native);
> > > }
> > >
> > > -SEC("xdp_devmap/egress")
> > > +SEC("xdp/devmap")
> > > int xdp_devmap_prog(struct xdp_md *ctx)
> > > {
> > > void *data_end = (void *)(long)ctx->data_end;
> > > diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> > > index 4ce94f4ed34a..1d97bc346be6 100644
> > > --- a/tools/lib/bpf/libbpf.c
> > > +++ b/tools/lib/bpf/libbpf.c
> > > @@ -237,6 +237,8 @@ enum sec_def_flags {
> > > SEC_SLOPPY_PFX = 16,
> > > /* BPF program support non-linear XDP buffer */
> > > SEC_XDP_FRAGS = 32,
> > > + /* deprecated sec definitions not supposed to be used */
> > > + SEC_DEPRECATED = 64,
> > > };
> > >
> > > struct bpf_sec_def {
> > > @@ -6575,6 +6577,10 @@ static int libbpf_preload_prog(struct bpf_program *prog,
> > > if (prog->type == BPF_PROG_TYPE_XDP && (def & SEC_XDP_FRAGS))
> > > opts->prog_flags |= BPF_F_XDP_HAS_FRAGS;
> > >
> > > + if (def & SEC_DEPRECATED)
> > > + pr_warn("sec '%s' is deprecated, please use new version instead\n",
> > > + prog->sec_name);
> > > +
> >
> > How is the user supposed to figure out what "the new version" is?
>
>
> Let's add the section to
> https://github.com/libbpf/libbpf/wiki/Libbpf-1.0-migration-guide and
> link to it from the deprecation warning.
so, is it better to add an utility routine to map the deprecated sec_name to
the new one, or is it enough to add a section in Libbpf-1.0-migration-guide?
I am fine both ways.
Regards,
Lorenzo
>
> >
> > -Toke
> >
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH bpf-next] libbpf: deprecate xdp_cpumap and xdp_devmap sec definitions
2022-01-27 17:24 ` Lorenzo Bianconi
@ 2022-02-01 0:53 ` Andrii Nakryiko
0 siblings, 0 replies; 5+ messages in thread
From: Andrii Nakryiko @ 2022-02-01 0:53 UTC (permalink / raw)
To: Lorenzo Bianconi
Cc: Toke Høiland-Jørgensen, bpf, Alexei Starovoitov,
Daniel Borkmann, David Ahern, Jesper Dangaard Brouer,
Lorenzo Bianconi, Andrii Nakryiko, john fastabend
On Thu, Jan 27, 2022 at 9:24 AM Lorenzo Bianconi <lorenzo@kernel.org> wrote:
>
> > On Thu, Jan 27, 2022 at 7:37 AM Toke Høiland-Jørgensen <toke@redhat.com> wrote:
> > >
> > > Lorenzo Bianconi <lorenzo@kernel.org> writes:
> > >
> > > > Deprecate xdp_cpumap xdp_devmap sec definitions.
> > > > Introduce xdp/devmap and xdp/cpumap definitions according to the standard
> > > > for SEC("") in libbpf:
> > > > - prog_type.prog_flags/attach_place
> > > > Update cpumap/devmap samples and kselftests
> > > >
> > > > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> > > > ---
> > > > samples/bpf/xdp_redirect_cpu.bpf.c | 8 ++++----
> > > > samples/bpf/xdp_redirect_map.bpf.c | 2 +-
> > > > samples/bpf/xdp_redirect_map_multi.bpf.c | 2 +-
> > > > tools/lib/bpf/libbpf.c | 12 ++++++++++--
> > > > .../bpf/progs/test_xdp_with_cpumap_frags_helpers.c | 2 +-
> > > > .../bpf/progs/test_xdp_with_cpumap_helpers.c | 2 +-
> > > > .../bpf/progs/test_xdp_with_devmap_frags_helpers.c | 2 +-
> > > > .../bpf/progs/test_xdp_with_devmap_helpers.c | 2 +-
> > > > .../selftests/bpf/progs/xdp_redirect_multi_kern.c | 2 +-
> > > > 9 files changed, 21 insertions(+), 13 deletions(-)
> > > >
> > > > diff --git a/samples/bpf/xdp_redirect_cpu.bpf.c b/samples/bpf/xdp_redirect_cpu.bpf.c
> > > > index 25e3a405375f..87c54bfdbb70 100644
> > > > --- a/samples/bpf/xdp_redirect_cpu.bpf.c
> > > > +++ b/samples/bpf/xdp_redirect_cpu.bpf.c
> > > > @@ -491,7 +491,7 @@ int xdp_prognum5_lb_hash_ip_pairs(struct xdp_md *ctx)
> > > > return bpf_redirect_map(&cpu_map, cpu_dest, 0);
> > > > }
> > > >
> > > > -SEC("xdp_cpumap/redirect")
> > > > +SEC("xdp/cpumap")
> > > > int xdp_redirect_cpu_devmap(struct xdp_md *ctx)
> > > > {
> > > > void *data_end = (void *)(long)ctx->data_end;
> > > > @@ -507,19 +507,19 @@ int xdp_redirect_cpu_devmap(struct xdp_md *ctx)
> > > > return bpf_redirect_map(&tx_port, 0, 0);
> > > > }
> > > >
> > > > -SEC("xdp_cpumap/pass")
> > > > +SEC("xdp/cpumap")
> > > > int xdp_redirect_cpu_pass(struct xdp_md *ctx)
> > > > {
> > > > return XDP_PASS;
> > > > }
> > > >
> > > > -SEC("xdp_cpumap/drop")
> > > > +SEC("xdp/cpumap")
> > > > int xdp_redirect_cpu_drop(struct xdp_md *ctx)
> > > > {
> > > > return XDP_DROP;
> > > > }
> > > >
> > > > -SEC("xdp_devmap/egress")
> > > > +SEC("xdp/devmap")
> > > > int xdp_redirect_egress_prog(struct xdp_md *ctx)
> > > > {
> > > > void *data_end = (void *)(long)ctx->data_end;
> > > > diff --git a/samples/bpf/xdp_redirect_map.bpf.c b/samples/bpf/xdp_redirect_map.bpf.c
> > > > index 59efd656e1b2..415bac1758e3 100644
> > > > --- a/samples/bpf/xdp_redirect_map.bpf.c
> > > > +++ b/samples/bpf/xdp_redirect_map.bpf.c
> > > > @@ -68,7 +68,7 @@ int xdp_redirect_map_native(struct xdp_md *ctx)
> > > > return xdp_redirect_map(ctx, &tx_port_native);
> > > > }
> > > >
> > > > -SEC("xdp_devmap/egress")
> > > > +SEC("xdp/devmap")
> > > > int xdp_redirect_map_egress(struct xdp_md *ctx)
> > > > {
> > > > void *data_end = (void *)(long)ctx->data_end;
> > > > diff --git a/samples/bpf/xdp_redirect_map_multi.bpf.c b/samples/bpf/xdp_redirect_map_multi.bpf.c
> > > > index bb0a5a3bfcf0..8b2fd4ec2c76 100644
> > > > --- a/samples/bpf/xdp_redirect_map_multi.bpf.c
> > > > +++ b/samples/bpf/xdp_redirect_map_multi.bpf.c
> > > > @@ -53,7 +53,7 @@ int xdp_redirect_map_native(struct xdp_md *ctx)
> > > > return xdp_redirect_map(ctx, &forward_map_native);
> > > > }
> > > >
> > > > -SEC("xdp_devmap/egress")
> > > > +SEC("xdp/devmap")
> > > > int xdp_devmap_prog(struct xdp_md *ctx)
> > > > {
> > > > void *data_end = (void *)(long)ctx->data_end;
> > > > diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> > > > index 4ce94f4ed34a..1d97bc346be6 100644
> > > > --- a/tools/lib/bpf/libbpf.c
> > > > +++ b/tools/lib/bpf/libbpf.c
> > > > @@ -237,6 +237,8 @@ enum sec_def_flags {
> > > > SEC_SLOPPY_PFX = 16,
> > > > /* BPF program support non-linear XDP buffer */
> > > > SEC_XDP_FRAGS = 32,
> > > > + /* deprecated sec definitions not supposed to be used */
> > > > + SEC_DEPRECATED = 64,
> > > > };
> > > >
> > > > struct bpf_sec_def {
> > > > @@ -6575,6 +6577,10 @@ static int libbpf_preload_prog(struct bpf_program *prog,
> > > > if (prog->type == BPF_PROG_TYPE_XDP && (def & SEC_XDP_FRAGS))
> > > > opts->prog_flags |= BPF_F_XDP_HAS_FRAGS;
> > > >
> > > > + if (def & SEC_DEPRECATED)
> > > > + pr_warn("sec '%s' is deprecated, please use new version instead\n",
> > > > + prog->sec_name);
> > > > +
> > >
> > > How is the user supposed to figure out what "the new version" is?
> >
> >
> > Let's add the section to
> > https://github.com/libbpf/libbpf/wiki/Libbpf-1.0-migration-guide and
> > link to it from the deprecation warning.
>
> so, is it better to add an utility routine to map the deprecated sec_name to
> the new one, or is it enough to add a section in Libbpf-1.0-migration-guide?
> I am fine both ways.
Let's add a section about deprecated sections (we were also talking
about deprecating "classifier" in favor of "tc", so we can mention
that as well). It's better to maintain that mapping in a wiki than
through libbpf code, IMO. Wiki can provide more context than what we
can reasonable put into deprecation messages as well.
>
> Regards,
> Lorenzo
>
> >
> > >
> > > -Toke
> > >
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-02-01 0:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-27 12:12 [PATCH bpf-next] libbpf: deprecate xdp_cpumap and xdp_devmap sec definitions Lorenzo Bianconi
2022-01-27 15:37 ` Toke Høiland-Jørgensen
2022-01-27 17:08 ` Andrii Nakryiko
2022-01-27 17:24 ` Lorenzo Bianconi
2022-02-01 0:53 ` Andrii Nakryiko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.