Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6f6df69 authored by John Fastabend's avatar John Fastabend Committed by David S. Miller
Browse files

bpf: export bpf_prog_inc_not_zero 



bpf_prog_inc_not_zero will be used by upcoming sockmap patches this
patch simply exports it so we can pull it in.

Signed-off-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b005fd18

include/linux/bpf.h

+7 −0
Original line number Diff line number Diff line
@@ -252,6 +252,7 @@ struct bpf_prog *bpf_prog_get_type(u32 ufd, enum bpf_prog_type type); 
struct bpf_prog * __must_check bpf_prog_add(struct bpf_prog *prog, int i);

void bpf_prog_sub(struct bpf_prog *prog, int i);

struct bpf_prog * __must_check bpf_prog_inc(struct bpf_prog *prog);

struct bpf_prog * __must_check bpf_prog_inc_not_zero(struct bpf_prog *prog);

void bpf_prog_put(struct bpf_prog *prog);

int __bpf_prog_charge(struct user_struct *user, u32 pages);

void __bpf_prog_uncharge(struct user_struct *user, u32 pages);
@@ -344,6 +345,12 @@ static inline struct bpf_prog * __must_check bpf_prog_inc(struct bpf_prog *prog) 
	return ERR_PTR(-EOPNOTSUPP);

}



static inline struct bpf_prog *__must_check

bpf_prog_inc_not_zero(struct bpf_prog *prog)

{

	return ERR_PTR(-EOPNOTSUPP);

}



static inline int __bpf_prog_charge(struct user_struct *user, u32 pages)

{

	return 0;

kernel/bpf/syscall.c

+2 −1
Original line number Diff line number Diff line
@@ -911,7 +911,7 @@ struct bpf_prog *bpf_prog_inc(struct bpf_prog *prog) 
EXPORT_SYMBOL_GPL(bpf_prog_inc);



/* prog_idr_lock should have been held */

static struct bpf_prog *bpf_prog_inc_not_zero(struct bpf_prog *prog)

struct bpf_prog *bpf_prog_inc_not_zero(struct bpf_prog *prog)

{

	int refold;
@@ -927,6 +927,7 @@ static struct bpf_prog *bpf_prog_inc_not_zero(struct bpf_prog *prog) 


	return prog;

}

EXPORT_SYMBOL_GPL(bpf_prog_inc_not_zero);



static struct bpf_prog *__bpf_prog_get(u32 ufd, enum bpf_prog_type *type)

{