| Message ID | 20190308043956.16906-1-tsu.yubo@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | bpf: fix warning about using plain integer as NULL | expand |
On 3/7/19 8:39 PM, Bo YU wrote: > Sparse warning below: > > sudo make C=2 CF=-D__CHECK_ENDIAN__ M=net/bpf/ > CHECK net/bpf//test_run.c > net/bpf//test_run.c:19:77: warning: Using plain integer as NULL pointer > ./include/linux/bpf-cgroup.h:295:77: warning: Using plain integer as NULL pointer > > Signed-off-by: Bo YU <tsu.yubo@gmail.com> Could you add proper fixes like below: Fixes: 8bad74f9840f ("bpf: extend cgroup bpf core to allow multiple cgroup storage types") With that, Acked-by: Yonghong Song <yhs@fb.com> > --- > include/linux/bpf-cgroup.h | 2 +- > net/bpf/test_run.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h > index 695b2a880d9a..a4c644c1c091 100644 > --- a/include/linux/bpf-cgroup.h > +++ b/include/linux/bpf-cgroup.h > @@ -292,7 +292,7 @@ static inline int bpf_cgroup_storage_assign(struct bpf_prog *prog, > static inline void bpf_cgroup_storage_release(struct bpf_prog *prog, > struct bpf_map *map) {} > static inline struct bpf_cgroup_storage *bpf_cgroup_storage_alloc( > - struct bpf_prog *prog, enum bpf_cgroup_storage_type stype) { return 0; } > + struct bpf_prog *prog, enum bpf_cgroup_storage_type stype) { return NULL; } > static inline void bpf_cgroup_storage_free( > struct bpf_cgroup_storage *storage) {} > static inline int bpf_percpu_cgroup_storage_copy(struct bpf_map *map, void *key, > diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c > index da7051d62727..fab142b796ef 100644 > --- a/net/bpf/test_run.c > +++ b/net/bpf/test_run.c > @@ -16,7 +16,7 @@ > static int bpf_test_run(struct bpf_prog *prog, void *ctx, u32 repeat, > u32 *retval, u32 *time) > { > - struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE] = { 0 }; > + struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE] = { NULL }; > enum bpf_cgroup_storage_type stype; > u64 time_start, time_spent = 0; > int ret = 0; >
diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h index 695b2a880d9a..a4c644c1c091 100644 --- a/include/linux/bpf-cgroup.h +++ b/include/linux/bpf-cgroup.h @@ -292,7 +292,7 @@ static inline int bpf_cgroup_storage_assign(struct bpf_prog *prog, static inline void bpf_cgroup_storage_release(struct bpf_prog *prog, struct bpf_map *map) {} static inline struct bpf_cgroup_storage *bpf_cgroup_storage_alloc( - struct bpf_prog *prog, enum bpf_cgroup_storage_type stype) { return 0; } + struct bpf_prog *prog, enum bpf_cgroup_storage_type stype) { return NULL; } static inline void bpf_cgroup_storage_free( struct bpf_cgroup_storage *storage) {} static inline int bpf_percpu_cgroup_storage_copy(struct bpf_map *map, void *key, diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index da7051d62727..fab142b796ef 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -16,7 +16,7 @@ static int bpf_test_run(struct bpf_prog *prog, void *ctx, u32 repeat, u32 *retval, u32 *time) { - struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE] = { 0 }; + struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE] = { NULL }; enum bpf_cgroup_storage_type stype; u64 time_start, time_spent = 0; int ret = 0;
Sparse warning below: sudo make C=2 CF=-D__CHECK_ENDIAN__ M=net/bpf/ CHECK net/bpf//test_run.c net/bpf//test_run.c:19:77: warning: Using plain integer as NULL pointer ./include/linux/bpf-cgroup.h:295:77: warning: Using plain integer as NULL pointer Signed-off-by: Bo YU <tsu.yubo@gmail.com> --- include/linux/bpf-cgroup.h | 2 +- net/bpf/test_run.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)