[PATCH v4 net-next 4/5] net: filter: rename sk_convert_filter() -> bpf_convert_filter()

2014-07-30 Thread Alexei Starovoitov
to indicate that this function is converting classic BPF into eBPF
and not related to sockets

Signed-off-by: Alexei Starovoitov 
---
 arch/x86/net/bpf_jit_comp.c |2 +-
 include/linux/filter.h  |4 ++--
 kernel/bpf/core.c   |2 +-
 kernel/seccomp.c|4 ++--
 net/core/filter.c   |   16 
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 71737a83f022..e2ecc1380b3d 100644
--- 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 c4d0be4c5e75..7cb9b40e9a2f 100644
--- 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 b479807ec383..188ac5ba3900 100644
--- 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 f4a77d23f209..33a3a97e2b58 100644
--- 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, _len);
+   ret = bpf_convert_filter(fp, fprog->len, NULL, _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, _len);
+   ret = bpf_convert_filter(fp, fprog->len, filter->prog->insnsi, 
_len);
if (ret)
goto free_filter_prog;
kfree(fp);
diff --git a/net/core/filter.c b/net/core/filter.c
index 5740ea08a3ad..6ac901613bee 100644
--- 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, _len)
+ *   bpf_convert_filter(old_prog, old_len, NULL, _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, _len);
+ *   bpf_convert_filter(old_prog, old_len, new_prog, _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, 

[PATCH v4 net-next 4/5] net: filter: rename sk_convert_filter() - bpf_convert_filter()

2014-07-30 Thread Alexei Starovoitov
to indicate that this function is converting classic BPF into eBPF
and not related to sockets

Signed-off-by: Alexei Starovoitov a...@plumgrid.com
---
 arch/x86/net/bpf_jit_comp.c |2 +-
 include/linux/filter.h  |4 ++--
 kernel/bpf/core.c   |2 +-
 kernel/seccomp.c|4 ++--
 net/core/filter.c   |   16 
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 71737a83f022..e2ecc1380b3d 100644
--- 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 c4d0be4c5e75..7cb9b40e9a2f 100644
--- 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 b479807ec383..188ac5ba3900 100644
--- 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 f4a77d23f209..33a3a97e2b58 100644
--- 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 5740ea08a3ad..6ac901613bee 100644
--- 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