Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / arch / x86 / net / bpf_jit.S

diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
index 4093216b3791311c995bfb2f644deed3845ef708..f2a7faf4706eb64debcc65d3c9ad0b0fd9c70599 100644 (file)
--- a/arch/x86/net/bpf_jit.S
+++ b/arch/x86/net/bpf_jit.S
@@ -8,6 +8,7 @@
  * of the License.
  */
 #include <linux/linkage.h>
+#include <asm/frame.h>
 
 /*
  * Calling convention :
@@ -22,15 +23,16 @@
        32 /* space for rbx,r13,r14,r15 */ + \
        8 /* space for skb_copy_bits */)
 
-sk_load_word:
-       .globl  sk_load_word
+#define FUNC(name) \
+       .globl name; \
+       .type name, @function; \
+       name:
 
+FUNC(sk_load_word)
        test    %esi,%esi
        js      bpf_slow_path_word_neg
 
-sk_load_word_positive_offset:
-       .globl  sk_load_word_positive_offset
-
+FUNC(sk_load_word_positive_offset)
        mov     %r9d,%eax               # hlen
        sub     %esi,%eax               # hlen - offset
        cmp     $3,%eax
@@ -39,15 +41,11 @@ sk_load_word_positive_offset:
        bswap   %eax                    /* ntohl() */
        ret
 
-sk_load_half:
-       .globl  sk_load_half
-
+FUNC(sk_load_half)
        test    %esi,%esi
        js      bpf_slow_path_half_neg
 
-sk_load_half_positive_offset:
-       .globl  sk_load_half_positive_offset
-
+FUNC(sk_load_half_positive_offset)
        mov     %r9d,%eax
        sub     %esi,%eax               #       hlen - offset
        cmp     $1,%eax
@@ -56,15 +54,11 @@ sk_load_half_positive_offset:
        rol     $8,%ax                  # ntohs()
        ret
 
-sk_load_byte:
-       .globl  sk_load_byte
-
+FUNC(sk_load_byte)
        test    %esi,%esi
        js      bpf_slow_path_byte_neg
 
-sk_load_byte_positive_offset:
-       .globl  sk_load_byte_positive_offset
-
+FUNC(sk_load_byte_positive_offset)
        cmp     %esi,%r9d   /* if (offset >= hlen) goto bpf_slow_path_byte */
        jle     bpf_slow_path_byte
        movzbl  (SKBDATA,%rsi),%eax
@@ -72,16 +66,18 @@ sk_load_byte_positive_offset:
 
 /* rsi contains offset and can be scratched */
 #define bpf_slow_path_common(LEN)              \
+       lea     -MAX_BPF_STACK + 32(%rbp), %rdx;\
+       FRAME_BEGIN;                            \
        mov     %rbx, %rdi; /* arg1 == skb */   \
        push    %r9;                            \
        push    SKBDATA;                        \
 /* rsi already has offset */                   \
        mov     $LEN,%ecx;      /* len */       \
-       lea     - MAX_BPF_STACK + 32(%rbp),%rdx;                        \
        call    skb_copy_bits;                  \
        test    %eax,%eax;                      \
        pop     SKBDATA;                        \
-       pop     %r9;
+       pop     %r9;                            \
+       FRAME_END
 
 
 bpf_slow_path_word:
@@ -106,6 +102,7 @@ bpf_slow_path_byte:
        ret
 
 #define sk_negative_common(SIZE)                               \
+       FRAME_BEGIN;                                            \
        mov     %rbx, %rdi; /* arg1 == skb */                   \
        push    %r9;                                            \
        push    SKBDATA;                                        \
@@ -115,13 +112,14 @@ bpf_slow_path_byte:
        test    %rax,%rax;                                      \
        pop     SKBDATA;                                        \
        pop     %r9;                                            \
+       FRAME_END;                                              \
        jz      bpf_error
 
 bpf_slow_path_word_neg:
        cmp     SKF_MAX_NEG_OFF, %esi   /* test range */
        jl      bpf_error       /* offset lower -> error  */
-sk_load_word_negative_offset:
-       .globl  sk_load_word_negative_offset
+
+FUNC(sk_load_word_negative_offset)
        sk_negative_common(4)
        mov     (%rax), %eax
        bswap   %eax
@@ -130,8 +128,8 @@ sk_load_word_negative_offset:
 bpf_slow_path_half_neg:
        cmp     SKF_MAX_NEG_OFF, %esi
        jl      bpf_error
-sk_load_half_negative_offset:
-       .globl  sk_load_half_negative_offset
+
+FUNC(sk_load_half_negative_offset)
        sk_negative_common(2)
        mov     (%rax),%ax
        rol     $8,%ax
@@ -141,8 +139,8 @@ sk_load_half_negative_offset:
 bpf_slow_path_byte_neg:
        cmp     SKF_MAX_NEG_OFF, %esi
        jl      bpf_error
-sk_load_byte_negative_offset:
-       .globl  sk_load_byte_negative_offset
+
+FUNC(sk_load_byte_negative_offset)
        sk_negative_common(1)
        movzbl  (%rax), %eax
        ret