Skip to contentSkip to conversation

libbpf: Remove deprecated bpf_object__find_map_by_offset

PATCH Superseded Tal Lossos 2 participants 3 messages Jul 22, 2021 – Jul 23, 2021

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Tal Lossos

author
#0 lore raw

PATCH 1/1 libbpf: Remove deprecated bpf_object__find_map_by_offset

Removing bpf_object__find_map_by_offset as part of the effort to move towards a v1.0 for libbpf: https://github.com/libbpf/libbpf/issues/302.

---
 tools/lib/bpf/libbpf.c   | 6 ------
 tools/lib/bpf/libbpf.h   | 7 -------
 tools/lib/bpf/libbpf.map | 1 -
 3 files changed, 14 deletions(-)
tools/lib/bpf/libbpf.c +0 -6
index 4c153c379989..6b021b893579 100644
@@ -9956,12 +9956,6 @@ bpf_object__find_map_fd_by_name(const struct bpf_object *obj, const char *name)
 	return bpf_map__fd(bpf_object__find_map_by_name(obj, name));
 }
 
-struct bpf_map *
-bpf_object__find_map_by_offset(struct bpf_object *obj, size_t offset)
-{
-	return libbpf_err_ptr(-ENOTSUP);
-}
-
 long libbpf_get_error(const void *ptr)
 {
 	if (!IS_ERR_OR_NULL(ptr))
tools/lib/bpf/libbpf.h +0 -7
index 6b08c1023609..1de34b315277 100644
@@ -422,13 +422,6 @@ bpf_object__find_map_by_name(const struct bpf_object *obj, const char *name);
 LIBBPF_API int
 bpf_object__find_map_fd_by_name(const struct bpf_object *obj, const char *name);
 
-/*
- * Get bpf_map through the offset of corresponding struct bpf_map_def
- * in the BPF object file.
- */
-LIBBPF_API struct bpf_map *
-bpf_object__find_map_by_offset(struct bpf_object *obj, size_t offset);
-
 LIBBPF_API struct bpf_map *
 bpf_map__next(const struct bpf_map *map, const struct bpf_object *obj);
 #define bpf_object__for_each_map(pos, obj)		\
tools/lib/bpf/libbpf.map +0 -1
index 5bfc10722647..220d22b73b9c 100644
@@ -38,7 +38,6 @@ LIBBPF_0.0.1 {
 		bpf_object__btf_fd;
 		bpf_object__close;
 		bpf_object__find_map_by_name;
-		bpf_object__find_map_by_offset;
 		bpf_object__find_program_by_title;
 		bpf_object__kversion;
 		bpf_object__load;
Signature · 1 line
2.27.0
#1 lore raw
Quoted 6 lines · Tal Lossos

Removing bpf_object__find_map_by_offset as part of the effort to move towards a v1.0 for libbpf: https://github.com/libbpf/libbpf/issues/302.

---

Thanks for helping with the libbpf 1.0 effort! But we shouldn't be removing APIs until right before 1.0 release, otherwise we are breaking backwards compatibility guarantees. So this will have to wait until then (even though I don't believe anyone is using bpf_object__find_map_by_offset() in the wild).

Quoted 45 lines
 tools/lib/bpf/libbpf.c   | 6 ------
 tools/lib/bpf/libbpf.h   | 7 -------
 tools/lib/bpf/libbpf.map | 1 -
 3 files changed, 14 deletions(-)
tools/lib/bpf/libbpf.c +0 -6
index 4c153c379989..6b021b893579 100644
@@ -9956,12 +9956,6 @@ bpf_object__find_map_fd_by_name(const struct bpf_object *obj, const char *name)
        return bpf_map__fd(bpf_object__find_map_by_name(obj, name));
 }
 
