diff options
Diffstat (limited to 'arch/x86/net/bpf_jit_comp.c')
-rw-r--r-- | arch/x86/net/bpf_jit_comp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index e2ecc1380b3d..5c8cb8043c5a 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c | |||
@@ -211,7 +211,7 @@ struct jit_context { | |||
211 | bool seen_ld_abs; | 211 | bool seen_ld_abs; |
212 | }; | 212 | }; |
213 | 213 | ||
214 | static int do_jit(struct sk_filter *bpf_prog, int *addrs, u8 *image, | 214 | static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image, |
215 | int oldproglen, struct jit_context *ctx) | 215 | int oldproglen, struct jit_context *ctx) |
216 | { | 216 | { |
217 | struct bpf_insn *insn = bpf_prog->insnsi; | 217 | struct bpf_insn *insn = bpf_prog->insnsi; |
@@ -841,7 +841,7 @@ common_load: ctx->seen_ld_abs = true; | |||
841 | /* By design x64 JIT should support all BPF instructions | 841 | /* By design x64 JIT should support all BPF instructions |
842 | * This error will be seen if new instruction was added | 842 | * This error will be seen if new instruction was added |
843 | * to interpreter, but not to JIT | 843 | * to interpreter, but not to JIT |
844 | * or if there is junk in sk_filter | 844 | * or if there is junk in bpf_prog |
845 | */ | 845 | */ |
846 | pr_err("bpf_jit: unknown opcode %02x\n", insn->code); | 846 | pr_err("bpf_jit: unknown opcode %02x\n", insn->code); |
847 | return -EINVAL; | 847 | return -EINVAL; |
@@ -862,11 +862,11 @@ common_load: ctx->seen_ld_abs = true; | |||
862 | return proglen; | 862 | return proglen; |
863 | } | 863 | } |
864 | 864 | ||
865 | void bpf_jit_compile(struct sk_filter *prog) | 865 | void bpf_jit_compile(struct bpf_prog *prog) |
866 | { | 866 | { |
867 | } | 867 | } |
868 | 868 | ||
869 | void bpf_int_jit_compile(struct sk_filter *prog) | 869 | void bpf_int_jit_compile(struct bpf_prog *prog) |
870 | { | 870 | { |
871 | struct bpf_binary_header *header = NULL; | 871 | struct bpf_binary_header *header = NULL; |
872 | int proglen, oldproglen = 0; | 872 | int proglen, oldproglen = 0; |
@@ -932,7 +932,7 @@ out: | |||
932 | 932 | ||
933 | static void bpf_jit_free_deferred(struct work_struct *work) | 933 | static void bpf_jit_free_deferred(struct work_struct *work) |
934 | { | 934 | { |
935 | struct sk_filter *fp = container_of(work, struct sk_filter, work); | 935 | struct bpf_prog *fp = container_of(work, struct bpf_prog, work); |
936 | unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK; | 936 | unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK; |
937 | struct bpf_binary_header *header = (void *)addr; | 937 | struct bpf_binary_header *header = (void *)addr; |
938 | 938 | ||
@@ -941,7 +941,7 @@ static void bpf_jit_free_deferred(struct work_struct *work) | |||
941 | kfree(fp); | 941 | kfree(fp); |
942 | } | 942 | } |
943 | 943 | ||
944 | void bpf_jit_free(struct sk_filter *fp) | 944 | void bpf_jit_free(struct bpf_prog *fp) |
945 | { | 945 | { |
946 | if (fp->jited) { | 946 | if (fp->jited) { |
947 | INIT_WORK(&fp->work, bpf_jit_free_deferred); | 947 | INIT_WORK(&fp->work, bpf_jit_free_deferred); |