net: filter: rename sk_convert_filter() -> bpf_convert_filter()

to indicate that this function is converting classic BPF into eBPF
and not related to sockets

Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 71737a83f022ca42bd3dd1e6334f38de066d9f56..e2ecc1380b3de28b6e0726a285c76d3a6026687b 100644 (file)
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -235,7 +235,7 @@ static int do_jit(struct sk_filter *bpf_prog, int *addrs, u8 *image,
        /* mov qword ptr [rbp-X],rbx */
        EMIT3_off32(0x48, 0x89, 0x9D, -stacksize);
 
-       /* sk_convert_filter() maps classic BPF register X to R7 and uses R8
+       /* bpf_convert_filter() maps classic BPF register X to R7 and uses R8
         * as temporary, so all tcpdump filters need to spill/fill R7(r13) and
         * R8(r14). R9(r15) spill could be made conditional, but there is only
         * one 'bpf_error' return path out of helper functions inside bpf_jit.S

diff --git a/include/linux/filter.h b/include/linux/filter.h
index c4d0be4c5e759c5aae3bed68c94ff3415b5c5d02..7cb9b40e9a2f6c67a159d8cccdc05accc64ff67a 100644 (file)
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -351,8 +351,8 @@ int sk_filter(struct sock *sk, struct sk_buff *skb);
 void sk_filter_select_runtime(struct sk_filter *fp);
 void sk_filter_free(struct sk_filter *fp);
 
-int sk_convert_filter(struct sock_filter *prog, int len,
-                     struct bpf_insn *new_prog, int *new_len);
+int bpf_convert_filter(struct sock_filter *prog, int len,
+                      struct bpf_insn *new_prog, int *new_len);
 
 int sk_unattached_filter_create(struct sk_filter **pfp,
                                struct sock_fprog_kern *fprog);

diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index b479807ec383affe9881a987f069e46137a4467e..188ac5ba390089c0f9a7af924277f169a2c52726 100644 (file)
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -446,7 +446,7 @@ load_word:
                /* BPF_LD + BPD_ABS and BPF_LD + BPF_IND insns are
                 * only appearing in the programs where ctx ==
                 * skb. All programs keep 'ctx' in regs[BPF_REG_CTX]
-                * == BPF_R6, sk_convert_filter() saves it in BPF_R6,
+                * == BPF_R6, bpf_convert_filter() saves it in BPF_R6,
                 * internal BPF verifier will check that BPF_R6 ==
                 * ctx.
                 *

diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index f4a77d23f209d7d659b9109db31d612d6b07af46..33a3a97e2b58c5ddefe0b76065e12fe5c05ebbae 100644 (file)
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
@@ -249,7 +249,7 @@ static long seccomp_attach_filter(struct sock_fprog *fprog)
                goto free_prog;
 
        /* Convert 'sock_filter' insns to 'bpf_insn' insns */
-       ret = sk_convert_filter(fp, fprog->len, NULL, &new_len);
+       ret = bpf_convert_filter(fp, fprog->len, NULL, &new_len);
        if (ret)
                goto free_prog;
 
@@ -265,7 +265,7 @@ static long seccomp_attach_filter(struct sock_fprog *fprog)
        if (!filter->prog)
                goto free_filter;
 
-       ret = sk_convert_filter(fp, fprog->len, filter->prog->insnsi, &new_len);
+       ret = bpf_convert_filter(fp, fprog->len, filter->prog->insnsi, &new_len);
        if (ret)
                goto free_filter_prog;
        kfree(fp);

diff --git a/net/core/filter.c b/net/core/filter.c
index 5740ea08a3ad3fe35def0b3fdc0707a6575f603c..6ac901613bee1b53d8e43401ff1c0aa2a4028ff4 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -312,7 +312,7 @@ static bool convert_bpf_extensions(struct sock_filter *fp,
 }
 
 /**
- *     sk_convert_filter - convert filter program
+ *     bpf_convert_filter - convert filter program
  *     @prog: the user passed filter program
  *     @len: the length of the user passed filter program
  *     @new_prog: buffer where converted program will be stored
@@ -322,12 +322,12 @@ static bool convert_bpf_extensions(struct sock_filter *fp,
  * Conversion workflow:
  *
  * 1) First pass for calculating the new program length:
- *   sk_convert_filter(old_prog, old_len, NULL, &new_len)
+ *   bpf_convert_filter(old_prog, old_len, NULL, &new_len)
  *
  * 2) 2nd pass to remap in two passes: 1st pass finds new
  *    jump offsets, 2nd pass remapping:
  *   new_prog = kmalloc(sizeof(struct bpf_insn) * new_len);
- *   sk_convert_filter(old_prog, old_len, new_prog, &new_len);
+ *   bpf_convert_filter(old_prog, old_len, new_prog, &new_len);
  *
  * User BPF's register A is mapped to our BPF register 6, user BPF
  * register X is mapped to BPF register 7; frame pointer is always
@@ -335,8 +335,8 @@ static bool convert_bpf_extensions(struct sock_filter *fp,
  * for socket filters: ctx == 'struct sk_buff *', for seccomp:
  * ctx == 'struct seccomp_data *'.
  */
-int sk_convert_filter(struct sock_filter *prog, int len,
-                     struct bpf_insn *new_prog, int *new_len)
+int bpf_convert_filter(struct sock_filter *prog, int len,
+                      struct bpf_insn *new_prog, int *new_len)
 {
        int new_flen = 0, pass = 0, target, i;
        struct bpf_insn *new_insn;
@@ -921,7 +921,7 @@ static struct sk_filter *__sk_migrate_filter(struct sk_filter *fp)
        }
 
        /* 1st pass: calculate the new program length. */
-       err = sk_convert_filter(old_prog, old_len, NULL, &new_len);
+       err = bpf_convert_filter(old_prog, old_len, NULL, &new_len);
        if (err)
                goto out_err_free;
 
@@ -940,9 +940,9 @@ static struct sk_filter *__sk_migrate_filter(struct sk_filter *fp)
        fp->len = new_len;
 
        /* 2nd pass: remap sock_filter insns into bpf_insn insns. */
-       err = sk_convert_filter(old_prog, old_len, fp->insnsi, &new_len);
+       err = bpf_convert_filter(old_prog, old_len, fp->insnsi, &new_len);
        if (err)
-               /* 2nd sk_convert_filter() can fail only if it fails
+               /* 2nd bpf_convert_filter() can fail only if it fails
                 * to allocate memory, remapping must succeed. Note,
                 * that at this time old_fp has already been released
                 * by krealloc().