-struct bpf_map *
-bpf_object__find_map_by_offset(struct bpf_object *obj, size_t offset)
-{
-       return libbpf_err_ptr(-ENOTSUP);
-}
-
 long libbpf_get_error(const void *ptr)
 {
        if (!IS_ERR_OR_NULL(ptr))
tools/lib/bpf/libbpf.h +0 -7
index 6b08c1023609..1de34b315277 100644
@@ -422,13 +422,6 @@ bpf_object__find_map_by_name(const struct bpf_object *obj, const char *name);
 LIBBPF_API int
 bpf_object__find_map_fd_by_name(const struct bpf_object *obj, const char *name);
 
-/*
- * Get bpf_map through the offset of corresponding struct bpf_map_def
- * in the BPF object file.
- */
-LIBBPF_API struct bpf_map *
-bpf_object__find_map_by_offset(struct bpf_object *obj, size_t offset);
-
 LIBBPF_API struct bpf_map *
 bpf_map__next(const struct bpf_map *map, const struct bpf_object *obj);
 #define bpf_object__for_each_map(pos, obj)             \
tools/lib/bpf/libbpf.map +0 -0
index 5bfc10722647..220d22b73b9c 100644

tools/lib/bpf/libbpf.map LIBBPF_0.0.1 { · line 41

Quoted 4 lines
tools/lib/bpf/libbpf.map +0 -1
@@ -38,7 +38,6 @@ LIBBPF_0.0.1 {
                bpf_object__btf_fd;
                bpf_object__close;
                bpf_object__find_map_by_name;
-               bpf_object__find_map_by_offset;

we can't retroactively modify libbpf.map for already released versions. I think once we are ready for libbpf 1.0 we'll just dump all the non-deleted APIs into a LIBBPF_1.0.0 section without inheriting from the last 0.x version.

Quoted 6 lines
tools/lib/bpf/libbpf.map +0 -1
                bpf_object__find_program_by_title;
                bpf_object__kversion;
                bpf_object__load;
--

2.27.0

author
#2 lore raw

Hi no worries!
I've submitted a fix for the patch which re-adds the deleted API in libbpf.map. Since we want to do it only when we're about to release libbpf 1.0 we can just wait with it until then :)

‫בתאריך יום ו׳, 23 ביולי 2021 ב-6:12 מאת ‪Andrii Nakryiko‬‏ <‪[email protected]‬‏>:‬

Quoted 76 lines · Tal Lossos
Quoted 6 lines

Removing bpf_object__find_map_by_offset as part of the effort to move towards a v1.0 for libbpf: https://github.com/libbpf/libbpf/issues/302.

---

Thanks for helping with the libbpf 1.0 effort! But we shouldn't be removing APIs until right before 1.0 release, otherwise we are breaking backwards compatibility guarantees. So this will have to wait until then (even though I don't believe anyone is using bpf_object__find_map_by_offset() in the wild).

Quoted 45 lines
 tools/lib/bpf/libbpf.c   | 6 ------
 tools/lib/bpf/libbpf.h   | 7 -------
 tools/lib/bpf/libbpf.map | 1 -
 3 files changed, 14 deletions(-)
tools/lib/bpf/libbpf.c +0 -6
index 4c153c379989..6b021b893579 100644
@@ -9956,12 +9956,6 @@ bpf_object__find_map_fd_by_name(const struct bpf_object *obj, const char *name)
        return bpf_map__fd(bpf_object__find_map_by_name(obj, name));
 }
 
-struct bpf_map *
-bpf_object__find_map_by_offset(struct bpf_object *obj, size_t offset)
-{
-       return libbpf_err_ptr(-ENOTSUP);
-}
-
 long libbpf_get_error(const void *ptr)
 {
        if (!IS_ERR_OR_NULL(ptr))
tools/lib/bpf/libbpf.h +0 -7
index 6b08c1023609..1de34b315277 100644
@@ -422,13 +422,6 @@ bpf_object__find_map_by_name(const struct bpf_object *obj, const char *name);
 LIBBPF_API int
 bpf_object__find_map_fd_by_name(const struct bpf_object *obj, const char *name);
 
-/*
- * Get bpf_map through the offset of corresponding struct bpf_map_def
- * in the BPF object file.
- */
-LIBBPF_API struct bpf_map *
-bpf_object__find_map_by_offset(struct bpf_object *obj, size_t offset);
-
 LIBBPF_API struct bpf_map *
 bpf_map__next(const struct bpf_map *map, const struct bpf_object *obj);
 #define bpf_object__for_each_map(pos, obj)             \
tools/lib/bpf/libbpf.map +0 -0
index 5bfc10722647..220d22b73b9c 100644

tools/lib/bpf/libbpf.map LIBBPF_0.0.1 { · line 41

Quoted 4 lines
tools/lib/bpf/libbpf.map +0 -1
@@ -38,7 +38,6 @@ LIBBPF_0.0.1 {
                bpf_object__btf_fd;
                bpf_object__close;
                bpf_object__find_map_by_name;
-               bpf_object__find_map_by_offset;

we can't retroactively modify libbpf.map for already released versions. I think once we are ready for libbpf 1.0 we'll just dump all the non-deleted APIs into a LIBBPF_1.0.0 section without inheriting from the last 0.x version.

Quoted 6 lines
tools/lib/bpf/libbpf.map +0 -1
                bpf_object__find_program_by_title;
                bpf_object__kversion;
                bpf_object__load;
--

2.27.0